Skip to content

Update GitHub Actions workflows and project files for .NET 10 support #57

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheAngryByrd merged 2 commits into from
Nov 2, 2025
Merged

Update GitHub Actions workflows and project files for .NET 10 support #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2562e0
Update GitHub Actions workflows and project files for .NET 10 support
TheAngryByrd Sep 27, 2025
cbf4916
Update Starship feature source and set .NET version to 10.0 in devcon…
TheAngryByrd Sep 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
// https://github.com/devcontainers/features/blob/main/src/github-cli/README.md
"ghcr.io/devcontainers/features/github-cli:1": {},
// https://github.com/devcontainers-contrib/features/blob/main/src/starship/README.md
"ghcr.io/devcontainers-contrib/features/starship:1": {},
"ghcr.io/devcontainers-extra/features/starship:1": {},
// https://github.com/devcontainers/features/blob/main/src/dotnet/README.md
"ghcr.io/devcontainers/features/dotnet:2": {
"version": "9.0",
"additionalVersions": "8.0"
"version": "10.0",
"additionalVersions": "9.0, 8.0"
}
},
"overrideFeatureInstallOrder": [
Expand Down
7 changes: 4 additions & 3 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@ jobs:
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5

- name: Setup necessary dotnet SDKs
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json
dotnet-version: |
8.x
9.x
10.x
# Build on mac/linux
- name: Build via Bash
if: runner.os != 'Windows'
Expand Down Expand Up @@ -59,7 +60,7 @@ jobs:
runs-on: ubuntu-latest
steps:

- uses: actions/checkout@v3
- uses: actions/checkout@v5

- name: Build and run dev container task
uses: devcontainers/[email protected]
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/fsdocs-gh-pages.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v5
- name: Setup Pages
uses: actions/configure-pages@v3
uses: actions/configure-pages@v5
- name: Setup necessary dotnet SDKs
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json
dotnet-version: |
9.x
8.x
9.x
10.x
- name: Build Docs
run: |
./build.sh builddocs
Expand All @@ -45,7 +46,7 @@ jobs:
CI: true

- name: Upload artifact
uses: actions/upload-pages-artifact@v3
uses: actions/upload-pages-artifact@v4
with:
path: docs/

Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ jobs:
url: https://www.nuget.org/packages/IcedTasks/${{ needs.set_version.outputs.no-v }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v5
- name: Setup necessary dotnet SDKs
uses: actions/setup-dotnet@v3
uses: actions/setup-dotnet@v5
with:
global-json-file: global.json
dotnet-version: |
8.x
9.x
10.x
- name: publish
env:
NUGET_TOKEN: ${{ secrets.NUGET_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/FSharpBenchmarks/benchmarks.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "9.0.100",
"version": "10.0.100-rc.1.25451.107",
"rollForward": "latestMinor"
}
}
2 changes: 1 addition & 1 deletion tests/IcedTasks.Tests.NS20/IcedTasks.Tests.NS20.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<GenerateProgramFile>false</GenerateProgramFile>
<DefineConstants>$(DefineConstants);NETSTANDARD2_0;TEST_NETSTANDARD2_0</DefineConstants>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/IcedTasks.Tests.NS21/IcedTasks.Tests.NS21.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net9.0;net8.0;</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0;</TargetFrameworks>
<GenerateProgramFile>false</GenerateProgramFile>
<DefineConstants>$(DefineConstants);NETSTANDARD2_1;TEST_NETSTANDARD2_1</DefineConstants>
</PropertyGroup>
Expand Down
12 changes: 6 additions & 6 deletions tests/IcedTasks.Tests/CancellablePoolingValueTaskTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,14 +532,14 @@ module CancellablePoolingValueTaskTests =
}

use cts =
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100))
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100.))

let inProgress = actor data cts.Token

Expect.isFalse wasDisposed "Dispose before cancellation"

do!
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100))
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100.))
|> Async.AwaitTask

