From 0038547ed9c0a0a6d910e3757fbd0420ac77b99c Mon Sep 17 00:00:00 2001 From: John Simons Date: Mon, 25 May 2026 16:40:06 +1000 Subject: [PATCH 1/3] Upgrade test projects to target .NET 11 Update all test projects (`NServiceBus.*Tests.csproj`) to target `net11.0`. This change also updates `global.json` to specify `11.0.100-preview.4.26230.115` SDK and configures the CI workflow to install both `10.0.x` and `11.0.x` .NET SDKs for build compatibility. --- .github/workflows/ci.yml | 4 +++- global.json | 8 ++++---- .../NServiceBus.AcceptanceTests.csproj | 2 +- .../NServiceBus.ContainerTests.csproj | 2 +- src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj | 2 +- src/NServiceBus.Core/Pipeline/PipelineStepDiagnostics.cs | 2 +- .../NServiceBus.Learning.AcceptanceTests.csproj | 2 +- .../NServiceBus.PersistenceTests.csproj | 2 +- .../NServiceBus.TransportTests.csproj | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0ed901eed90..ded337e9c05 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.2.0 with: - global-json-file: global.json + dotnet-version: | + 10.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 2b3567e3704..1040849f738 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { - "version": "10.0.0", - "allowPrerelease": false, - "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 54600cd9e06..62c5cd276c0 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 af477dfe711..b9387c6898b 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.Tests/NServiceBus.Core.Tests.csproj b/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj index 6cc1c4e8ed4..032bfcf6dae 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 13.0 diff --git a/src/NServiceBus.Core/Pipeline/PipelineStepDiagnostics.cs b/src/NServiceBus.Core/Pipeline/PipelineStepDiagnostics.cs index 7dc127aef37..38bb374c3b3 100644 --- a/src/NServiceBus.Core/Pipeline/PipelineStepDiagnostics.cs +++ b/src/NServiceBus.Core/Pipeline/PipelineStepDiagnostics.cs @@ -25,7 +25,7 @@ public static string PrettyPrint(IReadOnlyList steps) var nextContextName = $"context{i}"; sb.AppendLine(); - sb.Append(new string(' ', i * 4)); + sb.Append(' ', i * 4); sb.Append($"({step.InputContextType.Name} {nextContextName}) => {step.BehaviorType.Name}.Invoke({nextContextName}{(i + 1 < steps.Count ? "," : string.Empty)}"); } diff --git a/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj b/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj index f5bdf4ff005..a1c0384c2ba 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 6c61b6b86d0..1c818c208e9 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 4b5cad77e1b..06e50b0b21f 100644 --- a/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj +++ b/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj @@ -1,7 +1,7 @@  - net10.0 + net11.0 From 2117a508b9f4165a4d79fd22358d6ff83e2305d9 Mon Sep 17 00:00:00 2001 From: John Simons Date: Wed, 27 May 2026 08:58:00 +1000 Subject: [PATCH 2/3] a few small 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 ded337e9c05..1334effc1d2 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.2.0 with: - dotnet-version: | - 10.0.x - 11.0.x + global-json-file: global.json + dotnet-version: 10.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 be034ef6e42d862ee497c4b38c41e95c8a4b1bb1 Mon Sep 17 00:00:00 2001 From: John Simons Date: Thu, 28 May 2026 10:18:44 +1000 Subject: [PATCH 3/3] Add multitarget for tests --- .../NServiceBus.AcceptanceTests.csproj | 2 +- .../NServiceBus.ContainerTests.csproj | 2 +- src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj | 2 +- .../NServiceBus.Learning.AcceptanceTests.csproj | 2 +- .../NServiceBus.PersistenceTests.csproj | 2 +- .../NServiceBus.TransportTests.csproj | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj b/src/NServiceBus.AcceptanceTests/NServiceBus.AcceptanceTests.csproj index 62c5cd276c0..aa52fd4548d 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 b9387c6898b..ea97df4f63b 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.Tests/NServiceBus.Core.Tests.csproj b/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj index 032bfcf6dae..102cafcbc83 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 13.0 diff --git a/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj b/src/NServiceBus.Learning.AcceptanceTests/NServiceBus.Learning.AcceptanceTests.csproj index a1c0384c2ba..729ad8faa4f 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 1c818c208e9..0bd985f7490 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.TransportTests/NServiceBus.TransportTests.csproj b/src/NServiceBus.TransportTests/NServiceBus.TransportTests.csproj index 06e50b0b21f..770f9a054b1 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