From e4f74d6f3e44d367154fa9e636a6debf3d75d27d Mon Sep 17 00:00:00 2001
From: Kees Verhaar <kees.verhaar@wigo4it.nl>
Date: Mon, 2 Feb 2026 15:15:35 +0100
Subject: [PATCH 1/3] NServiceBus 10 compatibility (and .Net 10)

---
 .../EndpointConfigurationExtensions.cs                        | 2 --
 .../NServiceBus.Extensions.IntegrationTesting.csproj          | 4 ++--
 .../HostApplicationFactoryTests.cs                            | 3 ++-
 .../NServiceBus.Extensions.IntegrationTesting.Tests.csproj    | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/NServiceBus.Extensions.IntegrationTesting/EndpointConfigurationExtensions.cs b/src/NServiceBus.Extensions.IntegrationTesting/EndpointConfigurationExtensions.cs
index 71ff6ed..2fa9b9b 100644
--- a/src/NServiceBus.Extensions.IntegrationTesting/EndpointConfigurationExtensions.cs
+++ b/src/NServiceBus.Extensions.IntegrationTesting/EndpointConfigurationExtensions.cs
@@ -1,5 +1,4 @@
 using System;
-using NServiceBus.Features;
 
 namespace NServiceBus.Extensions.IntegrationTesting
 {
@@ -36,7 +35,6 @@ public static EndpointConfiguration ConfigureTestEndpoint(this EndpointConfigura
 
             endpoint.PurgeOnStartup(true);
             endpoint.DisableFeature<Features.Audit>();
-            endpoint.EnableOpenTelemetry();
 
             endpoint.Pipeline.Register(
                 new AttachIncomingLogicalMessageContextToActivity(),
diff --git a/src/NServiceBus.Extensions.IntegrationTesting/NServiceBus.Extensions.IntegrationTesting.csproj b/src/NServiceBus.Extensions.IntegrationTesting/NServiceBus.Extensions.IntegrationTesting.csproj
index 9a028fb..9460675 100644
--- a/src/NServiceBus.Extensions.IntegrationTesting/NServiceBus.Extensions.IntegrationTesting.csproj
+++ b/src/NServiceBus.Extensions.IntegrationTesting/NServiceBus.Extensions.IntegrationTesting.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <Authors>Jimmy Bogard</Authors>
     <Copyright>Jimmy Bogard</Copyright>
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NServiceBus" Version="[9.0.0, 10.0.0)" />
+    <PackageReference Include="NServiceBus" Version="[10.0.0, 11.0.0)" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />
   </ItemGroup>
diff --git a/tests/NServiceBus.Extensions.IntegrationTesting.Tests/HostApplicationFactoryTests.cs b/tests/NServiceBus.Extensions.IntegrationTesting.Tests/HostApplicationFactoryTests.cs
index a6fb9e9..8b9a8cd 100644
--- a/tests/NServiceBus.Extensions.IntegrationTesting.Tests/HostApplicationFactoryTests.cs
+++ b/tests/NServiceBus.Extensions.IntegrationTesting.Tests/HostApplicationFactoryTests.cs
@@ -152,7 +152,8 @@ public class SagaExample : Saga<SagaData>,
             protected override void ConfigureHowToFindSaga(SagaPropertyMapper<SagaData> mapper)
             {
                 //note that mapping on a string is the worst example ever
-                mapper.ConfigureMapping<StartSagaMessage>(m => m.Message).ToSaga(s => s.Message);
+                mapper.MapSaga(saga => saga.Message)
+                    .ToMessage<StartSagaMessage>(m => m.Message);
             }
 
             public Task Handle(StartSagaMessage message, IMessageHandlerContext context)
diff --git a/tests/NServiceBus.Extensions.IntegrationTesting.Tests/NServiceBus.Extensions.IntegrationTesting.Tests.csproj b/tests/NServiceBus.Extensions.IntegrationTesting.Tests/NServiceBus.Extensions.IntegrationTesting.Tests.csproj
index 96c6a70..d9f0807 100644
--- a/tests/NServiceBus.Extensions.IntegrationTesting.Tests/NServiceBus.Extensions.IntegrationTesting.Tests.csproj
+++ b/tests/NServiceBus.Extensions.IntegrationTesting.Tests/NServiceBus.Extensions.IntegrationTesting.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
@@ -9,7 +9,7 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.15" />
-    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="3.0.1" />
+    <PackageReference Include="NServiceBus.Extensions.Hosting" Version="4.0.0" />
     <PackageReference Include="Shouldly" Version="4.3.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">

From ad5e5641e94db4264b27d656d8a3674f234ffeca Mon Sep 17 00:00:00 2001
From: Kees Verhaar <kees.verhaar@wigo4it.nl>
Date: Mon, 2 Feb 2026 15:17:31 +0100
Subject: [PATCH 2/3] Udate dependencies

---
 .../NServiceBus.Extensions.IntegrationTesting.csproj        | 4 ++--
 .../NServiceBus.Extensions.IntegrationTesting.Tests.csproj  | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/NServiceBus.Extensions.IntegrationTesting/NServiceBus.Extensions.IntegrationTesting.csproj b/src/NServiceBus.Extensions.IntegrationTesting/NServiceBus.Extensions.IntegrationTesting.csproj
index 9460675..22aa36d 100644
--- a/src/NServiceBus.Extensions.IntegrationTesting/NServiceBus.Extensions.IntegrationTesting.csproj
+++ b/src/NServiceBus.Extensions.IntegrationTesting/NServiceBus.Extensions.IntegrationTesting.csproj
@@ -17,8 +17,8 @@
 
   <ItemGroup>
     <PackageReference Include="NServiceBus" Version="[10.0.0, 11.0.0)" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    <PackageReference Include="MinVer" Version="6.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.102" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="7.0.0" PrivateAssets="All" />
   </ItemGroup>
 
 </Project>
diff --git a/tests/NServiceBus.Extensions.IntegrationTesting.Tests/NServiceBus.Extensions.IntegrationTesting.Tests.csproj b/tests/NServiceBus.Extensions.IntegrationTesting.Tests/NServiceBus.Extensions.IntegrationTesting.Tests.csproj
index d9f0807..221c912 100644
--- a/tests/NServiceBus.Extensions.IntegrationTesting.Tests/NServiceBus.Extensions.IntegrationTesting.Tests.csproj
+++ b/tests/NServiceBus.Extensions.IntegrationTesting.Tests/NServiceBus.Extensions.IntegrationTesting.Tests.csproj
@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.15" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.2" />
     <PackageReference Include="NServiceBus.Extensions.Hosting" Version="4.0.0" />
     <PackageReference Include="Shouldly" Version="4.3.0" />
     <PackageReference Include="xunit" Version="2.9.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

From c40b65a1ad19f62cf88b704326dfc92c944b442f Mon Sep 17 00:00:00 2001
From: Kees Verhaar <KeesV@users.noreply.github.com>
Date: Wed, 25 Feb 2026 06:00:22 +0100
Subject: [PATCH 3/3] Use .Net 10 in workflows

---
 .github/workflows/ci.yml      | 4 ++--
 .github/workflows/release.yml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba6e1d3..e1d28de 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,10 +15,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Setup dotnet 8.0
+    - name: Setup dotnet 10.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.0.x'
     - name: Build and Test
       run: ./Build.ps1
       shell: pwsh
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 42bf571..2a6058e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,10 +12,10 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - name: Setup dotnet 8.0
+    - name: Setup dotnet 10.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '8.0.x'
+        dotnet-version: '10.0.x'
     - name: Build and Test
       run: ./Build.ps1
       shell: pwsh