From f594a7cb19288b4753519f82a15590386aaad26c Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Sat, 7 Nov 2026 09:59:48 +0100
Subject: [PATCH] Use version-aligned DCP for Aspire integration tests (#1531)

* Initial plan

* Fix Aspire integration test DCP version mismatch

Co-authored-by: StefH <249938+StefH@users.noreply.github.com>

* Enable Aspire Docker integration tests

Co-authored-by: StefH <249938+StefH@users.noreply.github.com>

* Use Aspire RID fallback with .NET 10 SDK

Co-authored-by: StefH <249938+StefH@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: StefH <249938+StefH@users.noreply.github.com>
---
 .../WireMock.Net.Aspire.TestAppHost.csproj                    | 2 +-
 test/WireMock.Net.Aspire.Tests/IntegrationTests.cs            | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj b/test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj
index 26b0c840..76ae505d 100644
--- a/test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj
+++ b/test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj
@@ -11,7 +11,7 @@
         <SignAssembly>true</SignAssembly>
         <AssemblyOriginatorKeyFile>../../src/WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
         <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-        <AspireUseCliBundle>true</AspireUseCliBundle>
+        <_AspireUseSdkPickBestRid>false</_AspireUseSdkPickBestRid>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs b/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs
index a4c23fc2..55d67bf6 100644
--- a/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs
+++ b/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs
@@ -11,7 +11,7 @@ public class IntegrationTests
 {
     private record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary);
 
-    //[DockerIsRunningInLinuxContainerModeFact]
+    [DockerIsRunningInLinuxContainerModeFact]
     public async Task StartAppHostWithWireMockAndCreateHttpClientToCallTheMockedWeatherForecastEndpoint()
     {
         // Arrange
@@ -39,7 +39,7 @@ public class IntegrationTests
         weatherForecasts2.Should().HaveCount(5);
     }
 
-    //[DockerIsRunningInLinuxContainerModeFact]
+    [DockerIsRunningInLinuxContainerModeFact]
     public async Task StartAppHostWithWireMockAndCreateWireMockAdminClientToCallTheAdminEndpoint()
     {
         // Arrange