From 30cf82fd8d1bc1d7ebcc6c438ee3fffa294abc4d Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Date: Sun, 1 Nov 2026 13:25:40 +0100
Subject: [PATCH] Use 10.x.x NuGets for .NET 10 (#1530)

* Use 10.x.x NuGets for .NET 10

* await Task.Delay(500, _ct);
---
 .../AspireApp1.ServiceDefaults.csproj                        | 4 ++--
 .../WireMock.Net.AspNetCore.Middleware.csproj                | 5 +++--
 src/WireMock.Net.Shared/WireMock.Net.Shared.csproj           | 5 +++--
 src/dotnet-WireMock.Net/dotnet-WireMock.csproj               | 2 +-
 .../WireMock.Net.Middleware.Tests.csproj                     | 5 +++--
 .../WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs | 2 ++
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/examples-Aspire/AspireApp1.ServiceDefaults/AspireApp1.ServiceDefaults.csproj b/examples-Aspire/AspireApp1.ServiceDefaults/AspireApp1.ServiceDefaults.csproj
index 452e6f67..bef59004 100644
--- a/examples-Aspire/AspireApp1.ServiceDefaults/AspireApp1.ServiceDefaults.csproj
+++ b/examples-Aspire/AspireApp1.ServiceDefaults/AspireApp1.ServiceDefaults.csproj
@@ -10,8 +10,8 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.4.0" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.11.0" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="10.11.0" />
     <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
     <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
diff --git a/src/WireMock.Net.AspNetCore.Middleware/WireMock.Net.AspNetCore.Middleware.csproj b/src/WireMock.Net.AspNetCore.Middleware/WireMock.Net.AspNetCore.Middleware.csproj
index 96818276..35495628 100644
--- a/src/WireMock.Net.AspNetCore.Middleware/WireMock.Net.AspNetCore.Middleware.csproj
+++ b/src/WireMock.Net.AspNetCore.Middleware/WireMock.Net.AspNetCore.Middleware.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <ImplicitUsings>enable</ImplicitUsings>
@@ -31,7 +31,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" Condition=" '$(TargetFramework)' != 'net10.0' " />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.14" Condition=" '$(TargetFramework)' == 'net10.0' " />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj
index 67483828..3e195852 100644
--- a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj
+++ b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>Shared interfaces, models, enumerations and types.</Description>
         <Authors>Stef Heyenrath</Authors>
@@ -29,7 +29,8 @@
         <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.9" />
         <PackageReference Include="Stef.Validation" Version="0.3.0" />
         <PackageReference Include="AnyOf" Version="0.5.0.1" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" Condition=" '$(TargetFramework)' != 'net10.0' " />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.14" Condition=" '$(TargetFramework)' == 'net10.0' " />
         <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.13.0" />
         <PackageReference Include="JsonConverter.System.Text.Json" Version="0.13.0" />
     </ItemGroup>
diff --git a/src/dotnet-WireMock.Net/dotnet-WireMock.csproj b/src/dotnet-WireMock.Net/dotnet-WireMock.csproj
index b4fe3f5a..64d1834d 100644
--- a/src/dotnet-WireMock.Net/dotnet-WireMock.csproj
+++ b/src/dotnet-WireMock.Net/dotnet-WireMock.csproj
@@ -17,7 +17,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.14" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj b/test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj
index cc076239..7e2ca729 100644
--- a/test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj
+++ b/test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
@@ -23,7 +23,8 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="AwesomeAssertions" Version="9.6.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.8" Condition=" '$(TargetFramework)' != 'net10.0' " />
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.14" Condition=" '$(TargetFramework)' == 'net10.0' " />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.11.0" />
         <PackageReference Include="Moq" Version="4.20.72" />
         <PackageReference Include="xunit.v3" Version="3.2.2" />
diff --git a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
index 60deeed1..c45b40c5 100644
--- a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
+++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
@@ -35,6 +35,8 @@ public class TestcontainersTests(ITestOutputHelper testOutputHelper, ITestContex
             .WithCleanUp(true)
             .Build();
 
+        await Task.Delay(500, _ct);
+
         await StartTestAsync(wireMockContainer);
         await StopAsync(wireMockContainer);
     }