mm

1.23.0
Fix: Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers (#1416 )
2026-01-11 22:30:41 +01:00 · 2026-01-05 21:38:14 +01:00 · 2026-01-05 21:34:11 +01:00 · 2026-01-05 21:24:48 +01:00 · 2026-01-04 08:03:19 +01:00 · 2026-01-02 21:30:59 +01:00
263 changed files with 5495 additions and 10157 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,6 +19,11 @@ jobs:
    steps:
    - uses: actions/checkout@v4

+    - name: Setup .NET 8
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: '8.0.x'
+
    - name: 'WireMock.Net.Tests'
      run: dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,76 @@
+# 1.23.0 (05 January 2026)
+- [#1414](https://github.com/wiremock/WireMock.Net/pull/1414) - Pass the parameter matchOperator in Request.WithPath to its inner calls [bug] contributed by [gbamqzkdyg](https://github.com/gbamqzkdyg)
+- [#1416](https://github.com/wiremock/WireMock.Net/pull/1416) - Fix: Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers library contributed by [samlatham](https://github.com/samlatham)
+- [#1413](https://github.com/wiremock/WireMock.Net/issues/1413) - Parameter `matchOperator` is not respected in the method Request.WithPath [bug]
+- [#1415](https://github.com/wiremock/WireMock.Net/issues/1415) - HandlebarsSettings AllowedHandlebarsHelpers Configuration Not Applied [bug]
+
+# 1.22.0 (02 January 2026)
+- [#1412](https://github.com/wiremock/WireMock.Net/pull/1412) - chore(testcontainers): bump up Testcontainers to version 4.10.0 [feature] contributed by [vhatsura](https://github.com/vhatsura)
+- [#1411](https://github.com/wiremock/WireMock.Net/issues/1411) - WireMock.Net.Testcontainers isn't compatible with Testcontainers 4.10.0 [bug]
+
+# 1.21.0 (25 December 2025)
+- [#1408](https://github.com/wiremock/WireMock.Net/pull/1408) - Fix readyness-check for Testcontainers [bug] contributed by [StefH](https://github.com/StefH)
+
+# 1.20.0 (24 December 2025)
+- [#1399](https://github.com/wiremock/WireMock.Net/pull/1399) - Upgrade RamlToOpenApiConverter and YamlDotNet [feature] contributed by [StefH](https://github.com/StefH)
+- [#1400](https://github.com/wiremock/WireMock.Net/pull/1400) - Add WireMock.Net.NUnit project [feature] contributed by [StefH](https://github.com/StefH)
+- [#1405](https://github.com/wiremock/WireMock.Net/pull/1405) - Fix Testcontainers AddProtoDefinition [bug] contributed by [StefH](https://github.com/StefH)
+- [#1398](https://github.com/wiremock/WireMock.Net/issues/1398) - Upgrade YamlDotNet dependency [feature]
+- [#1404](https://github.com/wiremock/WireMock.Net/issues/1404) - An exception occurs when adding multiple proto definitions in the TestContainer. [bug]
+
+# 1.19.0 (12 December 2025)
+- [#1391](https://github.com/wiremock/WireMock.Net/pull/1391) - Update WireMockContainerBuilder (WithImage and WithCustomImage) [feature] contributed by [StefH](https://github.com/StefH)
+- [#1392](https://github.com/wiremock/WireMock.Net/pull/1392) - WireMockContainerBuilder: allow all docker images named wiremock [feature] contributed by [StefH](https://github.com/StefH)
+- [#1390](https://github.com/wiremock/WireMock.Net/issues/1390) - Unable to build WireMockContainerBuilder with custom image [feature]
+
+# 1.18.0 (09 December 2025)
+- [#1388](https://github.com/wiremock/WireMock.Net/pull/1388) - Add WithBodyAsType to RequestMatcher [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.17.0 (07 December 2025)
+- [#1383](https://github.com/wiremock/WireMock.Net/pull/1383) - Aspire: Add WithProtoDefinition to support proto definition at server level [feature] contributed by [StefH](https://github.com/StefH)
+- [#1386](https://github.com/wiremock/WireMock.Net/pull/1386) - Fix random delay in mapping json file [bug] contributed by [StefH](https://github.com/StefH)
+- [#1274](https://github.com/wiremock/WireMock.Net/issues/1274) - .WithMappings to mount volume is not working for GRPC [bug]
+- [#1381](https://github.com/wiremock/WireMock.Net/issues/1381) - Downstream dependencies missing after 1.16.0 release [bug]
+- [#1382](https://github.com/wiremock/WireMock.Net/issues/1382) - Does Aspire support enabling HTTP/2? [feature]
+- [#1385](https://github.com/wiremock/WireMock.Net/issues/1385) - Do delays and probabilities show in saved static mappings? [bug]
+- [#1387](https://github.com/wiremock/WireMock.Net/issues/1387) - Tests failing with TaskCanceledException on Windows Server 2025 Build 7171 [bug]
+
+# 1.16.0 (18 November 2025)
+- [#1366](https://github.com/wiremock/WireMock.Net/pull/1366) - WireMock.Net.OpenApiParser : support Examples [feature] contributed by [StefH](https://github.com/StefH)
+- [#1375](https://github.com/wiremock/WireMock.Net/pull/1375) - Add WireMockHealthCheck in WireMock.Net.Aspire [feature] contributed by [Zguy](https://github.com/Zguy)
+- [#1377](https://github.com/wiremock/WireMock.Net/pull/1377) - Check if the path is valid when using WithPath(...) [feature] contributed by [StefH](https://github.com/StefH)
+- [#1380](https://github.com/wiremock/WireMock.Net/pull/1380) - Add WireMock.Net.xUnit.v3 project [feature] contributed by [StefH](https://github.com/StefH)
+- [#1364](https://github.com/wiremock/WireMock.Net/issues/1364) - Choosing examples from open api specification for responses. [feature]
+- [#1376](https://github.com/wiremock/WireMock.Net/issues/1376) - AdminApiMappingBuilder `WithPath` should add the starting `/` if missing [feature]
+- [#1379](https://github.com/wiremock/WireMock.Net/issues/1379) - xUnit v3 [feature]
+
+# 1.15.0 (22 October 2025)
+- [#1367](https://github.com/wiremock/WireMock.Net/pull/1367) - Fix WithProbability logic [bug] contributed by [StefH](https://github.com/StefH)
+- [#1370](https://github.com/wiremock/WireMock.Net/pull/1370) - Support Testcontainers 4.8.0 [bug] contributed by [MD-V](https://github.com/MD-V)
+- [#1126](https://github.com/wiremock/WireMock.Net/issues/1126) - Request matching WithProbability strange behaviour [bug]
+
+# 1.14.0 (06 October 2025)
+- [#1362](https://github.com/wiremock/WireMock.Net/pull/1362) - Update ProxyUrlReplaceSettingsModel with TransformTemplate property [feature] contributed by [StefH](https://github.com/StefH)
+- [#1363](https://github.com/wiremock/WireMock.Net/pull/1363) - Add Tls13 [bug] contributed by [StefH](https://github.com/StefH)
+- [#1342](https://github.com/wiremock/WireMock.Net/issues/1342) - Facing SSL certificate validation error when using .NET 5 and above framework for some http services during recording [bug]
+- [#1360](https://github.com/wiremock/WireMock.Net/issues/1360) - ProxyURL path configuration [feature]
+
+# 1.13.0 (28 September 2025)
+- [#1358](https://github.com/wiremock/WireMock.Net/pull/1358) - TypeLoader: implement Try methods [feature] contributed by [StefH](https://github.com/StefH)
+- [#1361](https://github.com/wiremock/WireMock.Net/pull/1361) - ProxyUrlTransformer [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.12.0 (30 August 2025)
+- [#1357](https://github.com/wiremock/WireMock.Net/pull/1357) - Upgrade Testcontainers to 4.7.0 [feature] contributed by [StefH](https://github.com/StefH)
+- [#1356](https://github.com/wiremock/WireMock.Net/issues/1356) - WireMock.Net 1.11.2 is not compatible with TestContainers 4.7.0 [bug]
+
+# 1.11.2 (27 August 2025)
+- [#1352](https://github.com/wiremock/WireMock.Net/pull/1352) - Add additional try-catch to TypeLoader logic [feature] contributed by [StefH](https://github.com/StefH)
+- [#1354](https://github.com/wiremock/WireMock.Net/pull/1354) - Add System.Net.Http again to solve CVE warning [bug] contributed by [StefH](https://github.com/StefH)
+- [#1355](https://github.com/wiremock/WireMock.Net/pull/1355) - Revert JetBrains.Annotations and add System.Text.RegularExpressions t&#8230; [bug] contributed by [StefH](https://github.com/StefH)
+- [#1071](https://github.com/wiremock/WireMock.Net/issues/1071) - Split WireMock into multiple nuget packages depending on features [feature]
+- [#1351](https://github.com/wiremock/WireMock.Net/issues/1351) - Version 1.11.0 seems to have a dependency to non-existing version of JetBrans.Annotations [bug]
+- [#1353](https://github.com/wiremock/WireMock.Net/issues/1353) - 1.11.0: NU1903: Warning As Error: Package 'System.Net.Http' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-7jgj-8wvc-jh57 [bug]
+
 # 1.11.0 (26 August 2025)
 - [#1350](https://github.com/wiremock/WireMock.Net/pull/1350) - Create WireMock.Net.ProtoBuf project [feature] contributed by [StefH](https://github.com/StefH)

--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <Version>1.11.0</Version>
+        <VersionPrefix>1.23.0</VersionPrefix>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/wiremock/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -13,7 +13,7 @@
        <RepositoryUrl>https://github.com/wiremock/WireMock.Net</RepositoryUrl>
        <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
        <PackageReadmeFile>PackageReadme.md</PackageReadmeFile>
-        <LangVersion>12.0</LangVersion>
+        <LangVersion>12</LangVersion>
        <Nullable>enable</Nullable>
    </PropertyGroup>

@@ -50,15 +50,18 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2025.2.0" PrivateAssets="All" />
+        <!-- CVE-2019-0820 -->
+        <!--<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />-->
+
+        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
    </ItemGroup>

    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.15.0.120848">
+        <!--<PackageReference Include="SonarAnalyzer.CSharp" Version="10.15.0.120848">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
+        </PackageReference>-->
        <!-- <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes

-SET version=1.11.0
+SET version=1.23.0

 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels wontfix test question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%

--- a/PackageReadme.md
+++ b/PackageReadme.md
@@ -15,48 +15,48 @@ Lightweight Http Mocking Server for .NET, inspired by WireMock.org (from the Jav

 ### :star: Stubbing
 A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
-See [Wiki : Stubbing](https://github.com/wiremock/WireMock.Net/wiki/Stubbing).
+See [Stubbing](https://wiremock.org/dotnet/stubbing).

 ### :star: Request Matching
-WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/wiremock/WireMock.Net/wiki/Request-Matching).
+WireMock.Net support advanced request-matching logic, see [Request Matching](https://wiremock.org/dotnet/request-matching).

 ### :star: Response Templating
-The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/wiremock/WireMock.Net/wiki/Response-Templating).
+The response which is returned WireMock.Net can be changed using templating. This is described here [Response Templating](https://wiremock.org/dotnet/response-templating).

 ### :star: Admin API Reference
-The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
+The WireMock admin API provides functionality to define the mappings via a http interface see [Admin API Reference](https://wiremock.org/dotnet/admin-api-reference).

 ### :star: Using
 WireMock.Net can be used in several ways:

 #### UnitTesting
 You can use your favorite test framework and use WireMock within your tests, see
-[Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
+[UnitTesting](https://wiremock.org/dotnet/using-wiremock-in-unittests).

 ### Unit/Integration Testing using Testcontainers.DotNet
-See [Wiki : WireMock.Net.Testcontainers](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
+See [WireMock.Net.Testcontainers](https://wiremock.org/dotnet/using-wiremock-net-testcontainers/) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.

 ### Unit/Integration Testing using an an Aspire Distributed Application
-See [Wiki : WireMock.Net.Aspire](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.
+See [WireMock.Net.Aspire](https://wiremock.org/dotnet/using-wiremock-net-Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.

 #### As a dotnet tool
-It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).
+It's simple to install WireMock.Net as (global) dotnet tool, see [dotnet tool](https://wiremock.org/dotnet/wiremock-as-dotnet-tool).

 #### As standalone process / console application
-This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
+This is quite straight forward to launch a mock server within a console application, see [Standalone Process](https://wiremock.org/dotnet/wiremock-as-a-standalone-process).

 #### As a Windows Service
-You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
+You can also run WireMock.Net as a Windows Service, follow this [Windows Service](https://wiremock.org/dotnet/wiremock-as-a-windows-service).

 #### As a Web Job in Azure or application in IIS
-See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
+See this link [WireMock-as-a-(Azure)-Web-App](https://wiremock.org/dotnet/wiremock-as-a-azure-web-app/)

 #### In a docker container
 There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
 For more details see also [Docker](https://github.com/wiremock/WireMock.Net-docker).

 #### HTTPS / SSL
-More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/wiremock/WireMock.Net/wiki/Using-HTTPS-(SSL))
+More details on using HTTPS (SSL) can be found here [HTTPS](https://wiremock.org/dotnet/using-https-ssl/)

 ## :books: Documentation
-For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/wiremock/WireMock.Net/wiki/What-Is-WireMock.Net).
+For more info, see also this documentation page: [What is WireMock.Net](https://wiremock.org/dotnet/what-is-wiremock-net/).
--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,4 +1,7 @@
-# 1.11.0 (26 August 2025)
- #1350 Create WireMock.Net.ProtoBuf project [feature]
+# 1.23.0 (05 January 2026)
+- #1414 Pass the parameter matchOperator in Request.WithPath to its inner calls [bug]
+- #1416 Fix: Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers library
+- #1413 Parameter `matchOperator` is not respected in the method Request.WithPath [bug]
+- #1415 HandlebarsSettings AllowedHandlebarsHelpers Configuration Not Applied [bug]

 The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -1,7 +1,11 @@
 # ![Project Icon](./resources/logo_32x32.png) WireMock.Net
-A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock](http://wiremock.org).
+A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics functionality from the original Java based WireMock.

-For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/wiremock/WireMock.Net/wiki/What-Is-WireMock.Net).
+---
+
+### :books: Full documentation can now be found at [wiremock.org](https://wiremock.org/dotnet)
+
+---

 ## :star: Key Features
 * HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
@@ -29,7 +33,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &nbsp;&nbsp;**Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/wiremock/WireMock.Net/issues) |
 | | |
 | ***Quality*** | &nbsp; |
-| &nbsp;&nbsp;**Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=7) |
+| &nbsp;&nbsp;**Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=61) |
 | &nbsp;&nbsp;**Quality** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=alert_status)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net) [![CodeFactor](https://www.codefactor.io/repository/github/wiremock/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock/wiremock.net) |
 | &nbsp;&nbsp;**Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=bugs)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=BUG) [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=code_smells)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=CODE_SMELL) |
 | &nbsp;&nbsp;**Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=coverage)](https://sonarcloud.io/component_measures?id=WireMock-Net_WireMock.Net&metric=coverage) [![codecov](https://codecov.io/gh/wiremock/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/wiremock/WireMock.Net)|
@@ -37,7 +41,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co

 ### :package: NuGet packages

-| | Official | Preview [:information_source:](https://github.com/wiremock/WireMock.Net/wiki/MyGet-preview-versions) |
+| | Official | Preview [:information_source:](https://wiremock.org/dotnet/MyGet-preview-versions) |
 | - | - | - |
 | &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://img.shields.io/nuget/v/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
 | &nbsp;&nbsp;**WireMock.Net.Minimal** 🔺| [![NuGet Badge WireMock.Net.Minimal](https://img.shields.io/nuget/v/WireMock.Net.Minimal)](https://www.nuget.org/packages/WireMock.Net.Minimal) |  [![MyGet Badge WireMock.Net](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Minimal?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Minimal)
@@ -49,7 +53,9 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &nbsp;&nbsp;**WireMock.Net.AwesomeAssertions** | [![NuGet Badge WireMock.Net.AwesomeAssertions](https://img.shields.io/nuget/v/WireMock.Net.AwesomeAssertions)](https://www.nuget.org/packages/WireMock.Net.AwesomeAssertions) | [![MyGet Badge WireMock.Net.AwesomeAssertions](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.AwesomeAssertions?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.AwesomeAssertions)
 | &nbsp;&nbsp;**WireMock.Net.FluentAssertions** | [![NuGet Badge WireMock.Net.FluentAssertions](https://img.shields.io/nuget/v/WireMock.Net.FluentAssertions)](https://www.nuget.org/packages/WireMock.Net.FluentAssertions) | [![MyGet Badge WireMock.Net.FluentAssertions](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.FluentAssertions?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.FluentAssertions)
 | &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
+| &nbsp;&nbsp;**WireMock.Net.xUnit.v3** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit.v3)](https://www.nuget.org/packages/WireMock.Net.xUnit.v3) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit.v3?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit.v3)
 | &nbsp;&nbsp;**WireMock.Net.TUnit** | [![NuGet Badge WireMock.Net.TUnit](https://img.shields.io/nuget/v/WireMock.Net.TUnit)](https://www.nuget.org/packages/WireMock.Net.TUnit) | [![MyGet Badge WireMock.Net.TUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.TUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.TUnit)
+| &nbsp;&nbsp;**WireMock.Net.NUnit** | [![NuGet Badge WireMock.Net.NUnit](https://img.shields.io/nuget/v/WireMock.Net.NUnit)](https://www.nuget.org/packages/WireMock.Net.NUnit) | [![MyGet Badge WireMock.Net.TUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.NUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.NUnit)
 | | | |
 | &nbsp;&nbsp;**WireMock.Net.Extensions.Routing** | [![NuGet Badge WireMock.Net.Extensions.Routing](https://img.shields.io/nuget/v/WireMock.Net.Extensions.Routing)](https://www.nuget.org/packages/WireMock.Net.Extensions.Routing) | [![MyGet Badge WireMock.Net.Extensions.Routing](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Extensions.Routing?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Extensions.Routing)
 | &nbsp;&nbsp;**WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/nuget/v/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Matchers.CSharpCode?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
@@ -89,52 +95,55 @@ To still enable this feature, you need to add the `Environment` category to the
 ---

 ## :memo: Development
-For the supported frameworks and build information, see [this](https://github.com/wiremock/WireMock.Net/wiki/Development-Information) page.
+For the supported frameworks and build information, see [this](https://wiremock.org/dotnet/development-information) page.

 ## :star: Stubbing
 A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
-See [Wiki : Stubbing](https://github.com/wiremock/WireMock.Net/wiki/Stubbing).
+See [Stubbing](https://wiremock.org/dotnet/stubbing).

 ## :star: Request Matching
-WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/wiremock/WireMock.Net/wiki/Request-Matching).
+WireMock.Net support advanced request-matching logic, see [Request Matching](https://wiremock.org/dotnet/request-matching).

 ## :star: Response Templating
-The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/wiremock/WireMock.Net/wiki/Response-Templating).
+The response which is returned WireMock.Net can be changed using templating. This is described here [Response Templating](https://wiremock.org/dotnet/response-templating).

 ## :star: Admin API Reference
-The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
+The WireMock admin API provides functionality to define the mappings via a http interface see [Admin API Reference](https://wiremock.org/dotnet/admin-api-reference).

 ## :star: Using
 WireMock.Net can be used in several ways:

 ### UnitTesting
 You can use your favorite test framework and use WireMock within your tests, see
-[Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
+[UnitTesting](https://wiremock.org/dotnet/using-wiremock-in-unittests).

 ### Unit/Integration Testing using Testcontainers.DotNet
-See [Wiki : WireMock.Net.Testcontainers](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
+See [WireMock.Net.Testcontainers](https://wiremock.org/dotnet/using-wiremock-net-testcontainers/) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.

 ### Unit/Integration Testing using an an Aspire Distributed Application
-See [Wiki : WireMock.Net.Aspire](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.
+See [WireMock.Net.Aspire](https://wiremock.org/dotnet/using-wiremock-net-Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.

 ### As a dotnet tool
-It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).
+It's simple to install WireMock.Net as (global) dotnet tool, see [dotnet tool](https://wiremock.org/dotnet/wiremock-as-dotnet-tool).

 ### As standalone process / console application
-This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
+This is quite straight forward to launch a mock server within a console application, see [Standalone Process](https://wiremock.org/dotnet/wiremock-as-a-standalone-process).

 ### As a Windows Service
-You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
+You can also run WireMock.Net as a Windows Service, follow this [Windows Service](https://wiremock.org/dotnet/wiremock-as-a-windows-service).

 ### As a Web Job in Azure or application in IIS
-See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
+See this link [WireMock-as-a-(Azure)-Web-App](https://wiremock.org/dotnet/wiremock-as-a-azure-web-app/)

 ### In a docker container
 There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
 For more details see also [Docker](https://github.com/wiremock/WireMock.Net-docker).

-#### HTTPS / SSL
-More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/wiremock/WireMock.Net/wiki/Using-HTTPS-(SSL))
+### HTTPS / SSL
+More details on using HTTPS (SSL) can be found here [HTTPS](https://wiremock.org/dotnet/using-https-ssl/)
+
+## :books: Documentation
+For more info, see also this documentation page: [What is WireMock.Net](https://wiremock.org/dotnet/what-is-wiremock-net/).

 ---

--- a/Solution.sln
+++ b/Solution.sln
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.0.31521.260
+# Visual Studio Version 18
+VisualStudioVersion = 18.0.11205.157
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8F890C6F-9ACC-438D-928A-AD61CDA862F2}"
 EndProject
@@ -68,14 +68,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Org.RestClient", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Org.Abstractions", "src\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj", "{3BA5109E-5F30-4CC2-B699-02EC82560AA6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NET6", "examples\WireMock.Net.WebApplication.NET6\WireMock.Net.WebApplication.NET6.csproj", "{3F7AA023-6833-4856-A08A-4B5717B592B8}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.NETCoreApp", "examples\WireMock.Net.Console.Proxy.NETCoreApp\WireMock.Net.Console.Proxy.NETCoreApp.csproj", "{670C7562-C154-442E-A249-7D26849BCD13}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.xUnit", "src\WireMock.Net.xUnit\WireMock.Net.xUnit.csproj", "{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NET6.WithCertificate", "examples\WireMock.Net.Console.NET6.WithCertificate\WireMock.Net.Console.NET6.WithCertificate.csproj", "{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueExample", "examples\WireMockAzureQueueExample\WireMockAzureQueueExample.csproj", "{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Testcontainers", "src\WireMock.Net.Testcontainers\WireMock.Net.Testcontainers.csproj", "{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}"
@@ -144,6 +140,14 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Extensions.Rou
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ProtoBuf", "src\WireMock.Net.ProtoBuf\WireMock.Net.ProtoBuf.csproj", "{B47413AA-55D3-49A7-896A-17ADBFF72407}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.xUnit.v3", "src\WireMock.Net.xUnit.v3\WireMock.Net.xUnit.v3.csproj", "{4F46BD02-BEBC-4B2D-B857-4169AD1FB067}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.NUnit", "src\WireMock.Net.NUnit\WireMock.Net.NUnit.csproj", "{2DBBD70D-8051-441F-92BB-FF9B8B4B4982}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NET8.WithCertificate", "examples\WireMock.Net.Console.NET8.WithCertificate\WireMock.Net.Console.NET8.WithCertificate.csproj", "{2D86546D-8A24-0A55-C962-2071BD299E05}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.WebApplication.IIS", "examples\WireMock.Net.WebApplication.IIS\WireMock.Net.WebApplication.IIS.csproj", "{5E6E9FA7-9135-7B82-2CCD-8CA87AC8043C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -206,10 +210,6 @@ Global
 		{3BA5109E-5F30-4CC2-B699-02EC82560AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3BA5109E-5F30-4CC2-B699-02EC82560AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BA5109E-5F30-4CC2-B699-02EC82560AA6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Release|Any CPU.Build.0 = Release|Any CPU
 		{670C7562-C154-442E-A249-7D26849BCD13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{670C7562-C154-442E-A249-7D26849BCD13}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{670C7562-C154-442E-A249-7D26849BCD13}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -218,10 +218,6 @@ Global
 		{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Release|Any CPU.Build.0 = Release|Any CPU
 		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -350,6 +346,22 @@ Global
 		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2D86546D-8A24-0A55-C962-2071BD299E05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2D86546D-8A24-0A55-C962-2071BD299E05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2D86546D-8A24-0A55-C962-2071BD299E05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2D86546D-8A24-0A55-C962-2071BD299E05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5E6E9FA7-9135-7B82-2CCD-8CA87AC8043C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E6E9FA7-9135-7B82-2CCD-8CA87AC8043C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E6E9FA7-9135-7B82-2CCD-8CA87AC8043C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E6E9FA7-9135-7B82-2CCD-8CA87AC8043C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F46BD02-BEBC-4B2D-B857-4169AD1FB067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F46BD02-BEBC-4B2D-B857-4169AD1FB067}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F46BD02-BEBC-4B2D-B857-4169AD1FB067}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F46BD02-BEBC-4B2D-B857-4169AD1FB067}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2DBBD70D-8051-441F-92BB-FF9B8B4B4982}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2DBBD70D-8051-441F-92BB-FF9B8B4B4982}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2DBBD70D-8051-441F-92BB-FF9B8B4B4982}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2DBBD70D-8051-441F-92BB-FF9B8B4B4982}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -371,10 +383,8 @@ Global
 		{5B64F6CA-BF6B-4F67-BB2A-9C47E441703E} = {7EFB2C5B-1BB2-4AAF-BC9F-216ED80C594D}
 		{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{3BA5109E-5F30-4CC2-B699-02EC82560AA6} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
-		{3F7AA023-6833-4856-A08A-4B5717B592B8} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{670C7562-C154-442E-A249-7D26849BCD13} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
-		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{56A38798-C48B-4A4A-B805-071E05C02CE1} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
@@ -407,6 +417,10 @@ Global
 		{3FCBCA9C-9DB0-4A96-B47E-30470764CC9C} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{1E874C8F-08A2-493B-8421-619F9A6E9E77} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{B47413AA-55D3-49A7-896A-17ADBFF72407} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{2D86546D-8A24-0A55-C962-2071BD299E05} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{5E6E9FA7-9135-7B82-2CCD-8CA87AC8043C} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{4F46BD02-BEBC-4B2D-B857-4169AD1FB067} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{2DBBD70D-8051-441F-92BB-FF9B8B4B4982} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -100,7 +100,7 @@ jobs:
 - job: Windows_Build_Test

  pool:
-    vmImage: 'windows-2022'
+    vmImage: 'windows-2025'

  steps:
  - task: UseDotNet@2
@@ -141,9 +141,13 @@ jobs:
  dependsOn: Windows_Build_Test

  pool:
-    vmImage: 'windows-2022'
+    vmImage: 'windows-2025'

  steps:
+  - script: |
+      echo "BuildId = $(buildId)"
+    displayName: 'Print buildId'
+
  - task: UseDotNet@2
    displayName: Use .NET 8.0
    inputs:
--- a/azure-pipelines-nuget.yml
+++ b/azure-pipelines-nuget.yml
@@ -1,5 +1,5 @@
 pool:
-  vmImage: 'windows-2022'
+  vmImage: 'windows-2025'

 variables:
  Prerelease: ''
--- a/examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
+++ b/examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
@@ -21,4 +21,13 @@
        <PackageReference Include="Aspire.Hosting.AppHost" Version="9.2.0" />
    </ItemGroup>

-</Project>
+    <ItemGroup>
+        <None Update="__admin\mappings\*.proto">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="__admin\mappings\*.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+</Project>
--- a/examples-Aspire/AspireApp1.AppHost/Program.cs
+++ b/examples-Aspire/AspireApp1.AppHost/Program.cs
@@ -4,12 +4,25 @@ var builder = DistributedApplication.CreateBuilder(args);

 // IResourceBuilder<ProjectResource> apiService = builder.AddProject<Projects.AspireApp1_ApiService>("apiservice");

-var mappingsPath = Path.Combine(Directory.GetCurrentDirectory(), "WireMockMappings");
+var mappingsPath = Path.Combine(Directory.GetCurrentDirectory(), "__admin", "mappings");

-IResourceBuilder<WireMockServerResource> apiService = builder
-    .AddWireMock("apiservice", WireMockServerArguments.DefaultPort)
+//IResourceBuilder<WireMockServerResource> apiService1 = builder
+//    //.AddWireMock("apiservice", WireMockServerArguments.DefaultPort)
+//    .AddWireMock("apiservice1", "http://*:8081", "grpc://*:9091")
+//    .AsHttp2Service()
+//    .WithMappingsPath(mappingsPath)
+//    .WithReadStaticMappings()
+//    .WithWatchStaticMappings()
+//    .WithApiMappingBuilder(WeatherForecastApiMock.BuildAsync);
+
+IResourceBuilder<WireMockServerResource> apiService2 = builder
+    .AddWireMock("apiservice", async args =>
+    {
+        args.WithAdditionalUrls("http://*:8081", "grpc://*:9093");
+        args.WithProtoDefinition("my-greeter", await File.ReadAllTextAsync(Path.Combine(mappingsPath, "greet.proto")));
+    })
+    .AsHttp2Service()
    .WithMappingsPath(mappingsPath)
-    .WithReadStaticMappings()
    .WithWatchStaticMappings()
    .WithApiMappingBuilder(WeatherForecastApiMock.BuildAsync);

@@ -45,6 +58,7 @@ IResourceBuilder<WireMockServerResource> apiService = builder

 builder.AddProject<Projects.AspireApp1_Web>("webfrontend")
    .WithExternalHttpEndpoints()
-    .WithReference(apiService);
+    .WithReference(apiService2)
+    .WaitFor(apiService2);

-builder.Build().Run();
+await builder.Build().RunAsync();
--- a/examples-Aspire/AspireApp1.AppHost/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json
+++ b/examples-Aspire/AspireApp1.AppHost/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json
--- a/examples-Aspire/AspireApp1.AppHost/__admin/mappings/greet.proto
+++ b/examples-Aspire/AspireApp1.AppHost/__admin/mappings/greet.proto
@@ -0,0 +1,21 @@
+syntax = "proto3";
+
+package greet;
+
+service Greeter {
+  rpc SayHello (HelloRequest) returns (HelloReply);
+}
+
+message HelloRequest {
+  string name = 1;
+}
+
+message HelloReply {
+  string message = 1;
+  enum PhoneType {
+    none = 0;
+    mobile = 1;
+    home = 2;
+  }
+  PhoneType phoneType = 2;
+}
--- a/examples-Aspire/AspireApp1.AppHost/__admin/mappings/protobuf-mapping-4.json
+++ b/examples-Aspire/AspireApp1.AppHost/__admin/mappings/protobuf-mapping-4.json
@@ -0,0 +1,40 @@
+{
+  "Guid": "351f0240-bba0-4bcb-93c6-1feba0fe0004",
+  "Title": "ProtoBuf Mapping 4",
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "WildcardMatcher",
+          "Pattern": "/greet.Greeter/SayHello",
+          "IgnoreCase": false
+        }
+      ]
+    },
+    "Methods": [
+      "POST"
+    ],
+    "Body": {
+      "Matcher": {
+        "Name": "ProtoBufMatcher",
+        "ProtoBufMessageType": "greet.HelloRequest"
+      }
+    }
+  },
+  "Response": {
+    "BodyAsJson": {
+      "message": "hello {{request.BodyAsJson.name}} {{request.method}}"
+    },
+    "UseTransformer": true,
+    "TransformerType": "Handlebars",
+    "TransformerReplaceNodeOptions": "EvaluateAndTryToConvert",
+    "Headers": {
+      "Content-Type": "application/grpc"
+    },
+    "TrailingHeaders": {
+      "grpc-status": "0"
+    },
+    "ProtoBufMessageType": "greet.HelloReply"
+  },
+  "ProtoDefinition": "my-greeter"
+}
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/HowTo.txt
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/HowTo.txt
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/Program.cs
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/Program.cs
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/WireMock.Net.Console.NET8.WithCertificate.csproj
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/WireMock.Net.Console.NET8.WithCertificate.csproj
@@ -7,7 +7,7 @@

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/cert-rsa.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/cert-rsa.pem
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/cert.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/cert.pem
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/private-key-rsa.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/private-key-rsa.pem
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/private-key.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/private-key.pem
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/public-key-rsa.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/public-key-rsa.pem
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/public-key.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/public-key.pem
--- a/examples/WireMock.Net.Console.NET8/MainApp.cs
+++ b/examples/WireMock.Net.Console.NET8/MainApp.cs
@@ -267,7 +267,7 @@ namespace WireMock.Net.ConsoleApplication
            }
        }

-        public static void Run()
+        public static async Task RunAsync()
        {
            //RunSse();
            //RunOnLocal();
@@ -290,25 +290,56 @@ namespace WireMock.Net.ConsoleApplication

            var server = WireMockServer.Start();

+            //server
+            //    .Given(Request.Create()
+            //        .WithPath("todos")
+            //        .UsingGet()
+            //    )
+            //    .RespondWith(Response.Create()
+            //        .WithBodyAsJson(todos.Values)
+            //    );
+
+            //server
+            //    .Given(Request.Create()
+            //        .UsingGet()
+            //        .WithPath("todos")
+            //        .WithParam("id")
+            //    )
+            //    .RespondWith(Response.Create()
+            //        .WithBodyAsJson(rm => todos[int.Parse(rm.Query!["id"].ToString())])
+            //    );
+
+            var pX = 0.80;
            server
-                .Given(Request.Create()
-                    .WithPath("todos")
-                    .UsingGet()
-                )
-                .RespondWith(Response.Create()
-                    .WithBodyAsJson(todos.Values)
-                );
+                .Given(Request.Create().UsingGet().WithPath("/p"))
+                .WithProbability(pX)
+                .RespondWith(Response.Create().WithStatusCode(200).WithBody("X"));

            server
-                .Given(Request.Create()
-                    .UsingGet()
-                    .WithPath("todos")
-                    .WithParam("id")
-                )
-                .RespondWith(Response.Create()
-                    .WithBodyAsJson(rm => todos[int.Parse(rm.Query!["id"].ToString())])
-                );
+                .Given(Request.Create().UsingGet().WithPath("/p"))
+                .RespondWith(Response.Create().WithStatusCode(200).WithBody("default"));

+            // Act
+            var requestUri = new Uri($"http://localhost:{server.Port}/p");
+            var c = server.CreateClient();
+            var xCount = 0;
+            var defaultCount = 0;
+            var tot = 1000;
+            for (var i = 0; i < tot; i++)
+            {
+                var response = await c.GetAsync(requestUri);
+                var value = await response.Content.ReadAsStringAsync();
+                if (value == "X")
+                {
+                    xCount++;
+                }
+                else if (value == "default")
+                {
+                    defaultCount++;
+                }
+            }
+            System.Console.WriteLine("X = {0} ; default = {1} ; pX = {2:0.00} ; valueX = {3:0.00}", xCount, defaultCount, pX, 1.0 * xCount / tot);
+            return;
            using var httpAndHttpsWithPort = WireMockServer.Start(new WireMockServerSettings
            {
                HostingScheme = HostingScheme.HttpAndHttps,
@@ -345,9 +376,9 @@ namespace WireMock.Net.ConsoleApplication
                PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); },

-#if USE_ASPNETCORE
+//#if USE_ASPNETCORE
                AdditionalServiceRegistration = services => { System.Console.WriteLine($"AdditionalServiceRegistration : {services.GetType()}"); },
-#endif
+//#endif
                Logger = new WireMockConsoleLogger(),

                HandlebarsRegistrationCallback = (handlebarsContext, fileSystemHandler) =>
@@ -368,7 +399,7 @@ namespace WireMock.Net.ConsoleApplication
            //var response = await http.GetAsync($"{_wireMockServer.Url}/pricing");
            //var value = await response.Content.ReadAsStringAsync();

-#if PROTOBUF
+//#if PROTOBUF
            var protoBufJsonMatcher = new JsonPartialWildcardMatcher(new { name = "*" });
            server
                .Given(Request.Create()
@@ -447,9 +478,9 @@ namespace WireMock.Net.ConsoleApplication
                    .WithTrailingHeader("grpc-status", "0")
                    .WithTransformer()
                );
-#endif
+//#endif

-#if GRAPHQL
+//#if GRAPHQL
            var customScalars = new Dictionary<string, Type> { { "MyCustomScalar", typeof(int) } };
            server
                .Given(Request.Create()
@@ -523,9 +554,9 @@ namespace WireMock.Net.ConsoleApplication
                        }
                        """)
                );
-#endif
+//#endif

-#if MIMEKIT
+//#if MIMEKIT
            var textPlainContentTypeMatcher = new ContentTypeMatcher("text/plain");
            var textPlainContentMatcher = new ExactMatcher("This is some plain text");
            var textPlainMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textPlainContentTypeMatcher, null, null, textPlainContentMatcher);
@@ -557,7 +588,7 @@ namespace WireMock.Net.ConsoleApplication
                .RespondWith(Response.Create()
                    .WithBody("MultiPart is ok")
                );
-#endif
+//#endif
            // 400 ms
            server
                .Given(Request.Create()
--- a/examples/WireMock.Net.Console.NET8/Program.cs
+++ b/examples/WireMock.Net.Console.NET8/Program.cs
@@ -2,6 +2,7 @@

 using System.IO;
 using System.Reflection;
+using System.Threading.Tasks;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
@@ -14,10 +15,10 @@ static class Program
    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
    private static readonly ILog Log = LogManager.GetLogger(typeof(Program));

-    static void Main(params string[] args)
+    static async Task Main(params string[] args)
    {
        XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));

-        MainApp.Run();
+        await MainApp.RunAsync();
    }
 }
--- a/examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj
+++ b/examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj
@@ -1,34 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-      <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <!--<DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>-->
+    </PropertyGroup>

-  <ItemGroup>
-    <Content Include="__admin\mappings\*.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-  </ItemGroup>
+    <ItemGroup>
+        <Content Include="__admin\mappings\*.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>

-  <ItemGroup>
-    <Compile Remove="__admin\mappings\1.cs" />
-  </ItemGroup>
+    <ItemGroup>
+        <Compile Remove="__admin\mappings\1.cs" />
+    </ItemGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="log4net" Version="2.0.15" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+        <PackageReference Include="log4net" Version="2.0.15" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    </ItemGroup>

-  <ItemGroup>
-    <None Update="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="nlog.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
+    <ItemGroup>
+        <None Update="log4net.config">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="nlog.config">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>

 </Project>
--- a/examples/WireMock.Net.Console.Proxy.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.Proxy.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj
@@ -2,7 +2,7 @@

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
    <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>

--- a/examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj
+++ b/examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj
@@ -7,16 +7,16 @@
    <Nullable>enable</Nullable>
  </PropertyGroup>

-  <ItemGroup>
+  <!--<ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-  </ItemGroup>
+  </ItemGroup>-->

  <ItemGroup>
    <PackageReference Update="SonarAnalyzer.CSharp" Version="10.12.0.118525" />
  </ItemGroup>

-  <!--<ItemGroup>
-    <PackageReference Include="WireMock.Net" Version="1.8.11" />
-  </ItemGroup>-->
+  <ItemGroup>
+    <PackageReference Include="WireMock.Net" Version="1.12.0" />
+  </ItemGroup>

 </Project>
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj
@@ -6,6 +6,8 @@
    </PropertyGroup>

    <ItemGroup>
+        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.3.0" />
+        
        <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
        <ProjectReference Include="..\..\src\WireMock.Net.OpenApiParser\WireMock.Net.OpenApiParser.csproj" />
        <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
--- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
+++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
@@ -115,10 +115,10 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="log4net">
-      <Version>3.0.3</Version>
+      <Version>3.2.0</Version>
    </PackageReference>
    <PackageReference Include="WireMock.Net">
-      <Version>1.8.11</Version>
+      <Version>1.12.0</Version>
    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
--- a/examples/WireMock.Net.WebApplication.NET6/App.cs
+++ b/examples/WireMock.Net.WebApplication.NET6/App.cs
--- a/examples/WireMock.Net.WebApplication.NET6/IWireMockService.cs
+++ b/examples/WireMock.Net.WebApplication.NET6/IWireMockService.cs
--- a/examples/WireMock.Net.WebApplication.NET6/Program.cs
+++ b/examples/WireMock.Net.WebApplication.NET6/Program.cs
--- a/examples/WireMock.Net.WebApplication.NET6/Properties/ServiceDependencies/WireMockNetWebApplicationNET6Linux
+++ b/examples/WireMock.Net.WebApplication.NET6/Properties/ServiceDependencies/WireMockNetWebApplicationNET6Linux
--- a/examples/WireMock.Net.WebApplication.NET6/Properties/launchSettings.json
+++ b/examples/WireMock.Net.WebApplication.NET6/Properties/launchSettings.json
--- a/examples/WireMock.Net.WebApplication.NET6/WireMock.Net.WebApplication.NET6.csproj
+++ b/examples/WireMock.Net.WebApplication.NET6/WireMock.Net.WebApplication.NET6.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

    <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
        <!--<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>-->
        <StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
        <AssemblyName>WireMock.Net.WebApplication</AssemblyName>
@@ -11,7 +11,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
    </ItemGroup>

--- a/examples/WireMock.Net.WebApplication.NET6/WireMockService.cs
+++ b/examples/WireMock.Net.WebApplication.NET6/WireMockService.cs
--- a/examples/WireMock.Net.WebApplication.NET6/admin/mappings/1e0686d3-5eb0-4c30-9482-db3735a1e4c4.json
+++ b/examples/WireMock.Net.WebApplication.NET6/admin/mappings/1e0686d3-5eb0-4c30-9482-db3735a1e4c4.json
--- a/examples/WireMock.Net.WebApplication.NET6/appsettings.json
+++ b/examples/WireMock.Net.WebApplication.NET6/appsettings.json
--- a/examples/WireMock.Net.WebApplication.NET6/readme.md
+++ b/examples/WireMock.Net.WebApplication.NET6/readme.md
--- a/examples/WireMock.Net.WebApplication.NET6/web.config
+++ b/examples/WireMock.Net.WebApplication.NET6/web.config
--- a/examples/WireMockAzureQueueExample/WireMockAzureQueueExample.csproj
+++ b/examples/WireMockAzureQueueExample/WireMockAzureQueueExample.csproj
@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
-    <UserSecretsId>bb7d8355-68c4-4f81-8c2d-6cdd80cd7602</UserSecretsId>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
-    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.12.1" />
-    <PackageReference Include="Azure.Storage.Queues" Version="12.12.0" />
-    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.5" />
-    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
-    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Update="host.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="local.settings.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
-    </None>
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <AzureFunctionsVersion>v4</AzureFunctionsVersion>
+        <UserSecretsId>bb7d8355-68c4-4f81-8c2d-6cdd80cd7602</UserSecretsId>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
+        <PackageReference Include="Azure.Storage.Files.Shares" Version="12.12.1" />
+        <PackageReference Include="Azure.Storage.Queues" Version="12.12.0" />
+        <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.5" />
+        <PackageReference Include="Microsoft.Extensions.Azure" Version="1.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
+        <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
+    </ItemGroup>
+    <ItemGroup>
+        <None Update="host.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+        <None Update="local.settings.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+            <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+        </None>
+    </ItemGroup>
 </Project>
--- a/examples/WireMockAzureQueueProxy/WireMockAzureQueueProxy.csproj
+++ b/examples/WireMockAzureQueueProxy/WireMockAzureQueueProxy.csproj
@@ -2,7 +2,7 @@

    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
    </PropertyGroup>

    <ItemGroup>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
@@ -22,7 +22,7 @@ public class MatcherModel
    public object? Pattern { get; set; }

    /// <summary>
-    /// Gets or sets the patterns. Can be array of strings (default) or an array of objects.
+    /// Gets or sets the patterns. Can be an array of strings (default) or an array of objects.
    /// </summary>
    public object[]? Patterns { get; set; }

--- a/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
@@ -24,4 +24,13 @@ public class StatusModel
    /// The error message.
    /// </summary>
    public string? Error { get; set; }
+
+    /// <summary>
+    /// Returns a string that represents the current status model, including its unique identifier, status, and error information.
+    /// </summary>
+    /// <returns>A string containing the values of the Guid, Status, and Error properties formatted for display.</returns>
+    public override string ToString()
+    {
+        return $"StatusModel [Guid={Guid}, Status={Status}, Error={Error}]";
+    }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs
@@ -47,5 +47,5 @@ public class LogRequestMatchModel
    /// <value>
    /// The match details.
    /// </value>
-    public IList<object> MatchDetails { get; set; }
+    public IList<object> MatchDetails { get; set; } = [];
 }
--- a/src/WireMock.Net.Abstractions/Admin/Settings/ProxyUrlReplaceSettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/ProxyUrlReplaceSettingsModel.cs
@@ -1,5 +1,7 @@
 // Copyright © WireMock.Net

+using WireMock.Types;
+
 namespace WireMock.Admin.Settings;

 /// <summary>
@@ -11,15 +13,25 @@ public class ProxyUrlReplaceSettingsModel
    /// <summary>
    /// The old path value to be replaced by the new path value
    /// </summary>
-    public string OldValue { get; set; } = null!;
+    public string? OldValue { get; set; }

    /// <summary>
    /// The new path value to replace the old value with
    /// </summary>
-    public string NewValue { get; set; } = null!;
+    public string? NewValue { get; set; }

    /// <summary>
-    /// Defines if the case should be ignore when replacing.
+    /// Defines if the case should be ignored when replacing.
    /// </summary>
    public bool IgnoreCase { get; set; }
+
+    /// <summary>
+    /// Holds the transformation template.
+    /// </summary>
+    public string? TransformTemplate { get; set; }
+
+    /// <summary>
+    /// The transformer type.
+    /// </summary>
+    public TransformerType TransformerType { get; set; } = TransformerType.Handlebars;
 }
--- a/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
@@ -2,7 +2,6 @@

 using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using JetBrains.Annotations;
 using WireMock.Handlers;
 using WireMock.Types;

@@ -123,7 +122,6 @@ public class SettingsModel
    /// </summary>
    public Dictionary<string, string[]>? ProtoDefinitions { get; set; }

-#if NETSTANDARD1_3_OR_GREATER || NET461
    /// <summary>
    /// Server client certificate mode
    /// </summary>
@@ -133,5 +131,4 @@ public class SettingsModel
    /// Whether to accept any client certificate
    /// </summary>
    public bool AcceptAnyClientCertificate { get; set; }
-#endif
 }
--- a/src/WireMock.Net.Abstractions/BuilderExtensions/RequestModelBuilder.cs
+++ b/src/WireMock.Net.Abstractions/BuilderExtensions/RequestModelBuilder.cs
@@ -1,6 +1,7 @@
 // Copyright © WireMock.Net

 using System;
+using WireMock.Validators;

 // ReSharper disable once CheckNamespace
 namespace WireMock.Admin.Mappings;
@@ -94,9 +95,14 @@ public partial class RequestModelBuilder
    }

    /// <summary>
-    /// Set the Path.
+    /// Set the Path. Must start with a forward slash (/).
    /// </summary>
-    public RequestModelBuilder WithPath(string value) => WithPath(() => value);
+    public RequestModelBuilder WithPath(string value)
+    {
+        PathValidator.ValidateAndThrow(value);
+
+        return WithPath(() => value);
+    }

    /// <summary>
    /// Set the Path.
--- a/src/WireMock.Net.Abstractions/IRequestMessage.cs
+++ b/src/WireMock.Net.Abstractions/IRequestMessage.cs
@@ -2,9 +2,7 @@

 using System;
 using System.Collections.Generic;
-#if NETSTANDARD1_3_OR_GREATER || NET461
 using System.Security.Cryptography.X509Certificates;
-#endif
 using WireMock.Types;
 using WireMock.Util;

@@ -118,13 +116,11 @@ public interface IRequestMessage
    /// </summary>
    byte[]? BodyAsBytes { get; }

-#if MIMEKIT
    /// <summary>
    /// The original body as MimeMessage.
    /// Convenience getter for Handlebars and WireMockAssertions.
    /// </summary>
    Models.Mime.IMimeMessageData? BodyAsMimeMessage { get; }
-#endif

    /// <summary>
    /// The detected body type. Convenience getter for Handlebars.
@@ -169,10 +165,8 @@ public interface IRequestMessage
    /// <returns>The query parameter value as WireMockList or null when not found.</returns>
    WireMockList<string>? GetParameter(string key, bool ignoreCase = false);

-#if NETSTANDARD1_3_OR_GREATER || NET461
    /// <summary>
    /// Gets the connection's client certificate
    /// </summary>
    X509Certificate2? ClientCertificate { get; }
-#endif
 }
--- a/src/WireMock.Net.Abstractions/Types/ClientCertificateMode.cs
+++ b/src/WireMock.Net.Abstractions/Types/ClientCertificateMode.cs
@@ -2,7 +2,6 @@

 namespace WireMock.Types;

-#if NETSTANDARD1_3_OR_GREATER || NET461
 /// <summary>
 /// Describes the client certificate requirements for a HTTPS connection.
 /// This enum is the same as https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.https.clientcertificatemode
@@ -29,5 +28,4 @@ public enum ClientCertificateMode
    /// It may be requested by the application later.
    /// </summary>
    DelayCertificate,
-}
-#endif
+}
--- a/src/WireMock.Net.Abstractions/Validators/PathValidator.cs
+++ b/src/WireMock.Net.Abstractions/Validators/PathValidator.cs
@@ -0,0 +1,19 @@
+// Copyright © WireMock.Net
+
+using System;
+
+namespace WireMock.Validators;
+
+public static class PathValidator
+{
+    /// <summary>
+    /// A valid path must start with a '/' and cannot be null, empty or whitespace.
+    /// </summary>
+    public static void ValidateAndThrow(string? path, string? paramName = null)
+    {
+        if (string.IsNullOrWhiteSpace(path) || path?.StartsWith("/") == false)
+        {
+            throw new ArgumentException("Path must start with a '/' and cannot be null, empty or whitespace.", paramName ?? nameof(path));
+        }
+    }
+}
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -4,7 +4,8 @@
        <Description>Commonly used interfaces, models, enumerations and types.</Description>
        <AssemblyTitle>WireMock.Net.Abstractions</AssemblyTitle>
        <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net45;net451;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <!--<TargetFrameworks>net45;net451;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <NoWarn>$(NoWarn);1591;8603</NoWarn>
        <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
@@ -33,29 +34,22 @@
        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    </PropertyGroup>

-    <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-        <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
-    </PropertyGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
+        <!-- CVE-2018-8292 / https://github.com/advisories/GHSA-7jgj-8wvc-jh57 -->
+        <PackageReference Include="System.Net.Http " Version="4.3.4" />
+    </ItemGroup>

    <ItemGroup>
-        <!-- See also https://mstack.nl/blog/20210801-source-generators -->
-        <PackageReference Include="FluentBuilder" Version="0.10.0">
+        <PackageReference Include="FluentBuilder" Version="0.13.0">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <PackageReference Include="PolySharp" Version="1.15.0">
+
+        <!-- Keep at 6.14.0 -->
+        <PackageReference Include="Polyfill" Version="6.14.0">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
    </ItemGroup>

-    <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) and '$(TargetFramework)' != 'netstandard1.0'">
-      <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
-    </ItemGroup>
-
-
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net461'">
-        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    </ItemGroup>
-
 </Project>
--- a/src/WireMock.Net.AspNetCore.Middleware/WireMock.Net.AspNetCore.Middleware.csproj
+++ b/src/WireMock.Net.AspNetCore.Middleware/WireMock.Net.AspNetCore.Middleware.csproj
@@ -38,7 +38,7 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
+++ b/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
@@ -30,7 +30,10 @@
    </ItemGroup>

    <ItemGroup>
-        <Compile Include="..\WireMock.Net.Minimal\Util\EnhancedFileSystemWatcher.cs" Link="Utils\EnhancedFileSystemWatcher.cs" />
+        <Compile Include="..\WireMock.Net.Minimal\Util\EnhancedFileSystemWatcher.cs" Link="Util\EnhancedFileSystemWatcher.cs" />
+        <Compile Include="..\WireMock.Net.Minimal\Constants\WireMockConstants.cs" Link="Constants\WireMockConstants.cs" />
+        <Compile Include="..\WireMock.Net.Shared\Constants\RegexConstants.cs" Link="Constants\RegexConstants.cs" />
+        <Compile Include="..\WireMock.Net.Minimal\Util\PortUtils.cs" Link="Util\PortUtils.cs" />
    </ItemGroup>

    <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
--- a/src/WireMock.Net.Aspire/WireMockHealthCheck.cs
+++ b/src/WireMock.Net.Aspire/WireMockHealthCheck.cs
@@ -0,0 +1,44 @@
+// Copyright © WireMock.Net
+
+using Aspire.Hosting.ApplicationModel;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using WireMock.Client;
+
+namespace WireMock.Net.Aspire;
+
+/// <summary>
+/// WireMockHealthCheck
+/// </summary>
+public class WireMockHealthCheck(WireMockServerResource resource) : IHealthCheck
+{
+    private const string HealthStatusHealthy = "Healthy";
+
+    /// <inheritdoc />
+    public async Task<HealthCheckResult> CheckHealthAsync(HealthCheckContext context, CancellationToken cancellationToken = default)
+    {
+        if (!await IsHealthyAsync(resource.AdminApi.Value, cancellationToken))
+        {
+            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();
+    }
+
+    private static async Task<bool> IsHealthyAsync(IWireMockAdminApi adminApi, CancellationToken cancellationToken)
+    {
+        try
+        {
+            var status = await adminApi.GetHealthAsync(cancellationToken);
+            return string.Equals(status, HealthStatusHealthy, StringComparison.OrdinalIgnoreCase);
+        }
+        catch
+        {
+            return false;
+        }
+    }
+}
--- a/src/WireMock.Net.Aspire/WireMockMappingState.cs
+++ b/src/WireMock.Net.Aspire/WireMockMappingState.cs
@@ -0,0 +1,12 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.Aspire;
+
+internal enum WireMockMappingState
+{
+    NoMappings = 0,
+
+    NotSubmitted = 1,
+
+    Submitted = 2
+}
--- a/src/WireMock.Net.Aspire/WireMockServerArguments.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerArguments.cs
@@ -1,7 +1,9 @@
 // Copyright © WireMock.Net

 using System.Diagnostics.CodeAnalysis;
+using Stef.Validation;
 using WireMock.Client.Builders;
+using WireMock.Util;

 // ReSharper disable once CheckNamespace
 namespace Aspire.Hosting;
@@ -21,10 +23,15 @@ public class WireMockServerArguments
    private const string DefaultLogger = "WireMockConsoleLogger";

    /// <summary>
-    /// The HTTP port where WireMock.Net is listening.
+    /// The HTTP ports where WireMock.Net is listening on.
    /// If not defined, .NET Aspire automatically assigns a random port.
    /// </summary>
-    public int? HttpPort { get; set; }
+    public List<int> HttpPorts { get; set; } = [];
+
+    /// <summary>
+    /// Additional Urls on which WireMock listens.
+    /// </summary>
+    public List<string> AdditionalUrls { get; set; } = [];

    /// <summary>
    /// The admin username.
@@ -67,6 +74,42 @@ public class WireMockServerArguments
    /// </summary>
    public Func<AdminApiMappingBuilder, CancellationToken, Task>? ApiMappingBuilder { get; set; }

+    /// <summary>
+    /// Grpc ProtoDefinitions.
+    /// </summary>
+    public Dictionary<string, string[]> ProtoDefinitions { get; set; } = [];
+
+    /// <summary>
+    /// Add an additional Urls on which WireMock should listen.
+    /// </summary>
+    /// <param name="additionalUrls">The additional urls which the WireMock Server should listen on.</param>
+    public void WithAdditionalUrls(params string[] additionalUrls)
+    {
+        foreach (var url in additionalUrls)
+        {
+            if (!PortUtils.TryExtract(Guard.NotNullOrEmpty(url), out _, out _, out _, out _, out var port))
+            {
+                throw new ArgumentException($"The URL '{url}' is not valid.");
+            }
+
+            AdditionalUrls.Add(Guard.NotNullOrWhiteSpace(url));
+            HttpPorts.Add(port);
+        }
+    }
+
+    /// <summary>
+    /// Add a Grpc ProtoDefinition at server-level.
+    /// </summary>
+    /// <param name="id">Unique identifier for the ProtoDefinition.</param>
+    /// <param name="protoDefinitions">The ProtoDefinition as text.</param>
+    public void WithProtoDefinition(string id, params string[] protoDefinitions)
+    {
+        Guard.NotNullOrWhiteSpace(id);
+        Guard.NotNullOrEmpty(protoDefinitions);
+
+        ProtoDefinitions[id] = protoDefinitions;
+    }
+
    /// <summary>
    /// Converts the current instance's properties to an array of command-line arguments for starting the WireMock.Net server.
    /// </summary>
@@ -95,6 +138,11 @@ public class WireMockServerArguments
            Add(args, "--WatchStaticMappingsInSubdirectories", "true");
        }

+        if (AdditionalUrls.Count > 0)
+        {
+            Add(args, "--Urls", $"http://*:{HttpContainerPort} {string.Join(' ', AdditionalUrls)}");
+        }
+
        return args
            .SelectMany(k => new[] { k.Key, k.Value })
            .ToArray();
--- a/src/WireMock.Net.Aspire/WireMockServerBuilderExtensions.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerBuilderExtensions.cs
@@ -3,10 +3,12 @@
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Lifecycle;
 using Aspire.Hosting.WireMock;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Diagnostics.HealthChecks;
 using Stef.Validation;
 using WireMock.Client.Builders;
 using WireMock.Net.Aspire;
+using WireMock.Util;

 // ReSharper disable once CheckNamespace
 namespace Aspire.Hosting;
@@ -33,9 +35,31 @@ public static class WireMockServerBuilderExtensions
        Guard.NotNullOrWhiteSpace(name);
        Guard.Condition(port, p => p is null or > 0 and <= ushort.MaxValue);

-        return builder.AddWireMock(name, callback =>
+        return builder.AddWireMock(name, serverArguments =>
        {
-            callback.HttpPort = port;
+            if (port != null)
+            {
+                serverArguments.HttpPorts = [port.Value];
+            }
+        });
+    }
+
+    /// <summary>
+    /// Adds a WireMock.Net Server resource to the application model.
+    /// </summary>
+    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
+    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
+    /// <param name="additionalUrls">The additional urls which the WireMock Server should listen on.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, params string[] additionalUrls)
+    {
+        Guard.NotNull(builder);
+        Guard.NotNullOrWhiteSpace(name);
+        Guard.NotNull(additionalUrls);
+
+        return builder.AddWireMock(name, serverArguments =>
+        {
+            serverArguments.WithAdditionalUrls(additionalUrls);
        });
    }

@@ -53,13 +77,50 @@ public static class WireMockServerBuilderExtensions
        Guard.NotNull(arguments);

        var wireMockContainerResource = new WireMockServerResource(name, arguments);
+
+        var healthCheckKey = $"{name}_check";
+        var healthCheckRegistration = new HealthCheckRegistration(
+            healthCheckKey,
+            _ => new WireMockHealthCheck(wireMockContainerResource),
+            failureStatus: null,
+            tags: null);
+        builder.Services.AddHealthChecks().Add(healthCheckRegistration);
+
        var resourceBuilder = builder
            .AddResource(wireMockContainerResource)
            .WithImage(DefaultLinuxImage)
            .WithEnvironment(ctx => ctx.EnvironmentVariables.Add("DOTNET_USE_POLLING_FILE_WATCHER", "1")) // https://khalidabuhakmeh.com/aspnet-docker-gotchas-and-workarounds#configuration-reloads-and-filesystemwatcher
-            .WithHttpEndpoint(port: arguments.HttpPort, targetPort: WireMockServerArguments.HttpContainerPort)
+            .WithHealthCheck(healthCheckKey)
            .WithWireMockInspectorCommand();

+        if (arguments.HttpPorts.Count == 0)
+        {
+            resourceBuilder = resourceBuilder.WithHttpEndpoint(port: null, targetPort: WireMockServerArguments.HttpContainerPort);
+        }
+        else if (arguments.HttpPorts.Count == 1)
+        {
+            resourceBuilder = resourceBuilder.WithHttpEndpoint(port: arguments.HttpPorts[0], targetPort: WireMockServerArguments.HttpContainerPort);
+        }
+        else
+        {
+            // Required for the default admin endpoint and health checks
+            resourceBuilder = resourceBuilder.WithHttpEndpoint(port: null, targetPort: WireMockServerArguments.HttpContainerPort);
+
+            var anyIsHttp2 = false;
+            foreach (var url in arguments.AdditionalUrls)
+            {
+                PortUtils.TryExtract(url, out _, out var isHttp2, out var scheme, out _, out var httpPort);
+                anyIsHttp2 |= isHttp2;
+
+                resourceBuilder = resourceBuilder.WithEndpoint(port: httpPort, targetPort: httpPort, scheme: scheme, name: $"{scheme}-{httpPort}");
+            }
+
+            if (anyIsHttp2)
+            {
+                resourceBuilder = resourceBuilder.AsHttp2Service();
+            }
+        }
+
        if (!string.IsNullOrEmpty(arguments.MappingsPath))
        {
            resourceBuilder = resourceBuilder.WithBindMount(arguments.MappingsPath, DefaultLinuxMappingsPath);
@@ -73,6 +134,9 @@ public static class WireMockServerBuilderExtensions
            }
        });

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

@@ -83,7 +147,10 @@ public static class WireMockServerBuilderExtensions
    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
    /// <param name="callback">A callback that allows for setting the <see cref="WireMockServerArguments"/>.</param>
    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
-    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, Action<WireMockServerArguments> callback)
+    public static IResourceBuilder<WireMockServerResource> AddWireMock(
+        this IDistributedApplicationBuilder builder,
+        string name,
+        Action<WireMockServerArguments> callback)
    {
        Guard.NotNull(builder);
        Guard.NotNullOrWhiteSpace(name);
@@ -154,7 +221,7 @@ public static class WireMockServerBuilderExtensions
    /// </summary>
    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
    /// <param name="configure">Delegate that will be invoked to configure the WireMock.Net resource.</param>
-    /// <returns></returns>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
    public static IResourceBuilder<WireMockServerResource> WithApiMappingBuilder(this IResourceBuilder<WireMockServerResource> wiremock, Func<AdminApiMappingBuilder, Task> configure)
    {
        return wiremock.WithApiMappingBuilder((adminApiMappingBuilder, _) => configure.Invoke(adminApiMappingBuilder));
@@ -165,13 +232,27 @@ public static class WireMockServerBuilderExtensions
    /// </summary>
    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
    /// <param name="configure">Delegate that will be invoked to configure the WireMock.Net resource.</param>
-    /// <returns></returns>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
    public static IResourceBuilder<WireMockServerResource> WithApiMappingBuilder(this IResourceBuilder<WireMockServerResource> wiremock, Func<AdminApiMappingBuilder, CancellationToken, Task> configure)
    {
        Guard.NotNull(wiremock);

-        wiremock.ApplicationBuilder.Services.TryAddLifecycleHook<WireMockServerLifecycleHook>();
        wiremock.Resource.Arguments.ApiMappingBuilder = configure;
+        wiremock.Resource.ApiMappingState = WireMockMappingState.NotSubmitted;
+
+        return wiremock;
+    }
+
+    /// <summary>
+    /// Add a Grpc ProtoDefinition at server-level.
+    /// </summary>
+    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
+    /// <param name="id">Unique identifier for the ProtoDefinition.</param>
+    /// <param name="protoDefinitions">The ProtoDefinition as text.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> WithProtoDefinition(this IResourceBuilder<WireMockServerResource> wiremock, string id, params string[] protoDefinitions)
+    {
+        Guard.NotNull(wiremock).Resource.Arguments.WithProtoDefinition(id, protoDefinitions);

        return wiremock;
    }
@@ -183,11 +264,11 @@ public static class WireMockServerBuilderExtensions
    /// dotnet tool install WireMockInspector --global --no-cache --ignore-failed-sources
    /// </code>
    /// </summary>
-    /// <param name="builder">The <see cref="IResourceBuilder{WireMockNetResource}"/>.</param>
-    /// <returns></returns>
-    public static IResourceBuilder<WireMockServerResource> WithWireMockInspectorCommand(this IResourceBuilder<WireMockServerResource> builder)
+    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockNetResource}"/>.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> WithWireMockInspectorCommand(this IResourceBuilder<WireMockServerResource> wiremock)
    {
-        Guard.NotNull(builder);
+        Guard.NotNull(wiremock);

        CommandOptions commandOptions = new()
        {
@@ -197,13 +278,13 @@ public static class WireMockServerBuilderExtensions
            IconVariant = IconVariant.Filled
        };

-        builder.WithCommand(
+        wiremock.WithCommand(
            name: "wiremock-inspector",
            displayName: "WireMock Inspector",
-            executeCommand: _ => OnRunOpenInspectorCommandAsync(builder),
+            executeCommand: _ => OnRunOpenInspectorCommandAsync(wiremock),
            commandOptions: commandOptions);

-        return builder;
+        return wiremock;
    }

    private static Task<ExecuteCommandResult> OnRunOpenInspectorCommandAsync(IResourceBuilder<WireMockServerResource> builder)
--- a/src/WireMock.Net.Aspire/WireMockServerLifecycleHook.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerLifecycleHook.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net

+using System.Diagnostics;
 using Aspire.Hosting.ApplicationModel;
 using Aspire.Hosting.Lifecycle;
 using Microsoft.Extensions.Logging;
@@ -10,32 +11,49 @@ internal class WireMockServerLifecycleHook(ILoggerFactory loggerFactory) : IDist
 {
    private readonly CancellationTokenSource _shutdownCts = new();

-    public async Task AfterResourcesCreatedAsync(DistributedApplicationModel appModel, CancellationToken cancellationToken = default)
+    private CancellationTokenSource? _linkedCts;
+    private Task? _mappingTask;
+
+    public Task AfterEndpointsAllocatedAsync(DistributedApplicationModel appModel, CancellationToken cancellationToken = default)
    {
-        var cts = CancellationTokenSource.CreateLinkedTokenSource(_shutdownCts.Token, cancellationToken);
+        _linkedCts = CancellationTokenSource.CreateLinkedTokenSource(_shutdownCts.Token, cancellationToken);

-        var wireMockServerResources = appModel.Resources
-            .OfType<WireMockServerResource>()
-            .ToArray();
-
-        foreach (var wireMockServerResource in wireMockServerResources)
+        _mappingTask = Task.Run(async () =>
        {
-            wireMockServerResource.SetLogger(loggerFactory.CreateLogger<WireMockServerResource>());
+            var wireMockServerResources = appModel.Resources
+                .OfType<WireMockServerResource>()
+                .ToArray();

-            var endpoint = wireMockServerResource.GetEndpoint();
-            if (endpoint.IsAllocated)
+            foreach (var wireMockServerResource in wireMockServerResources)
            {
-                await wireMockServerResource.WaitForHealthAsync(cts.Token);
+                wireMockServerResource.SetLogger(loggerFactory.CreateLogger<WireMockServerResource>());

-                await wireMockServerResource.CallApiMappingBuilderActionAsync(cts.Token);
+                var endpoint = wireMockServerResource.GetEndpoint();
+                Debug.Assert(endpoint.IsAllocated);

-                wireMockServerResource.StartWatchingStaticMappings(cts.Token);
+                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;
+        }
    }
 }
--- a/src/WireMock.Net.Aspire/WireMockServerResource.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerResource.cs
@@ -5,6 +5,7 @@ using RestEase;
 using Stef.Validation;
 using WireMock.Client;
 using WireMock.Client.Extensions;
+using WireMock.Net.Aspire;
 using WireMock.Util;

 // ReSharper disable once CheckNamespace
@@ -19,6 +20,7 @@ public class WireMockServerResource : ContainerResource, IResourceWithServiceDis

    internal WireMockServerArguments Arguments { get; }
    internal Lazy<IWireMockAdminApi> AdminApi => new(CreateWireMockAdminApi);
+    internal WireMockMappingState ApiMappingState { get; set; } = WireMockMappingState.NoMappings;

    private ILogger? _logger;
    private EnhancedFileSystemWatcher? _enhancedFileSystemWatcher;
@@ -64,6 +66,36 @@ public class WireMockServerResource : ContainerResource, IResourceWithServiceDis

        var mappingBuilder = AdminApi.Value.GetMappingBuilder();
        await Arguments.ApiMappingBuilder.Invoke(mappingBuilder, cancellationToken);
+
+        ApiMappingState = WireMockMappingState.Submitted;
+    }
+
+    internal async Task CallAddProtoDefinitionsAsync(CancellationToken cancellationToken)
+    {
+        _logger?.LogInformation("Calling AdminApi to add GRPC ProtoDefinition at server level to WireMock.Net");
+
+        foreach (var (id, protoDefinitions) in Arguments.ProtoDefinitions)
+        {
+            _logger?.LogInformation("Adding ProtoDefinition {Id}", id);
+            foreach (var protoDefinition in protoDefinitions)
+            {
+                try
+                {
+                    var status = await AdminApi.Value.AddProtoDefinitionAsync(id, protoDefinition, cancellationToken);
+                    _logger?.LogInformation("ProtoDefinition '{Id}' added with status: {Status}.", id, status.Status);
+                }
+                catch (Exception ex)
+                {
+                    _logger?.LogWarning(ex, "Error adding ProtoDefinition '{Id}'.", id);
+                }
+            }
+        }
+
+        // Force a reload of static mappings when ProtoDefinitions are added at server-level to fix #1382
+        if (Arguments.ProtoDefinitions.Count > 0)
+        {
+            await ReloadStaticMappingsAsync(default);
+        }
    }

    internal void StartWatchingStaticMappings(CancellationToken cancellationToken)
@@ -109,10 +141,17 @@ public class WireMockServerResource : ContainerResource, IResourceWithServiceDis

    private async void FileCreatedChangedOrDeleted(object sender, FileSystemEventArgs args)
    {
-        _logger?.LogInformation("MappingFile created, changed or deleted: '{0}'. Triggering ReloadStaticMappings.", args.FullPath);
+        _logger?.LogInformation("MappingFile created, changed or deleted: '{FullPath}'. Triggering ReloadStaticMappings.", args.FullPath);
+
+        await ReloadStaticMappingsAsync(default);
+    }
+
+    private async Task ReloadStaticMappingsAsync(CancellationToken cancellationToken)
+    {
        try
        {
-            await AdminApi.Value.ReloadStaticMappingsAsync();
+            var status = await AdminApi.Value.ReloadStaticMappingsAsync(cancellationToken);
+            _logger?.LogInformation("ReloadStaticMappings called with status: {Status}.", status);
        }
        catch (Exception ex)
        {
--- a/src/WireMock.Net.AwesomeAssertions/WireMock.Net.AwesomeAssertions.csproj
+++ b/src/WireMock.Net.AwesomeAssertions/WireMock.Net.AwesomeAssertions.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
        <Description>AwesomeAssertions extensions for WireMock.Net</Description>
        <AssemblyTitle>WireMock.Net.AwesomeAssertions</AssemblyTitle>
        <Authors>Francesco Venturoli;Mahmoud Ali;Stef Heyenrath</Authors>
-        <TargetFrameworks>net47;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <!--<TargetFrameworks>net47;netstandard2.0;netstandard2.1</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <AssemblyName>WireMock.Net.AwesomeAssertions</AssemblyName>
        <PackageId>WireMock.Net.AwesomeAssertions</PackageId>
@@ -32,7 +33,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="AwesomeAssertions" Version="9.0.0" />
+        <PackageReference Include="AwesomeAssertions" Version="9.1.0" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.Extensions.Routing/Models/WireMockRequestInfo{TBody}.cs
+++ b/src/WireMock.Net.Extensions.Routing/Models/WireMockRequestInfo{TBody}.cs
@@ -21,4 +21,4 @@ public sealed class WireMockRequestInfo<TBody> : WireMockRequestInfo
    /// Gets or initializes the deserialized request body.
    /// </summary>
    public TBody? Body { get; init; }
-}
+}
--- a/src/WireMock.Net.Extensions.Routing/WireMock.Net.Extensions.Routing.csproj
+++ b/src/WireMock.Net.Extensions.Routing/WireMock.Net.Extensions.Routing.csproj
@@ -25,10 +25,10 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.7.0" />
+        <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.7.2" />
    </ItemGroup>

    <ItemGroup>
-      <ProjectReference Include="..\WireMock.Net.Minimal\WireMock.Net.Minimal.csproj" />
+        <ProjectReference Include="..\WireMock.Net.Minimal\WireMock.Net.Minimal.csproj" />
    </ItemGroup>
 </Project>
--- a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
+++ b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
@@ -1,10 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
        <Description>FluentAssertions extensions for WireMock.Net</Description>
        <AssemblyTitle>WireMock.Net.FluentAssertions</AssemblyTitle>
        <Authors>Mahmoud Ali;Stef Heyenrath</Authors>
-        <TargetFrameworks>net451;net47;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <!--<TargetFrameworks>net451;net47;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <AssemblyName>WireMock.Net.FluentAssertions</AssemblyName>
        <PackageId>WireMock.Net.FluentAssertions</PackageId>
@@ -31,12 +32,8 @@
        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    </PropertyGroup>

-    <ItemGroup Condition="'$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'netstandard1.3'">
-        <PackageReference Include="FluentAssertions" Version="5.10.3" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'netstandard1.3'">
-        <PackageReference Include="FluentAssertions" Version="6.5.1" />
+    <ItemGroup>
+        <PackageReference Include="FluentAssertions" Version="7.2.0" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.GraphQL/WireMock.Net.GraphQL.csproj
+++ b/src/WireMock.Net.GraphQL/WireMock.Net.GraphQL.csproj
@@ -4,7 +4,8 @@
        <Description>GraphQL support for WireMock.Net</Description>
        <AssemblyTitle>WireMock.Net.Matchers.GraphQL</AssemblyTitle>
        <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net8.0</TargetFrameworks>
+        <!--<TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net8.0</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <PackageTags>wiremock;matchers;matcher;graphql</PackageTags>
        <RootNamespace>WireMock</RootNamespace>
@@ -26,22 +27,11 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="GraphQL.NewtonsoftJson" Version="8.2.1" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-        <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
+        <PackageReference Include="GraphQL.NewtonsoftJson" Version="8.5.0" />
    </ItemGroup>

    <ItemGroup>
        <ProjectReference Include="..\WireMock.Net.Shared\WireMock.Net.Shared.csproj" />
    </ItemGroup>

-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-        <PackageReference Include="Nullable" Version="1.3.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-
 </Project>
--- a/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
+++ b/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
@@ -108,72 +108,72 @@ public class CSharpCodeMatcher : ICSharpCodeMatcher

        object? result;

-#if (NET451 || NET452)
-        var compilerParams = new System.CodeDom.Compiler.CompilerParameters
-        {
-            GenerateInMemory = true,
-            GenerateExecutable = false,
-            ReferencedAssemblies =
-            {
-                "System.dll",
-                "System.Core.dll",
-                "Microsoft.CSharp.dll",
-                "Newtonsoft.Json.dll"
-            }
-        };
+        //#if (NET451 || NET452)
+        //        var compilerParams = new System.CodeDom.Compiler.CompilerParameters
+        //        {
+        //            GenerateInMemory = true,
+        //            GenerateExecutable = false,
+        //            ReferencedAssemblies =
+        //            {
+        //                "System.dll",
+        //                "System.Core.dll",
+        //                "Microsoft.CSharp.dll",
+        //                "Newtonsoft.Json.dll"
+        //            }
+        //        };

-        using (var codeProvider = new Microsoft.CSharp.CSharpCodeProvider())
-        {
-            var compilerResults = codeProvider.CompileAssemblyFromSource(compilerParams, source);
+        //        using (var codeProvider = new Microsoft.CSharp.CSharpCodeProvider())
+        //        {
+        //            var compilerResults = codeProvider.CompileAssemblyFromSource(compilerParams, source);

-            if (compilerResults.Errors.Count != 0)
-            {
-                var errors = from System.CodeDom.Compiler.CompilerError er in compilerResults.Errors select er.ToString();
-                throw new WireMockException(string.Join(", ", errors));
-            }
+        //            if (compilerResults.Errors.Count != 0)
+        //            {
+        //                var errors = from System.CodeDom.Compiler.CompilerError er in compilerResults.Errors select er.ToString();
+        //                throw new WireMockException(string.Join(", ", errors));
+        //            }

-            var helper = compilerResults.CompiledAssembly?.CreateInstance("CodeHelper");
-            if (helper == null)
-            {
-                throw new WireMockException("CSharpCodeMatcher: Unable to create instance from WireMock.CodeHelper");
-            }
+        //            var helper = compilerResults.CompiledAssembly?.CreateInstance("CodeHelper");
+        //            if (helper == null)
+        //            {
+        //                throw new WireMockException("CSharpCodeMatcher: Unable to create instance from WireMock.CodeHelper");
+        //            }

-            var methodInfo = helper.GetType().GetMethod("IsMatch");
-            if (methodInfo == null)
-            {
-                throw new WireMockException("CSharpCodeMatcher: Unable to find method 'IsMatch' in WireMock.CodeHelper");
-            }
+        //            var methodInfo = helper.GetType().GetMethod("IsMatch");
+        //            if (methodInfo == null)
+        //            {
+        //                throw new WireMockException("CSharpCodeMatcher: Unable to find method 'IsMatch' in WireMock.CodeHelper");
+        //            }

-            try
-            {
-                result = methodInfo.Invoke(helper, new[] { inputValue });
-            }
-            catch (Exception ex)
-            {
-                throw new WireMockException("CSharpCodeMatcher: Unable to call method 'IsMatch' in WireMock.CodeHelper", ex);
-            }
-        }
-#elif (NET46 || NET461)
-        dynamic script;
-        try
-        {
-            script = CSScriptLibrary.CSScript.Evaluator.CompileCode(source).CreateObject("*");
-        }
-        catch (Exception ex)
-        {
-            throw new WireMockException("CSharpCodeMatcher: Unable to create compiler for WireMock.CodeHelper", ex);
-        }
-        
-        try
-        {
-            result = script.IsMatch(inputValue);
-        }
-        catch (Exception ex)
-        {
-            throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
-        }
+        //            try
+        //            {
+        //                result = methodInfo.Invoke(helper, new[] { inputValue });
+        //            }
+        //            catch (Exception ex)
+        //            {
+        //                throw new WireMockException("CSharpCodeMatcher: Unable to call method 'IsMatch' in WireMock.CodeHelper", ex);
+        //            }
+        //        }
+        //#elif (NET46 || NET461)
+        //        dynamic script;
+        //        try
+        //        {
+        //            script = CSScriptLibrary.CSScript.Evaluator.CompileCode(source).CreateObject("*");
+        //        }
+        //        catch (Exception ex)
+        //        {
+        //            throw new WireMockException("CSharpCodeMatcher: Unable to create compiler for WireMock.CodeHelper", ex);
+        //        }

-#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0_OR_GREATER)
+        //        try
+        //        {
+        //            result = script.IsMatch(inputValue);
+        //        }
+        //        catch (Exception ex)
+        //        {
+        //            throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
+        //        }
+
+        //#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0_OR_GREATER || NET48)
        Assembly assembly;
        try
        {
@@ -202,9 +202,9 @@ public class CSharpCodeMatcher : ICSharpCodeMatcher
        {
            throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
        }
-#else
-        throw new NotSupportedException("The 'CSharpCodeMatcher' cannot be used in netstandard 1.3");
-#endif
+        //#else
+        //        throw new NotSupportedException("The 'CSharpCodeMatcher' cannot be used in netstandard 1.3");
+        //#endif
        try
        {
            return (bool)result;
--- a/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
+++ b/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
@@ -4,7 +4,8 @@
        <Description>A CSharpCodeMatcher which can be used to match WireMock.Net Requests using C# code.</Description>
        <AssemblyTitle>WireMock.Net.Matchers.CSharpCode</AssemblyTitle>
        <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+        <!--<TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <PackageTags>wiremock;matchers;matcher;csharp;csharpcode</PackageTags>
        <RootNamespace>WireMock</RootNamespace>
@@ -37,16 +38,8 @@
        <ProjectReference Include="..\WireMock.Net.Minimal\WireMock.Net.Minimal.csproj" />
    </ItemGroup>

-    <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
-        <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'net461' ">
-        <PackageReference Include="CS-Script" Version="3.30.3" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
-        <PackageReference Include="CS-Script" Version="4.8.17" />
+    <ItemGroup>
+        <PackageReference Include="CS-Script" Version="4.11.0" />
    </ItemGroup>

 </Project>
--- a/src/WireMock.Net.MimePart/Models/MimeMessageDataWrapper.cs
+++ b/src/WireMock.Net.MimePart/Models/MimeMessageDataWrapper.cs
@@ -135,6 +135,6 @@ internal class MimeMessageDataWrapper : IMimeMessageData
    /// <inheritdoc/>
    public override string ToString()
    {
-        return _message.ToString();
+        return _message.ToString() ?? string.Empty;
    }
 }
--- a/src/WireMock.Net.MimePart/Util/MimeKitUtils.cs
+++ b/src/WireMock.Net.MimePart/Util/MimeKitUtils.cs
@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net

 using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
@@ -33,16 +32,25 @@ internal class MimeKitUtils : IMimeKitUtils
            StartsWithMultiPart(contentTypeHeader)
        )
        {
-            var bytes = requestMessage.BodyData?.DetectedBodyType switch
+            byte[] bytes;
+
+            switch (requestMessage.BodyData?.DetectedBodyType)
            {
                // If the body is bytes, use the BodyAsBytes to match on.
-                BodyType.Bytes => requestMessage.BodyData.BodyAsBytes!,
+                case BodyType.Bytes:
+                    bytes = requestMessage.BodyData.BodyAsBytes!;
+                    break;

                // If the body is a String or MultiPart, use the BodyAsString to match on.
-                BodyType.String or BodyType.MultiPart => Encoding.UTF8.GetBytes(requestMessage.BodyData.BodyAsString!),
+                case BodyType.String or BodyType.MultiPart:
+                    bytes = Encoding.UTF8.GetBytes(requestMessage.BodyData.BodyAsString!);
+                    break;

-                _ => throw new NotSupportedException()
-            };
+                // Else return false.
+                default:
+                    mimeMessageData = null;
+                    return false;
+            }

            var fixedBytes = FixBytes(bytes, contentTypeHeader[0]);

--- a/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj
+++ b/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj
@@ -4,7 +4,8 @@
        <Description>MultiPart Mime support for WireMock.Net using MimeKitLite</Description>
        <AssemblyTitle>WireMock.Net.MimePart</AssemblyTitle>
        <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net6.0;net8.0</TargetFrameworks>
+        <!--<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net6.0;net8.0</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <PackageTags>wiremock;matchers;matcher;mime;multipart;mimekit</PackageTags>
        <RootNamespace>WireMock</RootNamespace>
@@ -36,24 +37,16 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Nullable" Version="1.3.1">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="Stef.Validation" Version="0.1.1" />
+        <PackageReference Include="Stef.Validation" Version="0.2.0" />
    </ItemGroup>

-    <!--<ItemGroup>
-        <PackageReference Include="MimeKitLite" Version="4.12.0" />
-    </ItemGroup>-->
-
    <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-        <PackageReference Include="MimeKitLite" Version="4.12.0" />
+        <PackageReference Include="MimeKitLite" Version="4.13.0" />
    </ItemGroup>

    <ItemGroup Condition="'$(Configuration)' == 'Release'">
-        <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.40" PrivateAssets="All" />
-        <PackageReference Include="MimeKitLite" Version="4.12.0" PrivateAssets="All" />
+        <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.43" PrivateAssets="All" />
+        <PackageReference Include="MimeKitLite" Version="4.13.0" PrivateAssets="All" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.Minimal/Authentication/AzureADAuthenticationMatcher.cs
+++ b/src/WireMock.Net.Minimal/Authentication/AzureADAuthenticationMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-#if !NETSTANDARD1_3
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.IdentityModel.Tokens.Jwt;
@@ -111,5 +110,4 @@ internal class AzureADAuthenticationMatcher : IStringMatcher
        tenant = null;
        return false;
    }
-}
-#endif
+}
--- a/src/WireMock.Net.Minimal/Compatibility/StringExtensions.cs
+++ b/src/WireMock.Net.Minimal/Compatibility/StringExtensions.cs
@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net

-#if NET451 || NET452 || NET46 || NET451 || NET461 || NETSTANDARD1_3 || NETSTANDARD2_0
+#if NET48
 using System.Text.RegularExpressions;
 using WireMock.Constants;

--- a/src/WireMock.Net.Minimal/Compatibility/WebProxy.cs
+++ b/src/WireMock.Net.Minimal/Compatibility/WebProxy.cs
@@ -1,28 +0,0 @@
-// Copyright © WireMock.Net
-
-#if NETSTANDARD1_3
-
-// ReSharper disable once CheckNamespace
-namespace System.Net;
-
-internal class WebProxy : IWebProxy
-{
-    private readonly string _proxy;
-    public ICredentials? Credentials { get; set; }
-
-    public WebProxy(string proxy)
-    {
-        _proxy = proxy;
-    }
-
-    public Uri GetProxy(Uri destination)
-    {
-        return new Uri(_proxy);
-    }
-
-    public bool IsBypassed(Uri host)
-    {
-        return true;
-    }
-}
-#endif
--- a/src/WireMock.Net.Minimal/Http/HttpClientBuilder.cs
+++ b/src/WireMock.Net.Minimal/Http/HttpClientBuilder.cs
@@ -11,24 +11,18 @@ internal static class HttpClientBuilder
 {
    public static HttpClient Build(HttpClientSettings settings)
    {
-#if NETSTANDARD || NETCOREAPP3_1 || NET5_0_OR_GREATER
+#if NET8_0_OR_GREATER
        var handler = new HttpClientHandler
        {
            CheckCertificateRevocationList = false,
-            SslProtocols = System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
-            ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
-            AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
-        };
-#elif NET46
-        var handler = new HttpClientHandler
-        {
-            ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
+            SslProtocols = System.Security.Authentication.SslProtocols.Tls13 | System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
+            ServerCertificateCustomValidationCallback = (_, _, _, _) => true,
            AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
        };
 #else
-        var handler = new WebRequestHandler
+        var handler = new HttpClientHandler
        {
-            ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true,
+            ServerCertificateCustomValidationCallback = (_, _, _, _) => true,
            AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
        };
 #endif
@@ -62,10 +56,8 @@ internal static class HttpClientBuilder
            }
        }

-#if !NETSTANDARD1_3
-        ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+        ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls13 | SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
        ServicePointManager.ServerCertificateValidationCallback = (message, cert, chain, errors) => true;
-#endif

        return HttpClientFactory2.Create(handler);
    }
--- a/src/WireMock.Net.Minimal/Http/WebhookSender.cs
+++ b/src/WireMock.Net.Minimal/Http/WebhookSender.cs
@@ -11,24 +11,17 @@ using Stef.Validation;
 using WireMock.Models;
 using WireMock.Settings;
 using WireMock.Transformers;
-using WireMock.Transformers.Handlebars;
-using WireMock.Transformers.Scriban;
 using WireMock.Types;
 using WireMock.Util;

 namespace WireMock.Http;

-internal class WebhookSender
+internal class WebhookSender(WireMockServerSettings settings)
 {
    private const string ClientIp = "::1";
    private static readonly ThreadLocal<Random> Random = new(() => new Random(DateTime.UtcNow.Millisecond));

-    private readonly WireMockServerSettings _settings;
-
-    public WebhookSender(WireMockServerSettings settings)
-    {
-        _settings = Guard.NotNull(settings);
-    }
+    private readonly WireMockServerSettings _settings = Guard.NotNull(settings);

    public async Task<HttpResponseMessage> SendAsync(
        HttpClient client,
@@ -49,24 +42,7 @@ internal class WebhookSender
        string requestUrl;
        if (webhookRequest.UseTransformer == true)
        {
-            ITransformer transformer;
-            switch (webhookRequest.TransformerType)
-            {
-                case TransformerType.Handlebars:
-                    var factoryHandlebars = new HandlebarsContextFactory(_settings);
-                    transformer = new Transformer(_settings, factoryHandlebars);
-                    break;
-
-                case TransformerType.Scriban:
-                case TransformerType.ScribanDotLiquid:
-                    var factoryDotLiquid = new ScribanContextFactory(_settings.FileSystemHandler, webhookRequest.TransformerType);
-                    transformer = new Transformer(_settings, factoryDotLiquid);
-                    break;
-
-                default:
-                    throw new NotImplementedException($"TransformerType '{webhookRequest.TransformerType}' is not supported.");
-            }
-
+            var transformer = TransformerFactory.Create(webhookRequest.TransformerType, _settings);
            bodyData = transformer.TransformBody(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.BodyData, webhookRequest.TransformerReplaceNodeOptions);
            headers = transformer.TransformHeaders(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Headers);
            requestUrl = transformer.TransformString(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Url);
--- a/src/WireMock.Net.Minimal/Http/WireMockHttpClientFactory.cs
+++ b/src/WireMock.Net.Minimal/Http/WireMockHttpClientFactory.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
-#if NET5_0_OR_GREATER
+
+#if NET8_0_OR_GREATER
 using System;
 using System.Net.Http;
 using WireMock.Server;
--- a/src/WireMock.Net.Minimal/HttpsCertificate/CertificateLoader.cs
+++ b/src/WireMock.Net.Minimal/HttpsCertificate/CertificateLoader.cs
@@ -43,11 +43,8 @@ internal static class CertificateLoader
            }
            finally
            {
-#if NETSTANDARD || NET46
                certStore.Dispose();
-#else
                certStore.Close();
-#endif
            }
        }

@@ -56,7 +53,7 @@ internal static class CertificateLoader
            if (options.X509CertificateFilePath.EndsWith(ExtensionPem, StringComparison.OrdinalIgnoreCase))
            {
                // PEM logic based on: https://www.scottbrady91.com/c-sharp/pem-loading-in-dotnet-core-and-dotnet
-#if NET5_0_OR_GREATER
+#if NET8_0_OR_GREATER
                if (!string.IsNullOrEmpty(options.X509CertificatePassword))
                {
                    var certPem = File.ReadAllText(options.X509CertificateFilePath);
@@ -66,18 +63,8 @@ internal static class CertificateLoader
                    return new X509Certificate2(cert.Export(X509ContentType.Pfx, defaultPasswordPem), defaultPasswordPem);
                }
                return X509Certificate2.CreateFromPemFile(options.X509CertificateFilePath);
-
-#elif NETCOREAPP3_1
-                var cert = new X509Certificate2(options.X509CertificateFilePath);
-                if (!string.IsNullOrEmpty(options.X509CertificatePassword))
-                {
-                    var key = System.Security.Cryptography.ECDsa.Create()!;
-                    key.ImportECPrivateKey(System.Text.Encoding.UTF8.GetBytes(options.X509CertificatePassword), out _);
-                    return cert.CopyWithPrivateKey(key);
-                }
-                return cert;
 #else                
-                throw new InvalidOperationException("Loading a PEM Certificate is only supported for .NET Core App 3.1, .NET 5.0 and higher.");
+                throw new InvalidOperationException("Loading a PEM Certificate is only supported for .NET 8.0 and higher.");
 #endif
            }

@@ -123,11 +110,8 @@ internal static class CertificateLoader
        }
        finally
        {
-#if NETSTANDARD || NET46
            certStore.Dispose();
-#else
            certStore.Close();
-#endif
        }
    }
 }
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageBodyMatcher`1.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageBodyMatcher`1.cs
@@ -0,0 +1,60 @@
+// Copyright © WireMock.Net
+
+using System;
+using Newtonsoft.Json.Linq;
+using Stef.Validation;
+
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request body matcher.
+/// </summary>
+public class RequestMessageBodyMatcher<T> : IRequestMatcher
+{
+    /// <summary>
+    /// The body data function for type T
+    /// </summary>
+    public Func<T?, bool>? Func { get; }
+
+    /// <summary>
+    /// The <see cref="MatchOperator"/>
+    /// </summary>
+    public MatchOperator MatchOperator { get; } = MatchOperator.Or;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
+    /// </summary>
+    /// <param name="func">The function.</param>
+    public RequestMessageBodyMatcher(Func<T?, bool> func)
+    {
+        Func = Guard.NotNull(func);
+    }
+
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        var (score, exception) = CalculateMatchScore(requestMessage).Expand();
+        return requestMatchResult.AddScore(GetType(), score, exception);
+    }
+
+    private MatchResult CalculateMatchScore(IRequestMessage requestMessage)
+    {
+        if (Func != null)
+        {
+            if (requestMessage.BodyData?.BodyAsJson is JObject jsonObject)
+            {
+                try
+                {
+                    var bodyAsT = jsonObject.ToObject<T>();
+                    return MatchScores.ToScore(Func(bodyAsT));
+                }
+                catch (Exception ex)
+                {
+                    return new MatchResult(ex);
+                }
+            }
+        }
+
+        return default;
+    }
+}
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMultiPartMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMultiPartMatcher.cs
@@ -12,7 +12,7 @@ namespace WireMock.Matchers.Request;
 /// </summary>
 public class RequestMessageMultiPartMatcher : IRequestMatcher
 {
-    private static readonly IMimeKitUtils MimeKitUtils = TypeLoader.LoadStaticInstance<IMimeKitUtils>();
+    private readonly IMimeKitUtils _mimeKitUtils = LoadMimeKitUtils();

    /// <summary>
    /// The matchers.
@@ -62,7 +62,7 @@ public class RequestMessageMultiPartMatcher : IRequestMatcher
            return requestMatchResult.AddScore(GetType(), score, null);
        }

-        if (!MimeKitUtils.TryGetMimeMessage(requestMessage, out var message))
+        if (!_mimeKitUtils.TryGetMimeMessage(requestMessage, out var message))
        {
            return requestMatchResult.AddScore(GetType(), score, null);
        }
@@ -96,4 +96,14 @@ public class RequestMessageMultiPartMatcher : IRequestMatcher

        return requestMatchResult.AddScore(GetType(), score, exception);
    }
+
+    private static IMimeKitUtils LoadMimeKitUtils()
+    {
+        if (TypeLoader.TryLoadStaticInstance<IMimeKitUtils>(out var mimeKitUtils))
+        {
+            return mimeKitUtils;
+        }
+
+        throw new InvalidOperationException("MimeKit is required for RequestMessageMultiPartMatcher. Please install the WireMock.Net.MimePart package.");
+    }
 }
--- a/src/WireMock.Net.Minimal/Matchers/XPathMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/XPathMatcher.cs
@@ -11,9 +11,7 @@ using WireMock.Models;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Util;
-#if !NETSTANDARD1_3
 using Wmhelp.XPath2;
-#endif

 namespace WireMock.Matchers;

@@ -135,7 +133,7 @@ public class XPathMatcher : IStringMatcher
            }
            catch
            {
-                _xmlDocument = default;
+                _xmlDocument = null;
            }
        }

@@ -151,25 +149,17 @@ public class XPathMatcher : IStringMatcher
            var xmlNamespaceManager = GetXmlNamespaceManager(xmlNamespaceMap);
            if (xmlNamespaceManager == null)
            {
-#if NETSTANDARD1_3
-                return navigator.Evaluate(xpath);
-#else
                return navigator.XPath2Evaluate(xpath);
-#endif
            }

-#if NETSTANDARD1_3
-            return navigator.Evaluate(xpath, xmlNamespaceManager);
-#else
            return navigator.XPath2Evaluate(xpath, xmlNamespaceManager);
-#endif
        }

        private XmlNamespaceManager? GetXmlNamespaceManager(IEnumerable<XmlNamespace>? xmlNamespaceMap)
        {
            if (_xpathNavigator == null || xmlNamespaceMap == null)
            {
-                return default;
+                return null;
            }

            var nsManager = new XmlNamespaceManager(_xpathNavigator.NameTable);
--- a/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.NETCore.cs
+++ b/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.NETCore.cs
@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net

-#if NETCOREAPP3_1 || NET5_0_OR_GREATER
+#if NET8_0
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using WireMock.Types;
@@ -9,6 +9,8 @@ namespace WireMock.Owin;

 internal partial class AspNetCoreSelfHost
 {
+    private const string CorsPolicyName = "WireMock.Net - Policy";
+
    public void AddCors(IServiceCollection services)
    {
        if (_wireMockMiddlewareOptions.CorsPolicyOptions > CorsPolicyOptions.None)
--- a/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.NETStandard.cs
+++ b/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.NETStandard.cs
@@ -1,12 +1,10 @@
 // Copyright © WireMock.Net

-#if USE_ASPNETCORE && !NETSTANDARD1_3
 using System;
 using System.Collections.Generic;
 using System.Net;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
-using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using CertificateLoader = WireMock.HttpsCertificate.CertificateLoader;
@@ -38,7 +36,7 @@ internal partial class AspNetCoreSelfHost
                            options.ServerCertificate = CertificateLoader.LoadCertificate(wireMockMiddlewareOptions, urlDetail.Host);
                        }

-                        options.ClientCertificateMode = (ClientCertificateMode)wireMockMiddlewareOptions.ClientCertificateMode;
+                        options.ClientCertificateMode = wireMockMiddlewareOptions.ClientCertificateMode;
                        if (wireMockMiddlewareOptions.AcceptAnyClientCertificate)
                        {
                            options.ClientCertificateValidation = (_, _, _) => true;
@@ -47,7 +45,7 @@ internal partial class AspNetCoreSelfHost

                    if (urlDetail.IsHttp2)
                    {
-                        listenOptions.Protocols = HttpProtocols.Http2;
+                        SetHttp2AsProtocolsOnListenOptions(listenOptions);
                    }
                });
                continue;
@@ -55,10 +53,7 @@ internal partial class AspNetCoreSelfHost

            if (urlDetail.IsHttp2)
            {
-                Listen(kestrelOptions, urlDetail, listenOptions =>
-                {
-                    listenOptions.Protocols = HttpProtocols.Http2;
-                });
+                Listen(kestrelOptions, urlDetail, SetHttp2AsProtocolsOnListenOptions);
                continue;
            }

@@ -66,6 +61,15 @@ internal partial class AspNetCoreSelfHost
        }
    }

+    private static void SetHttp2AsProtocolsOnListenOptions(ListenOptions listenOptions)
+    {
+#if NET8_0_OR_GREATER
+        listenOptions.Protocols = HttpProtocols.Http2;
+#else
+        throw new NotSupportedException("HTTP/2 is only supported in .NET 8 or greater.");
+#endif
+    }
+
    private static void Listen(KestrelServerOptions kestrelOptions, HostUrlDetails urlDetail, Action<ListenOptions> configure)
    {
        // Listens on any IP with the given port.
@@ -111,5 +115,4 @@ internal static class IWebHostBuilderExtensions
            services.Configure<KestrelServerOptions>(context.Configuration.GetSection("Kestrel"));
        });
    }
-}
-#endif
+}
--- a/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.NETStandard13.cs
+++ b/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.NETStandard13.cs
@@ -1,57 +0,0 @@
-// Copyright © WireMock.Net
-
-#if USE_ASPNETCORE && NETSTANDARD1_3
-using System.Collections.Generic;
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Server.Kestrel;
-using Microsoft.AspNetCore.Server.Kestrel.Https;
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using WireMock.HttpsCertificate;
-
-namespace WireMock.Owin;
-
-internal partial class AspNetCoreSelfHost
-{
-    private static void SetKestrelOptionsLimits(KestrelServerOptions options)
-    {
-        options.Limits.MaxRequestBufferSize = null;
-        options.Limits.MaxRequestHeaderCount = 100;
-        options.Limits.MaxResponseBufferSize = null;
-    }
-
-    private static void SetHttpsAndUrls(KestrelServerOptions options, IWireMockMiddlewareOptions wireMockMiddlewareOptions, IEnumerable<HostUrlDetails> urlDetails)
-    {
-        foreach (var urlDetail in urlDetails)
-        {
-            if (urlDetail.IsHttps)
-            {
-                options.UseHttps(new HttpsConnectionFilterOptions
-                {
-                    ServerCertificate = wireMockMiddlewareOptions.CustomCertificateDefined ? CertificateLoader.LoadCertificate(wireMockMiddlewareOptions, urlDetail.Host) : PublicCertificateHelper.GetX509Certificate2(),
-                    ClientCertificateMode = (ClientCertificateMode) wireMockMiddlewareOptions.ClientCertificateMode,
-                    ClientCertificateValidation = wireMockMiddlewareOptions.AcceptAnyClientCertificate ? (_, _, _) => true : null
-                });
-            }
-        }
-    }
-}
-
-internal static class IWebHostBuilderExtensions
-{
-    internal static IWebHostBuilder ConfigureAppConfigurationUsingEnvironmentVariables(this IWebHostBuilder builder) => builder;
-
-    internal static IWebHostBuilder ConfigureKestrelServerOptions(this IWebHostBuilder builder)
-    {
-        var configuration = new ConfigurationBuilder()
-            .AddEnvironmentVariables()
-            .Build();
-
-        return builder.ConfigureServices(services =>
-        {
-            services.Configure<KestrelServerOptions>(configuration.GetSection("Kestrel"));
-        });
-    }
-}
-
-#endif
--- a/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs
+++ b/src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs
@@ -1,10 +1,8 @@
 // Copyright © WireMock.Net

-#if USE_ASPNETCORE
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Builder;
@@ -20,8 +18,6 @@ namespace WireMock.Owin;

 internal partial class AspNetCoreSelfHost : IOwinSelfHost
 {
-    private const string CorsPolicyName = "WireMock.Net - Policy";
-
    private readonly CancellationTokenSource _cts = new();
    private readonly IWireMockMiddlewareOptions _wireMockMiddlewareOptions;
    private readonly IWireMockLogger _logger;
@@ -74,7 +70,7 @@ internal partial class AspNetCoreSelfHost : IOwinSelfHost
                services.AddSingleton<IOwinResponseMapper, OwinResponseMapper>();
                services.AddSingleton<IGuidUtils, GuidUtils>();

-#if NETCOREAPP3_1 || NET5_0_OR_GREATER
+#if NET8_0_OR_GREATER
                AddCors(services);
 #endif
                _wireMockMiddlewareOptions.AdditionalServiceRegistration?.Invoke(services);
@@ -83,7 +79,7 @@ internal partial class AspNetCoreSelfHost : IOwinSelfHost
            {
                appBuilder.UseMiddleware<GlobalExceptionMiddleware>();

-#if NETCOREAPP3_1 || NET5_0_OR_GREATER
+#if NET8_0_OR_GREATER
                UseCors(appBuilder);
 #endif
                _wireMockMiddlewareOptions.PreWireMockMiddlewareInit?.Invoke(appBuilder);
@@ -99,69 +95,44 @@ internal partial class AspNetCoreSelfHost : IOwinSelfHost
                SetHttpsAndUrls(options, _wireMockMiddlewareOptions, _urlOptions.GetDetails());
            })
            .ConfigureKestrelServerOptions()
-
-#if NETSTANDARD1_3
-            .UseUrls(_urlOptions.GetDetails().Select(u => u.Url).ToArray())
-#endif
            .Build();

        return RunHost(_cts.Token);
    }

-        private Task RunHost(CancellationToken token)
+    private Task RunHost(CancellationToken token)
+    {
+        try
        {
-            try
-            {
-#if NETCOREAPP3_1 || NET5_0_OR_GREATER
-                var appLifetime = _host.Services.GetRequiredService<Microsoft.Extensions.Hosting.IHostApplicationLifetime>();
+#if NET8_0_OR_GREATER
+            var appLifetime = _host.Services.GetRequiredService<Microsoft.Extensions.Hosting.IHostApplicationLifetime>();
 #else
-                var appLifetime = _host.Services.GetRequiredService<IApplicationLifetime>();
+            var appLifetime = _host.Services.GetRequiredService<IApplicationLifetime>();
 #endif
-                appLifetime.ApplicationStarted.Register(() =>
+            appLifetime.ApplicationStarted.Register(() =>
+            {
+                var addresses = _host.ServerFeatures
+                    .Get<Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature>()!
+                    .Addresses;
+
+                foreach (var address in addresses)
                {
-                    var addresses = _host.ServerFeatures
-                        .Get<Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature>()!
-                        .Addresses;
+                    Urls.Add(address.Replace("0.0.0.0", "localhost").Replace("[::]", "localhost"));

-                    foreach (var address in addresses)
-                    {
-                        Urls.Add(address.Replace("0.0.0.0", "localhost").Replace("[::]", "localhost"));
-
-                        PortUtils.TryExtract(address, out _, out _, out _, out _, out var port);
-                        Ports.Add(port);
-                    }
+                    PortUtils.TryExtract(address, out _, out _, out _, out _, out var port);
+                    Ports.Add(port);
+                }

                IsStarted = true;
            });

-#if NETSTANDARD1_3
-            _logger.Info("Server using netstandard1.3");
-#elif NETSTANDARD2_0
-            _logger.Info("Server using netstandard2.0");
-#elif NETSTANDARD2_1
-            _logger.Info("Server using netstandard2.1");
-#elif NETCOREAPP3_1
-            _logger.Info("Server using .NET Core App 3.1");
-#elif NET5_0
-            _logger.Info("Server using .NET 5.0");
-#elif NET6_0
-            _logger.Info("Server using .NET 6.0");
-#elif NET7_0
-            _logger.Info("Server using .NET 7.0");
-#elif NET8_0
+#if NET8_0
            _logger.Info("Server using .NET 8.0");
-#elif NET46
-            _logger.Info("Server using .NET Framework 4.6.1 or higher");
+#elif NET48
+            _logger.Info("Server using .NET Framework 4.8");
 #endif

-#if NETSTANDARD1_3
-            return Task.Run(() =>
-            {
-                _host.Run(token);
-            });
-#else
            return _host.RunAsync(token);
-#endif
        }
        catch (Exception e)
        {
@@ -179,11 +150,6 @@ internal partial class AspNetCoreSelfHost : IOwinSelfHost
        _cts.Cancel();

        IsStarted = false;
-#if NETSTANDARD1_3
-        return Task.CompletedTask;
-#else
        return _host.StopAsync();
-#endif
    }
-}
-#endif
+}
--- a/src/WireMock.Net.Minimal/Owin/GlobalExceptionMiddleware.cs
+++ b/src/WireMock.Net.Minimal/Owin/GlobalExceptionMiddleware.cs
@@ -3,68 +3,44 @@
 using System;
 using System.Threading.Tasks;
 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 Microsoft.AspNetCore.Http;

-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)
-        {
-            _options = Guard.NotNull(options);
-            _responseMapper = Guard.NotNull(responseMapper);;
-        }
-#else
-        public GlobalExceptionMiddleware(Next next, IWireMockMiddlewareOptions options, IOwinResponseMapper responseMapper)
-        {
-            Next = next;
-            _options = Guard.NotNull(options);
-            _responseMapper = Guard.NotNull(responseMapper);
-        }
-#endif
+    public RequestDelegate? Next { get; }

-#if USE_ASPNETCORE
-        public Next Next { get; }
-#endif
+    public Task Invoke(HttpContext ctx)
+    {
+        return InvokeInternalAsync(ctx);
+    }

-#if !USE_ASPNETCORE
-        public override Task Invoke(IContext ctx)
-#else
-        public Task Invoke(IContext ctx)
-#endif
+    private async Task InvokeInternalAsync(HttpContext ctx)
+    {
+        try
        {
-            return InvokeInternalAsync(ctx);
-        }
-
-        private async Task InvokeInternalAsync(IContext ctx)
-        {
-            try
+            if (Next != null)
            {
-                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);
+                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);
+        }
    }
-}
+}
--- a/src/WireMock.Net.Minimal/Owin/HostUrlOptions.cs
+++ b/src/WireMock.Net.Minimal/Owin/HostUrlOptions.cs
@@ -55,10 +55,10 @@ internal class HostUrlOptions

    private static int FindFreeTcpPort()
    {
-#if USE_ASPNETCORE || NETSTANDARD2_0 || NETSTANDARD2_1
+//#if USE_ASPNETCORE || NETSTANDARD2_0 || NETSTANDARD2_1
        return 0;
-#else
-        return PortUtils.FindFreeTcpPort();
-#endif
+//#else
+        //return PortUtils.FindFreeTcpPort();
+//#endif
    }
 }
--- a/src/WireMock.Net.Minimal/Owin/IWireMockMiddlewareOptions.cs
+++ b/src/WireMock.Net.Minimal/Owin/IWireMockMiddlewareOptions.cs
@@ -2,21 +2,22 @@

 using System;
 using System.Collections.Concurrent;
+using System.Security.Cryptography.X509Certificates;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Types;
 using WireMock.Util;
-using System.Security.Cryptography.X509Certificates;
+using ClientCertificateMode = Microsoft.AspNetCore.Server.Kestrel.Https.ClientCertificateMode;

-using JetBrains.Annotations;
-
-#if !USE_ASPNETCORE
-using Owin;
-#else
-using IAppBuilder = Microsoft.AspNetCore.Builder.IApplicationBuilder;
-using Microsoft.Extensions.DependencyInjection;
-#endif
+//#if !USE_ASPNETCORE
+//using Owin;
+//#else
+//using IAppBuilder = Microsoft.AspNetCore.Builder.IApplicationBuilder;
+//using Microsoft.Extensions.DependencyInjection;
+//#endif

 namespace WireMock.Owin;

@@ -40,11 +41,11 @@ internal interface IWireMockMiddlewareOptions

    int? MaxRequestLogCount { get; set; }

-    Action<IAppBuilder>? PreWireMockMiddlewareInit { get; set; }
+    Action<IApplicationBuilder>? PreWireMockMiddlewareInit { get; set; }

-    Action<IAppBuilder>? PostWireMockMiddlewareInit { get; set; }
+    Action<IApplicationBuilder>? PostWireMockMiddlewareInit { get; set; }

-#if USE_ASPNETCORE
+//#if USE_ASPNETCORE
    Action<IServiceCollection>? AdditionalServiceRegistration { get; set; }

    CorsPolicyOptions? CorsPolicyOptions { get; set; }
@@ -52,7 +53,7 @@ internal interface IWireMockMiddlewareOptions
    ClientCertificateMode ClientCertificateMode { get; set; }

    bool AcceptAnyClientCertificate { get; set; }
-#endif
+//#endif

    IFileSystemHandler? FileSystemHandler { get; set; }

--- a/src/WireMock.Net.Minimal/Owin/Mappers/IOwinRequestMapper.cs
+++ b/src/WireMock.Net.Minimal/Owin/Mappers/IOwinRequestMapper.cs
@@ -1,25 +1,25 @@
 // Copyright © WireMock.Net

 using System.Threading.Tasks;
-#if !USE_ASPNETCORE
-using IRequest = Microsoft.Owin.IOwinRequest;
-#else
-using IRequest = Microsoft.AspNetCore.Http.HttpRequest;
-#endif
+using Microsoft.AspNetCore.Http;
+//#if !USE_ASPNETCORE
+//using IRequest = Microsoft.Owin.IOwinRequest;
+//#else
+//using IRequest = Microsoft.AspNetCore.Http.HttpRequest;
+//#endif

-namespace WireMock.Owin.Mappers
+namespace WireMock.Owin.Mappers;
+
+/// <summary>
+/// IOwinRequestMapper
+/// </summary>
+internal interface IOwinRequestMapper
 {
    /// <summary>
-    /// IOwinRequestMapper
+    /// MapAsync IRequest to RequestMessage
    /// </summary>
-    internal interface IOwinRequestMapper
-    {
-        /// <summary>
-        /// MapAsync IRequest to RequestMessage
-        /// </summary>
-        /// <param name="request">The OwinRequest/HttpRequest</param>
-        /// <param name="options">The WireMockMiddlewareOptions</param>
-        /// <returns>RequestMessage</returns>
-        Task<RequestMessage> MapAsync(IRequest request, IWireMockMiddlewareOptions options);
-    }
+    /// <param name="request">The HttpRequest</param>
+    /// <param name="options">The WireMockMiddlewareOptions</param>
+    /// <returns>RequestMessage</returns>
+    Task<RequestMessage> MapAsync(HttpRequest request, IWireMockMiddlewareOptions options);
 }
--- a/src/WireMock.Net.Minimal/Owin/Mappers/IOwinResponseMapper.cs
+++ b/src/WireMock.Net.Minimal/Owin/Mappers/IOwinResponseMapper.cs
@@ -1,11 +1,13 @@
 // Copyright © WireMock.Net

 using System.Threading.Tasks;
-#if !USE_ASPNETCORE
-using IResponse = Microsoft.Owin.IOwinResponse;
-#else
-using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
-#endif
+using Microsoft.AspNetCore.Http;
+
+//#if !USE_ASPNETCORE
+//using IResponse = Microsoft.Owin.IOwinResponse;
+//#else
+//using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
+//#endif

 namespace WireMock.Owin.Mappers;

@@ -18,6 +20,6 @@ internal interface IOwinResponseMapper
    /// Map ResponseMessage to IResponse.
    /// </summary>
    /// <param name="responseMessage">The ResponseMessage</param>
-    /// <param name="response">The OwinResponse/HttpResponse</param>
-    Task MapAsync(IResponseMessage? responseMessage, IResponse response);
-}
+    /// <param name="response">The HttpResponse</param>
+    Task MapAsync(IResponseMessage? responseMessage, HttpResponse response);
+}
--- a/src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs
+++ b/src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs
@@ -4,15 +4,17 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Extensions;
 using WireMock.Http;
 using WireMock.Models;
 using WireMock.Util;
-#if !USE_ASPNETCORE
-using IRequest = Microsoft.Owin.IOwinRequest;
-#else
-using Microsoft.AspNetCore.Http.Extensions;
-using IRequest = Microsoft.AspNetCore.Http.HttpRequest;
-#endif
+//#if !USE_ASPNETCORE
+//using IRequest = Microsoft.Owin.IOwinRequest;
+//#else
+//using Microsoft.AspNetCore.Http.Extensions;
+//using IRequest = Microsoft.AspNetCore.Http.HttpRequest;
+//#endif

 namespace WireMock.Owin.Mappers;

@@ -22,7 +24,7 @@ namespace WireMock.Owin.Mappers;
 internal class OwinRequestMapper : IOwinRequestMapper
 {
    /// <inheritdoc />
-    public async Task<RequestMessage> MapAsync(IRequest request, IWireMockMiddlewareOptions options)
+    public async Task<RequestMessage> MapAsync(HttpRequest request, IWireMockMiddlewareOptions options)
    {
        var (urlDetails, clientIP) = ParseRequest(request);

@@ -73,22 +75,22 @@ internal class OwinRequestMapper : IOwinRequestMapper
            body,
            headers,
            cookies,
-            httpVersion
-#if USE_ASPNETCORE
-            , await request.HttpContext.Connection.GetClientCertificateAsync()
-#endif
+            httpVersion,
+//#if USE_ASPNETCORE
+            await request.HttpContext.Connection.GetClientCertificateAsync()
+//#endif
            )
        {
            DateTime = DateTime.UtcNow
        };
    }

-    private static (UrlDetails UrlDetails, string ClientIP) ParseRequest(IRequest request)
+    private static (UrlDetails UrlDetails, string ClientIP) ParseRequest(HttpRequest request)
    {
-#if !USE_ASPNETCORE
-        var urlDetails = UrlUtils.Parse(request.Uri, request.PathBase);
-        var clientIP = request.RemoteIpAddress;
-#else
+        //#if !USE_ASPNETCORE
+        //        var urlDetails = UrlUtils.Parse(request.Uri, request.PathBase);
+        //        var clientIP = request.RemoteIpAddress;
+        //#else
        var urlDetails = UrlUtils.Parse(new Uri(request.GetEncodedUrl()), request.PathBase);

        var connection = request.HttpContext.Connection;
@@ -105,7 +107,7 @@ internal class OwinRequestMapper : IOwinRequestMapper
        {
            clientIP = connection.RemoteIpAddress.ToString();
        }
-#endif
+        //#endif
        return (urlDetails, clientIP);
    }
 }
--- a/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs
@@ -8,21 +8,22 @@ using System.Net;
 using System.Reflection;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Newtonsoft.Json;
 using RandomDataGenerator.FieldOptions;
 using RandomDataGenerator.Randomizers;
+using Stef.Validation;
 using WireMock.Http;
 using WireMock.ResponseBuilders;
 using WireMock.Types;
-using Stef.Validation;
 using WireMock.Util;

-#if !USE_ASPNETCORE
-using IResponse = Microsoft.Owin.IOwinResponse;
-#else
-using Microsoft.AspNetCore.Http;
-using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
-#endif
+//#if !USE_ASPNETCORE
+//using IResponse = Microsoft.Owin.IOwinResponse;
+//#else
+//using Microsoft.AspNetCore.Http;
+//using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
+//#endif

 namespace WireMock.Owin.Mappers
 {
@@ -37,8 +38,8 @@ namespace WireMock.Owin.Mappers
        private readonly Encoding _utf8NoBom = new UTF8Encoding(false);

        // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
-        private static readonly IDictionary<string, Action<IResponse, bool, WireMockList<string>>> ResponseHeadersToFix =
-            new Dictionary<string, Action<IResponse, bool, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase)
+        private static readonly IDictionary<string, Action<HttpResponse, bool, WireMockList<string>>> ResponseHeadersToFix =
+            new Dictionary<string, Action<HttpResponse, bool, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase)
            {
                { HttpKnownHeaderNames.ContentType, (r, _, v) => r.ContentType = v.FirstOrDefault() },
                { HttpKnownHeaderNames.ContentLength, (r, hasBody, v) =>
@@ -62,7 +63,7 @@ namespace WireMock.Owin.Mappers
        }

        /// <inheritdoc />
-        public async Task MapAsync(IResponseMessage? responseMessage, IResponse response)
+        public async Task MapAsync(IResponseMessage? responseMessage, HttpResponse response)
        {
            if (responseMessage == null)
            {
@@ -128,7 +129,7 @@ namespace WireMock.Owin.Mappers
            SetResponseTrailingHeaders(responseMessage, response);
        }

-        private static async Task HandleSseStringAsync(IResponseMessage responseMessage, IResponse response, IBodyData bodyData)
+        private static async Task HandleSseStringAsync(IResponseMessage responseMessage, HttpResponse response, IBodyData bodyData)
        {
            if (bodyData.SseStringQueue == null)
            {
@@ -178,9 +179,12 @@ namespace WireMock.Owin.Mappers
                    return (bodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);

                case BodyType.ProtoBuf:
-                    var protoDefinitions = bodyData.ProtoDefinition?.Invoke().Texts;
-                    var protoBufUtils = TypeLoader.LoadStaticInstance<IProtoBufUtils>();
-                    return await protoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);
+                    if (TypeLoader.TryLoadStaticInstance<IProtoBufUtils>(out var protoBufUtils))
+                    {
+                        var protoDefinitions = bodyData.ProtoDefinition?.Invoke().Texts;
+                        return await protoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);
+                    }
+                    break;

                case BodyType.Bytes:
                    return bodyData.BodyAsBytes;
@@ -199,7 +203,7 @@ namespace WireMock.Owin.Mappers
            return null;
        }

-        private static void SetResponseHeaders(IResponseMessage responseMessage, bool hasBody, IResponse response)
+        private static void SetResponseHeaders(IResponseMessage responseMessage, bool hasBody, HttpResponse response)
        {
            // Force setting the Date header (#577)
            AppendResponseHeader(
@@ -215,7 +219,7 @@ namespace WireMock.Owin.Mappers
                var value = item.Value;
                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
                {
-                    action?.Invoke(response, hasBody, value);
+                    action.Invoke(response, hasBody, value);
                }
                else
                {
@@ -228,7 +232,7 @@ namespace WireMock.Owin.Mappers
            }
        }

-        private static void SetResponseTrailingHeaders(IResponseMessage responseMessage, IResponse response)
+        private static void SetResponseTrailingHeaders(IResponseMessage responseMessage, HttpResponse response)
        {
            if (responseMessage.TrailingHeaders == null)
            {
@@ -236,13 +240,11 @@ namespace WireMock.Owin.Mappers
            }

 #if TRAILINGHEADERS
-            foreach (var item in responseMessage.TrailingHeaders)
+            foreach (var (headerName, value) in responseMessage.TrailingHeaders)
            {
-                var headerName = item.Key;
-                var value = item.Value;
                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
                {
-                    action?.Invoke(response, false, value);
+                    action.Invoke(response, false, value);
                }
                else
                {
@@ -256,13 +258,13 @@ namespace WireMock.Owin.Mappers
 #endif
        }

-        private static void AppendResponseHeader(IResponse response, string headerName, string[] values)
+        private static void AppendResponseHeader(HttpResponse response, string headerName, string[] values)
        {
-#if !USE_ASPNETCORE
-            response.Headers.AppendValues(headerName, values);
-#else
+            //#if !USE_ASPNETCORE
+            //            response.Headers.AppendValues(headerName, values);
+            //#else
            response.Headers.Append(headerName, values);
-#endif
+            //#endif
        }
    }
 }
--- a/src/WireMock.Net.Minimal/Owin/MappingMatcher.cs
+++ b/src/WireMock.Net.Minimal/Owin/MappingMatcher.cs
@@ -9,16 +9,10 @@ using WireMock.Services;

 namespace WireMock.Owin;

-internal class MappingMatcher : IMappingMatcher
+internal class MappingMatcher(IWireMockMiddlewareOptions options, IRandomizerDoubleBetween0And1 randomizerDoubleBetween0And1) : IMappingMatcher
 {
-    private readonly IWireMockMiddlewareOptions _options;
-    private readonly IRandomizerDoubleBetween0And1 _randomizerDoubleBetween0And1;
-
-    public MappingMatcher(IWireMockMiddlewareOptions options, IRandomizerDoubleBetween0And1 randomizerDoubleBetween0And1)
-    {
-        _options = Guard.NotNull(options);
-        _randomizerDoubleBetween0And1 = Guard.NotNull(randomizerDoubleBetween0And1);
-    }
+    private readonly IWireMockMiddlewareOptions _options = Guard.NotNull(options);
+    private readonly IRandomizerDoubleBetween0And1 _randomizerDoubleBetween0And1 = Guard.NotNull(randomizerDoubleBetween0And1);

    public (MappingMatcherResult? Match, MappingMatcherResult? Partial) FindBestMatch(RequestMessage request)
    {
@@ -28,7 +22,7 @@ internal class MappingMatcher : IMappingMatcher

        var mappings = _options.Mappings.Values
            .Where(m => m.TimeSettings.IsValid())
-            .Where(m => m.Probability is null || m.Probability <= _randomizerDoubleBetween0And1.Generate())
+            .Where(m => m.Probability is null || _randomizerDoubleBetween0And1.Generate() <= m.Probability)
            .ToArray();

        foreach (var mapping in mappings)
@@ -41,10 +35,10 @@ internal class MappingMatcher : IMappingMatcher

                var exceptions = mappingMatcherResult.RequestMatchResult.MatchDetails
                    .Where(md => md.Exception != null)
-                    .Select(md => md.Exception)
+                    .Select(md => md.Exception!)
                    .ToArray();

-                if (!exceptions.Any())
+                if (exceptions.Length == 0)
                {
                    possibleMappings.Add(mappingMatcherResult);
                }
@@ -52,7 +46,7 @@ internal class MappingMatcher : IMappingMatcher
                {
                    foreach (var ex in exceptions)
                    {
-                        LogException(mapping, ex!);
+                        LogException(mapping, ex);
                    }
                }
            }
@@ -62,14 +56,16 @@ internal class MappingMatcher : IMappingMatcher
            }
        }

-        var partialMappings = possibleMappings
+        var partialMatches = possibleMappings
            .Where(pm => (pm.Mapping.IsAdminInterface && pm.RequestMatchResult.IsPerfectMatch) || !pm.Mapping.IsAdminInterface)
            .OrderBy(m => m.RequestMatchResult)
                .ThenBy(m => m.RequestMatchResult.TotalNumber)
                .ThenBy(m => m.Mapping.Priority)
+                .ThenByDescending(m => m.Mapping.Probability)
                .ThenByDescending(m => m.Mapping.UpdatedAt)
-            .ToList();
-        var partialMatch = partialMappings.FirstOrDefault(pm => pm.RequestMatchResult.AverageTotalScore > 0.0);
+            .Where(pm => pm.RequestMatchResult.AverageTotalScore > 0.0)
+            .ToArray();
+        var partialMatch = partialMatches.FirstOrDefault();

        if (_options.AllowPartialMapping == true)
        {
@@ -78,7 +74,11 @@ internal class MappingMatcher : IMappingMatcher

        var match = possibleMappings
            .Where(m => m.RequestMatchResult.IsPerfectMatch)
-            .OrderBy(m => m.Mapping.Priority).ThenBy(m => m.RequestMatchResult).ThenByDescending(m => m.Mapping.UpdatedAt)
+            .OrderBy(m => m.Mapping.Priority)
+                .ThenBy(m => m.RequestMatchResult)
+                .ThenBy(m => m.RequestMatchResult.TotalNumber)
+                .ThenByDescending(m => m.Mapping.Probability)
+                .ThenByDescending(m => m.Mapping.UpdatedAt)
            .FirstOrDefault();

        return (match, partialMatch);
--- a/src/WireMock.Net.Minimal/Owin/OwinSelfHost.cs
+++ b/src/WireMock.Net.Minimal/Owin/OwinSelfHost.cs
@@ -1,114 +0,0 @@
-// Copyright © WireMock.Net
-
-#if !USE_ASPNETCORE
-using Microsoft.Owin.Hosting;
-using Owin;
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-using WireMock.Logging;
-using WireMock.Owin.Mappers;
-using Stef.Validation;
-using WireMock.Services;
-using WireMock.Util;
-
-namespace WireMock.Owin;
-
-internal class OwinSelfHost : IOwinSelfHost
-{
-    private readonly IWireMockMiddlewareOptions _options;
-    private readonly CancellationTokenSource _cts = new();
-    private readonly IWireMockLogger _logger;
-
-    private Exception? _runningException;
-
-    public OwinSelfHost(IWireMockMiddlewareOptions options, HostUrlOptions urlOptions)
-    {
-        Guard.NotNull(urlOptions);
-
-        _options = Guard.NotNull(options);
-        _logger = options.Logger ?? new WireMockConsoleLogger();
-
-        foreach (var detail in urlOptions.GetDetails())
-        {
-            Urls.Add(detail.Url);
-            Ports.Add(detail.Port);
-        }
-    }
-
-    public bool IsStarted { get; private set; }
-
-    public List<string> Urls { get; } = new();
-
-    public List<int> Ports { get; } = new();
-
-    public Exception? RunningException => _runningException;
-
-    [PublicAPI]
-    public Task StartAsync()
-    {
-        return Task.Run(StartServers, _cts.Token);
-    }
-
-    [PublicAPI]
-    public Task StopAsync()
-    {
-        _cts.Cancel();
-
-        return Task.FromResult(true);
-    }
-
-    private void StartServers()
-    {
-#if NET46
-        _logger.Info("Server using .net 4.6");
-#else
-        _logger.Info("Server using .net 4.5.x");
-#endif
-        var servers = new List<IDisposable>();
-
-        try
-        {
-            var requestMapper = new OwinRequestMapper();
-            var responseMapper = new OwinResponseMapper(_options);
-            var matcher = new MappingMatcher(_options, new RandomizerDoubleBetween0And1());
-            var guidUtils = new GuidUtils();
-
-            Action<IAppBuilder> startup = app =>
-            {
-                app.Use<GlobalExceptionMiddleware>(_options, responseMapper);
-                _options.PreWireMockMiddlewareInit?.Invoke(app);
-                app.Use<WireMockMiddleware>(_options, requestMapper, responseMapper, matcher, guidUtils);
-                _options.PostWireMockMiddlewareInit?.Invoke(app);
-            };
-
-            foreach (var url in Urls)
-            {
-                servers.Add(WebApp.Start(url, startup));
-            }
-
-            IsStarted = true;
-
-            // WaitHandle is signaled when the token is cancelled,
-            // which will be more efficient than Thread.Sleep in while loop
-            _cts.Token.WaitHandle.WaitOne();
-        }
-        catch (Exception e)
-        {
-            // Expose exception of starting host, otherwise it's hard to be troubleshooting if keeping quiet
-            // For example, WebApp.Start will fail with System.MissingMemberException if Microsoft.Owin.Host.HttpListener.dll is being located
-            // https://stackoverflow.com/questions/25090211/owin-httplistener-not-located/31369857
-            _runningException = e;
-            _logger.Error(e.ToString());
-        }
-        finally
-        {
-            IsStarted = false;
-            // Dispose all servers in finally block to make sure clean up allocated resource on error happening
-            servers.ForEach(s => s.Dispose());
-        }
-    }
-}
-#endif
--- a/src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs
@@ -1,368 +1,368 @@
 // Copyright © WireMock.Net

 using System;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Stef.Validation;
-using WireMock.Logging;
-using WireMock.Matchers;
-using WireMock.Http;
-using WireMock.Owin.Mappers;
-using WireMock.Serialization;
-using WireMock.ResponseBuilders;
-using WireMock.Settings;
-using System.Collections.Generic;
 using WireMock.Constants;
 using WireMock.Exceptions;
+using WireMock.Http;
+using WireMock.Logging;
+using WireMock.Matchers;
+using WireMock.Owin.Mappers;
+using WireMock.ResponseBuilders;
+using WireMock.Serialization;
+using WireMock.Settings;
 using WireMock.Util;
-#if !USE_ASPNETCORE
-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
+//#if !USE_ASPNETCORE
+//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

-namespace WireMock.Owin
+namespace WireMock.Owin;
+
+internal class WireMockMiddleware //: OwinMiddleware
 {
-    internal class WireMockMiddleware : OwinMiddleware
+    private readonly object _lock = new();
+    private static readonly Task CompletedTask = Task.FromResult(false);
+
+    private readonly IWireMockMiddlewareOptions _options;
+    private readonly IOwinRequestMapper _requestMapper;
+    private readonly IOwinResponseMapper _responseMapper;
+    private readonly IMappingMatcher _mappingMatcher;
+    private readonly LogEntryMapper _logEntryMapper;
+    private readonly IGuidUtils _guidUtils;
+
+    //#if !USE_ASPNETCORE
+    //        public WireMockMiddleware(
+    //            Next next,
+    //            IWireMockMiddlewareOptions options,
+    //            IOwinRequestMapper requestMapper,
+    //            IOwinResponseMapper responseMapper,
+    //            IMappingMatcher mappingMatcher,
+    //            IGuidUtils guidUtils
+    //        ) : base(next)
+    //        {
+    //            _options = Guard.NotNull(options);
+    //            _requestMapper = Guard.NotNull(requestMapper);
+    //            _responseMapper = Guard.NotNull(responseMapper);
+    //            _mappingMatcher = Guard.NotNull(mappingMatcher);
+    //            _logEntryMapper = new LogEntryMapper(options);
+    //            _guidUtils = Guard.NotNull(guidUtils);
+    //        }
+    //#else
+    public WireMockMiddleware(
+        RequestDelegate next,
+        IWireMockMiddlewareOptions options,
+        IOwinRequestMapper requestMapper,
+        IOwinResponseMapper responseMapper,
+        IMappingMatcher mappingMatcher,
+        IGuidUtils guidUtils
+    )
    {
-        private readonly object _lock = new();
-        private static readonly Task CompletedTask = Task.FromResult(false);
+        _options = Guard.NotNull(options);
+        _requestMapper = Guard.NotNull(requestMapper);
+        _responseMapper = Guard.NotNull(responseMapper);
+        _mappingMatcher = Guard.NotNull(mappingMatcher);
+        _logEntryMapper = new LogEntryMapper(options);
+        _guidUtils = Guard.NotNull(guidUtils);
+    }
+    //#endif

-        private readonly IWireMockMiddlewareOptions _options;
-        private readonly IOwinRequestMapper _requestMapper;
-        private readonly IOwinResponseMapper _responseMapper;
-        private readonly IMappingMatcher _mappingMatcher;
-        private readonly LogEntryMapper _logEntryMapper;
-        private readonly IGuidUtils _guidUtils;
-
-#if !USE_ASPNETCORE
-        public WireMockMiddleware(
-            Next next,
-            IWireMockMiddlewareOptions options,
-            IOwinRequestMapper requestMapper,
-            IOwinResponseMapper responseMapper,
-            IMappingMatcher mappingMatcher,
-            IGuidUtils guidUtils
-        ) : base(next)
+    //#if !USE_ASPNETCORE
+    //        public override Task Invoke(IContext ctx)
+    //#else
+    public Task Invoke(HttpContext ctx)
+    //#endif
+    {
+        if (_options.HandleRequestsSynchronously.GetValueOrDefault(false))
        {
-            _options = Guard.NotNull(options);
-            _requestMapper = Guard.NotNull(requestMapper);
-            _responseMapper = Guard.NotNull(responseMapper);
-            _mappingMatcher = Guard.NotNull(mappingMatcher);
-            _logEntryMapper = new LogEntryMapper(options);
-            _guidUtils = Guard.NotNull(guidUtils);
-        }
-#else
-        public WireMockMiddleware(
-            Next next,
-            IWireMockMiddlewareOptions options,
-            IOwinRequestMapper requestMapper,
-            IOwinResponseMapper responseMapper,
-            IMappingMatcher mappingMatcher,
-            IGuidUtils guidUtils
-        )
-        {
-            _options = Guard.NotNull(options);
-            _requestMapper = Guard.NotNull(requestMapper);
-            _responseMapper = Guard.NotNull(responseMapper);
-            _mappingMatcher = Guard.NotNull(mappingMatcher);
-            _logEntryMapper = new LogEntryMapper(options);
-            _guidUtils = Guard.NotNull(guidUtils);
-        }
-#endif
-
-#if !USE_ASPNETCORE
-        public override Task Invoke(IContext ctx)
-#else
-        public Task Invoke(IContext ctx)
-#endif
-        {
-            if (_options.HandleRequestsSynchronously.GetValueOrDefault(false))
+            lock (_lock)
            {
-                lock (_lock)
+                return InvokeInternalAsync(ctx);
+            }
+        }
+
+        return InvokeInternalAsync(ctx);
+    }
+
+    private async Task InvokeInternalAsync(HttpContext ctx)
+    {
+        var request = await _requestMapper.MapAsync(ctx.Request, _options).ConfigureAwait(false);
+
+        var logRequest = false;
+        IResponseMessage? response = null;
+        (MappingMatcherResult? Match, MappingMatcherResult? Partial) result = (null, null);
+
+        try
+        {
+            foreach (var mapping in _options.Mappings.Values)
+            {
+                if (mapping.Scenario is null)
                {
-                    return InvokeInternalAsync(ctx);
+                    continue;
+                }
+
+                // Set scenario start
+                if (!_options.Scenarios.ContainsKey(mapping.Scenario) && mapping.IsStartState)
+                {
+                    _options.Scenarios.TryAdd(mapping.Scenario, new ScenarioState
+                    {
+                        Name = mapping.Scenario
+                    });
                }
            }

-            return InvokeInternalAsync(ctx);
-        }
+            result = _mappingMatcher.FindBestMatch(request);

-        private async Task InvokeInternalAsync(IContext ctx)
-        {
-            var request = await _requestMapper.MapAsync(ctx.Request, _options).ConfigureAwait(false);
-
-            var logRequest = false;
-            IResponseMessage? response = null;
-            (MappingMatcherResult? Match, MappingMatcherResult? Partial) result = (null, null);
-
-            try
+            var targetMapping = result.Match?.Mapping;
+            if (targetMapping == null)
            {
-                foreach (var mapping in _options.Mappings.Values)
+                logRequest = true;
+                _options.Logger.Warn("HttpStatusCode set to 404 : No matching mapping found");
+                response = ResponseMessageBuilder.Create(HttpStatusCode.NotFound, WireMockConstants.NoMatchingFound);
+                return;
+            }
+
+            logRequest = targetMapping.LogMapping;
+
+            if (targetMapping.IsAdminInterface && _options.AuthenticationMatcher != null && request.Headers != null)
+            {
+                var authorizationHeaderPresent = request.Headers.TryGetValue(HttpKnownHeaderNames.Authorization, out var authorization);
+                if (!authorizationHeaderPresent)
                {
-                    if (mapping.Scenario is null)
-                    {
-                        continue;
-                    }
-
-                    // Set scenario start
-                    if (!_options.Scenarios.ContainsKey(mapping.Scenario) && mapping.IsStartState)
-                    {
-                        _options.Scenarios.TryAdd(mapping.Scenario, new ScenarioState
-                        {
-                            Name = mapping.Scenario
-                        });
-                    }
-                }
-
-                result = _mappingMatcher.FindBestMatch(request);
-
-                var targetMapping = result.Match?.Mapping;
-                if (targetMapping == null)
-                {
-                    logRequest = true;
-                    _options.Logger.Warn("HttpStatusCode set to 404 : No matching mapping found");
-                    response = ResponseMessageBuilder.Create(HttpStatusCode.NotFound, WireMockConstants.NoMatchingFound);
+                    _options.Logger.Error("HttpStatusCode set to 401, authorization header is missing.");
+                    response = ResponseMessageBuilder.Create(HttpStatusCode.Unauthorized, null);
                    return;
                }

-                logRequest = targetMapping.LogMapping;
-
-                if (targetMapping.IsAdminInterface && _options.AuthenticationMatcher != null && request.Headers != null)
+                var authorizationHeaderMatchResult = _options.AuthenticationMatcher.IsMatch(authorization!.ToString());
+                if (!MatchScores.IsPerfect(authorizationHeaderMatchResult.Score))
                {
-                    var authorizationHeaderPresent = request.Headers.TryGetValue(HttpKnownHeaderNames.Authorization, out var authorization);
-                    if (!authorizationHeaderPresent)
-                    {
-                        _options.Logger.Error("HttpStatusCode set to 401, authorization header is missing.");
-                        response = ResponseMessageBuilder.Create(HttpStatusCode.Unauthorized, null);
-                        return;
-                    }
+                    _options.Logger.Error("HttpStatusCode set to 401, authentication failed.", authorizationHeaderMatchResult.Exception ?? throw new WireMockException("Authentication failed"));
+                    response = ResponseMessageBuilder.Create(HttpStatusCode.Unauthorized, null);
+                    return;
+                }
+            }

-                    var authorizationHeaderMatchResult = _options.AuthenticationMatcher.IsMatch(authorization!.ToString());
-                    if (!MatchScores.IsPerfect(authorizationHeaderMatchResult.Score))
-                    {
-                        _options.Logger.Error("HttpStatusCode set to 401, authentication failed.", authorizationHeaderMatchResult.Exception ?? throw new WireMockException("Authentication failed"));
-                        response = ResponseMessageBuilder.Create(HttpStatusCode.Unauthorized, null);
-                        return;
-                    }
+            if (!targetMapping.IsAdminInterface && _options.RequestProcessingDelay > TimeSpan.Zero)
+            {
+                await Task.Delay(_options.RequestProcessingDelay.Value).ConfigureAwait(false);
+            }
+
+            var (theResponse, theOptionalNewMapping) = await targetMapping.ProvideResponseAsync(request).ConfigureAwait(false);
+            response = theResponse;
+
+            var responseBuilder = targetMapping.Provider as Response;
+
+            if (!targetMapping.IsAdminInterface && theOptionalNewMapping != null)
+            {
+                if (responseBuilder?.ProxyAndRecordSettings?.SaveMapping == true || targetMapping.Settings.ProxyAndRecordSettings?.SaveMapping == true)
+                {
+                    _options.Mappings.TryAdd(theOptionalNewMapping.Guid, theOptionalNewMapping);
                }

-                if (!targetMapping.IsAdminInterface && _options.RequestProcessingDelay > TimeSpan.Zero)
+                if (responseBuilder?.ProxyAndRecordSettings?.SaveMappingToFile == true || targetMapping.Settings.ProxyAndRecordSettings?.SaveMappingToFile == true)
                {
-                    await Task.Delay(_options.RequestProcessingDelay.Value).ConfigureAwait(false);
+                    var matcherMapper = new MatcherMapper(targetMapping.Settings);
+                    var mappingConverter = new MappingConverter(matcherMapper);
+                    var mappingToFileSaver = new MappingToFileSaver(targetMapping.Settings, mappingConverter);
+
+                    mappingToFileSaver.SaveMappingToFile(theOptionalNewMapping);
                }
+            }

-                var (theResponse, theOptionalNewMapping) = await targetMapping.ProvideResponseAsync(request).ConfigureAwait(false);
-                response = theResponse;
+            if (targetMapping.Scenario != null)
+            {
+                UpdateScenarioState(targetMapping);
+            }

-                var responseBuilder = targetMapping.Provider as Response;
+            if (!targetMapping.IsAdminInterface && targetMapping.Webhooks?.Length > 0)
+            {
+                await SendToWebhooksAsync(targetMapping, request, response).ConfigureAwait(false);
+            }
+        }
+        catch (Exception ex)
+        {
+            _options.Logger.Error($"Providing a Response for Mapping '{result.Match?.Mapping.Guid}' failed. HttpStatusCode set to 500. Exception: {ex}");
+            response = ResponseMessageBuilder.Create(500, ex.Message);
+        }
+        finally
+        {
+            var log = new LogEntry
+            {
+                Guid = _guidUtils.NewGuid(),
+                RequestMessage = request,
+                ResponseMessage = response,

-                if (!targetMapping.IsAdminInterface && theOptionalNewMapping != null)
+                MappingGuid = result.Match?.Mapping?.Guid,
+                MappingTitle = result.Match?.Mapping?.Title,
+                RequestMatchResult = result.Match?.RequestMatchResult,
+
+                PartialMappingGuid = result.Partial?.Mapping?.Guid,
+                PartialMappingTitle = result.Partial?.Mapping?.Title,
+                PartialMatchResult = result.Partial?.RequestMatchResult
+            };
+
+            LogRequest(log, logRequest);
+
+            try
+            {
+                if (_options.SaveUnmatchedRequests == true && result.Match?.RequestMatchResult is not { IsPerfectMatch: true })
                {
-                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMapping == true || targetMapping.Settings.ProxyAndRecordSettings?.SaveMapping == true)
-                    {
-                        _options.Mappings.TryAdd(theOptionalNewMapping.Guid, theOptionalNewMapping);
-                    }
-
-                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMappingToFile == true || targetMapping.Settings.ProxyAndRecordSettings?.SaveMappingToFile == true)
-                    {
-                        var matcherMapper = new MatcherMapper(targetMapping.Settings);
-                        var mappingConverter = new MappingConverter(matcherMapper);
-                        var mappingToFileSaver = new MappingToFileSaver(targetMapping.Settings, mappingConverter);
-
-                        mappingToFileSaver.SaveMappingToFile(theOptionalNewMapping);
-                    }
+                    var filename = $"{log.Guid}.LogEntry.json";
+                    _options.FileSystemHandler?.WriteUnmatchedRequest(filename, JsonUtils.Serialize(log));
                }
+            }
+            catch
+            {
+                // Empty catch
+            }

-                if (targetMapping.Scenario != null)
-                {
-                    UpdateScenarioState(targetMapping);
-                }
-
-                if (!targetMapping.IsAdminInterface && targetMapping.Webhooks?.Length > 0)
-                {
-                    await SendToWebhooksAsync(targetMapping, request, response).ConfigureAwait(false);
-                }
+            try
+            {
+                await _responseMapper.MapAsync(response, ctx.Response).ConfigureAwait(false);
            }
            catch (Exception ex)
            {
-                _options.Logger.Error($"Providing a Response for Mapping '{result.Match?.Mapping.Guid}' failed. HttpStatusCode set to 500. Exception: {ex}");
-                response = ResponseMessageBuilder.Create(500, ex.Message);
+                _options.Logger.Error("HttpStatusCode set to 404 : No matching mapping found", ex);
+
+                var notFoundResponse = ResponseMessageBuilder.Create(HttpStatusCode.NotFound, WireMockConstants.NoMatchingFound);
+                await _responseMapper.MapAsync(notFoundResponse, ctx.Response).ConfigureAwait(false);
            }
-            finally
+        }
+
+        await CompletedTask.ConfigureAwait(false);
+    }
+
+    private async Task SendToWebhooksAsync(IMapping mapping, IRequestMessage request, IResponseMessage response)
+    {
+        var tasks = new List<Func<Task>>();
+        for (int index = 0; index < mapping.Webhooks?.Length; index++)
+        {
+            var httpClientForWebhook = HttpClientBuilder.Build(mapping.Settings.WebhookSettings ?? new WebhookSettings());
+            var webhookSender = new WebhookSender(mapping.Settings);
+            var webhookRequest = mapping.Webhooks[index].Request;
+            var webHookIndex = index;
+
+            tasks.Add(async () =>
            {
-                var log = new LogEntry
-                {
-                    Guid = _guidUtils.NewGuid(),
-                    RequestMessage = request,
-                    ResponseMessage = response,
-
-                    MappingGuid = result.Match?.Mapping?.Guid,
-                    MappingTitle = result.Match?.Mapping?.Title,
-                    RequestMatchResult = result.Match?.RequestMatchResult,
-
-                    PartialMappingGuid = result.Partial?.Mapping?.Guid,
-                    PartialMappingTitle = result.Partial?.Mapping?.Title,
-                    PartialMatchResult = result.Partial?.RequestMatchResult
-                };
-
-                LogRequest(log, logRequest);
-
                try
                {
-                    if (_options.SaveUnmatchedRequests == true && result.Match?.RequestMatchResult is not { IsPerfectMatch: true })
+                    var result = await webhookSender.SendAsync(httpClientForWebhook, mapping, webhookRequest, request, response).ConfigureAwait(false);
+                    if (!result.IsSuccessStatusCode)
                    {
-                        var filename = $"{log.Guid}.LogEntry.json";
-                        _options.FileSystemHandler?.WriteUnmatchedRequest(filename, JsonUtils.Serialize(log));
+                        var content = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
+                        _options.Logger.Warn($"Sending message to Webhook [{webHookIndex}] from Mapping '{mapping.Guid}' failed. HttpStatusCode: {result.StatusCode} Content: {content}");
                    }
                }
-                catch
-                {
-                    // Empty catch
-                }
-
-                try
-                {
-                    await _responseMapper.MapAsync(response, ctx.Response).ConfigureAwait(false);
-                }
                catch (Exception ex)
                {
-                    _options.Logger.Error("HttpStatusCode set to 404 : No matching mapping found", ex);
-
-                    var notFoundResponse = ResponseMessageBuilder.Create(HttpStatusCode.NotFound, WireMockConstants.NoMatchingFound);
-                    await _responseMapper.MapAsync(notFoundResponse, ctx.Response).ConfigureAwait(false);
+                    _options.Logger.Error($"Sending message to Webhook [{webHookIndex}] from Mapping '{mapping.Guid}' failed. Exception: {ex}");
                }
-            }
-
-            await CompletedTask.ConfigureAwait(false);
+            });
        }

-        private async Task SendToWebhooksAsync(IMapping mapping, IRequestMessage request, IResponseMessage response)
+        if (mapping.UseWebhooksFireAndForget == true)
        {
-            var tasks = new List<Func<Task>>();
-            for (int index = 0; index < mapping.Webhooks?.Length; index++)
+            try
            {
-                var httpClientForWebhook = HttpClientBuilder.Build(mapping.Settings.WebhookSettings ?? new WebhookSettings());
-                var webhookSender = new WebhookSender(mapping.Settings);
-                var webhookRequest = mapping.Webhooks[index].Request;
-                var webHookIndex = index;
-
-                tasks.Add(async () =>
+                // Do not wait
+                await Task.Run(() =>
                {
-                    try
-                    {
-                        var result = await webhookSender.SendAsync(httpClientForWebhook, mapping, webhookRequest, request, response).ConfigureAwait(false);
-                        if (!result.IsSuccessStatusCode)
-                        {
-                            var content = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
-                            _options.Logger.Warn($"Sending message to Webhook [{webHookIndex}] from Mapping '{mapping.Guid}' failed. HttpStatusCode: {result.StatusCode} Content: {content}");
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        _options.Logger.Error($"Sending message to Webhook [{webHookIndex}] from Mapping '{mapping.Guid}' failed. Exception: {ex}");
-                    }
+                    Task.WhenAll(tasks.Select(async task => await task.Invoke())).ConfigureAwait(false);
                });
            }
-
-            if (mapping.UseWebhooksFireAndForget == true)
-            {
-                try
-                {
-                    // Do not wait
-                    await Task.Run(() =>
-                    {
-                        Task.WhenAll(tasks.Select(async task => await task.Invoke())).ConfigureAwait(false);
-                    });
-                }
-                catch
-                {
-                    // Ignore
-                }
-            }
-            else
-            {
-                await Task.WhenAll(tasks.Select(async task => await task.Invoke())).ConfigureAwait(false);
-            }
-        }
-
-        private void UpdateScenarioState(IMapping mapping)
-        {
-            var scenario = _options.Scenarios[mapping.Scenario!];
-
-            // Increase the number of times this state has been executed
-            scenario.Counter++;
-
-            // Only if the number of times this state is executed equals the required StateTimes, proceed to next state and reset the counter to 0
-            if (scenario.Counter == (mapping.TimesInSameState ?? 1))
-            {
-                scenario.NextState = mapping.NextState;
-                scenario.Counter = 0;
-            }
-
-            // Else just update Started and Finished
-            scenario.Started = true;
-            scenario.Finished = mapping.NextState == null;
-        }
-
-        private void LogRequest(LogEntry entry, bool addRequest)
-        {
-            _options.Logger.DebugRequestResponse(_logEntryMapper.Map(entry), entry.RequestMessage.Path.StartsWith("/__admin/"));
-
-            // If addRequest is set to true and MaxRequestLogCount is null or does have a value greater than 0, try to add a new request log.
-            if (addRequest && _options.MaxRequestLogCount is null or > 0)
-            {
-                TryAddLogEntry(entry);
-            }
-
-            // In case MaxRequestLogCount has a value greater than 0, try to delete existing request logs based on the count.
-            if (_options.MaxRequestLogCount is > 0)
-            {
-                var logEntries = _options.LogEntries.ToList();
-                foreach (var logEntry in logEntries.OrderBy(le => le.RequestMessage.DateTime).Take(logEntries.Count - _options.MaxRequestLogCount.Value))
-                {
-                    TryRemoveLogEntry(logEntry);
-                }
-            }
-
-            // In case RequestLogExpirationDuration has a value greater than 0, try to delete existing request logs based on the date.
-            if (_options.RequestLogExpirationDuration is > 0)
-            {
-                var checkTime = DateTime.UtcNow.AddHours(-_options.RequestLogExpirationDuration.Value);
-                foreach (var logEntry in _options.LogEntries.ToList().Where(le => le.RequestMessage.DateTime < checkTime))
-                {
-                    TryRemoveLogEntry(logEntry);
-                }
-            }
-        }
-
-        private void TryAddLogEntry(LogEntry logEntry)
-        {
-            try
-            {
-                _options.LogEntries.Add(logEntry);
-            }
            catch
            {
-                // Ignore exception (can happen during stress testing)
+                // Ignore
+            }
+        }
+        else
+        {
+            await Task.WhenAll(tasks.Select(async task => await task.Invoke())).ConfigureAwait(false);
+        }
+    }
+
+    private void UpdateScenarioState(IMapping mapping)
+    {
+        var scenario = _options.Scenarios[mapping.Scenario!];
+
+        // Increase the number of times this state has been executed
+        scenario.Counter++;
+
+        // Only if the number of times this state is executed equals the required StateTimes, proceed to next state and reset the counter to 0
+        if (scenario.Counter == (mapping.TimesInSameState ?? 1))
+        {
+            scenario.NextState = mapping.NextState;
+            scenario.Counter = 0;
+        }
+
+        // Else just update Started and Finished
+        scenario.Started = true;
+        scenario.Finished = mapping.NextState == null;
+    }
+
+    private void LogRequest(LogEntry entry, bool addRequest)
+    {
+        _options.Logger.DebugRequestResponse(_logEntryMapper.Map(entry), entry.RequestMessage.Path.StartsWith("/__admin/"));
+
+        // If addRequest is set to true and MaxRequestLogCount is null or does have a value greater than 0, try to add a new request log.
+        if (addRequest && _options.MaxRequestLogCount is null or > 0)
+        {
+            TryAddLogEntry(entry);
+        }
+
+        // In case MaxRequestLogCount has a value greater than 0, try to delete existing request logs based on the count.
+        if (_options.MaxRequestLogCount is > 0)
+        {
+            var logEntries = _options.LogEntries.ToList();
+            foreach (var logEntry in logEntries.OrderBy(le => le.RequestMessage.DateTime).Take(logEntries.Count - _options.MaxRequestLogCount.Value))
+            {
+                TryRemoveLogEntry(logEntry);
            }
        }

-        private void TryRemoveLogEntry(LogEntry logEntry)
+        // In case RequestLogExpirationDuration has a value greater than 0, try to delete existing request logs based on the date.
+        if (_options.RequestLogExpirationDuration is > 0)
        {
-            try
+            var checkTime = DateTime.UtcNow.AddHours(-_options.RequestLogExpirationDuration.Value);
+            foreach (var logEntry in _options.LogEntries.ToList().Where(le => le.RequestMessage.DateTime < checkTime))
            {
-                _options.LogEntries.Remove(logEntry);
-            }
-            catch
-            {
-                // Ignore exception (can happen during stress testing)
+                TryRemoveLogEntry(logEntry);
            }
        }
    }
-}
+
+    private void TryAddLogEntry(LogEntry logEntry)
+    {
+        try
+        {
+            _options.LogEntries.Add(logEntry);
+        }
+        catch
+        {
+            // Ignore exception (can happen during stress testing)
+        }
+    }
+
+    private void TryRemoveLogEntry(LogEntry logEntry)
+    {
+        try
+        {
+            _options.LogEntries.Remove(logEntry);
+        }
+        catch
+        {
+            // Ignore exception (can happen during stress testing)
+        }
+    }
+}
--- a/src/WireMock.Net.Minimal/Owin/WireMockMiddlewareOptions.cs
+++ b/src/WireMock.Net.Minimal/Owin/WireMockMiddlewareOptions.cs
@@ -8,13 +8,17 @@ using WireMock.Matchers;
 using WireMock.Types;
 using WireMock.Util;
 using System.Security.Cryptography.X509Certificates;
-
-#if !USE_ASPNETCORE
-using Owin;
-#else
-using IAppBuilder = Microsoft.AspNetCore.Builder.IApplicationBuilder;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Server.Kestrel.Https;
 using Microsoft.Extensions.DependencyInjection;
-#endif
+using ClientCertificateMode = Microsoft.AspNetCore.Server.Kestrel.Https.ClientCertificateMode;
+
+//#if !USE_ASPNETCORE
+//using Owin;
+//#else
+//using IAppBuilder = Microsoft.AspNetCore.Builder.IApplicationBuilder;
+//using Microsoft.Extensions.DependencyInjection;
+//#endif

 namespace WireMock.Owin;

@@ -38,11 +42,11 @@ internal class WireMockMiddlewareOptions : IWireMockMiddlewareOptions

    public int? MaxRequestLogCount { get; set; }

-    public Action<IAppBuilder>? PreWireMockMiddlewareInit { get; set; }
+    public Action<IApplicationBuilder>? PreWireMockMiddlewareInit { get; set; }

-    public Action<IAppBuilder>? PostWireMockMiddlewareInit { get; set; }
+    public Action<IApplicationBuilder>? PostWireMockMiddlewareInit { get; set; }

-#if USE_ASPNETCORE
+//#if USE_ASPNETCORE
    public Action<IServiceCollection>? AdditionalServiceRegistration { get; set; }

    public CorsPolicyOptions? CorsPolicyOptions { get; set; }
@@ -51,7 +55,7 @@ internal class WireMockMiddlewareOptions : IWireMockMiddlewareOptions

    /// <inheritdoc />
    public bool AcceptAnyClientCertificate { get; set; }
-#endif
+    //#endif

    /// <inheritdoc cref="IWireMockMiddlewareOptions.FileSystemHandler"/>
    public IFileSystemHandler? FileSystemHandler { get; set; }
--- a/src/WireMock.Net.Minimal/Proxy/ProxyHelper.cs
+++ b/src/WireMock.Net.Minimal/Proxy/ProxyHelper.cs
@@ -13,16 +13,10 @@ using WireMock.Util;

 namespace WireMock.Proxy;

-internal class ProxyHelper
+internal class ProxyHelper(WireMockServerSettings settings)
 {
-    private readonly WireMockServerSettings _settings;
-    private readonly ProxyMappingConverter _proxyMappingConverter;
-
-    public ProxyHelper(WireMockServerSettings settings)
-    {
-        _settings = Guard.NotNull(settings);
-        _proxyMappingConverter = new ProxyMappingConverter(settings, new GuidUtils(), new DateTimeUtils());
-    }
+    private readonly WireMockServerSettings _settings = Guard.NotNull(settings);
+    private readonly ProxyMappingConverter _proxyMappingConverter = new(settings, new GuidUtils(), new DateTimeUtils());

    public async Task<(IResponseMessage Message, IMapping? Mapping)> SendAsync(
        IMapping? mapping,
@@ -39,18 +33,7 @@ internal class ProxyHelper
        var requiredUri = new Uri(url);

        // Create HttpRequestMessage
-        var replaceSettings = proxyAndRecordSettings.ReplaceSettings;
-        string proxyUrl;
-        if (replaceSettings is not null)
-        {
-            var stringComparison = replaceSettings.IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal;
-            proxyUrl = url.Replace(replaceSettings.OldValue, replaceSettings.NewValue, stringComparison);
-        }
-        else
-        {
-            proxyUrl = url;
-        }
-
+        var proxyUrl = proxyAndRecordSettings.ReplaceSettings != null ? ProxyUrlTransformer.Transform(_settings, proxyAndRecordSettings.ReplaceSettings, url) : url;
        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, proxyUrl);

        // Call the URL
--- a/src/WireMock.Net.Minimal/Proxy/ProxyUrlTransformer.cs
+++ b/src/WireMock.Net.Minimal/Proxy/ProxyUrlTransformer.cs
@@ -0,0 +1,21 @@
+// Copyright © WireMock.Net
+
+using System;
+using WireMock.Settings;
+using WireMock.Transformers;
+
+namespace WireMock.Proxy;
+
+internal static class ProxyUrlTransformer
+{
+    internal static string Transform(WireMockServerSettings settings, ProxyUrlReplaceSettings replaceSettings, string url)
+    {
+        if (!replaceSettings.UseTransformer)
+        {
+            return url.Replace(replaceSettings.OldValue, replaceSettings.NewValue, replaceSettings.IgnoreCase ? StringComparison.OrdinalIgnoreCase : StringComparison.Ordinal);
+        }
+        
+        var transformer = TransformerFactory.Create(replaceSettings.TransformerType, settings);
+        return transformer.Transform(replaceSettings.TransformTemplate, url);
+    }
+}
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.WithBody.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.WithBody.cs
@@ -34,13 +34,6 @@ public partial class Request
        return this;
    }

-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        var matcher = body as IMatcher ?? new JsonMatcher(matchBehaviour, body);
-        return WithBody([matcher]);
-    }
-
    /// <inheritdoc />
    public IRequestBuilder WithBody(IMatcher matcher)
    {
@@ -98,4 +91,20 @@ public partial class Request
        _requestMatchers.Add(new RequestMessageBodyMatcher(Guard.NotNull(func)));
        return this;
    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        var matcher = body as IMatcher ?? new JsonMatcher(matchBehaviour, body);
+        return WithBody([matcher]);
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsType<T>(Func<T?, bool> func)
+    {
+        Guard.NotNull(func);
+
+        _requestMatchers.Add(new RequestMessageBodyMatcher<T>(func));
+        return this;
+    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	276f329eed	mm	2026-01-05 21:38:14 +01:00
Stef Heyenrath	f5d53453e5	1.23.0	2026-01-05 21:34:11 +01:00
samlatham	0e60e3f3f9	Fix: Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers (#1416 ) Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers so that optional handlebars helpers can be enabled. Co-authored-by: Sam Latham <sam.latham@citrix.com>	2026-01-05 21:24:48 +01:00
Luca Ma	9cee6dde00	Pass the parameter matchOperator in Request.WithPath to its inner calls (#1414 ) Co-authored-by: Luca Ma <lucama@microsoft.com>	2026-01-04 08:03:19 +01:00
Stef Heyenrath	c88e7378a7	1.22.0	2026-01-02 21:30:59 +01:00
Vadim Hatsura	b090296559	chore(testcontainers): bump up Testcontainers to version 4.10.0 (#1412 )	2026-01-02 21:25:28 +01:00
Stef Heyenrath	e5afd69f7c	1.21.0	2025-12-25 15:00:54 +01:00
Stef Heyenrath	3b3f3604f7	Merge branch 'master' into version-2.x	2025-12-25 13:57:44 +01:00
Stef Heyenrath	f38133d7a4	Fix readyness-check for Testcontainers (#1408 ) * Add XUnit Logging to TestcontainersTests * .	2025-12-25 13:56:29 +01:00
Stef Heyenrath	d311813851	Merge branch 'master' into version-2.x	2025-12-24 17:00:27 +01:00
Stef Heyenrath	597c95000e	vmImage: 'windows-2025' (#1407 )	2025-12-24 16:59:02 +01:00
Stef Heyenrath	c8e1c66bf2	Merge branch 'master' into version-2.x	2025-12-24 15:30:29 +01:00
Stef Heyenrath	4617b99c30	[Collection("Grpc")]	2025-12-24 12:32:56 +01:00
Stef Heyenrath	76d6f92be2	mm	2025-12-24 12:18:53 +01:00
Stef Heyenrath	ffd4d89946	Re-enable TestcontainersTestsGrpc (#1406 ) * Re-enable TestcontainersTestsGrpc * //[Collection("Grpc")]	2025-12-24 12:16:56 +01:00
Stef Heyenrath	2d46c86f47	1.20.0	2025-12-24 10:11:53 +01:00
Stef Heyenrath	75f4fbe9d0	Fix Testcontainers AddProtoDefinition (#1405 ) * Fix Testcontainers AddProtoDefinition * . * UntilHttpRequestIsSucceeded * WireMockContainer.ContainerPort * System.Net/System.Net.Http * ... * WithWaitStrategy * MaxHealthCheckRetries * for * _adminApi * static * ... * testOutputHelper.WriteLine("Dumping WireMock logs:"); * Console.WriteLine( * testOutputHelper.WriteLine("Dumping WireMock.Net mappings:"); * fix WithWaitStrategy * [Fact] * <PackageReference Include="ProtoBufJsonConverter" Version="0.11.0" /> * [Collection("Grpc")] / [Fact(Skip = "TODO")] * ...	2025-12-24 10:09:30 +01:00
Stef Heyenrath	3f349cca4c	WireMock.Net.NUnit	2025-12-21 10:17:13 +01:00
Stef Heyenrath	19b85c7856	Merge branch 'master' into version-2.x	2025-12-21 09:50:31 +01:00
Stef Heyenrath	16e3872402	Run the Grpc TestcontainersTests sequential (#1402 )	2025-12-21 09:40:16 +01:00
Stef Heyenrath	da912be37e	mm	2025-12-20 13:46:11 +01:00
Stef Heyenrath	4c797c328f	Add WireMock.Net.NUnit project (#1400 ) * Add WireMock.Net.NUnit project * <Version>0.0.1-preview-01</Version> * --v	2025-12-20 13:43:54 +01:00
Stef Heyenrath	ca9fceab67	mm	2025-12-20 12:10:45 +01:00
Stef Heyenrath	a5e75a7278	Fix Grpc tests (#1401 ) * Fix some Grpc tests * await Task.Delay(1000); * ports	2025-12-20 12:08:41 +01:00
Stef Heyenrath	56f65c19e2	Upgrade RamlToOpenApiConverter and YamlDotNet (#1399 ) * Upgrade RamlToOpenApiConverter and YamlDotNet * fix	2025-12-19 18:33:58 +01:00
Stef Heyenrath	c662bb7ad5	mm	2025-12-19 17:56:26 +01:00
Stef Heyenrath	6aef4816a5	WireMockServer_WithRequiredClientCertificates_Should_Work_Correct --> IgnoreOnContinuousIntegrationFact	2025-12-19 17:52:20 +01:00
Stef Heyenrath	197a211a52	TestcontainersTests	2025-12-13 11:48:48 +01:00
Stef Heyenrath	7d6fd35716	Merge branch 'master' into version-2.x	2025-12-12 11:19:09 +01:00
Stef Heyenrath	3cfeec6035	1.19.0	2025-12-12 11:16:38 +01:00
Stef Heyenrath	b57d5e7548	WireMockContainerBuilder: allow only docker images named wiremock (#1392 )	2025-12-11 22:21:39 +01:00
Stef Heyenrath	36b89afce5	fix CI link in Readme	2025-12-11 11:25:28 +01:00
Stef Heyenrath	e2acac55a4	Update WireMockContainerBuilder (WithImage and WithCustomImage) (#1391 ) * Update WireMockContainerBuilder (WithImage and WithCustomImage) * .	2025-12-11 10:55:31 +01:00
Stef Heyenrath	ceabd27ce0	1.18.0	2025-12-09 18:28:28 +01:00
Stef Heyenrath	1b0b42d538	Merge branch 'master' into version-2.x	2025-12-08 19:16:51 +01:00
Stef Heyenrath	f8e2c7ee90	Add WithBodyAsType to RequestMatcher (#1388 ) * Add WithBody<T> * . * t * t2	2025-12-08 19:15:14 +01:00
Stef Heyenrath	c25d8f33d2	1.17.0	2025-12-07 10:55:07 +01:00
Stef Heyenrath	5f7b50a5b8	mm	2025-12-07 10:52:17 +01:00
Stef Heyenrath	6da190e596	Aspire: Add WithProtoDefinition to support proto definition at server level (#1383 ) * Add property UseHttp2 to WireMockServerArguments * . * additionalUrls * ok? * WireMockServerArguments * fx * AddProtoDefinition * ... * FIX * Always add the lifecycle hook to support dynamic mappings and proto definitions	2025-12-07 10:50:11 +01:00
Stef Heyenrath	44388ce80d	Fix random delay in mapping json file (#1386 )	2025-11-25 20:54:06 +01:00
Stef Heyenrath	5e25ca767d	Fix BuildId (#1384 )	2025-11-23 11:19:39 +01:00
Stef Heyenrath	0cc583a4a3	WireMock.Net.xUnit.v3 (netstandard2.0)	2025-11-18 18:52:07 +01:00
Stef Heyenrath	f9633adac1	1.16.0	2025-11-18 18:45:12 +01:00
Stef Heyenrath	37bad618a3	Add WireMock.Net.xUnit.v3 project (#1380 ) * Add WireMock.Net.xUnit.v3 project * .	2025-11-18 18:42:28 +01:00
Stef Heyenrath	2e37e822a8	Merge branch 'master' into version-2.x	2025-11-17 20:15:20 +01:00
Johannes Häggqvist	8e69f36f04	Add WireMockHealthCheck in WireMock.Net.Aspire (#1375 ) * Add WireMockHealthCheck For use with Aspire, to make WaitFor(wiremock) more useful. Calls /__admin/health and checks the result, as well as checks if mappings using AdminApiMappingBuilder has been submitted to the server. This created a catch-22 problem where the mappings were not submitted until the health check was healthy, but the health check was not healthy until the mappings were submitted. To avoid this, the WireMockServerLifecycleHook class has been slightly re-arranged, and is now using the AfterEndpointsAllocatedAsync callback rather than the AfterResourcesCreatedAsync callback. Within which a separate Task is created that waits until the server is ready and submits the mappings. * Move WireMockMappingState to its own file * Dispose the cancellation tokens in WireMockServerLifecycleHook	2025-11-17 20:14:42 +01:00
Stef Heyenrath	21601889e0	Check if the path is valid when using WithPath(...) (#1377 )	2025-11-08 09:02:00 +01:00
Stef Heyenrath	dfeabf228e	WireMock.Net.OpenApiParser : support Examples (#1366 )	2025-11-08 07:45:38 +01:00
Stef Heyenrath	1feb0ade70	Fix wiki links (#1373 ) * Change all links from wiki to documention website * . * doc * ws	2025-10-26 10:13:58 +01:00
Stef Heyenrath	1bc693512f	HashSet	2025-10-22 12:26:39 +02:00
Stef Heyenrath	398dfe3eff	mm	2025-10-22 11:01:42 +02:00
Stef Heyenrath	8b1bd1b21b	1.15.0	2025-10-22 10:58:44 +02:00
Michi	c1b23b615e	Support Testcontainers 4.8.0 (#1370 )	2025-10-22 10:18:16 +02:00
Stef Heyenrath	5885324dfb	Fix WithProbability logic (#1367 ) * Fix WithProbability logic * . * FIX * Update src/WireMock.Net.Minimal/Owin/MappingMatcher.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-10-22 10:16:59 +02:00
Tom Akehurst	e3f3e0a8f2	Tweaked docs message in README	2025-10-13 20:29:29 +01:00
Tom Akehurst	685d28db0b	Added link to new doc site from README.md	2025-10-13 20:23:18 +01:00
Stef Heyenrath	02228e5f8a	mm	2025-10-06 17:08:28 +02:00
Stef Heyenrath	f6c5225fe0	1.14.0	2025-10-06 17:00:19 +02:00
Stef Heyenrath	27d1a4b494	mm	2025-10-06 09:18:20 +02:00
Stef Heyenrath	b9019a2f61	Update ProxyUrlReplaceSettingsModel with TransformTemplate property (#1362 ) * Update ProxyUrlReplaceSettingsModel with TransformTemplate property + parse settings correctly * oldValue nullable * <Version>1.14.0-preview-01</Version>	2025-10-06 09:16:25 +02:00
Stef	3e170778c8	HttpClientBuilder / ssl3	2025-10-05 16:55:22 +02:00
Stef Heyenrath	b82dad2563	Add Tls13 (#1363 ) * Add Tls13 * fix	2025-10-05 15:51:47 +02:00
Stef	9fa1f4081e	mm	2025-10-05 15:19:18 +02:00
Stef Heyenrath	45d4e7077d	1.13.0	2025-09-28 12:44:14 +02:00
Stef Heyenrath	19e95325fa	ProxyUrlTransformer (#1361 ) * ProxyUrlTransformer * tests * Update src/WireMock.Net.Shared/Settings/ProxyUrlReplaceSettings.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-09-28 12:40:33 +02:00
Stef Heyenrath	37e140b342	#endif	2025-09-07 19:51:42 +02:00
Stef Heyenrath	4fd3ee1dfd	.	2025-08-31 12:51:33 +02:00
Stef Heyenrath	5b43a4f341	NO ConfigureAwait(false) + cleanup	2025-08-31 12:39:51 +02:00
Stef Heyenrath	0960d7cebd	openapi	2025-08-31 12:21:21 +02:00
Stef Heyenrath	b111b019bc	cleanup + fix tests for net8	2025-08-31 11:39:03 +02:00
Stef Heyenrath	bb561c94d0	cleanup some #if for NETSTANDARD1_3	2025-08-31 11:07:25 +02:00
Stef Heyenrath	5c221ff4fa	12	2025-08-31 10:03:51 +02:00
Stef Heyenrath	3077e7bee1	Setup .NET 9	2025-08-31 09:43:48 +02:00
Stef Heyenrath	ec54599827	mm + ...	2025-08-31 09:21:08 +02:00
Stef Heyenrath	371bfdc160	TypeLoader: implement Try methods (#1358 ) * TypeLoader: implement Try methods * fix	2025-08-31 08:48:29 +02:00
Stef Heyenrath	5c5e104f2c	1.12.0	2025-08-30 11:49:20 +02:00
Stef Heyenrath	068fdf33e3	Upgrade Testcontainers to 4.7.0 (#1357 ) * Upgrade Testcontainers to 4.7.0 * .	2025-08-30 11:46:52 +02:00
Stef Heyenrath	034766a2d6	Version 2.x	2025-08-30 10:24:07 +02:00
Stef Heyenrath	358590918e	1.11.2	2025-08-27 10:25:31 +02:00
Stef Heyenrath	32afea5d30	Revert JetBrains.Annotations and add System.Text.RegularExpressions to solve CVE (#1355 )	2025-08-27 10:04:36 +02:00
Stef Heyenrath	50b3d58a01	1.11.1	2025-08-27 08:47:58 +02:00
Stef Heyenrath	35bf5e94a5	Add System.Net.Http again to solve CVE warning (#1354 )	2025-08-27 08:45:24 +02:00
Stef Heyenrath	9fcc9ade10	Add additional try-catch to TypeLoader logic (#1352 )	2025-08-27 08:33:01 +02:00
Stef Heyenrath	865bbf2432	WireMock.Net.ProtoBuf: fix version	2025-08-26 15:42:23 +02:00