Skip to content

Commit 4a0378a

Browse files
gdziadkiewiczgdziadkiewicz
authored
Merge pull request #444 from gdziadkiewicz/master
Add testing on net10.0
2 parents 638eaf4 + 254e0d5 commit 4a0378a

File tree

7 files changed

+55
-51
lines changed

7 files changed

+55
-51
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": "9.0.2",
6+
"version": "10.0.0-alpha011",
77
"commands": [
88
"paket"
99
],

‎.github/workflows/main.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ jobs:
2929
dotnet-version: |
3030
8.0.x
3131
9.0.x
32+
10.0.x
3233
- name: Run fake build script
3334
run: ./build.sh
3435
shell: bash

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

‎paket.dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ nuget FSharpx.Collections
99

1010
group Test
1111
source https://api.nuget.org/v3/index.json
12-
framework: net48, net8, net9
12+
framework: net48, net8, net9, net10.0
1313
storage: none
1414
nuget FSharp.Core ~> 8.0
1515
nuget NUnit

‎paket.lock‎

Lines changed: 47 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ NUGET
174174

175175
GROUP Test
176176
STORAGE: NONE
177-
RESTRICTION: || (== net48) (== net8.0) (== net9.0)
177+
RESTRICTION: || (== net10.0) (== net48) (== net8.0) (== net9.0)
178178
NUGET
179179
remote: https://api.nuget.org/v3/index.json
180180
FsCheck (2.16.6)
@@ -188,52 +188,55 @@ NUGET
188188
NUnit (>= 3.14 < 4.0)
189189
GitHubActionsTestLogger (2.4.1)
190190
Microsoft.TestPlatform.ObjectModel (>= 17.10)
191-
Microsoft.ApplicationInsights (2.22)
191+
Microsoft.ApplicationInsights (2.23)
192192
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)
193+
Microsoft.CodeCoverage (18.0.1)
194+
Microsoft.NET.Test.Sdk (18.0.1)
195+
Microsoft.CodeCoverage (>= 18.0.1)
196+
Microsoft.TestPlatform.TestHost (>= 18.0.1) - restriction: || (== net10.0) (&& (== net48) (>= net8.0)) (== net8.0) (== net9.0)
197+
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)
198+
Microsoft.Testing.Extensions.Telemetry (1.9)
199+
Microsoft.ApplicationInsights (>= 2.23)
200+
Microsoft.Testing.Platform (>= 1.9)
201+
System.Diagnostics.DiagnosticSource (>= 6.0) - restriction: || (&& (== net10.0) (< net6.0)) (== net48) (&& (== net8.0) (< net6.0)) (&& (== net9.0) (< net6.0))
202+
Microsoft.Testing.Extensions.TrxReport.Abstractions (1.9)
203+
Microsoft.Testing.Platform (>= 1.9)
204+
Microsoft.Testing.Extensions.VSTestBridge (1.9)
205+
Microsoft.Testing.Extensions.Telemetry (>= 1.9)
206+
Microsoft.Testing.Extensions.TrxReport.Abstractions (>= 1.9)
207+
Microsoft.Testing.Platform (>= 1.9)
208+
Microsoft.TestPlatform.AdapterUtilities (>= 17.13)
207209
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)
212-
System.Reflection.Metadata (>= 1.6)
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)
210+
Microsoft.Testing.Platform (1.9)
211+
Microsoft.Testing.Platform.MSBuild (1.9)
212+
Microsoft.Testing.Platform (>= 1.9)
213+
Microsoft.TestPlatform.AdapterUtilities (18.0)
214+
Microsoft.TestPlatform.ObjectModel (18.0.1)
215+
System.Reflection.Metadata (>= 8.0)
216+
Microsoft.TestPlatform.TestHost (18.0.1) - restriction: || (== net10.0) (&& (== net48) (>= net8.0)) (== net8.0) (== net9.0)
217+
Microsoft.TestPlatform.ObjectModel (>= 18.0.1) - restriction: || (== net10.0) (&& (== net48) (>= net8.0)) (== net8.0) (== net9.0)
218+
Newtonsoft.Json (>= 13.0.3) - restriction: || (== net10.0) (&& (== net48) (>= net8.0)) (== net8.0) (== net9.0)
219+
NETStandard.Library (2.0.3) - restriction: || (== net10.0) (&& (== net48) (< net35)) (== net8.0) (== net9.0)
217220
Microsoft.NETCore.Platforms (>= 1.1)
218-
Newtonsoft.Json (13.0.3) - restriction: || (&& (== net48) (>= netcoreapp3.1)) (== net8.0) (== net9.0)
221+
Newtonsoft.Json (13.0.3) - restriction: || (== net10.0) (&& (== net48) (>= net8.0)) (== net8.0) (== net9.0)
219222
NUnit (3.14)
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))
223+
NETStandard.Library (>= 2.0) - restriction: || (== net10.0) (&& (== net48) (< net35)) (== net8.0) (== net9.0)
224+
NUnit3TestAdapter (5.2)
225+
Microsoft.Testing.Extensions.VSTestBridge (>= 1.9)
226+
Microsoft.Testing.Platform.MSBuild (>= 1.9)
227+
System.Buffers (4.6) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< netcoreapp2.1)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1))
228+
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))
229+
System.Memory (>= 4.5.5) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
230+
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))
228231
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))
232+
System.Memory (>= 4.5.5) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
233+
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))
234+
System.Memory (4.6) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
235+
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))
236+
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))
237+
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))
238+
System.Numerics.Vectors (4.6) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< netcoreapp2.1)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< netcoreapp2.1))
236239
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))
240+
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))
241+
System.Memory (>= 4.5.5) - restriction: || (&& (== net10.0) (>= net462)) (&& (== net10.0) (< net8.0)) (== net48) (&& (== net8.0) (>= net462)) (&& (== net9.0) (>= net462)) (&& (== net9.0) (< net8.0))
242+
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))

‎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;net8;net9</TargetFrameworks>
5+
<TargetFrameworks>net48;net8;net9;net10.0</TargetFrameworks>
66
<IsPackable>false</IsPackable>
77
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
88
<LangVersion>latest</LangVersion>
99
</PropertyGroup>
1010
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
11-
<TargetFrameworks>net8;net9</TargetFrameworks>
11+
<TargetFrameworks>net8;net9;net10.0</TargetFrameworks>
1212
</PropertyGroup>
1313
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'DataStructures|AnyCPU'">
1414
<DebugSymbols>true</DebugSymbols>

‎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;net8;net9</TargetFrameworks>
5+
<TargetFrameworks>net48;net8;net9;net10.0</TargetFrameworks>
66
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
77
<IsPackable>false</IsPackable>
88
<LangVersion>preview</LangVersion>
99
</PropertyGroup>
1010
<PropertyGroup Condition=" '$(OS)' != 'Windows_NT' ">
11-
<TargetFrameworks>net8;net9</TargetFrameworks>
11+
<TargetFrameworks>net8;net9;net10.0</TargetFrameworks>
1212
</PropertyGroup>
1313
<ItemGroup>
1414
<ProjectReference Include="..\..\src\FSharpx.Extras\FSharpx.Extras.fsproj">

0 commit comments

Comments
 (0)