starred/WireMock.Net
1
0
Fork 0
mirror of https://github.com/wiremock/WireMock.Net.git synced 2026-06-06 23:12:46 +02:00
Code Issues 32 Packages Projects Releases 10 Wiki Activity

Fix WireMock.Net.Aspire project when using Aspire 13.4.0

Browse Source
This commit is contained in:
Stef Heyenrath
2026-06-02 19:09:32 +02:00
parent 1264df4a72
commit 6caa3df521
10 changed files with 38 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Directory.Build.props
+1 -1
View File
@@ -52,7 +52,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="JetBrains.Annotations" Version="2025.2.4" PrivateAssets="All" /> <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>
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' "> <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
+2 -2
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" /> <Sdk Name="Aspire.AppHost.Sdk" Version="13.4.0" />
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
@@ -18,7 +18,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" /> <PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj
+2 -2
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" /> <Sdk Name="Aspire.AppHost.Sdk" Version="13.4.0" />
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
@@ -15,7 +15,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" /> <PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>
src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
+1 -1
View File
@@ -45,7 +45,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Aspire.Hosting" Version="13.1.0" /> <PackageReference Include="Aspire.Hosting" Version="13.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
src/WireMock.Net.Aspire/WireMockHealthCheck.cs
+1 -6
View File
@@ -21,11 +21,6 @@ public class WireMockHealthCheck(WireMockServerResource resource) : IHealthCheck
return HealthCheckResult.Unhealthy("WireMock.Net is not healthy"); 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(); return HealthCheckResult.Healthy();
} }
@@ -41,4 +36,4 @@ public class WireMockHealthCheck(WireMockServerResource resource) : IHealthCheck
return false; return false;
} }
} }
} }
src/WireMock.Net.Aspire/WireMockLifecycleSubscriber.cs
+6
View File
@@ -21,7 +21,13 @@ internal class WireMockLifecycleSubscriber(ILoggerFactory loggerFactory) : IDist
var endpoint = wireMockServerResource.GetEndpoint(); var endpoint = wireMockServerResource.GetEndpoint();
Debug.Assert(endpoint.IsAllocated); Debug.Assert(endpoint.IsAllocated);
}
});
eventing.Subscribe<ResourceReadyEvent>(async (@event, ct) =>
{
if (@event.Resource is WireMockServerResource wireMockServerResource)
{
await wireMockServerResource.WaitForHealthAsync(ct); await wireMockServerResource.WaitForHealthAsync(ct);
await wireMockServerResource.CallAddProtoDefinitionsAsync(ct); await wireMockServerResource.CallAddProtoDefinitionsAsync(ct);
src/WireMock.Net.RestClient/Extensions/WireMockAdminApiExtensions.cs
+1
View File
@@ -65,6 +65,7 @@ public static class WireMockAdminApiExtensions
waitTime = (int)(InitialWaitingTimeInMilliSeconds * Math.Pow(2, retries)); waitTime = (int)(InitialWaitingTimeInMilliSeconds * Math.Pow(2, retries));
await Task.Delay(waitTime, cancellationToken); await Task.Delay(waitTime, cancellationToken);
isHealthy = await IsHealthyAsync(adminApi, cancellationToken); isHealthy = await IsHealthyAsync(adminApi, cancellationToken);
retries++; retries++;
totalWaitTime += waitTime; totalWaitTime += waitTime;
} }
test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj
+2 -2
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" /> <Sdk Name="Aspire.AppHost.Sdk" Version="13.4.0" />
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
@@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.1" /> <PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj
+2 -2
View File
@@ -14,7 +14,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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="Codecov" Version="1.13.0" />
<PackageReference Include="coverlet.msbuild" Version="6.0.4"> <PackageReference Include="coverlet.msbuild" Version="6.0.4">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
@@ -25,7 +25,7 @@
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="AwesomeAssertions" Version="9.4.0" /> <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="Moq" Version="4.20.72" />
<PackageReference Include="xunit.v3" Version="3.2.2" /> <PackageReference Include="xunit.v3" Version="3.2.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.5"> <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
test/WireMock.Net.Aspire.Tests/WireMockServerBuilderExtensionsTests.cs
+20 -41
View File
@@ -92,17 +92,11 @@ public class WireMockServerBuilderExtensionsTests
Tag = "latest" Tag = "latest"
}); });
var endpointAnnotation = wiremock.Resource.Annotations.OfType<EndpointAnnotation>().FirstOrDefault(); var endpointAnnotation = wiremock.Resource.Annotations.OfType<EndpointAnnotation>().First();
endpointAnnotation.Should().BeEquivalentTo(new EndpointAnnotation( endpointAnnotation.Protocol.Should().Be(ProtocolType.Tcp);
protocol: ProtocolType.Tcp, endpointAnnotation.UriScheme.Should().Be("http");
uriScheme: "http", endpointAnnotation.Port.Should().Be(port);
transport: null, endpointAnnotation.TargetPort.Should().Be(80);
name: null,
port: port,
targetPort: 80,
isExternal: null,
isProxied: true
));
wiremock.Resource.Annotations.OfType<EnvironmentCallbackAnnotation>().FirstOrDefault().Should().NotBeNull(); wiremock.Resource.Annotations.OfType<EnvironmentCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();
wiremock.Resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>().FirstOrDefault().Should().NotBeNull(); wiremock.Resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();
@@ -153,39 +147,24 @@ public class WireMockServerBuilderExtensionsTests
endpointAnnotations.Should().HaveCount(3); endpointAnnotations.Should().HaveCount(3);
var endpointAnnotationForHttp80 = endpointAnnotations[0]; var endpointAnnotationForHttp80 = endpointAnnotations[0];
endpointAnnotationForHttp80.Should().BeEquivalentTo(new EndpointAnnotation( endpointAnnotationForHttp80.Protocol.Should().Be(ProtocolType.Tcp);
protocol: ProtocolType.Tcp, endpointAnnotationForHttp80.UriScheme.Should().Be("http");
uriScheme: "http", endpointAnnotationForHttp80.Port.Should().BeNull();
transport: null, endpointAnnotationForHttp80.TargetPort.Should().Be(80);
name: null,
port: null,
targetPort: 80,
isExternal: null,
isProxied: true
));
var endpointAnnotationForHttpFreePort = endpointAnnotations[1]; var endpointAnnotationForHttpFreePort = endpointAnnotations[1];
endpointAnnotationForHttpFreePort.Should().BeEquivalentTo(new EndpointAnnotation( endpointAnnotationForHttpFreePort.Protocol.Should().Be(ProtocolType.Tcp);
protocol: ProtocolType.Tcp, endpointAnnotationForHttpFreePort.UriScheme.Should().Be("http");
uriScheme: "http", endpointAnnotationForHttpFreePort.Name.Should().Be($"http-{freePorts[0]}");
transport: null, endpointAnnotationForHttpFreePort.Port.Should().Be(freePorts[0]);
name: $"http-{freePorts[0]}", endpointAnnotationForHttpFreePort.TargetPort.Should().Be(freePorts[0]);
port: freePorts[0],
targetPort: freePorts[0],
isExternal: null,
isProxied: true
));
var endpointAnnotationForGrpcFreePort = endpointAnnotations[2]; var endpointAnnotationForGrpcFreePort = endpointAnnotations[2];
endpointAnnotationForGrpcFreePort.Should().BeEquivalentTo(new EndpointAnnotation( endpointAnnotationForGrpcFreePort.Protocol.Should().Be(ProtocolType.Tcp);
protocol: ProtocolType.Tcp, endpointAnnotationForGrpcFreePort.UriScheme.Should().Be("grpc");
uriScheme: "grpc", endpointAnnotationForGrpcFreePort.Name.Should().Be($"grpc-{freePorts[1]}");
transport: null, endpointAnnotationForGrpcFreePort.Port.Should().Be(freePorts[1]);
name: $"grpc-{freePorts[1]}", endpointAnnotationForGrpcFreePort.TargetPort.Should().Be(freePorts[1]);
port: freePorts[1],
targetPort: freePorts[1],
isExternal: null,
isProxied: true
));
wiremock.Resource.Annotations.OfType<EnvironmentCallbackAnnotation>().FirstOrDefault().Should().NotBeNull(); wiremock.Resource.Annotations.OfType<EnvironmentCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();
wiremock.Resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>().FirstOrDefault().Should().NotBeNull(); wiremock.Resource.Annotations.OfType<CommandLineArgsCallbackAnnotation>().FirstOrDefault().Should().NotBeNull();