Expect.isFalse wasDisposed "Dispose after cancellation"
Expand Down Expand Up @@ -1228,7 +1228,7 @@ module CancellablePoolingValueTaskTests =

do!
timeProvider.Delay(
TimeSpan.FromMilliseconds(1000),
TimeSpan.FromMilliseconds(1000.),
ct
)
}
Expand All @@ -1237,13 +1237,13 @@ module CancellablePoolingValueTaskTests =

use cts =
timeProvider.CreateCancellationTokenSource(
TimeSpan.FromMilliseconds(100)
TimeSpan.FromMilliseconds(100.)
)

let runningTask = fooTask cts.Token
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
Expect.isFalse runningTask.IsCanceled ""
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
do! runningTask
}
)
Expand Down
15 changes: 8 additions & 7 deletions tests/IcedTasks.Tests/CancellableTaskTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,6 +468,7 @@ module CancellableTaskTests =

testCaseAsync "use IAsyncDisposable propagate exception"
<| async {

let doDispose () =
task {
do! Task.Delay(15)
Expand Down Expand Up @@ -509,19 +510,19 @@ module CancellableTaskTests =
let actor data =
cancellableTask {
use d = TestHelpers.makeAsyncDisposable (doDispose)
do! fun ct -> timeProvider.Delay(TimeSpan.FromMilliseconds(200), ct)
do! fun ct -> timeProvider.Delay(TimeSpan.FromMilliseconds(200.), ct)
return ()
}

use cts =
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100))
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100.))

let inProgress = actor data cts.Token

Expect.isFalse wasDisposed "Dispose before cancellation"

do!
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100))
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100.))
|> Async.AwaitTask


Expand Down Expand Up @@ -1192,7 +1193,7 @@ module CancellableTaskTests =

do!
timeProvider.Delay(
TimeSpan.FromMilliseconds(1000),
TimeSpan.FromMilliseconds(1000.),
ct
)
}
Expand All @@ -1201,13 +1202,13 @@ module CancellableTaskTests =

use cts =
timeProvider.CreateCancellationTokenSource(
TimeSpan.FromMilliseconds(100)
TimeSpan.FromMilliseconds(100.)
)

let runningTask = fooTask cts.Token
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
Expect.isFalse runningTask.IsCanceled ""
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
do! runningTask
}
)
Expand Down
12 changes: 6 additions & 6 deletions tests/IcedTasks.Tests/CancellableValueTaskTests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,14 +532,14 @@ module CancellableValueTaskTests =
}

use cts =
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100))
timeProvider.CreateCancellationTokenSource(TimeSpan.FromMilliseconds(100.))

let inProgress = actor data cts.Token

Expect.isFalse wasDisposed "Dispose before cancellation"

do!
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100))
timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(100.))
|> Async.AwaitTask


Expand Down Expand Up @@ -1230,7 +1230,7 @@ module CancellableValueTaskTests =

do!
timeProvider.Delay(
TimeSpan.FromMilliseconds(1000),
TimeSpan.FromMilliseconds(1000.),
ct
)
}
Expand All @@ -1239,13 +1239,13 @@ module CancellableValueTaskTests =

use cts =
timeProvider.CreateCancellationTokenSource(
TimeSpan.FromMilliseconds(100)
TimeSpan.FromMilliseconds(100.)
)

let runningTask = fooTask cts.Token
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
Expect.isFalse runningTask.IsCanceled ""
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50))
do! timeProvider.ForwardTimeAsync(TimeSpan.FromMilliseconds(50.))
do! runningTask
}
)
Expand Down
2 changes: 1 addition & 1 deletion tests/IcedTasks.Tests/IcedTasks.Tests.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
<GenerateProgramFile>false</GenerateProgramFile>
<DefineConstants>$(DefineConstants);TEST_NET6_0_OR_GREATER</DefineConstants>
</PropertyGroup>
Expand Down
Loading