diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 42ed823..148093f 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -30,6 +30,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: SetupBuildInfo
id: SetupBuildInfo
run: dotnet run --project _atom/_atom.csproj -- SetupBuildInfo --skip --headless
@@ -57,6 +62,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: Pack
id: Pack
run: dotnet run --project _atom/_atom.csproj -- Pack --skip --headless
@@ -72,6 +82,9 @@ jobs:
TestProjects:
runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ test-framework: [ net10.0, net11.0 ]
steps:
- name: Checkout
@@ -84,14 +97,22 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: TestProjects
id: TestProjects
run: dotnet run --project _atom/_atom.csproj -- TestProjects --skip --headless
+ env:
+ test-framework: ${{ matrix.test-framework }}
+ build-slice: ${{ matrix.test-framework }}
- name: Store Invex.Tools.ArtifactClean.Tests
uses: actions/upload-artifact@v7
with:
- name: Invex.Tools.ArtifactClean.Tests
+ name: 'Invex.Tools.ArtifactClean.Tests-${{ matrix.test-framework }}'
path: '${{ github.workspace }}/.github/publish/Invex.Tools.ArtifactClean.Tests'
PushToNuget:
@@ -109,6 +130,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: Retrieve Invex.Tools.ArtifactClean
uses: actions/download-artifact@v8
with:
@@ -169,6 +195,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: Retrieve Invex.Tools.ArtifactClean
uses: actions/download-artifact@v8
with:
@@ -226,6 +257,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: BuildDocs
id: BuildDocs
run: dotnet run --project _atom/_atom.csproj -- BuildDocs --skip --headless
@@ -254,6 +290,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: Retrieve GeneratedDocs
uses: actions/download-artifact@v8
with:
diff --git a/.github/workflows/Cleanup Prereleases.yml b/.github/workflows/Cleanup Prereleases.yml
index 5c0899d..ed3b071 100644
--- a/.github/workflows/Cleanup Prereleases.yml
+++ b/.github/workflows/Cleanup Prereleases.yml
@@ -26,6 +26,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: UnlistOldPrereleases
id: UnlistOldPrereleases
run: dotnet run --project _atom/_atom.csproj -- UnlistOldPrereleases --skip --headless
diff --git a/.github/workflows/Dependabot Enable auto-merge.yml b/.github/workflows/Dependabot Enable auto-merge.yml
index f9563cf..0b43808 100644
--- a/.github/workflows/Dependabot Enable auto-merge.yml
+++ b/.github/workflows/Dependabot Enable auto-merge.yml
@@ -23,6 +23,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: ApproveDependabotPr
id: ApproveDependabotPr
run: dotnet run --project _atom/_atom.csproj -- ApproveDependabotPr --skip --headless
diff --git a/.github/workflows/Validate.yml b/.github/workflows/Validate.yml
index 7a307c4..6db0fa6 100644
--- a/.github/workflows/Validate.yml
+++ b/.github/workflows/Validate.yml
@@ -28,6 +28,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: SetupBuildInfo
id: SetupBuildInfo
run: dotnet run --project _atom/_atom.csproj -- SetupBuildInfo --skip --headless
@@ -55,6 +60,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: Pack
id: Pack
run: dotnet run --project _atom/_atom.csproj -- Pack --skip --headless
@@ -64,6 +74,9 @@ jobs:
TestProjects:
runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ test-framework: [ net10.0, net11.0 ]
steps:
- name: Checkout
@@ -76,9 +89,17 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: TestProjects
id: TestProjects
run: dotnet run --project _atom/_atom.csproj -- TestProjects --skip --headless
+ env:
+ test-framework: ${{ matrix.test-framework }}
+ build-slice: ${{ matrix.test-framework }}
WaitForCopilotReview:
runs-on: ubuntu-latest
@@ -94,6 +115,11 @@ jobs:
with:
dotnet-version: 10.0.x
+ - name: Setup .NET 11.0.x
+ uses: actions/setup-dotnet@v5
+ with:
+ dotnet-version: 11.0.x
+
- name: WaitForCopilotReview
id: WaitForCopilotReview
run: dotnet run --project _atom/_atom.csproj -- WaitForCopilotReview --skip --headless
diff --git a/AGENTS.md b/AGENTS.md
index 8722606..f7b93b7 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -14,7 +14,8 @@ used for CI, packaging, releases, and documentation publishing.
The solution is `Invex.Tools.slnx` and contains the ArtifactClean project, its
NUnit test project under `tests/Invex.Tools.ArtifactClean.Tests`, and the
-`_atom` build project.
+`_atom` build project. The tool targets `net10.0` only, because a second target framework collides with the
+Native AOT tool packages (NU5118); the test project targets `net10.0` and `net11.0`.
## Build, test, and cleanup
@@ -27,7 +28,7 @@ dotnet build Invex.Tools.slnx --configuration Release --no-restore
```
Run the tests with `dotnet test Invex.Tools.slnx` and keep the build
-warning-free. CI runs them on `net10.0` through the Atom `TestProjects`
+warning-free. CI runs them on `net10.0` and `net11.0` through the Atom `TestProjects`
target:
```shell
diff --git a/Directory.Build.props b/Directory.Build.props
index 9048855..d2df9d9 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,7 +11,7 @@
true
true
- 14
+ 15
enable
enable
true
diff --git a/README.md b/README.md
index a84f033..d0ae21a 100644
--- a/README.md
+++ b/README.md
@@ -98,7 +98,7 @@ Full documentation: [https://invex-games.github.io/tools/](https://invex-games.g
## Development
-The repository requires the .NET 10 SDK (see `global.json`).
+The repository requires the .NET 11 SDK (see `global.json`), plus the .NET 10 runtime (or SDK) for the `net10.0` projects. Tests run on `net10.0` and `net11.0`.
```shell
dotnet build Invex.Tools.slnx
diff --git a/_atom/IBuild.cs b/_atom/IBuild.cs
index 1b2d880..5f3b6bc 100644
--- a/_atom/IBuild.cs
+++ b/_atom/IBuild.cs
@@ -34,6 +34,12 @@ internal interface IBuild : IWorkflowBuildDefinition,
static readonly string[] ProjectsToTest = [Projects.Invex_Tools_ArtifactClean_Tests.Name];
+ static readonly string[] TestFrameworkNames =
+ [
+ WorkflowLabels.Dotnet.Framework.Net_10_0,
+ WorkflowLabels.Dotnet.Framework.Net_11_0,
+ ];
+
[ParamDefinition("test-framework", "Test framework to use for unit tests")]
string TestFramework => GetParam(() => TestFramework, "net10.0");
@@ -220,6 +226,8 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
BuildOptions.GitVersion.ProvideBuildId,
BuildOptions.GitVersion.ProvideBuildVersion,
BuildOptions.Steps.SetupDotnet.Dotnet100X(),
+ // .NET 11 SDK. The .NET 10 step above still provides the runtime for net10.0 tests.
+ BuildOptions.Steps.SetupDotnet.Dotnet110X(),
];
IReadOnlyList IWorkflowBuildDefinition.Workflows =>
@@ -243,6 +251,13 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
},
new(nameof(TestProjects))
{
+ MatrixDimensions =
+ [
+ new(nameof(TestFramework))
+ {
+ Values = [..TestFrameworkNames],
+ },
+ ],
Options = [BuildOptions.Target.SuppressArtifactPublishing],
},
new(nameof(WaitForCopilotReview))
@@ -281,7 +296,16 @@ await UnlistPrereleasesBelowVersionForPackages(NugetFeed,
},
],
},
- new(nameof(TestProjects)),
+ new(nameof(TestProjects))
+ {
+ MatrixDimensions =
+ [
+ new(nameof(TestFramework))
+ {
+ Values = [..TestFrameworkNames],
+ },
+ ],
+ },
new(nameof(PushToNuget))
{
Options = [BuildOptions.Inject.Secret(nameof(NugetApiKey))],
diff --git a/_atom/_atom.csproj b/_atom/_atom.csproj
index 0d17992..16ea8d9 100644
--- a/_atom/_atom.csproj
+++ b/_atom/_atom.csproj
@@ -8,8 +8,8 @@
-
-
+
+
diff --git a/global.json b/global.json
index e65d8fb..e64fa94 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
{
"sdk": {
- "version": "10.0.403",
- "rollForward": "latestMajor",
+ "version": "11.0.100",
+ "rollForward": "latestMinor",
"allowPrerelease": false
}
}
\ No newline at end of file
diff --git a/src/Invex.Tools.ArtifactClean/Invex.Tools.ArtifactClean.csproj b/src/Invex.Tools.ArtifactClean/Invex.Tools.ArtifactClean.csproj
index f7594f9..c1b04bc 100644
--- a/src/Invex.Tools.ArtifactClean/Invex.Tools.ArtifactClean.csproj
+++ b/src/Invex.Tools.ArtifactClean/Invex.Tools.ArtifactClean.csproj
@@ -5,6 +5,12 @@
true
true
artclean
+
net10.0
diff --git a/tests/Invex.Tools.ArtifactClean.Tests/Invex.Tools.ArtifactClean.Tests.csproj b/tests/Invex.Tools.ArtifactClean.Tests/Invex.Tools.ArtifactClean.Tests.csproj
index f2a5e3e..1206ae8 100644
--- a/tests/Invex.Tools.ArtifactClean.Tests/Invex.Tools.ArtifactClean.Tests.csproj
+++ b/tests/Invex.Tools.ArtifactClean.Tests/Invex.Tools.ArtifactClean.Tests.csproj
@@ -1,7 +1,7 @@
- net10.0
+ net10.0;net11.0
false