Skip to content

Commit 863bf91

Browse files
TheAngryByrdTheAngryByrd
authored
Update GitHub Actions workflows and project files for .NET 10 support (#57)
* Update GitHub Actions workflows and project files for .NET 10 support * Update Starship feature source and set .NET version to 10.0 in devcontainer configuration
1 parent 59f97f5 commit 863bf91

File tree

12 files changed

+41
-37
lines changed

12 files changed

+41
-37
lines changed

‎.devcontainer/devcontainer.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
// https://github.com/devcontainers/features/blob/main/src/github-cli/README.md
2121
"ghcr.io/devcontainers/features/github-cli:1": {},
2222
// https://github.com/devcontainers-contrib/features/blob/main/src/starship/README.md
23-
"ghcr.io/devcontainers-contrib/features/starship:1": {},
23+
"ghcr.io/devcontainers-extra/features/starship:1": {},
2424
// https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
2525
"ghcr.io/devcontainers/features/dotnet:2": {
26-
"version": "9.0",
27-
"additionalVersions": "8.0"
26+
"version": "10.0",
27+
"additionalVersions": "9.0, 8.0"
2828
}
2929
},
3030
"overrideFeatureInstallOrder": [

‎.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'
@@ -59,7 +60,7 @@ jobs:
5960
runs-on: ubuntu-latest
6061
steps:
6162

62-
- uses: actions/checkout@v3
63+
- uses: actions/checkout@v5
6364

6465
- name: Build and run dev container task
6566
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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -532,14 +532,14 @@ module CancellablePoolingValueTaskTests =
532532
}
533533

534534
use cts =
535-
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100))
535+
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100.))
536536

537537
let inProgress = actor data cts.Token
538538

539539
Expect.isFalse wasDisposed "Dispose before cancellation"
540540

541541
do!
542-
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100))
542+
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100.))
543543
|> Async.AwaitTask
544544

545545
Expect.isFalse wasDisposed "Dispose after cancellation"
@@ -1228,7 +1228,7 @@ module CancellablePoolingValueTaskTests =
12281228

12291229
do!
12301230
timeProvider.Delay(
1231-
TimeSpan.FromMilliseconds(1000),
1231+
TimeSpan.FromMilliseconds(1000.),
12321232
ct
12331233
)
12341234
}
@@ -1237,13 +1237,13 @@ module CancellablePoolingValueTaskTests =
12371237

12381238
use cts =
12391239
timeProvider.CreateCancellationTokenSource(
1240-
TimeSpan.FromMilliseconds(100)
1240+
TimeSpan.FromMilliseconds(100.)
12411241
)
12421242

12431243
let runningTask = fooTask cts.Token
1244-
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
1244+
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
12451245
Expect.isFalse runningTask.IsCanceled ""
1246-
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
1246+
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
12471247
do! runningTask
12481248
}
12491249
)

‎tests/IcedTasks.Tests/CancellableTaskTests.fs‎

Lines changed: 8 additions & 7 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)
@@ -509,19 +510,19 @@ module CancellableTaskTests =
509510
let actor data =
510511
cancellableTask {
511512
use d = TestHelpers.makeAsyncDisposable (doDispose)
512-
do! fun ct -> timeProvider.Delay(TimeSpan.FromMilliseconds(200), ct)
513+
do! fun ct -> timeProvider.Delay(TimeSpan.FromMilliseconds(200.), ct)
513514
return ()
514515
}
515516

516517
use cts =
517-
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100))
518+
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100.))
518519

519520
let inProgress = actor data cts.Token
520521

521522
Expect.isFalse wasDisposed "Dispose before cancellation"
522523

523524
do!
524-
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100))
525+
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100.))
525526
|> Async.AwaitTask
526527

527528

@@ -1192,7 +1193,7 @@ module CancellableTaskTests =
11921193

11931194
do!
11941195
timeProvider.Delay(
1195-
TimeSpan.FromMilliseconds(1000),
1196+
TimeSpan.FromMilliseconds(1000.),
11961197
ct
11971198
)
11981199
}
@@ -1201,13 +1202,13 @@ module CancellableTaskTests =
12011202

12021203
use cts =
12031204
timeProvider.CreateCancellationTokenSource(
1204-
TimeSpan.FromMilliseconds(100)
1205+
TimeSpan.FromMilliseconds(100.)
12051206
)
12061207

12071208
let runningTask = fooTask cts.Token
1208-
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
1209+
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
12091210
Expect.isFalse runningTask.IsCanceled ""
1210-
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
1211+
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
12111212
do! runningTask
12121213
}
12131214
)

0 commit comments

Comments
 (0)