Skip to content

Commit 647e06b

Browse files
gdziadkiewiczgdziadkiewicz
authored
Merge pull request #441 from gdziadkiewicz/Update_dotnet_cli_version
Add testing on net9, update sdk version and update test deps
2 parents fb5156e + 63a7a09 commit 647e06b

File tree

10 files changed

+70
-42
lines changed

10 files changed

+70
-42
lines changed

‎.config/dotnet-tools.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "8.0.3",
6+
"version": "9.0.2",
77
"commands": [
88
"paket"
99
],

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ jobs:
2727
uses: actions/setup-dotnet@v4
2828
with:
2929
dotnet-version: |
30-
3.1.x
31-
6.0.x
3230
8.0.x
31+
9.0.x
3332
- name: Run fake build script
3433
run: ./build.sh
3534
shell: bash

‎.paket/Paket.Restore.targets‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,14 +235,15 @@
235235
<Splits>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',').Length)</Splits>
236236
<PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
237237
<PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>
238+
<Reference>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[2])</Reference>
238239
<AllPrivateAssets>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[4])</AllPrivateAssets>
239240
<CopyLocal Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 6">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[5])</CopyLocal>
240241
<OmitContent Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 7">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[6])</OmitContent>
241242
<ImportTargets Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 8">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[7])</ImportTargets>
242243
<Aliases Condition="%(PaketReferencesFileLinesInfo.Splits) &gt;= 9">$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[8])</Aliases>
243244
</PaketReferencesFileLinesInfo>
244-
<PackageReference Include="%(PaketReferencesFileLinesInfo.PackageName)">
245-
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
245+
<PackageReference Condition=" '$(ManagePackageVersionsCentrally)' != 'true' Or '%(PaketReferencesFileLinesInfo.Reference)' == 'Direct' " Include="%(PaketReferencesFileLinesInfo.PackageName)">
246+
<Version Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
246247
<PrivateAssets Condition=" ('%(PaketReferencesFileLinesInfo.AllPrivateAssets)' == 'true') Or ('$(PackAsTool)' == 'true') ">All</PrivateAssets>
247248
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.CopyLocal) == 'false' or %(PaketReferencesFileLinesInfo.AllPrivateAssets) == 'exclude'">runtime</ExcludeAssets>
248249
<ExcludeAssets Condition=" %(PaketReferencesFileLinesInfo.OmitContent) == 'true'">$(ExcludeAssets);contentFiles</ExcludeAssets>
@@ -252,6 +253,10 @@
252253
<AllowExplicitVersion>true</AllowExplicitVersion>
253254

254255
</PackageReference>
256+
257+
<PackageVersion Include="%(PaketReferencesFileLinesInfo.PackageName)">
258+
<Version>%(PaketReferencesFileLinesInfo.PackageVersion)</Version>
259+
</PackageVersion>
255260
</ItemGroup>
256261

257262
<PropertyGroup>

‎build.cmd‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
@echo off
22

33
dotnet tool restore
4+
if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
45
dotnet restore
6+
if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%
57
dotnet run -v:m --project ./build/build.fsproj -- -t %*
8+
if %ERRORLEVEL% NEQ 0 exit /b %ERRORLEVEL%

‎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.402",
3+
"version": "9.0.200",
44
"rollForward": "latestFeature"
55
}
66
}

‎paket.dependencies‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version 6.2.1
1+
version 9.0.2
22

33
source https://api.nuget.org/v3/index.json
44
framework: netstandard20
@@ -9,13 +9,13 @@ nuget FSharpx.Collections
99

1010
group Test
1111
source https://api.nuget.org/v3/index.json
12-
framework: net48, net6, net8
12+
framework: net48, net8, net9
1313
storage: none
1414
nuget FSharp.Core ~> 8.0
1515
nuget NUnit
1616
nuget NUnit3TestAdapter
17-
nuget FsCheck
18-
nuget FsCheck.NUnit
17+
nuget FsCheck ~> 2.16
18+
nuget FsCheck.NUnit ~> 2.16
1919
nuget FsUnit ~> 5.1
2020
nuget Microsoft.NET.Test.Sdk
2121
nuget GitHubActionsTestLogger

