Add testing on net9, update sdk version and update test deps

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "8.0.3",
+      "version": "9.0.2",
       "commands": [
         "paket"
       ],

.github/workflows/main.yml

@@ -27,9 +27,8 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          3.1.x
-          6.0.x
           8.0.x
+          9.0.x
     - name: Run fake build script
       run: ./build.sh
       shell: bash

.paket/Paket.Restore.targets

@@ -235,14 +235,15 @@
 				<Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
 				<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
 				<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
+				<Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
 				<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
 				<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
 				<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
 				<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
 				<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
 			</PaketReferencesFileLinesInfo>
-			<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
-				<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+			<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
+				<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
 				<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
 				<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
 				<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
@@ -252,6 +253,10 @@
 				<AllowExplicitVersion>true</AllowExplicitVersion>
 
 			</PackageReference>
+
+			<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
+				<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
+			</PackageVersion>
 		</ItemGroup>
 
 		<PropertyGroup>

build.cmd

@@ -1,5 +1,8 @@
 @echo off
 
 dotnet tool restore
+if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
 dotnet restore
+if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
 dotnet run -v:m --project ./build/build.fsproj -- -t %*
+if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%

global.json

@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "8.0.402",
+      "version": "9.0.200",
       "rollForward": "latestFeature"
     }
 }

paket.dependencies

@@ -1,4 +1,4 @@
-version 6.2.1
+version 9.0.2
 
 source https://api.nuget.org/v3/index.json
 framework: netstandard20
@@ -9,13 +9,13 @@ nuget FSharpx.Collections
 
 group Test
   source https://api.nuget.org/v3/index.json
-  framework: net48, net6, net8
+  framework: net48, net8, net9
   storage: none
   nuget FSharp.Core ~> 8.0
   nuget NUnit
   nuget NUnit3TestAdapter
-  nuget FsCheck
-  nuget FsCheck.NUnit
+  nuget FsCheck ~> 2.16
+  nuget FsCheck.NUnit ~> 2.16
   nuget FsUnit ~> 5.1
   nuget Microsoft.NET.Test.Sdk
   nuget GitHubActionsTestLogger

paket.lock

@@ -174,45 +174,66 @@ NUGET
 
 GROUP Test
 STORAGE: NONE
-RESTRICTION: || (== net48) (== net6.0) (== net8.0)
+RESTRICTION: || (== net48) (== net8.0) (== net9.0)
 NUGET
   remote: https://api.nuget.org/v3/index.json
     FsCheck (2.16.6)
       FSharp.Core (>= 4.2.3)
     FsCheck.NUnit (2.16.6)
       FsCheck (2.16.6)
       NUnit (>= 3.13.1 < 4.0)
-    FSharp.Core (8.0.401)
+    FSharp.Core (8.0.403)
     FsUnit (5.6.1)
       FSharp.Core (>= 5.0.2)
       NUnit (>= 3.14 < 4.0)
     GitHubActionsTestLogger (2.4.1)
       Microsoft.TestPlatform.ObjectModel (>= 17.10)
