diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8dd19936..7f977a8b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "paket": { - "version": "9.0.2", + "version": "10.0.0-alpha011", "commands": [ "paket" ], diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b64aefa4..83618ee2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,7 @@ jobs: dotnet-version: | 8.0.x 9.0.x + 10.0.x - name: Run fake build script run: ./build.sh shell: bash diff --git a/global.json b/global.json index 78cc8656..37fa95e2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "9.0.200", + "version": "10.0.100", "rollForward": "latestFeature" } } \ No newline at end of file diff --git a/paket.dependencies b/paket.dependencies index 4e80e6c5..56ea76c7 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -9,7 +9,7 @@ nuget FSharpx.Collections group Test source https://api.nuget.org/v3/index.json - framework: net48, net8, net9 + framework: net48, net8, net9, net10.0 storage: none nuget FSharp.Core ~> 8.0 nuget NUnit diff --git a/paket.lock b/paket.lock index 7356c4f4..9f601525 100644 --- a/paket.lock +++ b/paket.lock @@ -174,7 +174,7 @@ NUGET GROUP Test STORAGE: NONE -RESTRICTION: || (== net48) (== net8.0) (== net9.0) +RESTRICTION: || (== net10.0) (== net48) (== net8.0) (== net9.0) NUGET remote: https://api.nuget.org/v3/index.json FsCheck (2.16.6) @@ -188,52 +188,55 @@ NUGET NUnit (>= 3.14 < 4.0) GitHubActionsTestLogger (2.4.1) Microsoft.TestPlatform.ObjectModel (>= 17.10) - Microsoft.ApplicationInsights (2.22) + Microsoft.ApplicationInsights (2.23) System.Diagnostics.DiagnosticSource (>= 5.0) - Microsoft.CodeCoverage (17.13) - Microsoft.NET.Test.Sdk (17.13) - Microsoft.CodeCoverage (>= 17.13) - Microsoft.TestPlatform.TestHost (>= 17.13) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0) - Microsoft.NETCore.Platforms (7.0.4) - restriction: || (&& (== net48) (< net35)) (&& (== net48) (>= netcoreapp2.0)) (&& (== net48) (< netstandard1.0) (>= win8)) (&& (== net48) (< netstandard1.3) (>= wpa81)) (&& (== net48) (< netstandard1.5) (>= uap10.0)) (&& (== net48) (>= uap10.1)) (&& (== net48) (>= wp8)) (== net8.0) (== net9.0) - Microsoft.Testing.Extensions.Telemetry (1.6) - Microsoft.ApplicationInsights (>= 2.22) - Microsoft.Testing.Platform (>= 1.6) - Microsoft.Testing.Extensions.TrxReport.Abstractions (1.6) - Microsoft.Testing.Platform (>= 1.6) - Microsoft.Testing.Extensions.VSTestBridge (1.6) - Microsoft.Testing.Extensions.Telemetry (>= 1.6) - Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.6) - Microsoft.Testing.Platform (>= 1.6) + Microsoft.CodeCoverage (18.0.1) + Microsoft.NET.Test.Sdk (18.0.1) + Microsoft.CodeCoverage (>= 18.0.1) + Microsoft.TestPlatform.TestHost (>= 18.0.1) - restriction: || (== net10.0) (&& (== net48) (>= net8.0)) (== net8.0) (== net9.0) + Microsoft.NETCore.Platforms (7.0.4) - restriction: || (== net10.0) (&& (== net48) (< net35)) (&& (== net48) (>= netcoreapp2.0)) (&& (== net48) (< netstandard1.0) (>= win8)) (&& (== net48) (< netstandard1.3) (>= wpa81)) (&& (== net48) (< netstandard1.5) (>= uap10.0)) (&& (== net48) (>= uap10.1)) (&& (== net48) (>= wp8)) (== net8.0) (== net9.0) + Microsoft.Testing.Extensions.Telemetry (1.9) + Microsoft.ApplicationInsights (>= 2.23) + Microsoft.Testing.Platform (>= 1.9) + System.Diagnostics.DiagnosticSource (>= 6.0) - restriction: || (&& (== net10.0) (< net6.0)) (== net48) (&& (== net8.0) (< net6.0)) (&& (== net9.0) (< net6.0)) + Microsoft.Testing.Extensions.TrxReport.Abstractions (1.9) + Microsoft.Testing.Platform (>= 1.9) + Microsoft.Testing.Extensions.VSTestBridge (1.9) + Microsoft.Testing.Extensions.Telemetry (>= 1.9) + Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.9) + Microsoft.Testing.Platform (>= 1.9) + Microsoft.TestPlatform.AdapterUtilities (>= 17.13) Microsoft.TestPlatform.ObjectModel (>= 17.13) - Microsoft.Testing.Platform (1.6) - Microsoft.Testing.Platform.MSBuild (1.6) - Microsoft.Testing.Platform (>= 1.6) - Microsoft.TestPlatform.ObjectModel (17.13) - System.Reflection.Metadata (>= 1.6) - Microsoft.TestPlatform.TestHost (17.13) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0) - Microsoft.TestPlatform.ObjectModel (>= 17.13) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0) - Newtonsoft.Json (>= 13.0.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0) - NETStandard.Library (2.0.3) - restriction: || (&& (== net48) (< net35)) (== net8.0) (== net9.0) + Microsoft.Testing.Platform (1.9) + Microsoft.Testing.Platform.MSBuild (1.9) + Microsoft.Testing.Platform (>= 1.9) + Microsoft.TestPlatform.AdapterUtilities (18.0) + Microsoft.TestPlatform.ObjectModel (18.0.1) + System.Reflection.Metadata (>= 8.0) + Microsoft.TestPlatform.TestHost (18.0.1) - restriction: || (== net10.0) (&& (== net48) (>= net8.0)) (== net8.0) (== net9.0) + Microsoft.TestPlatform.ObjectModel (>= 18.0.1) - restriction: || (== net10.0) (&& (== net48) (>= net8.0)) (== net8.0) (== net9.0) + Newtonsoft.Json (>= 13.0.3) - restriction: || (== net10.0) (&& (== net48) (>= net8.0)) (== net8.0) (== net9.0) + NETStandard.Library (2.0.3) - restriction: || (== net10.0) (&& (== net48) (< net35)) (== net8.0) (== net9.0) Microsoft.NETCore.Platforms (>= 1.1) - Newtonsoft.Json (13.0.3) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0) + Newtonsoft.Json (13.0.3) - restriction: || (== net10.0) (&& (== net48) (>= net8.0)) (== net8.0) (== net9.0) NUnit (3.14) - NETStandard.Library (>= 2.0) - restriction: || (&& (== net48) (< net35)) (== net8.0) (== net9.0) - NUnit3TestAdapter (5.0) - Microsoft.Testing.Extensions.VSTestBridge (>= 1.5.3) - Microsoft.Testing.Platform.MSBuild (>= 1.5.3) - System.Buffers (4.6) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) - System.Collections.Immutable (9.0.2) - restriction: || (== net48) (== net8.0) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) - System.Memory (>= 4.5.5) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) + NETStandard.Library (>= 2.0) - restriction: || (== net10.0) (&& (== net48) (< net35)) (== net8.0) (== net9.0) + NUnit3TestAdapter (5.2) + Microsoft.Testing.Extensions.VSTestBridge (>= 1.9) + Microsoft.Testing.Platform.MSBuild (>= 1.9) + System.Buffers (4.6) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< netcoreapp2.1)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) + System.Collections.Immutable (9.0.2) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (&& (== net10.0) (< net9.0)) (== net48) (== net8.0) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) + System.Memory (>= 4.5.5) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) System.Diagnostics.DiagnosticSource (9.0.2) - System.Memory (>= 4.5.5) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) - System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) - System.Memory (4.6) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) - System.Buffers (>= 4.6) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) - System.Numerics.Vectors (>= 4.6) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) - System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) - System.Numerics.Vectors (4.6) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) + System.Memory (>= 4.5.5) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) + System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) + System.Memory (4.6) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) + System.Buffers (>= 4.6) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< netcoreapp2.1)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) + System.Numerics.Vectors (>= 4.6) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< netcoreapp2.1)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) + System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< netcoreapp2.1)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) + System.Numerics.Vectors (4.6) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< netcoreapp2.1)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) System.Reflection.Metadata (9.0.2) - System.Collections.Immutable (>= 9.0.2) - restriction: || (== net48) (== net8.0) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) - System.Memory (>= 4.5.5) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) - System.Runtime.CompilerServices.Unsafe (6.1) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) + System.Collections.Immutable (>= 9.0.2) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (&& (== net10.0) (< net9.0)) (== net48) (== net8.0) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) + System.Memory (>= 4.5.5) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0)) + System.Runtime.CompilerServices.Unsafe (6.1) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< netcoreapp2.1)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1)) diff --git a/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj b/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj index d718bed5..9b892820 100644 --- a/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj +++ b/tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj @@ -2,13 +2,13 @@ FSharpx.CSharpTests - net48;net8;net9 + net48;net8;net9;net10.0 false true latest - net8;net9 + net8;net9;net10.0 true diff --git a/tests/FSharpx.Tests/FSharpx.Tests.fsproj b/tests/FSharpx.Tests/FSharpx.Tests.fsproj index c243c8dc..4af7fa01 100644 --- a/tests/FSharpx.Tests/FSharpx.Tests.fsproj +++ b/tests/FSharpx.Tests/FSharpx.Tests.fsproj @@ -2,13 +2,13 @@ FSharpx.Tests - net48;net8;net9 + net48;net8;net9;net10.0 true false preview - net8;net9 + net8;net9;net10.0