Version 2.x (#1359)

* Version 2.x * Setup .NET 9 * 12 * cleanup some #if for NETSTANDARD1_3 * cleanup + fix tests for net8 * openapi * NO ConfigureAwait(false) + cleanup * . * #endif * HashSet * WireMock.Net.NUnit * HttpContext * Add WebSockets (#1423) * Add WebSockets * Add tests * fix * more tests * Add tests * ... * remove IOwin * - * tests * fluent * ok * match * . * byte[] * x * func * func * byte * trans * ... * frameworks......... * jmes * xxx * sc * using var httpClient = new HttpClient(); * usings * maxRetries * up * xunit v3 * ct * --- * ct * ct2 * T Unit * WireMock.Net.TUnitTests / 10 * t unit first * --project * no tunit * t2 * --project * --project * ci - --project * publish ./test/wiremock-coverage.xml * windows * . * log * ... * log * goed * BodyType * . * . * --scenario * ... * pact * ct * . * WireMock.Net.RestClient.AwesomeAssertions (#1427) * WireMock.Net.RestClient.AwesomeAssertions * ok * atpath * fix test * sonar fixes * ports * proxy test * FIX? * --- * await Task.Delay(100, _ct); * ? * --project * Aspire: use IDistributedApplicationEventingSubscriber (#1428) * broadcast * ok * more tsts * . * Collection * up * . * 2 * remove nfluent * <VersionPrefix>2.0.0-preview-02</VersionPrefix> * ... * . * nuget icon * . * <PackageReference Include="JmesPath.Net" Version="1.1.0" /> * x * 500 * . * fix some warnings * ws
2026-04-27 03:09:35 +02:00 · 2026-03-11 17:02:47 +01:00
parent d6e19532bc
commit a292f28dda
521 changed files with 79740 additions and 5246 deletions
--- a/src/WireMock.Net.Aspire/WireMockLifecycleSubscriber.cs
+++ b/src/WireMock.Net.Aspire/WireMockLifecycleSubscriber.cs
@@ -0,0 +1,37 @@
+// Copyright © WireMock.Net
+
+using System.Diagnostics;
+using Aspire.Hosting;
+using Aspire.Hosting.ApplicationModel;
+using Aspire.Hosting.Eventing;
+using Aspire.Hosting.Lifecycle;
+using Microsoft.Extensions.Logging;
+
+namespace WireMock.Net.Aspire;
+
+internal class WireMockLifecycleSubscriber(ILoggerFactory loggerFactory) : IDistributedApplicationEventingSubscriber
+{
+    public Task SubscribeAsync(IDistributedApplicationEventing eventing, DistributedApplicationExecutionContext executionContext, CancellationToken cancellationToken)
+    {
+        eventing.Subscribe<ResourceEndpointsAllocatedEvent>(async (@event, ct) =>
+        {
+            if (@event.Resource is WireMockServerResource wireMockServerResource)
+            {
+                wireMockServerResource.SetLogger(loggerFactory.CreateLogger<WireMockServerResource>());
+
+                var endpoint = wireMockServerResource.GetEndpoint();
+                Debug.Assert(endpoint.IsAllocated);
+
+                await wireMockServerResource.WaitForHealthAsync(ct);
+
+                await wireMockServerResource.CallAddProtoDefinitionsAsync(ct);
+
+                await wireMockServerResource.CallApiMappingBuilderActionAsync(ct);
+
+                wireMockServerResource.StartWatchingStaticMappings(ct);
+            }
+        });
+
+        return Task.CompletedTask;
+    }
+}
--- a/src/WireMock.Net.Aspire/WireMockServerBuilderExtensions.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerBuilderExtensions.cs
@@ -135,7 +135,7 @@ public static class WireMockServerBuilderExtensions
        });

        // Always add the lifecycle hook to support dynamic mappings and proto definitions
-        resourceBuilder.ApplicationBuilder.Services.TryAddLifecycleHook<WireMockServerLifecycleHook>();
+        resourceBuilder.ApplicationBuilder.Services.AddEventingSubscriber<WireMockLifecycleSubscriber>();

        return resourceBuilder;
    }
--- a/src/WireMock.Net.Aspire/WireMockServerLifecycleHook.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerLifecycleHook.cs
@@ -1,59 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Diagnostics;
-using Aspire.Hosting.ApplicationModel;
-using Aspire.Hosting.Lifecycle;
-using Microsoft.Extensions.Logging;
-
-namespace WireMock.Net.Aspire;
-
-internal class WireMockServerLifecycleHook(ILoggerFactory loggerFactory) : IDistributedApplicationLifecycleHook, IAsyncDisposable
-{
-    private readonly CancellationTokenSource _shutdownCts = new();
-
-    private CancellationTokenSource? _linkedCts;
-    private Task? _mappingTask;
-
-    public Task AfterEndpointsAllocatedAsync(DistributedApplicationModel appModel, CancellationToken cancellationToken = default)
-    {
-        _linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_shutdownCts.Token, cancellationToken);
-
-        _mappingTask = Task.Run(async () =>
-        {
-            var wireMockServerResources = appModel.Resources
-                .OfType<WireMockServerResource>()
-                .ToArray();
-
-            foreach (var wireMockServerResource in wireMockServerResources)
-            {
-                wireMockServerResource.SetLogger(loggerFactory.CreateLogger<WireMockServerResource>());
-
-                var endpoint = wireMockServerResource.GetEndpoint();
-                Debug.Assert(endpoint.IsAllocated);
-
-                await wireMockServerResource.WaitForHealthAsync(_linkedCts.Token);
-
-                await wireMockServerResource.CallAddProtoDefinitionsAsync(_linkedCts.Token);
-
-                await wireMockServerResource.CallApiMappingBuilderActionAsync(_linkedCts.Token);
-
-                wireMockServerResource.StartWatchingStaticMappings(_linkedCts.Token);
-            }
-        }, _linkedCts.Token);
-
-        return Task.CompletedTask;
-    }
-
-    public async ValueTask DisposeAsync()
-    {
-        await _shutdownCts.CancelAsync();
-
-        _linkedCts?.Dispose();
-        _shutdownCts.Dispose();
-
-        if (_mappingTask is not null)
-        {
-            await _mappingTask;
-        }
-    }
-}