‎paket.lock‎

Lines changed: 48 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -174,45 +174,66 @@ NUGET
174174

175175
GROUP Test
176176
STORAGE: NONE
177-
RESTRICTION: || (== net48) (== net6.0) (== net8.0)
177+
RESTRICTION: || (== net48) (== net8.0) (== net9.0)
178178
NUGET
179179
remote: https://api.nuget.org/v3/index.json
180180
FsCheck (2.16.6)
181181
FSharp.Core (>= 4.2.3)
182182
FsCheck.NUnit (2.16.6)
183183
FsCheck (2.16.6)
184184
NUnit (>= 3.13.1 < 4.0)
185-
FSharp.Core (8.0.401)
185+
FSharp.Core (8.0.403)
186186
FsUnit (5.6.1)
187187
FSharp.Core (>= 5.0.2)
188188
NUnit (>= 3.14 < 4.0)
189189
GitHubActionsTestLogger (2.4.1)
190190
Microsoft.TestPlatform.ObjectModel (>= 17.10)
191-
Microsoft.CodeCoverage (17.11.1)
192-
Microsoft.NET.Test.Sdk (17.11.1)
193-
Microsoft.CodeCoverage (>= 17.11.1)
194-
Microsoft.TestPlatform.TestHost (>= 17.11.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
195-
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)
196-
Microsoft.TestPlatform.ObjectModel (17.11.1)
191+
Microsoft.ApplicationInsights (2.22)
192+
System.Diagnostics.DiagnosticSource (>= 5.0)
193+
Microsoft.CodeCoverage (17.13)
194+
Microsoft.NET.Test.Sdk (17.13)
195+
Microsoft.CodeCoverage (>= 17.13)
196+
Microsoft.TestPlatform.TestHost (>= 17.13) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0)
197+
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)
198+
Microsoft.Testing.Extensions.Telemetry (1.6)
199+
Microsoft.ApplicationInsights (>= 2.22)
200+
Microsoft.Testing.Platform (>= 1.6)
201+
Microsoft.Testing.Extensions.TrxReport.Abstractions (1.6)
202+
Microsoft.Testing.Platform (>= 1.6)
203+
Microsoft.Testing.Extensions.VSTestBridge (1.6)
204+
Microsoft.Testing.Extensions.Telemetry (>= 1.6)
205+
Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.6)
206+
Microsoft.Testing.Platform (>= 1.6)
207+
Microsoft.TestPlatform.ObjectModel (>= 17.13)
208+
Microsoft.Testing.Platform (1.6)
209+
Microsoft.Testing.Platform.MSBuild (1.6)
210+
Microsoft.Testing.Platform (>= 1.6)
211+
Microsoft.TestPlatform.ObjectModel (17.13)
197212
System.Reflection.Metadata (>= 1.6)
198-
Microsoft.TestPlatform.TestHost (17.11.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
199-
Microsoft.TestPlatform.ObjectModel (>= 17.11.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
200-
Newtonsoft.Json (>= 13.0.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
201-
NETStandard.Library (2.0.3) - restriction: || (&& (== net48) (< net35)) (== net6.0) (== net8.0)
213+
Microsoft.TestPlatform.TestHost (17.13) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0)
214+
Microsoft.TestPlatform.ObjectModel (>= 17.13) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0)
215+
Newtonsoft.Json (>= 13.0.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0)
216+
NETStandard.Library (2.0.3) - restriction: || (&& (== net48) (< net35)) (== net8.0) (== net9.0)
202217
Microsoft.NETCore.Platforms (>= 1.1)
203-
Newtonsoft.Json (13.0.1) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net6.0) (== net8.0)
218+
Newtonsoft.Json (13.0.3) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0)
204219
NUnit (3.14)
205-
NETStandard.Library (>= 2.0) - restriction: || (&& (== net48) (< net35)) (== net6.0) (== net8.0)
206-
NUnit3TestAdapter (4.6)
207-
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))
208-
System.Collections.Immutable (6.0)
209-
System.Memory (>= 4.5.4) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0))
210-
System.Runtime.CompilerServices.Unsafe (>= 6.0)
211-
System.Memory (4.5.5) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461)) (&& (== net8.0) (< net6.0))
212-
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))
213-
System.Numerics.Vectors (>= 4.5) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461))
214-
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))
215-
System.Numerics.Vectors (4.5) - restriction: || (== net48) (&& (== net6.0) (>= net461)) (&& (== net8.0) (>= net461))
216-
System.Reflection.Metadata (6.0.1)
217-
System.Collections.Immutable (>= 6.0)
218-
System.Runtime.CompilerServices.Unsafe (6.0)
220+
NETStandard.Library (>= 2.0) - restriction: || (&& (== net48) (< net35)) (== net8.0) (== net9.0)
221+
NUnit3TestAdapter (5.0)
222+
Microsoft.Testing.Extensions.VSTestBridge (>= 1.5.3)
223+
Microsoft.Testing.Platform.MSBuild (>= 1.5.3)
224+
System.Buffers (4.6) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1))
225+
System.Collections.Immutable (9.0.2) - restriction: || (== net48) (== net8.0) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
226+
System.Memory (>= 4.5.5) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
227+
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
228+
System.Diagnostics.DiagnosticSource (9.0.2)
229+
System.Memory (>= 4.5.5) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
230+
System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
231+
System.Memory (4.6) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
232+
System.Buffers (>= 4.6) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1))
233+
System.Numerics.Vectors (>= 4.6) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1))
234+
System.Runtime.CompilerServices.Unsafe (>= 6.1) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net8.0) (< netcoreapp2.1)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1))
235+
System.Numerics.Vectors (4.6) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1))
236+
System.Reflection.Metadata (9.0.2)
237+
System.Collections.Immutable (>= 9.0.2) - restriction: || (== net48) (== net8.0) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
238+
System.Memory (>= 4.5.5) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
239+
System.Runtime.CompilerServices.Unsafe (6.1) - restriction: || (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1))