-    Microsoft.CodeCoverage (17.11.1)
-    Microsoft.NET.Test.Sdk (17.11.1)
-      Microsoft.CodeCoverage (>= 17.11.1)
-      Microsoft.TestPlatform.TestHost (>= 17.11.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
-    Microsoft.NETCore.Platforms (6.0.6) - restriction: || (&& (== net48) (< net35)) (&& (== net48) (>= netcoreapp2.0)) (&& (== net48) (< netstandard1.0) (>= win8)) (&& (== net48) (< netstandard1.3) (>= wpa81)) (&& (== net48) (< netstandard1.5) (>= uap10.0)) (&& (== net48) (>= uap10.1)) (&& (== net48) (>= wp8)) (== net6.0) (== net8.0)
-    Microsoft.TestPlatform.ObjectModel (17.11.1)
+    Microsoft.ApplicationInsights (2.22)
+      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.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.11.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
-      Microsoft.TestPlatform.ObjectModel (>= 17.11.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
-      Newtonsoft.Json (>= 13.0.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
-    NETStandard.Library (2.0.3) - restriction: || (&& (== net48) (< net35)) (== net6.0) (== net8.0)
+    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.NETCore.Platforms (>= 1.1)
-    Newtonsoft.Json (13.0.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
+    Newtonsoft.Json (13.0.3) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0)
     NUnit (3.14)
-      NETStandard.Library (>= 2.0) - restriction: || (&& (== net48) (< net35)) (== net6.0) (== net8.0)
-    NUnit3TestAdapter (4.6)
-    System.Buffers (4.5.1) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0) (>= xamarinios)) (&& (== net8.0) (< net6.0) (>= xamarinmac)) (&& (== net8.0) (< net6.0) (>= xamarintvos)) (&& (== net8.0) (< net6.0) (>= xamarinwatchos)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0))
-    System.Collections.Immutable (6.0)
-      System.Memory (>= 4.5.4) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0))
-      System.Runtime.CompilerServices.Unsafe (>= 6.0)
-    System.Memory (4.5.5) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0))
-      System.Buffers (>= 4.5.1) - restriction: || (== net48) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos))
-      System.Numerics.Vectors (>= 4.5) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461))
-      System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (== net48) (&& (== net6.0) (>= monotouch)) (&& (== net6.0) (>= net461)) (&& (== net6.0) (< netcoreapp2.0)) (&& (== net6.0) (< netcoreapp2.1)) (&& (== net6.0) (< netstandard1.1)) (&& (== net6.0) (< netstandard2.0)) (&& (== net6.0) (>= uap10.1)) (&& (== net6.0) (>= xamarinios)) (&& (== net6.0) (>= xamarinmac)) (&& (== net6.0) (>= xamarintvos)) (&& (== net6.0) (>= xamarinwatchos)) (&& (== net8.0) (>= monotouch)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< netcoreapp2.0)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net8.0) (< netstandard1.1)) (&& (== net8.0) (< netstandard2.0)) (&& (== net8.0) (>= uap10.1)) (&& (== net8.0) (>= xamarinios)) (&& (== net8.0) (>= xamarinmac)) (&& (== net8.0) (>= xamarintvos)) (&& (== net8.0) (>= xamarinwatchos))
-    System.Numerics.Vectors (4.5) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461))
-    System.Reflection.Metadata (6.0.1)
-      System.Collections.Immutable (>= 6.0)
-    System.Runtime.CompilerServices.Unsafe (6.0)
+      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))
+    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.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))

tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj

@@ -2,13 +2,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>FSharpx.CSharpTests</AssemblyName>
-    <TargetFrameworks>net48;net6;net8</TargetFrameworks>
+    <TargetFrameworks>net48;net8;net9</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFrameworks>net6;net8</TargetFrameworks>
+    <TargetFrameworks>net8;net9</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DataStructures|AnyCPU'">
     <DebugSymbols>true</DebugSymbols>

tests/FSharpx.Tests/EnumTest.fs

@@ -79,7 +79,7 @@ let ``getValues works as expected for dotnet enum`` ()=
             NumberStyles.AllowTrailingSign; NumberStyles.AllowParentheses; NumberStyles.AllowDecimalPoint; NumberStyles.AllowThousands; NumberStyles.Number;
             NumberStyles.AllowExponent; NumberStyles.Float; NumberStyles.AllowCurrencySymbol; NumberStyles.Currency; NumberStyles.Any; NumberStyles.AllowHexSpecifier;
             NumberStyles.HexNumber;
-            #if NET8_0
+            #if NET8_0_OR_GREATER
             NumberStyles.BinaryNumber; NumberStyles.AllowBinarySpecifier
             #endif
          ]

tests/FSharpx.Tests/FSharpx.Tests.fsproj

@@ -2,13 +2,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>FSharpx.Tests</AssemblyName>
-    <TargetFrameworks>net48;net6;net8</TargetFrameworks>
+    <TargetFrameworks>net48;net8;net9</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <IsPackable>false</IsPackable>
     <LangVersion>preview</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
-    <TargetFrameworks>net6;net8</TargetFrameworks>
+    <TargetFrameworks>net8;net9</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\FSharpx.Extras\FSharpx.Extras.fsproj">