Skip to content

Commit 419ed4c

Browse files
TheAngryByrdTheAngryByrd
committed
Update GitHub Actions workflows and project files for .NET 10 support
1 parent 50de32c commit 419ed4c

File tree

11 files changed

+41
-37
lines changed

11 files changed

+41
-37
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,16 @@ jobs:
2222
runs-on: ${{ matrix.os }}
2323

2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v5
2626

2727
- name: Setup necessary dotnet SDKs
28-
uses: actions/setup-dotnet@v3
28+
uses: actions/setup-dotnet@v5
2929
with:
3030
global-json-file: global.json
3131
dotnet-version: |
3232
8.x
3333
9.x
34+
10.x
3435
# Build on mac/linux
3536
- name: Build via Bash
3637
if: runner.os != 'Windows'
@@ -52,7 +53,7 @@ jobs:
5253
runs-on: ubuntu-latest
5354
steps:
5455

55-
- uses: actions/checkout@v3
56+
- uses: actions/checkout@v5
5657

5758
- name: Build and run dev container task
5859
uses: devcontainers/[email protected]

‎.github/workflows/fsdocs-gh-pages.yml‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,17 @@ jobs:
2727

2828
steps:
2929
- name: Checkout
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v5
3131
- name: Setup Pages
32-
uses: actions/configure-pages@v3
32+
uses: actions/configure-pages@v5
3333
- name: Setup necessary dotnet SDKs
34-
uses: actions/setup-dotnet@v3
34+
uses: actions/setup-dotnet@v5
3535
with:
3636
global-json-file: global.json
3737
dotnet-version: |
38-
9.x
3938
8.x
39+
9.x
40+
10.x
4041
- name: Build Docs
4142
run: |
4243
./build.sh builddocs
@@ -45,7 +46,7 @@ jobs:
4546
CI: true
4647

4748
- name: Upload artifact
48-
uses: actions/upload-pages-artifact@v3
49+
uses: actions/upload-pages-artifact@v4
4950
with:
5051
path: docs/
5152

‎.github/workflows/publish.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,15 @@ jobs:
3434
url: https://www.nuget.org/packages/IcedTasks/${{ needs.set_version.outputs.no-v }}
3535
runs-on: ubuntu-latest
3636
steps:
37-
- uses: actions/checkout@v3
37+
- uses: actions/checkout@v5
3838
- name: Setup necessary dotnet SDKs
39-
uses: actions/setup-dotnet@v3
39+
uses: actions/setup-dotnet@v5
4040
with:
4141
global-json-file: global.json
4242
dotnet-version: |
4343
8.x
4444
9.x
45+
10.x
4546
- name: publish
4647
env:
4748
NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}

‎benchmarks/FSharpBenchmarks/benchmarks.fsproj‎

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
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
55
</PropertyGroup>
66
<PropertyGroup>
77
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎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.100",
3+
"version": "10.0.100-rc.1.25451.107",
44
"rollForward": "latestMinor"
55
}
66
}

‎tests/IcedTasks.Tests.NS20/IcedTasks.Tests.NS20.fsproj‎

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
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
55
<GenerateProgramFile>false</GenerateProgramFile>
66
<DefineConstants>$(DefineConstants);NETSTANDARD2_0;TEST_NETSTANDARD2_0</DefineConstants>
77
</PropertyGroup>

‎tests/IcedTasks.Tests.NS21/IcedTasks.Tests.NS21.fsproj‎

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
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
4+
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
55
<GenerateProgramFile>false</GenerateProgramFile>
66
<DefineConstants>$(DefineConstants);NETSTANDARD2_1;TEST_NETSTANDARD2_1</DefineConstants>
77
</PropertyGroup>

‎tests/IcedTasks.Tests/CancellablePoolingValueTaskTests.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -524,17 +524,17 @@ module CancellablePoolingValueTaskTests =
524524
let actor data =
525525
cancellablePoolingValueTask {
526526
use d = TestHelpers.makeAsyncDisposable (doDispose)
527-
do! fun ct -> timeProvider.Delay(TimeSpan.FromMilliseconds(200), ct)
527+
do! fun ct -> timeProvider.Delay(TimeSpan.FromMilliseconds(200.), ct)
528528

529529
}
530530

531531
use cts =
532-
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100))
532+
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100.))
533533

534534
let inProgress = actor data cts.Token
535535

536536
do!
537-
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100))
537+
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100.))
538538
|> Async.AwaitTask
539539

540540
do!
@@ -1213,7 +1213,7 @@ module CancellablePoolingValueTaskTests =
12131213

