Skip to content

Commit f6f3ab6

Browse files
kMutageneclaude
andcommitted
Update dev tooling to .NET 10 and latest stable NuGet/tool versions
SDK / runtime: - global.json: 8.0.100 -> 10.0.100 (rollForward: latestMinor) - CI (build-and-test.yml): dotnet-version 8.x.x -> 10.x.x - All net8.0 TFMs updated to net10.0 (build project, Plotly.NET.CSharp, all test/console projects) - netstandard2.0 / netstandard2.1 library TFMs unchanged for broad compatibility Dotnet tools (.config/dotnet-tools.json): - fantomas: 5.2.2 -> 7.0.5 - fsdocs-tool: 20.0.1 -> 22.0.0 Build dependencies (build/build.fsproj): - Fake.* modules: 6.0.0 -> 6.1.4 (Api.Github, Core.Process, Core.ReleaseNotes, Core.Target, DotNet.Cli, DotNet.MSBuild, IO.FileSystem, Tools.Git) Library dependencies: - Newtonsoft.Json: 13.0.3 -> 13.0.4 (Plotly.NET) - PuppeteerSharp: 20.2.2 -> 24.40.0 (Plotly.NET.ImageExport) - Microsoft.DotNet.Interactive: 1.0.0-beta.25323.1 -> 1.0.0-beta.26120.1 (Plotly.NET.Interactive) - Microsoft.DotNet.Interactive.Formatting: 1.0.0-beta.25323.1 -> 1.0.0-beta.26120.1 (Plotly.NET.Interactive) Test dependencies: - Deedle: 2.4.1 -> 5.0.0 (FSharpTestBase, CoreTests, ImageExportTests); 3.0.0 -> 5.0.0 (FSharpConsole) - FSharp.Data: 4.2.0 -> 8.1.7 (FSharpTestBase, CoreTests, ImageExportTests) - Microsoft.NET.Test.Sdk: 16.* -> 18.* (CoreTests, ImageExportTests, InteractiveTests); 16.9.4 -> 18.4.0 (CSharpTests) - Microsoft.DotNet.Interactive: 1.0.0-beta.25070.1 -> 1.0.0-beta.26120.1 (InteractiveTests) - Microsoft.DotNet.Interactive.Formatting: 1.0.0-beta.25070.1 -> 1.0.0-beta.26120.1 (InteractiveTests) - xunit: 2.4.1 -> 2.9.3 (CSharpTests) - xunit.runner.visualstudio: 2.4.3 -> 3.1.5 (CSharpTests) - coverlet.collector: 3.0.2 -> 8.0.1 (CSharpTests) All 947 tests pass (933 core + 6 image export + 8 C#) on net10.0. Co-Authored-By: Claude Sonnet 4.6 <[email protected]>
1 parent eb9e0d8 commit f6f3ab6

16 files changed

Lines changed: 51 additions & 51 deletions

File tree

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"isRoot": true,
44
"tools": {
55
"fantomas": {
6-
"version": "5.2.2",
6+
"version": "7.0.5",
77
"commands": [
88
"fantomas"
99
],
1010
"rollForward": false
1111
},
1212
"fsdocs-tool": {
13-
"version": "20.0.1",
13+
"version": "22.0.0",
1414
"commands": [
1515
"fsdocs"
1616
],

.github/workflows/build-and-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
uses: actions/setup-dotnet@v4
1919
with:
2020
dotnet-version: |
21-
8.x.x
21+
10.x.x
2222
- name: make script executable
2323
run: chmod u+x build.sh
2424
- name: Build and test
@@ -35,7 +35,7 @@ jobs:
3535
uses: actions/setup-dotnet@v4
3636
with:
3737
dotnet-version: |
38-
8.x.x
38+
10.x.x
3939
- name: Build and test
4040
working-directory: ./
4141
run: ./build.cmd runtestsall

build/build.fsproj

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>
77

@@ -19,14 +19,14 @@
1919

2020
<ItemGroup>
2121
<PackageReference Include="BlackFox.Fake.BuildTask" Version="0.1.3" />
22-
<PackageReference Include="Fake.Api.Github" Version="6.0.0" />
23-
<PackageReference Include="Fake.Core.Process" Version="6.0.0" />
24-
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.0.0" />
25-
<PackageReference Include="Fake.Core.Target" Version="6.0.0" />
26-
<PackageReference Include="Fake.DotNet.Cli" Version="6.0.0" />
27-
<PackageReference Include="Fake.DotNet.MSBuild" Version="6.0.0" />
28-
<PackageReference Include="Fake.IO.FileSystem" Version="6.0.0" />
29-
<PackageReference Include="Fake.Tools.Git" Version="6.0.0" />
22+
<PackageReference Include="Fake.Api.Github" Version="6.1.4" />
23+
<PackageReference Include="Fake.Core.Process" Version="6.1.4" />
24+
<PackageReference Include="Fake.Core.ReleaseNotes" Version="6.1.4" />
25+
<PackageReference Include="Fake.Core.Target" Version="6.1.4" />
26+
<PackageReference Include="Fake.DotNet.Cli" Version="6.1.4" />
27+
<PackageReference Include="Fake.DotNet.MSBuild" Version="6.1.4" />
28+
<PackageReference Include="Fake.IO.FileSystem" Version="6.1.4" />
29+
<PackageReference Include="Fake.Tools.Git" Version="6.1.4" />
3030
</ItemGroup>
3131

3232
</Project>

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.100",
3+
"version": "10.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

src/Plotly.NET.CSharp/Plotly.NET.CSharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
<AssemblyName>Plotly.NET.CSharp</AssemblyName>

src/Plotly.NET.ImageExport/Plotly.NET.ImageExport.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434

3535
<ItemGroup>
3636
<ProjectReference Include="..\Plotly.NET\Plotly.NET.fsproj" PackageVersion="[6.0.0, 7.0.0)" />
37-
<PackageReference Include="PuppeteerSharp" Version="20.2.2" />
37+
<PackageReference Include="PuppeteerSharp" Version="24.40.0" />
3838
</ItemGroup>
3939
<Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">
4040
<ItemGroup>

src/Plotly.NET.Interactive/Plotly.NET.Interactive.fsproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848

4949
<ItemGroup>
5050
<ProjectReference Include="..\Plotly.NET\Plotly.NET.fsproj" PackageVersion="[6.0.0, 7.0.0)" />
51-
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.25323.1" />
52-
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.25323.1" />
51+
<PackageReference Include="Microsoft.DotNet.Interactive" Version="1.0.0-beta.26120.1" />
52+
<PackageReference Include="Microsoft.DotNet.Interactive.Formatting" Version="1.0.0-beta.26120.1" />
5353
</ItemGroup>
5454

5555
<Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">

src/Plotly.NET/Plotly.NET.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
<None Include="Playground.fsx" />
193193
</ItemGroup>
194194
<ItemGroup>
195-
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
195+
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
196196
<PackageReference Include="DynamicObj" Version="[7.0.1, 8.0.0)" />
197197
<PackageReference Include="Giraffe.ViewEngine" Version="1.4.0" />
198198
</ItemGroup>

tests/Common/CSharpTestBase/CSharpTestBase.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

tests/Common/FSharpTestBase/FSharpTestBase.fsproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net10.0</TargetFramework>
55
<GenerateDocumentationFile>true</GenerateDocumentationFile>
66
</PropertyGroup>
77

@@ -10,7 +10,7 @@
1010
<EmbeddedResource Include="..\..\..\src\Plotly.NET\plotly-2.28.0.min.js" />
1111
<EmbeddedResource Include="..\..\..\src\Plotly.NET\plotly-2.28.0.min.js.LICENSE.txt" />
1212
</ItemGroup>
13-
13+
1414
<ItemGroup>
1515
<Compile Include="TestCharts\FeatureAdditions\Fix_3d_GridPosition.fs" />
1616
<Compile Include="TestCharts\FeatureAdditions\Grid_SubPlotTitles.fs" />
@@ -39,9 +39,9 @@
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<PackageReference Include="Deedle" Version="2.4.1" />
42+
<PackageReference Include="Deedle" Version="5.0.0" />
4343
<PackageReference Include="Expecto" Version="10.*" />
44-
<PackageReference Include="FSharp.Data" Version="4.2.0" />
44+
<PackageReference Include="FSharp.Data" Version="8.1.7" />
4545
</ItemGroup>
4646

4747
<ItemGroup>

0 commit comments

Comments
 (0)