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-28 11:47:50 +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.Minimal/Owin/GlobalExceptionMiddleware.cs
+++ b/src/WireMock.Net.Minimal/Owin/GlobalExceptionMiddleware.cs
@@ -1,70 +1,41 @@
 // Copyright © WireMock.Net

-using System;
-using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
-#if !USE_ASPNETCORE
-using Microsoft.Owin;
-using IContext = Microsoft.Owin.IOwinContext;
-using OwinMiddleware = Microsoft.Owin.OwinMiddleware;
-using Next = Microsoft.Owin.OwinMiddleware;
-#else
-using OwinMiddleware = System.Object;
-using IContext = Microsoft.AspNetCore.Http.HttpContext;
-using Next = Microsoft.AspNetCore.Http.RequestDelegate;
-#endif
-using WireMock.Owin.Mappers;
 using Stef.Validation;
+using WireMock.Owin.Mappers;

-namespace WireMock.Owin
+namespace WireMock.Owin;
+
+internal class GlobalExceptionMiddleware
 {
-    internal class GlobalExceptionMiddleware : OwinMiddleware
+    private readonly IWireMockMiddlewareOptions _options;
+    private readonly IOwinResponseMapper _responseMapper;
+
+    public GlobalExceptionMiddleware(RequestDelegate next, IWireMockMiddlewareOptions options, IOwinResponseMapper responseMapper)
    {
-        private readonly IWireMockMiddlewareOptions _options;
-        private readonly IOwinResponseMapper _responseMapper;
+        Next = next;
+        _options = Guard.NotNull(options);
+        _responseMapper = Guard.NotNull(responseMapper);
+    }

-#if !USE_ASPNETCORE
-        public GlobalExceptionMiddleware(Next next, IWireMockMiddlewareOptions options, IOwinResponseMapper responseMapper) : base(next)
+    public RequestDelegate Next { get; }
+
+    public Task Invoke(HttpContext ctx)
+    {
+        return InvokeInternalAsync(ctx);
+    }
+
+    private async Task InvokeInternalAsync(HttpContext ctx)
+    {
+        try
        {
-            _options = Guard.NotNull(options);
-            _responseMapper = Guard.NotNull(responseMapper);;
+            await Next.Invoke(ctx).ConfigureAwait(false);
        }
-#else
-        public GlobalExceptionMiddleware(Next next, IWireMockMiddlewareOptions options, IOwinResponseMapper responseMapper)
+        catch (Exception ex)
        {
-            Next = next;
-            _options = Guard.NotNull(options);
-            _responseMapper = Guard.NotNull(responseMapper);
-        }
-#endif
-
-#if USE_ASPNETCORE
-        public Next Next { get; }
-#endif
-
-#if !USE_ASPNETCORE
-        public override Task Invoke(IContext ctx)
-#else
-        public Task Invoke(IContext ctx)
-#endif
-        {
-            return InvokeInternalAsync(ctx);
-        }
-
-        private async Task InvokeInternalAsync(IContext ctx)
-        {
-            try
-            {
-                if (Next != null)
-                {
-                    await Next.Invoke(ctx).ConfigureAwait(false);
-                }
-            }
-            catch (Exception ex)
-            {
-                _options.Logger.Error("HttpStatusCode set to 500 {0}", ex);
-                await _responseMapper.MapAsync(ResponseMessageBuilder.Create(500, JsonConvert.SerializeObject(ex)), ctx.Response).ConfigureAwait(false);
-            }
+            _options.Logger.Error("HttpStatusCode set to 500 {0}", ex);
+            await _responseMapper.MapAsync(ResponseMessageBuilder.Create(500, JsonConvert.SerializeObject(ex)), ctx.Response).ConfigureAwait(false);
        }
    }
-}
+}