12141214
do!
12151215
timeProvider.Delay(
1216-
TimeSpan.FromMilliseconds(1000),
1216+
TimeSpan.FromMilliseconds(1000.),
12171217
ct
12181218
)
12191219
}
@@ -1222,13 +1222,13 @@ module CancellablePoolingValueTaskTests =
12221222

12231223
use cts =
12241224
timeProvider.CreateCancellationTokenSource(
1225-
TimeSpan.FromMilliseconds(100)
1225+
TimeSpan.FromMilliseconds(100.)
12261226
)
12271227

12281228
let runningTask = fooTask cts.Token
1229-
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
1229+
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
12301230
Expect.isFalse runningTask.IsCanceled ""
1231-
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
1231+
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
12321232
do! runningTask
12331233
}
12341234
)

‎tests/IcedTasks.Tests/CancellableTaskTests.fs‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -468,6 +468,7 @@ module CancellableTaskTests =
468468

469469
testCaseAsync "use IAsyncDisposable propagate exception"
470470
<| async {
471+
471472
let doDispose () =
472473
task {
473474
do! Task.Delay(15)
@@ -508,23 +509,23 @@ module CancellableTaskTests =
508509
let actor data =
509510
cancellableTask {
510511
use d = TestHelpers.makeAsyncDisposable (doDispose)
511-
do! fun ct -> timeProvider.Delay(TimeSpan.FromMilliseconds(200), ct)
512+
do! fun ct -> timeProvider.Delay(TimeSpan.FromMilliseconds(200.), ct)
512513
return ()
513514
}
514515

515516
use cts =
516-
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100))
517+
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100.))
517518

518519
let inProgress = actor data cts.Token
519520

520521
do!
521-
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100))
522+
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100.))
522523
|> Async.AwaitTask
523524

524525
Expect.isFalse wasDisposed ""
525526

526527
do!
527-
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100))
528+
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100.))
528529
|> Async.AwaitTask
529530

530531
do!
@@ -1183,7 +1184,7 @@ module CancellableTaskTests =
11831184

11841185
do!
11851186
timeProvider.Delay(
1186-
TimeSpan.FromMilliseconds(1000),
1187+
TimeSpan.FromMilliseconds(1000.),
11871188
ct
11881189
)
11891190
}
@@ -1192,13 +1193,13 @@ module CancellableTaskTests =
11921193

11931194
use cts =
11941195
timeProvider.CreateCancellationTokenSource(
1195-
TimeSpan.FromMilliseconds(100)
1196+
TimeSpan.FromMilliseconds(100.)
11961197
)
11971198

11981199
let runningTask = fooTask cts.Token
1199-
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
1200+
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
12001201
Expect.isFalse runningTask.IsCanceled ""
1201-
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
1202+
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
12021203
do! runningTask
12031204
}
12041205
)

‎tests/IcedTasks.Tests/CancellableValueTaskTests.fs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -525,17 +525,17 @@ module CancellableValueTaskTests =
525525
let actor data =
526526
cancellableValueTask {
527527
use d = TestHelpers.makeAsyncDisposable (doDispose)
528-
do! fun ct -> timeProvider.Delay(TimeSpan.FromMilliseconds(200), ct)
528+
do! fun ct -> timeProvider.Delay(TimeSpan.FromMilliseconds(200.), ct)
529529

530530
}
531531

532532
use cts =
533-
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100))
533+
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100.))
534534

535535
let inProgress = actor data cts.Token
536536

537537
do!
538-
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100))
538+
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100.))
539539
|> Async.AwaitTask
540540

541541
do!
@@ -1215,7 +1215,7 @@ module CancellableValueTaskTests =
12151215

12161216
do!
12171217
timeProvider.Delay(
1218-
TimeSpan.FromMilliseconds(1000),
1218+
TimeSpan.FromMilliseconds(1000.),
12191219
ct
12201220
)
12211221
}
@@ -1224,13 +1224,13 @@ module CancellableValueTaskTests =
12241224

12251225
use cts =
12261226
timeProvider.CreateCancellationTokenSource(
1227-
TimeSpan.FromMilliseconds(100)
1227+
TimeSpan.FromMilliseconds(100.)
12281228
)
12291229

12301230
let runningTask = fooTask cts.Token
1231-
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
1231+
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
12321232
Expect.isFalse runningTask.IsCanceled ""
1233-
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
1233+
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
12341234
do! runningTask
12351235
}
12361236
)

0 commit comments

Comments
 (0)