‎tests/FSharpx.CSharpTests/FSharpx.CSharpTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<AssemblyName>FSharpx.CSharpTests</AssemblyName>
5-
<TargetFrameworks>net48;net6;net8</TargetFrameworks>
5+
<TargetFrameworks>net48;net8;net9</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
88
<LangVersion>latest</LangVersion>
99
</PropertyGroup>
1010
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
11-
<TargetFrameworks>net6;net8</TargetFrameworks>
11+
<TargetFrameworks>net8;net9</TargetFrameworks>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DataStructures|AnyCPU'">
1414
<DebugSymbols>true</DebugSymbols>

‎tests/FSharpx.Tests/EnumTest.fs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ let ``getValues works as expected for dotnet enum`` ()=
7979
NumberStyles.AllowTrailingSign; NumberStyles.AllowParentheses; NumberStyles.AllowDecimalPoint; NumberStyles.AllowThousands; NumberStyles.Number;
8080
NumberStyles.AllowExponent; NumberStyles.Float; NumberStyles.AllowCurrencySymbol; NumberStyles.Currency; NumberStyles.Any; NumberStyles.AllowHexSpecifier;
8181
NumberStyles.HexNumber;
82-
#if NET8_0
82+
#if NET8_0_OR_GREATER
8383
NumberStyles.BinaryNumber; NumberStyles.AllowBinarySpecifier
8484
#endif
8585
]

‎tests/FSharpx.Tests/FSharpx.Tests.fsproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<AssemblyName>FSharpx.Tests</AssemblyName>
5-
<TargetFrameworks>net48;net6;net8</TargetFrameworks>
5+
<TargetFrameworks>net48;net8;net9</TargetFrameworks>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
77
<IsPackable>false</IsPackable>
88
<LangVersion>preview</LangVersion>
99
</PropertyGroup>
1010
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
11-
<TargetFrameworks>net6;net8</TargetFrameworks>
11+
<TargetFrameworks>net8;net9</TargetFrameworks>
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<ProjectReference Include="..\..\src\FSharpx.Extras\FSharpx.Extras.fsproj">

0 commit comments

Comments
 (0)