Fix WireMock.Net.Aspire project when using Aspire 13.4.0

Directory.Build.props

@@ -52,7 +52,7 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" Version="2025.2.4" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.103" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.300" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">

examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />
+    <Sdk Name="Aspire.AppHost.Sdk" Version="13.4.0" />
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -18,7 +18,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.0" />
     </ItemGroup>
 
     <ItemGroup>

examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />
+    <Sdk Name="Aspire.AppHost.Sdk" Version="13.4.0" />
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -15,7 +15,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.0" />
     </ItemGroup>
 
 </Project>

src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj

@@ -45,7 +45,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting" Version="13.1.0" />
+        <PackageReference Include="Aspire.Hosting" Version="13.4.0" />
     </ItemGroup>
 
     <ItemGroup>

src/WireMock.Net.Aspire/WireMockHealthCheck.cs

@@ -21,11 +21,6 @@ public class WireMockHealthCheck(WireMockServerResource resource) : IHealthCheck
             return HealthCheckResult.Unhealthy("WireMock.Net is not healthy");
         }
 
-        if (resource.ApiMappingState == WireMockMappingState.NotSubmitted)
-        {
-            return HealthCheckResult.Unhealthy("WireMock.Net has not received mappings");
-        }
-
         return HealthCheckResult.Healthy();
     }
 
@@ -41,4 +36,4 @@ public class WireMockHealthCheck(WireMockServerResource resource) : IHealthCheck
             return false;
         }
     }
-}
+}

src/WireMock.Net.Aspire/WireMockLifecycleSubscriber.cs

@@ -21,7 +21,13 @@ internal class WireMockLifecycleSubscriber(ILoggerFactory loggerFactory) : IDist
 
                 var endpoint = wireMockServerResource.GetEndpoint();
                 Debug.Assert(endpoint.IsAllocated);
+            }
+        });
 
+        eventing.Subscribe<ResourceReadyEvent>(async (@event, ct) =>
+        {
+            if (@event.Resource is WireMockServerResource wireMockServerResource)
+            {
                 await wireMockServerResource.WaitForHealthAsync(ct);
 
                 await wireMockServerResource.CallAddProtoDefinitionsAsync(ct);

src/WireMock.Net.RestClient/Extensions/WireMockAdminApiExtensions.cs

@@ -65,6 +65,7 @@ public static class WireMockAdminApiExtensions
             waitTime = (int)(InitialWaitingTimeInMilliSeconds * Math.Pow(2, retries));
             await Task.Delay(waitTime, cancellationToken);
             isHealthy = await IsHealthyAsync(adminApi, cancellationToken);
+
             retries++;
             totalWaitTime += waitTime;
         }

test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />
+    <Sdk Name="Aspire.AppHost.Sdk" Version="13.4.0" />
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -19,7 +19,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.1" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.0" />
     </ItemGroup>
 
     <ItemGroup>

test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj

@@ -14,7 +14,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.Testing" Version="13.1.1" />
+        <PackageReference Include="Aspire.Hosting.Testing" Version="13.4.0" />
         <PackageReference Include="Codecov" Version="1.13.0" />
         <PackageReference Include="coverlet.msbuild" Version="6.0.4">
             <PrivateAssets>all</PrivateAssets>
@@ -25,7 +25,7 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="AwesomeAssertions" Version="9.4.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
         <PackageReference Include="Moq" Version="4.20.72" />
         <PackageReference Include="xunit.v3" Version="3.2.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">

test/WireMock.Net.Aspire.Tests/WireMockServerBuilderExtensionsTests.cs

@@ -92,17 +92,11 @@ public class WireMockServerBuilderExtensionsTests
             Tag = "latest"
         });
 
-        var endpointAnnotation = wiremock.Resource.Annotations.OfType<EndpointAnnotation>().FirstOrDefault();
-        endpointAnnotation.Should().BeEquivalentTo(new EndpointAnnotation(
-            protocol: ProtocolType.Tcp,
-            uriScheme: "http",
-            transport: null,
-            name: null,
-            port: port,
-            targetPort: 80,
-            isExternal: null,
-            isProxied: true
-        ));
+        var endpointAnnotation = wiremock.Resource.Annotations.OfType<EndpointAnnotation>().First();
+        endpointAnnotation.Protocol.Should().Be(ProtocolType.Tcp);
+        endpointAnnotation.UriScheme.Should().Be("http");
+        endpointAnnotation.Port.Should().Be(port);
+        endpointAnnotation.TargetPort.Should().Be(80);
 
         wiremock.Resource.Annotations.OfType<EnvironmentCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();
         wiremock.Resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();
@@ -153,39 +147,24 @@ public class WireMockServerBuilderExtensionsTests
         endpointAnnotations.Should().HaveCount(3);
 
         var endpointAnnotationForHttp80 = endpointAnnotations[0];
-        endpointAnnotationForHttp80.Should().BeEquivalentTo(new EndpointAnnotation(
-            protocol: ProtocolType.Tcp,
-            uriScheme: "http",
-            transport: null,
-            name: null,
-            port: null,
-            targetPort: 80,
-            isExternal: null,
-            isProxied: true
-        ));
+        endpointAnnotationForHttp80.Protocol.Should().Be(ProtocolType.Tcp);
+        endpointAnnotationForHttp80.UriScheme.Should().Be("http");
+        endpointAnnotationForHttp80.Port.Should().BeNull();
+        endpointAnnotationForHttp80.TargetPort.Should().Be(80);
+
         var endpointAnnotationForHttpFreePort = endpointAnnotations[1];
-        endpointAnnotationForHttpFreePort.Should().BeEquivalentTo(new EndpointAnnotation(
-            protocol: ProtocolType.Tcp,
-            uriScheme: "http",
-            transport: null,
-            name: $"http-{freePorts[0]}",
-            port: freePorts[0],
-            targetPort: freePorts[0],
-            isExternal: null,
-            isProxied: true
-        ));
+        endpointAnnotationForHttpFreePort.Protocol.Should().Be(ProtocolType.Tcp);
+        endpointAnnotationForHttpFreePort.UriScheme.Should().Be("http");
+        endpointAnnotationForHttpFreePort.Name.Should().Be($"http-{freePorts[0]}");
+        endpointAnnotationForHttpFreePort.Port.Should().Be(freePorts[0]);
+        endpointAnnotationForHttpFreePort.TargetPort.Should().Be(freePorts[0]);
 
         var endpointAnnotationForGrpcFreePort = endpointAnnotations[2];
-        endpointAnnotationForGrpcFreePort.Should().BeEquivalentTo(new EndpointAnnotation(
-            protocol: ProtocolType.Tcp,
-            uriScheme: "grpc",
-            transport: null,
-            name: $"grpc-{freePorts[1]}",
-            port: freePorts[1],
-            targetPort: freePorts[1],
-            isExternal: null,
-            isProxied: true
-        ));
+        endpointAnnotationForGrpcFreePort.Protocol.Should().Be(ProtocolType.Tcp);
+        endpointAnnotationForGrpcFreePort.UriScheme.Should().Be("grpc");
+        endpointAnnotationForGrpcFreePort.Name.Should().Be($"grpc-{freePorts[1]}");
+        endpointAnnotationForGrpcFreePort.Port.Should().Be(freePorts[1]);
+        endpointAnnotationForGrpcFreePort.TargetPort.Should().Be(freePorts[1]);
 
         wiremock.Resource.Annotations.OfType<EnvironmentCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();
         wiremock.Resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();