From 1aa424e242bfb67054964d83bf07271d2aee8022 Mon Sep 17 00:00:00 2001 From: John Simons Date: Mon, 25 May 2026 15:25:50 +1000 Subject: [PATCH 1/3] Configure project for .NET 11 Preview 4 Update `global.json` to target the .NET 11 Preview 4 SDK and enable prerelease versions. Adjust CI workflow to install the 11.0.x SDK alongside 8.0.x to support the new preview. --- .github/workflows/ci.yml | 4 +++- global.json | 5 +++-- .../NServiceBus.AcceptanceTests.csproj | 2 +- .../NServiceBus.ContainerTests.csproj | 2 +- .../NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj | 2 +- src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj | 2 +- .../NServiceBus.Learning.AcceptanceTests.csproj | 2 +- .../NServiceBus.PersistenceTests.csproj | 2 +- .../NServiceBus.TransportTests.csproj | 2 +- 9 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3cb052de22d..b2818ae07b2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,7 +31,9 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5.1.0 with: - global-json-file: global.json + dotnet-version: | + 8.0.x + 11.0.x - name: Build run: dotnet build src --configuration Release - name: Upload packages diff --git a/global.json b/global.json index 859752a8315..1040849f738 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,7 @@ { "sdk": { - "version": "10.0.0", - "rollForward": "latestFeature" + "version": "11.0.100-preview.4.26230.115", + "allowPrerelease": true, + "rollForward": "latestPatch" } } \ No newline at end of file diff --git a/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj b/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj index c81abb79bb7..8710f647e69 100644 --- a/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj +++ b/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 diff --git a/src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj b/src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj index b442e0b86a5..e32b16043d7 100644 --- a/src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj +++ b/src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj b/src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj index de7e892daa5..5122f143a75 100644 --- a/src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj +++ b/src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 diff --git a/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj b/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj index 7ba504ff988..d4369c24f49 100644 --- a/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj +++ b/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj b/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj index bb79c665f31..0c555237a18 100644 --- a/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj +++ b/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 diff --git a/src/NServiceBus.PersistenceTests/NServiceBus.PersistenceTests.csproj b/src/NServiceBus.PersistenceTests/NServiceBus.PersistenceTests.csproj index a486e5c7df1..021fd8e7b61 100644 --- a/src/NServiceBus.PersistenceTests/NServiceBus.PersistenceTests.csproj +++ b/src/NServiceBus.PersistenceTests/NServiceBus.PersistenceTests.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj b/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj index f20713c3ad6..00980a22593 100644 --- a/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj +++ b/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj @@ -1,7 +1,7 @@ - net10.0 + net11.0 From 1df07714f50a0a5115016685fe0abf3b959a08d9 Mon Sep 17 00:00:00 2001 From: John Simons Date: Wed, 27 May 2026 08:59:59 +1000 Subject: [PATCH 2/3] A few fixes --- .github/workflows/ci.yml | 5 ++--- global.json | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b2818ae07b2..32e3c078a31 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,9 +31,8 @@ jobs: - name: Setup .NET SDK uses: actions/setup-dotnet@v5.1.0 with: - dotnet-version: | - 8.0.x - 11.0.x + global-json-file: global.json + dotnet-version: 8.0.x - name: Build run: dotnet build src --configuration Release - name: Upload packages diff --git a/global.json b/global.json index 1040849f738..77f7357e6c9 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "11.0.100-preview.4.26230.115", + "version": "11.0.0", "allowPrerelease": true, - "rollForward": "latestPatch" + "rollForward": "latestFeature" } } \ No newline at end of file From 7521f6c0c995e501b6133a3d040b6c1807d3a05e Mon Sep 17 00:00:00 2001 From: John Simons Date: Thu, 28 May 2026 10:22:02 +1000 Subject: [PATCH 3/3] add multitarget --- .github/workflows/ci.yml | 2 +- .../NServiceBus.AcceptanceTests.csproj | 2 +- .../NServiceBus.ContainerTests.csproj | 2 +- .../NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj | 2 +- src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj | 2 +- .../NServiceBus.Learning.AcceptanceTests.csproj | 2 +- .../NServiceBus.PersistenceTests.csproj | 2 +- src/NServiceBus.Testing.Fakes/NServiceBus.Testing.Fakes.csproj | 2 +- .../NServiceBus.TransportTests.csproj | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 32e3c078a31..412e1836140 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: uses: actions/setup-dotnet@v5.1.0 with: global-json-file: global.json - dotnet-version: 8.0.x + dotnet-version: 10.0.x - name: Build run: dotnet build src --configuration Release - name: Upload packages diff --git a/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj b/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj index 8710f647e69..50fc5fba2a7 100644 --- a/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj +++ b/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj @@ -1,7 +1,7 @@ - net11.0 + net10.0;net11.0 diff --git a/src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj b/src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj index e32b16043d7..e9c032e27e4 100644 --- a/src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj +++ b/src/NServiceBus.ContainerTests/NServiceBus.ContainerTests.csproj @@ -1,7 +1,7 @@ - net11.0 + net10.0;net11.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj b/src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj index 5122f143a75..2ca8a8b12d3 100644 --- a/src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj +++ b/src/NServiceBus.Core.Analyzer.Tests.Roslyn4/NServiceBus.Core.Analyzer.Tests.Roslyn4.csproj @@ -1,7 +1,7 @@ - net11.0 + net10.0;net11.0 diff --git a/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj b/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj index d4369c24f49..2e25c3b9bc3 100644 --- a/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj +++ b/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj @@ -1,7 +1,7 @@ - net11.0 + net10.0;net11.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj b/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj index 0c555237a18..c4238f32ceb 100644 --- a/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj +++ b/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj @@ -1,7 +1,7 @@ - net11.0 + net10.0;net11.0 diff --git a/src/NServiceBus.PersistenceTests/NServiceBus.PersistenceTests.csproj b/src/NServiceBus.PersistenceTests/NServiceBus.PersistenceTests.csproj index 021fd8e7b61..6a583f33a14 100644 --- a/src/NServiceBus.PersistenceTests/NServiceBus.PersistenceTests.csproj +++ b/src/NServiceBus.PersistenceTests/NServiceBus.PersistenceTests.csproj @@ -1,7 +1,7 @@ - net11.0 + net10.0;net11.0 true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.Testing.Fakes/NServiceBus.Testing.Fakes.csproj b/src/NServiceBus.Testing.Fakes/NServiceBus.Testing.Fakes.csproj index 5d8f06fb050..69c2d9c5bd5 100644 --- a/src/NServiceBus.Testing.Fakes/NServiceBus.Testing.Fakes.csproj +++ b/src/NServiceBus.Testing.Fakes/NServiceBus.Testing.Fakes.csproj @@ -1,7 +1,7 @@  - net8.0 + net10.0;net11.0 NServiceBus.Testing true ..\NServiceBusTests.snk diff --git a/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj b/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj index 00980a22593..f3484b01095 100644 --- a/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj +++ b/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj @@ -1,7 +1,7 @@ - net11.0 + net10.0;net11.0