1.6.4

Add WireMock.Net.TUnit project (#1179 )
* Add WireMock.Net.TUnit project * fix * . * fix * bd * 0.1.812 * dotnet test * 0.1.817 * cat * type * type2 * find * -- --diagnostic * --no-build * fix?
2026-01-13 13:53:34 +01:00 · 2024-09-25 08:56:44 +02:00 · 2024-09-25 08:52:40 +02:00 · 2024-09-20 15:20:38 +02:00 · 2024-09-20 15:20:25 +02:00 · 2024-09-20 13:52:45 +02:00
88 changed files with 1709 additions and 576 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,9 @@ jobs:
    - uses: actions/checkout@v4

    - name: 'Execute Tests'
-      run: dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0    
+      run: |
+        dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0
+        dotnet test './test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj' -c Release --framework net8.0

  linux-build-and-run:
    name: Run Tests on Linux
@@ -33,7 +35,9 @@ jobs:
    - uses: actions/checkout@v4

    - name: 'Execute Tests'
-      run: dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0
+      run: |
+        dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0
+        dotnet test './test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj' -c Release --framework net8.0

    - name: Install .NET Aspire workload
      run: dotnet workload install aspire
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,40 @@
+# 1.6.4 (25 September 2024)
+- [#1169](https://github.com/WireMock-Net/WireMock.Net/pull/1169) - Allow mapping without Path or Url [bug] contributed by [StefH](https://github.com/StefH)
+- [#1170](https://github.com/WireMock-Net/WireMock.Net/pull/1170) - Update the .NET Aspire tests [feature] contributed by [StefH](https://github.com/StefH)
+- [#1172](https://github.com/WireMock-Net/WireMock.Net/pull/1172) - Fix JSON parsing of text/plain content type [bug] contributed by [ruxo](https://github.com/ruxo)
+- [#1177](https://github.com/WireMock-Net/WireMock.Net/pull/1177) - Unpin Testcontainers version and upgrade to version 3.10.0 [bug] contributed by [StefH](https://github.com/StefH)
+- [#1178](https://github.com/WireMock-Net/WireMock.Net/pull/1178) - Upgrade CS-Script to version 4.8.17 [feature] contributed by [StefH](https://github.com/StefH)
+- [#1179](https://github.com/WireMock-Net/WireMock.Net/pull/1179) - Add WireMock.Net.TUnit project [feature] contributed by [StefH](https://github.com/StefH)
+- [#1146](https://github.com/WireMock-Net/WireMock.Net/issues/1146) - Bump Request CS-Script 4.8.13 to 4.8.17 [feature]
+- [#1167](https://github.com/WireMock-Net/WireMock.Net/issues/1167) - Admin API fails to create a mapping with Request Header matching using WildCardMatcher [bug]
+- [#1168](https://github.com/WireMock-Net/WireMock.Net/issues/1168) - Numbers in text/plain content is parsed as JSON. [bug]
+- [#1176](https://github.com/WireMock-Net/WireMock.Net/issues/1176) - WireMock.NET TestContainer Dependency Constraint Issue [bug]
+
+# 1.6.3 (07 September 2024)
+- [#1165](https://github.com/WireMock-Net/WireMock.Net/pull/1165) - Fix listen on AnyIP for url 0.0.0.0 contributed by [cocoon](https://github.com/cocoon)
+- [#1154](https://github.com/WireMock-Net/WireMock.Net/issues/1154) - Listen on all ips [bug]
+
+# 1.6.2 (04 September 2024)
+- [#1152](https://github.com/WireMock-Net/WireMock.Net/pull/1152) - Update MappingConverter to correctly write the Matcher as C# code [bug] contributed by [StefH](https://github.com/StefH)
+- [#1163](https://github.com/WireMock-Net/WireMock.Net/pull/1163) - Upgrade Aspire to version 8.2.0 [feature] contributed by [StefH](https://github.com/StefH)
+- [#1166](https://github.com/WireMock-Net/WireMock.Net/pull/1166) - Also update IWireMockMiddlewareOptions when settings are updated via admin interface [bug] contributed by [StefH](https://github.com/StefH)
+- [#1151](https://github.com/WireMock-Net/WireMock.Net/issues/1151) - MappingsToCSharpCode should use RegexMatcher when specified [bug]
+- [#1164](https://github.com/WireMock-Net/WireMock.Net/issues/1164) - WithParam not working. [bug]
+
+# 1.6.1 (22 August 2024)
+- [#1160](https://github.com/WireMock-Net/WireMock.Net/pull/1160) - Use default timeout for Regex [bug] contributed by [StefH](https://github.com/StefH)
+- [#1159](https://github.com/WireMock-Net/WireMock.Net/issues/1159) - RegexMatchTimeoutException when trying to parse HTTP version [bug]
+
+# 1.6.0 (16 August 2024)
+- [#1042](https://github.com/WireMock-Net/WireMock.Net/pull/1042) - Update + add fluent builder methods [feature] contributed by [StefH](https://github.com/StefH)
+- [#1109](https://github.com/WireMock-Net/WireMock.Net/pull/1109) - Add Aspire Extension [feature] contributed by [StefH](https://github.com/StefH)
+- [#1148](https://github.com/WireMock-Net/WireMock.Net/pull/1148) - Use Guid.TryParseExact with format &quot;D&quot; contributed by [StefH](https://github.com/StefH)
+- [#1157](https://github.com/WireMock-Net/WireMock.Net/pull/1157) - Fix FormUrlEncodedMatcher (MatchOperator.And) [bug] contributed by [StefH](https://github.com/StefH)
+- [#1158](https://github.com/WireMock-Net/WireMock.Net/pull/1158) - Allow setting Content-Length header on the response [feature] contributed by [StefH](https://github.com/StefH)
+- [#720](https://github.com/WireMock-Net/WireMock.Net/issues/720) - Response Header Content-Length not available when call HEAD Method [feature]
+- [#1145](https://github.com/WireMock-Net/WireMock.Net/issues/1145) - Response is auto converting string to guid [bug]
+- [#1156](https://github.com/WireMock-Net/WireMock.Net/issues/1156) - FormUrlEncodedMatcher is not requiring to match all properties when MatchOperator.And  [bug]
+
 # 1.5.62 (27 July 2024)
 - [#1147](https://github.com/WireMock-Net/WireMock.Net/pull/1147) - Add FormUrlEncodedMatcher [feature] contributed by [StefH](https://github.com/StefH)
 - [#1143](https://github.com/WireMock-Net/WireMock.Net/issues/1143) - FormEncoded Request fails (404 Not Found) if key value pairs order in mapping is different from request body order [bug]
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <VersionPrefix>1.5.62</VersionPrefix>
+        <VersionPrefix>1.6.4</VersionPrefix>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -44,12 +44,12 @@
    </Choose>

    <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2023.3.0" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2024.2.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="9.29.0.95321">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes

-SET version=1.5.62
+SET version=1.6.4

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

--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,5 +1,13 @@
-# 1.5.62 (27 July 2024)
- #1147 Add FormUrlEncodedMatcher [feature]
- #1143 FormEncoded Request fails (404 Not Found) if key value pairs order in mapping is different from request body order [bug]
+# 1.6.4 (25 September 2024)
+- #1169 Allow mapping without Path or Url [bug]
+- #1170 Update the .NET Aspire tests [feature]
+- #1172 Fix JSON parsing of text/plain content type [bug]
+- #1177 Unpin Testcontainers version and upgrade to version 3.10.0 [bug]
+- #1178 Upgrade CS-Script to version 4.8.17 [feature]
+- #1179 Add WireMock.Net.TUnit project [feature]
+- #1146 Bump Request CS-Script 4.8.13 to 4.8.17 [feature]
+- #1167 Admin API fails to create a mapping with Request Header matching using WildCardMatcher [bug]
+- #1168 Numbers in text/plain content is parsed as JSON. [bug]
+- #1176 WireMock.NET TestContainer Dependency Constraint Issue [bug]

 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -39,16 +39,16 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co

 | | Official | Preview [:information_source:](https://github.com/WireMock-Net/WireMock.Net/wiki/MyGet-preview-versions) |
 | - | - | - |
-| &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
-| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
-| &nbsp;&nbsp;**WireMock.Net.FluentAssertions** | [![NuGet Badge WireMock.Net.FluentAssertions](https://buildstats.info/nuget/WireMock.Net.FluentAssertions)](https://www.nuget.org/packages/WireMock.Net.FluentAssertions) | [![MyGet Badge WireMock.Net.FluentAssertions](https://buildstats.info/myget/wiremock-net/WireMock.Net.FluentAssertions?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.FluentAssertions)
-| &nbsp;&nbsp;**WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://buildstats.info/nuget/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://buildstats.info/myget/wiremock-net/WireMock.Net.Matchers.CSharpCode?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
-| &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/nuget/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/myget/wiremock-net/WireMock.Net.OpenApiParser?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
-| &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
-| &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://buildstats.info/nuget/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://buildstats.info/myget/wiremock-net/WireMock.Net.xUnit?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
-| &nbsp;&nbsp;**WireMock.Net.Testcontainers** | [![NuGet Badge WireMock.Net.Testcontainers](https://buildstats.info/nuget/WireMock.Net.Testcontainers)](https://www.nuget.org/packages/WireMock.Net.Testcontainers) | [![MyGet Badge WireMock.Net.Testcontainers](https://buildstats.info/myget/wiremock-net/WireMock.Net.Testcontainers?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Testcontainers)
-| &nbsp;&nbsp;**WireMock.Net.Aspire** | [![NuGet Badge WireMock.Net.Aspire](https://buildstats.info/nuget/WireMock.Net.Aspire)](https://www.nuget.org/packages/WireMock.Net.Aspire) | [![MyGet Badge WireMock.Net.Aspire](https://buildstats.info/myget/wiremock-net/WireMock.Net.Aspire?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Aspire)
-| &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://buildstats.info/nuget/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Org.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)
+| &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.StandAlone** | [![NuGet Badge WireMock.Net](https://img.shields.io/nuget/v/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.StandAlone?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
+| &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.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)
+| &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/nuget/v/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.OpenApiParser?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
+| &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://img.shields.io/nuget/v/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
+| &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.Testcontainers** | [![NuGet Badge WireMock.Net.Testcontainers](https://img.shields.io/nuget/v/WireMock.Net.Testcontainers)](https://www.nuget.org/packages/WireMock.Net.Testcontainers) | [![MyGet Badge WireMock.Net.Testcontainers](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Testcontainers?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Testcontainers)
+| &nbsp;&nbsp;**WireMock.Net.Aspire** | [![NuGet Badge WireMock.Net.Aspire](https://img.shields.io/nuget/v/WireMock.Net.Aspire)](https://www.nuget.org/packages/WireMock.Net.Aspire) | [![MyGet Badge WireMock.Net.Aspire](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Aspire?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Aspire)
+| &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://img.shields.io/nuget/v/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Org.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)


 ## :memo: Development
--- a/Solution.sln
+++ b/Solution.sln
@@ -131,6 +131,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Aspire.TestApp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspireApp1.AppHostOriginal", "examples-Aspire\AspireApp1.AppHostOriginal\AspireApp1.AppHostOriginal.csproj", "{C9210DA3-F390-4598-8512-349A473FE9C9}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.TUnit", "src\WireMock.Net.TUnit\WireMock.Net.TUnit.csproj", "{91024A93-848F-4A02-AF53-5EBE5834E23C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.TUnitTests", "test\WireMock.Net.TUnitTests\WireMock.Net.TUnitTests.csproj", "{4CD237F7-B616-46B8-872F-E49B4BBB3EAE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -317,6 +321,14 @@ Global
 		{C9210DA3-F390-4598-8512-349A473FE9C9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C9210DA3-F390-4598-8512-349A473FE9C9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C9210DA3-F390-4598-8512-349A473FE9C9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91024A93-848F-4A02-AF53-5EBE5834E23C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91024A93-848F-4A02-AF53-5EBE5834E23C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91024A93-848F-4A02-AF53-5EBE5834E23C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91024A93-848F-4A02-AF53-5EBE5834E23C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4CD237F7-B616-46B8-872F-E49B4BBB3EAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4CD237F7-B616-46B8-872F-E49B4BBB3EAE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4CD237F7-B616-46B8-872F-E49B4BBB3EAE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4CD237F7-B616-46B8-872F-E49B4BBB3EAE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -369,6 +381,8 @@ Global
 		{CE602F57-FEF8-4559-A9E0-6200BE1BF398} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{F1B5999D-D22E-48A6-AB86-18A7876BD32E} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{C9210DA3-F390-4598-8512-349A473FE9C9} = {AD474543-0715-49F2-A284-936B060BF736}
+		{91024A93-848F-4A02-AF53-5EBE5834E23C} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{4CD237F7-B616-46B8-872F-E49B4BBB3EAE} = {0BB8B634-407A-4610-A91F-11586990767A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/Solution.sln.DotSettings
+++ b/Solution.sln.DotSettings
@@ -33,6 +33,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Guids/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Levenstein/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=openapi/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pacticipant/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=protobuf/@EntryIndexedValue">True</s:Boolean>
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -38,7 +38,7 @@ jobs:
  
  # See: https://docs.sonarsource.com/sonarcloud/enriching/test-coverage/dotnet-test-coverage
  - script: |
-      dotnet sonarscanner begin /k:"WireMock-Net_WireMock.Net" /o:"wiremock-net" /d:sonar.branch.name=$(Build.SourceBranchName) /d:sonar.host.url="https://sonarcloud.io" /d:sonar.token="$(SONAR_TOKEN)" /d:sonar.pullrequest.provider=github /d:sonar.dotnet.excludeTestProjects=true /d:sonar.cs.vscoveragexml.reportsPaths=**/wiremock-coverage-*.xml /d:sonar.verbose=true
+      dotnet sonarscanner begin /k:"WireMock-Net_WireMock.Net" /o:"wiremock-net" /d:sonar.branch.name=$(Build.SourceBranchName) /d:sonar.host.url="https://sonarcloud.io" /d:sonar.token="$(SONAR_TOKEN)" /d:sonar.pullrequest.provider=github /d:sonar.cs.vscoveragexml.reportsPaths=**/wiremock-coverage-*.xml /d:sonar.verbose=true
    displayName: 'Begin analysis on SonarCloud'
    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
  
@@ -52,9 +52,15 @@ jobs:
  - task: CmdLine@2
    inputs:
      script: |
-          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-1.xml"
-          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj --configuration Debug --no-build" -f xml -o "wiremock-coverage-2.xml"
-    displayName: 'Execute Unit Tests with Coverage'
+          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-xunit.xml"
+          dotnet-coverage collect "dotnet test ./test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-tunit.xml"
+    displayName: 'Execute WireMock.Net.Tests with Coverage'
+
+  - task: CmdLine@2
+    inputs:
+      script: |
+          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj --configuration Debug --no-build" -f xml -o "wiremock-coverage-aspire.xml"
+    displayName: 'Execute WireMock.Net.Aspire.Tests with Coverage'

  - task: CmdLine@2
    displayName: 'Merge coverage files'
--- a/examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
+++ b/examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
@@ -17,7 +17,7 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="8.0.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="8.2.0" />
    </ItemGroup>

 </Project>
--- a/examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj
+++ b/examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj
@@ -14,7 +14,7 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="8.0.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="8.2.0" />
    </ItemGroup>

 </Project>
--- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
@@ -137,7 +137,6 @@ message HelloReply {
        public static void Run()
        {
            RunOnLocal();
-            return;

            var mappingBuilder = new MappingBuilder();
            mappingBuilder
@@ -308,17 +307,6 @@ message HelloReply {
                .RespondWith(Response.Create()
                    .WithBody("GraphQL is ok")
                );
-
-            //server
-            //    .AddGraphQLSchema("my-graphql", TestSchema, customScalars)
-            //    .Given(Request.Create()
-            //        .WithPath("/graphql2")
-            //        .UsingPost()
-            //    )
-            //    .WithGraphQLSchema("my-graphql")
-            //    .RespondWith(Response.Create()
-            //        .WithBody("GraphQL is ok")
-            //    );
 #endif

 #if MIMEKIT
@@ -377,6 +365,15 @@ message HelloReply {
                        .WithHeader("Content-Type", "text/plain")
                );

+            server
+                .Given(Request.Create()
+                    .UsingHead()
+                    .WithPath("/cl")
+                )
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Length", "42")
+                );
+
            server
                .Given(Request.Create()
                    .UsingMethod("GET")
--- a/src/WireMock.Net.Abstractions/Models/IBodyDataExtensions.cs
+++ b/src/WireMock.Net.Abstractions/Models/IBodyDataExtensions.cs
@@ -0,0 +1,25 @@
+// Copyright © WireMock.Net
+
+using WireMock.Types;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.Util;
+
+// ReSharper disable once InconsistentNaming
+public static class IBodyDataExtensions
+{
+    public static BodyType GetBodyType(this IBodyData bodyData)
+    {
+        if (bodyData.DetectedBodyTypeFromContentType is not null and not BodyType.None)
+        {
+            return bodyData.DetectedBodyTypeFromContentType.Value;
+        }
+
+        if (bodyData.DetectedBodyType is not null and not BodyType.None)
+        {
+            return bodyData.DetectedBodyType.Value;
+        }
+
+        return BodyType.None;
+    }
+}
--- a/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
+++ b/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <Version>0.0.1-preview-05</Version>
        <ImplicitUsings>enable</ImplicitUsings>
        <Description>Aspire extension to start a WireMock.Net server to stub an api.</Description>
        <AssemblyTitle>WireMock.Net.Aspire</AssemblyTitle>
@@ -36,7 +35,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting" Version="8.0.0" />
+        <PackageReference Include="Aspire.Hosting" Version="8.2.0" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
+++ b/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
@@ -10,6 +10,7 @@ using Stef.Validation;
 using WireMock.Exceptions;
 using WireMock.Extensions;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers;

@@ -92,6 +93,17 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
    }

+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
+    }
+
    private bool IsMatch(dynamic input, string pattern)
    {
        var isMatchWithString = input is string;
--- a/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
+++ b/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
@@ -43,7 +43,7 @@
  </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.13" />
+    <PackageReference Include="CS-Script" Version="4.8.17" />
  </ItemGroup>

 </Project>
--- a/src/WireMock.Net.TUnit/TUnitWireMockLogger.cs
+++ b/src/WireMock.Net.TUnit/TUnitWireMockLogger.cs
@@ -0,0 +1,80 @@
+// Copyright © WireMock.Net
+
+using System;
+using Newtonsoft.Json;
+using Stef.Validation;
+using TUnit.Core.Logging;
+using WireMock.Admin.Requests;
+using WireMock.Logging;
+
+namespace WireMock.Net.TUnit;
+
+/// <summary>
+/// When using TUnit, this class enables to log the output from WireMock.Net to the <see cref="TUnitLogger"/>.
+/// </summary>
+// ReSharper disable once InconsistentNaming
+public sealed class TUnitWireMockLogger : IWireMockLogger
+{
+    private readonly TUnitLogger _tUnitLogger;
+
+    /// <summary>
+    /// Create a new instance on the <see cref="TUnitWireMockLogger"/>.
+    /// </summary>
+    /// <param name="tUnitLogger">Represents a class which can be used to provide test output.</param>
+    public TUnitWireMockLogger(TUnitLogger tUnitLogger)
+    {
+        _tUnitLogger = Guard.NotNull(tUnitLogger);
+    }
+
+    /// <inheritdoc />
+    public void Debug(string formatString, params object[] args)
+    {
+        _tUnitLogger.LogDebug(Format("Debug", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Info(string formatString, params object[] args)
+    {
+        _tUnitLogger.LogInformation(Format("Info", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Warn(string formatString, params object[] args)
+    {
+        _tUnitLogger.LogWarning(Format("Warning", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Error(string formatString, params object[] args)
+    {
+        _tUnitLogger.LogError(Format("Error", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Error(string formatString, Exception exception)
+    {
+        _tUnitLogger.LogError(Format("Error", formatString, exception.Message), exception);
+
+        if (exception is AggregateException ae)
+        {
+            ae.Handle(ex =>
+            {
+                _tUnitLogger.LogError(Format("Error", "Exception {0}", ex.Message), exception);
+                return true;
+            });
+        }
+    }
+
+    /// <inheritdoc />
+    public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+    {
+        var message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+        _tUnitLogger.LogDebug(Format("DebugRequestResponse", "Admin[{0}] {1}", isAdminRequest, message));
+    }
+
+    private static string Format(string level, string formatString, params object[] args)
+    {
+        var message = args.Length > 0 ? string.Format(formatString, args) : formatString;
+        return $"{DateTime.UtcNow} [{level}] : {message}";
+    }
+}
--- a/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj
+++ b/src/WireMock.Net.TUnit/WireMock.Net.TUnit.csproj
@@ -0,0 +1,38 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>Some extensions for TUnit (TUnitLogger)</Description>
+        <AssemblyTitle>WireMock.Net.TUnit</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AssemblyName>WireMock.Net.TUnit</AssemblyName>
+        <RootNamespace>WireMock.Net.Tunit</RootNamespace>
+        <PackageId>WireMock.Net.TUnit</PackageId>
+        <PackageTags>tdd;wiremock;test;unittest;TUnit</PackageTags>
+        <ProjectGuid>{0DE0954F-8C00-4E8D-B94A-4361FC1CB34A}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Stef.Validation" Version="0.1.1" />
+        <PackageReference Include="TUnit.Core" Version="0.1.817" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+    </ItemGroup>
+
+</Project>
--- a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
+++ b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
@@ -28,7 +28,7 @@
          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
        <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="Testcontainers" Version="[3.9.0]" />
+        <PackageReference Include="Testcontainers" Version="3.10.0" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.xUnit/TestOutputHelperWireMockLogger.cs
+++ b/src/WireMock.Net.xUnit/TestOutputHelperWireMockLogger.cs
@@ -73,8 +73,6 @@ public sealed class TestOutputHelperWireMockLogger : IWireMockLogger

    private static string Format(string level, string formatString, params object[] args)
    {
-        Guard.NotNull(formatString);
-
        var message = args.Length > 0 ? string.Format(formatString, args) : formatString;
        return $"{DateTime.UtcNow} [{level}] : {message}";
    }
--- a/src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs
+++ b/src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs
@@ -10,6 +10,7 @@ using Microsoft.IdentityModel.Protocols;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;
 using Stef.Validation;
+using WireMock.Constants;
 using WireMock.Matchers;
 using WireMock.Models;

@@ -41,7 +42,7 @@ internal class AzureADAuthenticationMatcher : IStringMatcher
        return EmptyArray<AnyOf<string, StringPattern>>.Value;
    }

-    public MatchOperator MatchOperator { get; } = MatchOperator.Or;
+    public MatchOperator MatchOperator => MatchOperator.Or;

    public MatchResult IsMatch(string? input)
    {
@@ -50,7 +51,7 @@ internal class AzureADAuthenticationMatcher : IStringMatcher
            return MatchScores.Mismatch;
        }

-        var token = Regex.Replace(input, BearerPrefix, string.Empty, RegexOptions.IgnoreCase);
+        var token = Regex.Replace(input, BearerPrefix, string.Empty, RegexOptions.IgnoreCase, WireMockConstants.DefaultRegexTimeout);

        try
        {
@@ -75,5 +76,11 @@ internal class AzureADAuthenticationMatcher : IStringMatcher
            return new MatchResult(MatchScores.Mismatch, ex);
        }
    }
+
+    /// <inheritdoc />
+    public virtual string GetCSharpCodeArguments()
+    {
+        throw new NotImplementedException();
+    }
 }
 #endif
--- a/src/WireMock.Net/Authentication/BasicAuthenticationMatcher.cs
+++ b/src/WireMock.Net/Authentication/BasicAuthenticationMatcher.cs
@@ -6,12 +6,9 @@ using WireMock.Matchers;

 namespace WireMock.Authentication;

-internal class BasicAuthenticationMatcher : RegexMatcher
+internal class BasicAuthenticationMatcher(string username, string password)
+    : RegexMatcher(BuildPattern(username, password))
 {
-    public BasicAuthenticationMatcher(string username, string password) : base(BuildPattern(username, password))
-    {
-    }
-
    public override string Name => nameof(BasicAuthenticationMatcher);

    private static string BuildPattern(string username, string password)
--- a/src/WireMock.Net/Compatibility/StringExtensions.cs
+++ b/src/WireMock.Net/Compatibility/StringExtensions.cs
@@ -2,6 +2,7 @@

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

 // ReSharper disable once CheckNamespace
 namespace System;
@@ -11,7 +12,7 @@ internal static class StringExtensions
    public static string Replace(this string text, string oldValue, string newValue, StringComparison stringComparison)
    {
        var options = stringComparison == StringComparison.OrdinalIgnoreCase ? RegexOptions.IgnoreCase : RegexOptions.None;
-        return Regex.Replace(text, oldValue, newValue, options);
+        return Regex.Replace(text, oldValue, newValue, options, WireMockConstants.DefaultRegexTimeout);
    }
 }
 #endif
--- a/src/WireMock.Net/Constants/WireMockConstants.cs
+++ b/src/WireMock.Net/Constants/WireMockConstants.cs
@@ -1,15 +1,19 @@
 // Copyright © WireMock.Net

+using System;
+
 namespace WireMock.Constants;

 internal static class WireMockConstants
 {
-    public const int AdminPriority = int.MinValue;
-    public const int MinPriority = -1_000_000;
-    public const int ProxyPriority = -2_000_000;
+    internal static readonly TimeSpan DefaultRegexTimeout = TimeSpan.FromSeconds(10);
+             
+    internal const int AdminPriority = int.MinValue;
+    internal const int MinPriority = -1_000_000;
+    internal const int ProxyPriority = -2_000_000;

-    public const string ContentTypeJson = "application/json";
-    public const string ContentTypeTextPlain = "text/plain";
+    internal const string ContentTypeJson = "application/json";
+    internal const string ContentTypeTextPlain = "text/plain";

-    public const string NoMatchingFound = "No matching mapping found";
-}
+    internal const string NoMatchingFound = "No matching mapping found";
+} 
--- a/src/WireMock.Net/Http/HttpKnownHeaderNames.cs
+++ b/src/WireMock.Net/Http/HttpKnownHeaderNames.cs
@@ -14,12 +14,12 @@ namespace WireMock.Http;
 /// </summary>
 internal static class HttpKnownHeaderNames
 {
-    // https://docs.microsoft.com/en-us/dotnet/api/system.net.webheadercollection.isrestricted
+    // - https://docs.microsoft.com/en-us/dotnet/api/system.net.webheadercollection.isrestricted
+    // - ContentLength is allowed per #720
    private static readonly string[] RestrictedResponseHeaders =
    {
        Accept,
        Connection,
-        ContentLength,
        ContentType,
        Date, // RFC1123Pattern
        Expect,
--- a/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
+++ b/src/WireMock.Net/Http/HttpRequestMessageHelper.cs
@@ -9,6 +9,7 @@ using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Constants;
 using WireMock.Types;
+using WireMock.Util;

 namespace WireMock.Http;

@@ -33,12 +34,14 @@ internal static class HttpRequestMessageHelper
            MediaTypeHeaderValue.TryParse(value, out contentType);
        }

-        httpRequestMessage.Content = requestMessage.BodyData?.DetectedBodyType switch
+        var bodyData = requestMessage.BodyData;
+        httpRequestMessage.Content = bodyData?.GetBodyType() switch
        {
-            BodyType.Bytes => ByteArrayContentHelper.Create(requestMessage.BodyData.BodyAsBytes!, contentType),
-            BodyType.Json => StringContentHelper.Create(JsonConvert.SerializeObject(requestMessage.BodyData.BodyAsJson), contentType),
-            BodyType.String => StringContentHelper.Create(requestMessage.BodyData.BodyAsString!, contentType),
-            BodyType.FormUrlEncoded => StringContentHelper.Create(requestMessage.BodyData.BodyAsString!, contentType),
+            BodyType.Bytes => ByteArrayContentHelper.Create(bodyData!.BodyAsBytes!, contentType),
+            BodyType.Json => StringContentHelper.Create(JsonConvert.SerializeObject(bodyData!.BodyAsJson), contentType),
+            BodyType.String => StringContentHelper.Create(bodyData!.BodyAsString!, contentType),
+            BodyType.FormUrlEncoded => StringContentHelper.Create(bodyData!.BodyAsString!, contentType),
+
            _ => httpRequestMessage.Content
        };

--- a/src/WireMock.Net/MappingBuilder.cs
+++ b/src/WireMock.Net/MappingBuilder.cs
@@ -130,7 +130,10 @@ public class MappingBuilder : IMappingBuilder

    private IMapping[] GetNonAdminMappings()
    {
-        return _options.Mappings.Values.Where(m => !m.IsAdminInterface).OrderBy(m => m.UpdatedAt).ToArray();
+        return _options.Mappings.Values
+            .Where(m => !m.IsAdminInterface)
+            .OrderBy(m => m.Guid)
+            .ToArray();
    }

    private void RegisterMapping(IMapping mapping, bool saveToFile)
--- a/src/WireMock.Net/Matchers/ContentTypeMatcher.cs
+++ b/src/WireMock.Net/Matchers/ContentTypeMatcher.cs
@@ -2,7 +2,10 @@

 using System.Net.Http.Headers;
 using AnyOfTypes;
+using Stef.Validation;
+using WireMock.Extensions;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers;

@@ -19,7 +22,7 @@ public class ContentTypeMatcher : WildcardMatcher
    /// </summary>
    /// <param name="pattern">The pattern.</param>
    /// <param name="ignoreCase">IgnoreCase (default false)</param>
-    public ContentTypeMatcher(AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
+    public ContentTypeMatcher(AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this([pattern], ignoreCase)
    {
    }

@@ -29,7 +32,8 @@ public class ContentTypeMatcher : WildcardMatcher
    /// <param name="matchBehaviour">The match behaviour.</param>
    /// <param name="pattern">The pattern.</param>
    /// <param name="ignoreCase">IgnoreCase (default false)</param>
-    public ContentTypeMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
+    public ContentTypeMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour,
+        [pattern], ignoreCase)
    {
    }

@@ -50,7 +54,7 @@ public class ContentTypeMatcher : WildcardMatcher
    /// <param name="ignoreCase">IgnoreCase (default false)</param>
    public ContentTypeMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : base(matchBehaviour, patterns, ignoreCase)
    {
-        _patterns = patterns;
+        _patterns = Guard.NotNull(patterns);
    }

    /// <inheritdoc />
@@ -72,4 +76,15 @@ public class ContentTypeMatcher : WildcardMatcher

    /// <inheritdoc />
    public override string Name => nameof(ContentTypeMatcher);
+
+    /// <inheritdoc />
+    public override string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}" +
+               $")";
+    }
 }
--- a/src/WireMock.Net/Matchers/ExactMatcher.cs
+++ b/src/WireMock.Net/Matchers/ExactMatcher.cs
@@ -4,7 +4,9 @@ using System;
 using System.Linq;
 using AnyOfTypes;
 using Stef.Validation;
+using WireMock.Extensions;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers;

@@ -86,8 +88,20 @@ public class ExactMatcher : IStringMatcher, IIgnoreCaseMatcher
    public MatchOperator MatchOperator { get; }

    /// <inheritdoc />
-    public string Name => "ExactMatcher";
+    public string Name => nameof(ExactMatcher);

    /// <inheritdoc />
    public bool IgnoreCase { get; }
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_values)}" +
+               $")";
+    }
 }
--- a/src/WireMock.Net/Matchers/ExactObjectMatcher.cs
+++ b/src/WireMock.Net/Matchers/ExactObjectMatcher.cs
@@ -72,5 +72,11 @@ public class ExactObjectMatcher : IObjectMatcher
    }

    /// <inheritdoc />
-    public string Name => "ExactObjectMatcher";
+    public string Name => nameof(ExactObjectMatcher);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return "NotImplemented";
+    }
 }
--- a/src/WireMock.Net/Matchers/FormUrlEncodedMatcher.cs
+++ b/src/WireMock.Net/Matchers/FormUrlEncodedMatcher.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using AnyOfTypes;
 using Stef.Validation;
+using WireMock.Extensions;
 using WireMock.Models;
 using WireMock.Util;

@@ -163,4 +164,16 @@ public class FormUrlEncodedMatcher : IStringMatcher, IIgnoreCaseMatcher

    /// <inheritdoc />
    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}" +
+               $")";
+    }
 }
--- a/src/WireMock.Net/Matchers/GraphQLMatcher.cs
+++ b/src/WireMock.Net/Matchers/GraphQLMatcher.cs
@@ -156,6 +156,12 @@ public class GraphQLMatcher : IStringMatcher
    /// <inheritdoc />
    public string Name => nameof(GraphQLMatcher);

+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return "NotImplemented";
+    }
+
    private static bool TryGetGraphQLRequest(string input, [NotNullWhen(true)] out GraphQLRequest? graphQLRequest)
    {
        try
--- a/src/WireMock.Net/Matchers/IMatcher.cs
+++ b/src/WireMock.Net/Matchers/IMatcher.cs
@@ -16,4 +16,10 @@ public interface IMatcher
    /// Gets the match behaviour.
    /// </summary>
    MatchBehaviour MatchBehaviour { get; }
+
+    /// <summary>
+    /// Get the C# code arguments.
+    /// </summary>
+    /// <returns></returns>
+    string GetCSharpCodeArguments();
 }
--- a/src/WireMock.Net/Matchers/JSONPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/JSONPathMatcher.cs
@@ -7,6 +7,7 @@ using Newtonsoft.Json.Linq;
 using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers;

@@ -89,7 +90,7 @@ public class JsonPathMatcher : IStringMatcher, IObjectMatcher
        Exception? exception = null;

        // When input is null or byte[], return Mismatch.
-        if (input != null && !(input is byte[]))
+        if (input != null && input is not byte[])
        {
            try
            {
@@ -116,7 +117,18 @@ public class JsonPathMatcher : IStringMatcher, IObjectMatcher
    public MatchOperator MatchOperator { get; }

    /// <inheritdoc />
-    public string Name => "JsonPathMatcher";
+    public string Name => nameof(JsonPathMatcher);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
+    }

    private double IsMatch(JToken jToken)
    {
--- a/src/WireMock.Net/Matchers/JmesPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/JmesPathMatcher.cs
@@ -8,6 +8,7 @@ using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers;

@@ -115,4 +116,15 @@ public class JmesPathMatcher : IStringMatcher, IObjectMatcher

    /// <inheritdoc />
    public string Name => nameof(JmesPathMatcher);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
+    }
 }
--- a/src/WireMock.Net/Matchers/JsonMatcher.cs
+++ b/src/WireMock.Net/Matchers/JsonMatcher.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;
+using WireMock.Extensions;
 using WireMock.Util;
 using JsonUtils = WireMock.Util.JsonUtils;

@@ -98,6 +99,18 @@ public class JsonMatcher : IJsonMatcher
        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), error);
    }

+    /// <inheritdoc />
+    public virtual string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " + 
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(Regex)}" +
+               $")";
+    }
+
    /// <summary>
    /// Compares the input against the matcher value
    /// </summary>
--- a/src/WireMock.Net/Matchers/JsonPartialMatcher.cs
+++ b/src/WireMock.Net/Matchers/JsonPartialMatcher.cs
@@ -1,5 +1,8 @@
 // Copyright © WireMock.Net

+using WireMock.Extensions;
+using WireMock.Util;
+
 namespace WireMock.Matchers;

 /// <summary>
@@ -34,4 +37,16 @@ public class JsonPartialMatcher : AbstractJsonPartialMatcher
        var exactStringMatcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, IgnoreCase, MatchOperator.Or, value);
        return exactStringMatcher.IsMatch(input).IsPerfect();
    }
+
+    /// <inheritdoc />
+    public override string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(Regex)}" +
+               $")";
+    }
 }
--- a/src/WireMock.Net/Matchers/JsonPartialWildCardMatcher.cs
+++ b/src/WireMock.Net/Matchers/JsonPartialWildCardMatcher.cs
@@ -1,5 +1,8 @@
 // Copyright © WireMock.Net

+using WireMock.Extensions;
+using WireMock.Util;
+
 namespace WireMock.Matchers;

 /// <summary>
@@ -34,4 +37,16 @@ public class JsonPartialWildcardMatcher : AbstractJsonPartialMatcher
        var wildcardStringMatcher = new WildcardMatcher(MatchBehaviour.AcceptOnMatch, value, IgnoreCase);
        return wildcardStringMatcher.IsMatch(input).IsPerfect();
    }
+
+    /// <inheritdoc />
+    public override string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(Regex)}" +
+               $")";
+    }
 }
--- a/src/WireMock.Net/Matchers/LinqMatcher.cs
+++ b/src/WireMock.Net/Matchers/LinqMatcher.cs
@@ -9,6 +9,7 @@ using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Json;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers;

@@ -136,4 +137,15 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher

    /// <inheritdoc />
    public string Name => nameof(LinqMatcher);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
+    }
 }
--- a/src/WireMock.Net/Matchers/MimePartMatcher.cs
+++ b/src/WireMock.Net/Matchers/MimePartMatcher.cs
@@ -3,6 +3,7 @@
 #if MIMEKIT
 using System;
 using MimeKit;
+using WireMock.Extensions;
 using WireMock.Matchers;
 using WireMock.Matchers.Helpers;
 using WireMock.Models;
@@ -60,13 +61,13 @@ public class MimePartMatcher : IMatcher
        ContentTransferEncodingMatcher = contentTransferEncodingMatcher;
        ContentMatcher = contentMatcher;

-        _funcs = new[]
-        {
+        _funcs =
+        [
            mp => ContentTypeMatcher?.IsMatch(GetContentTypeAsString(mp.ContentType)) ?? MatchScores.Perfect,
            mp => ContentDispositionMatcher?.IsMatch(mp.ContentDisposition.ToString().Replace("Content-Disposition: ", string.Empty)) ?? MatchScores.Perfect,
            mp => ContentTransferEncodingMatcher?.IsMatch(mp.ContentTransferEncoding.ToString().ToLowerInvariant()) ?? MatchScores.Perfect,
            MatchOnContent
-        };
+        ];
    }

    /// <summary>
@@ -94,6 +95,12 @@ public class MimePartMatcher : IMatcher
        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
    }

+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return "NotImplemented";
+    }
+
    private MatchResult MatchOnContent(MimePart mimePart)
    {
        if (ContentMatcher == null)
--- a/src/WireMock.Net/Matchers/NotNullOrEmptyMatcher.cs
+++ b/src/WireMock.Net/Matchers/NotNullOrEmptyMatcher.cs
@@ -3,7 +3,9 @@
 using System;
 using System.Linq;
 using AnyOfTypes;
+using WireMock.Extensions;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers;

@@ -70,5 +72,14 @@ public class NotNullOrEmptyMatcher : IObjectMatcher, IStringMatcher
    }

    /// <inheritdoc />
-    public MatchOperator MatchOperator { get; } = MatchOperator.Or;
+    public MatchOperator MatchOperator => MatchOperator.Or;
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}" +
+               $")";
+    }
 }
--- a/src/WireMock.Net/Matchers/ProtoBufMatcher.cs
+++ b/src/WireMock.Net/Matchers/ProtoBufMatcher.cs
@@ -89,6 +89,12 @@ public class ProtoBufMatcher : IProtoBufMatcher
        return DecodeAsync(input, false, cancellationToken);
    }

+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return "NotImplemented";
+    }
+
    private async Task<object?> DecodeAsync(byte[]? input, bool throwException, CancellationToken cancellationToken)
    {
        if (input == null)
--- a/src/WireMock.Net/Matchers/RegexMatcher.cs
+++ b/src/WireMock.Net/Matchers/RegexMatcher.cs
@@ -5,10 +5,12 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using AnyOfTypes;
 using JetBrains.Annotations;
+using Stef.Validation;
+using WireMock.Constants;
 using WireMock.Extensions;
 using WireMock.Models;
 using WireMock.RegularExpressions;
-using Stef.Validation;
+using WireMock.Util;

 namespace WireMock.Matchers;

@@ -21,6 +23,7 @@ public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
 {
    private readonly AnyOf<string, StringPattern>[] _patterns;
    private readonly Regex[] _expressions;
+    private readonly bool _useRegexExtended;

    /// <inheritdoc />
    public MatchBehaviour MatchBehaviour { get; }
@@ -37,7 +40,7 @@ public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
        bool ignoreCase = false,
        bool useRegexExtended = true,
        MatchOperator matchOperator = MatchOperator.Or) :
-        this(MatchBehaviour.AcceptOnMatch, new[] { pattern }, ignoreCase, useRegexExtended, matchOperator)
+        this(MatchBehaviour.AcceptOnMatch, [pattern], ignoreCase, useRegexExtended, matchOperator)
    {
    }

@@ -55,7 +58,7 @@ public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
        bool ignoreCase = false,
        bool useRegexExtended = true,
        MatchOperator matchOperator = MatchOperator.Or) :
-        this(matchBehaviour, new[] { pattern }, ignoreCase, useRegexExtended, matchOperator)
+        this(matchBehaviour, [pattern], ignoreCase, useRegexExtended, matchOperator)
    {
    }

@@ -76,17 +79,18 @@ public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
    {
        _patterns = Guard.NotNull(patterns);
        IgnoreCase = ignoreCase;
+        _useRegexExtended = useRegexExtended;
        MatchBehaviour = matchBehaviour;
        MatchOperator = matchOperator;

-        RegexOptions options = RegexOptions.Compiled | RegexOptions.Multiline;
+        var options = RegexOptions.Compiled | RegexOptions.Multiline;

        if (ignoreCase)
        {
            options |= RegexOptions.IgnoreCase;
        }

-        _expressions = patterns.Select(p => useRegexExtended ? new RegexExtended(p.GetPattern(), options) : new Regex(p.GetPattern(), options)).ToArray();
+        _expressions = patterns.Select(p => useRegexExtended ? new RegexExtended(p.GetPattern(), options) : new Regex(p.GetPattern(), options, WireMockConstants.DefaultRegexTimeout)).ToArray();
    }

    /// <inheritdoc />
@@ -125,4 +129,16 @@ public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
    /// <inheritdoc />
    public MatchOperator MatchOperator { get; }

+    /// <inheritdoc />
+    public virtual string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(_useRegexExtended)}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}" +
+               $")";
+    }
 }
--- a/src/WireMock.Net/Matchers/SimMetricsMatcher.cs
+++ b/src/WireMock.Net/Matchers/SimMetricsMatcher.cs
@@ -8,6 +8,7 @@ using SimMetrics.Net.Metric;
 using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers;

@@ -88,6 +89,18 @@ public class SimMetricsMatcher : IStringMatcher
        return MatchBehaviourHelper.Convert(MatchBehaviour, score);
    }

+    /// <inheritdoc />
+    public virtual string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"{_simMetricType.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}" +
+               $")";
+    }
+
    private IStringMetric GetStringMetricType()
    {
        return _simMetricType switch
--- a/src/WireMock.Net/Matchers/WildcardMatcher.cs
+++ b/src/WireMock.Net/Matchers/WildcardMatcher.cs
@@ -6,6 +6,7 @@ using AnyOfTypes;
 using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers;

@@ -70,6 +71,18 @@ public class WildcardMatcher : RegexMatcher
    /// <inheritdoc />
    public override string Name => nameof(WildcardMatcher);

+    /// <inheritdoc />
+    public override string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}" +
+               $")";
+    }
+
    private static AnyOf<string, StringPattern>[] CreateArray(AnyOf<string, StringPattern>[] patterns)
    {
        return patterns
--- a/src/WireMock.Net/Matchers/XPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/XPathMatcher.cs
@@ -10,6 +10,7 @@ using WireMock.Extensions;
 using WireMock.Models;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
+using WireMock.Util;
 #if !NETSTANDARD1_3
 using Wmhelp.XPath2;
 #endif
@@ -89,11 +90,6 @@ public class XPathMatcher : IStringMatcher
        return CreateMatchResult(score);
    }

-    private MatchResult CreateMatchResult(double score, Exception? exception = null)
-    {
-        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
-    }
-
    /// <inheritdoc />
    public AnyOf<string, StringPattern>[] GetPatterns()
    {
@@ -106,6 +102,23 @@ public class XPathMatcher : IStringMatcher
    /// <inheritdoc />
    public string Name => nameof(XPathMatcher);

+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"null, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
+    }
+
+    private MatchResult CreateMatchResult(double score, Exception? exception = null)
+    {
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
+    }
+
    private sealed class XPathEvaluator
    {
        private XmlDocument? _xmlDocument;
@@ -130,6 +143,7 @@ public class XPathMatcher : IStringMatcher
        {
            return _xpathNavigator == null ? [] : patterns.Select(pattern => true.Equals(Evaluate(_xpathNavigator, pattern, xmlNamespaceMap))).ToArray();
        }
+
        private object Evaluate(XPathNavigator navigator, AnyOf<string, StringPattern> pattern, IEnumerable<XmlNamespace>? xmlNamespaceMap)
        {
            var xpath = $"boolean({pattern.GetPattern()})";
--- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs
+++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs
@@ -75,8 +75,15 @@ namespace WireMock.Owin

        private static void Listen(KestrelServerOptions kestrelOptions, HostUrlDetails urlDetail, Action<ListenOptions> configure)
        {
+            // Listens on any IP with the given port.
+            if (urlDetail is { Port: > 0, Host: "0.0.0.0" })
+            {
+                kestrelOptions.ListenAnyIP(urlDetail.Port, configure);
+                return;
+            }
+            
            // Listens on ::1 and 127.0.0.1 with the given port.
-            if (urlDetail is { Port: > 0, Host: "localhost" or "127.0.0.1" or "0.0.0.0" or "::1" })
+            if (urlDetail is { Port: > 0, Host: "localhost" or "127.0.0.1" or "::1" })
            {
                kestrelOptions.ListenLocalhost(urlDetail.Port, configure);
                return;
@@ -113,4 +120,4 @@ namespace WireMock.Owin
        }
    }
 }
-#endif
+#endif
--- a/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
@@ -37,13 +37,20 @@ namespace WireMock.Owin.Mappers
        private readonly Encoding _utf8NoBom = new UTF8Encoding(false);

        // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
-#if !USE_ASPNETCORE
-        private static readonly IDictionary<string, Action<IResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<IResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
-#else
-        private static readonly IDictionary<string, Action<IResponse, WireMockList<string>>> ResponseHeadersToFix = new Dictionary<string, Action<IResponse, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase) {
-#endif
-            { HttpKnownHeaderNames.ContentType, (r, v) => r.ContentType = v.FirstOrDefault() }
-        };
+        private static readonly IDictionary<string, Action<IResponse, bool, WireMockList<string>>> ResponseHeadersToFix =
+            new Dictionary<string, Action<IResponse, bool, WireMockList<string>>>(StringComparer.OrdinalIgnoreCase)
+            {
+                { HttpKnownHeaderNames.ContentType, (r, _, v) => r.ContentType = v.FirstOrDefault() },
+                { HttpKnownHeaderNames.ContentLength, (r, hasBody, v) =>
+                    {
+                        // Only set the Content-Length header if the response does not have a body
+                        if (!hasBody && long.TryParse(v.FirstOrDefault(), out var contentLength))
+                        {
+                            r.ContentLength = contentLength;
+                        }
+                    }
+                }
+            };

        /// <summary>
        /// Constructor
@@ -83,23 +90,21 @@ namespace WireMock.Owin.Mappers
            }

            var statusCodeType = responseMessage.StatusCode?.GetType();
-            switch (statusCodeType)
+            if (statusCodeType != null)
            {
-                case { } when statusCodeType == typeof(int) || statusCodeType == typeof(int?) || statusCodeType.GetTypeInfo().IsEnum:
+                if (statusCodeType == typeof(int) || statusCodeType == typeof(int?) || statusCodeType.GetTypeInfo().IsEnum)
+                {
                    response.StatusCode = MapStatusCode((int)responseMessage.StatusCode!);
-                    break;
-
-                case { } when statusCodeType == typeof(string):
-                    // Note: this case will also match on null 
-                    int.TryParse(responseMessage.StatusCode as string, out var result);
-                    response.StatusCode = MapStatusCode(result);
-                    break;
-
-                default:
-                    break;
+                }
+                else if (statusCodeType == typeof(string))
+                {
+                    // Note: this case will also match on null
+                    int.TryParse(responseMessage.StatusCode as string, out var statusCodeTypeAsInt);
+                    response.StatusCode = MapStatusCode(statusCodeTypeAsInt);
+                }
            }

-            SetResponseHeaders(responseMessage, response);
+            SetResponseHeaders(responseMessage, bytes, response);

            if (bytes != null)
            {
@@ -131,45 +136,49 @@ namespace WireMock.Owin.Mappers
            return responseMessage.FaultPercentage == null || _randomizerDouble.Generate() <= responseMessage.FaultPercentage;
        }

-        private async Task<byte[]?> GetNormalBodyAsync(IResponseMessage responseMessage)
-        {
-            switch (responseMessage.BodyData?.DetectedBodyType)
+        private async Task<byte[]?> GetNormalBodyAsync(IResponseMessage responseMessage) {
+            var bodyData = responseMessage.BodyData;
+            switch (bodyData?.GetBodyType())
            {
                case BodyType.String:
                case BodyType.FormUrlEncoded:
-                    return (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(responseMessage.BodyData.BodyAsString!);
+                    return (bodyData.Encoding ?? _utf8NoBom).GetBytes(bodyData.BodyAsString!);

                case BodyType.Json:
-                    var formatting = responseMessage.BodyData.BodyAsJsonIndented == true ? Formatting.Indented : Formatting.None;
-                    var jsonBody = JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
-                    return (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);
+                    var formatting = bodyData.BodyAsJsonIndented == true ? Formatting.Indented : Formatting.None;
+                    var jsonBody = JsonConvert.SerializeObject(bodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
+                    return (bodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);

 #if PROTOBUF
                case BodyType.ProtoBuf:
-                    var protoDefinition = responseMessage.BodyData.ProtoDefinition?.Invoke().Text;
-                    return await ProtoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinition, responseMessage.BodyData.ProtoBufMessageType, responseMessage.BodyData.BodyAsJson).ConfigureAwait(false);
+                    var protoDefinition = bodyData.ProtoDefinition?.Invoke().Text;
+                    return await ProtoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinition, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);
 #endif

                case BodyType.Bytes:
-                    return responseMessage.BodyData.BodyAsBytes;
+                    return bodyData.BodyAsBytes;

                case BodyType.File:
-                    return _options.FileSystemHandler?.ReadResponseBodyAsFile(responseMessage.BodyData.BodyAsFile!);
+                    return _options.FileSystemHandler?.ReadResponseBodyAsFile(bodyData.BodyAsFile!);
+
+                case BodyType.MultiPart:
+                    _options.Logger.Warn("MultiPart body type is not handled!");
+                    break;
+
+                case BodyType.None:
+                    break;
            }

            return null;
        }

-        private static void SetResponseHeaders(IResponseMessage responseMessage, IResponse response)
+        private static void SetResponseHeaders(IResponseMessage responseMessage, byte[]? bytes, IResponse response)
        {
            // Force setting the Date header (#577)
            AppendResponseHeader(
                response,
                HttpKnownHeaderNames.Date,
-                new[]
-                {
-                    DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture)
-                }
+                [ DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture) ]
            );

            // Set other headers
@@ -179,11 +188,11 @@ namespace WireMock.Owin.Mappers
                var value = item.Value;
                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
                {
-                    action?.Invoke(response, value);
+                    action?.Invoke(response, bytes != null, value);
                }
                else
                {
-                    // Check if this response header can be added (#148 and #227)
+                    // Check if this response header can be added (#148, #227 and #720)
                    if (!HttpKnownHeaderNames.IsRestrictedResponseHeader(headerName))
                    {
                        AppendResponseHeader(response, headerName, value.ToArray());
@@ -206,7 +215,7 @@ namespace WireMock.Owin.Mappers
                var value = item.Value;
                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
                {
-                    action?.Invoke(response, value);
+                    action?.Invoke(response, false, value);
                }
                else
                {
--- a/src/WireMock.Net/Owin/WireMockMiddlewareOptionsHelper.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddlewareOptionsHelper.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net

+using System;
 using Stef.Validation;
 using WireMock.Settings;

@@ -7,21 +8,31 @@ namespace WireMock.Owin;

 internal static class WireMockMiddlewareOptionsHelper
 {
-    public static IWireMockMiddlewareOptions InitFromSettings(WireMockServerSettings settings, IWireMockMiddlewareOptions? options = null)
+    public static IWireMockMiddlewareOptions InitFromSettings(
+        WireMockServerSettings settings,
+        IWireMockMiddlewareOptions? options = null,
+        Action<IWireMockMiddlewareOptions>? postConfigure = null
+    )
    {
        Guard.NotNull(settings);

        options ??= new WireMockMiddlewareOptions();

-        options.FileSystemHandler = settings.FileSystemHandler;
-        options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
-        options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
-        options.Logger = settings.Logger;
+        options.AllowBodyForAllHttpMethods = settings.AllowBodyForAllHttpMethods;
+        options.AllowOnlyDefinedHttpStatusCodeInResponse = settings.AllowOnlyDefinedHttpStatusCodeInResponse;
+        options.AllowPartialMapping = settings.AllowPartialMapping;
        options.DisableJsonBodyParsing = settings.DisableJsonBodyParsing;
-        options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
-        options.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;
+        options.DisableRequestBodyDecompressing = settings.DisableRequestBodyDecompressing;
        options.DoNotSaveDynamicResponseInLogEntry = settings.DoNotSaveDynamicResponseInLogEntry;
+        options.FileSystemHandler = settings.FileSystemHandler;
+        options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
+        options.Logger = settings.Logger;
+        options.MaxRequestLogCount = settings.MaxRequestLogCount;
+        options.PostWireMockMiddlewareInit = settings.PostWireMockMiddlewareInit;
+        options.PreWireMockMiddlewareInit = settings.PreWireMockMiddlewareInit;
        options.QueryParameterMultipleValueSupport = settings.QueryParameterMultipleValueSupport;
+        options.RequestLogExpirationDuration = settings.RequestLogExpirationDuration;
+        options.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;

        if (settings.CustomCertificateDefined)
        {
@@ -32,6 +43,8 @@ internal static class WireMockMiddlewareOptionsHelper
            options.X509CertificatePassword = settings.CertificateSettings.X509CertificatePassword;
        }

+        postConfigure?.Invoke(options);
+
        return options;
    }
 }
--- a/src/WireMock.Net/Serialization/MappingConverter.cs
+++ b/src/WireMock.Net/Serialization/MappingConverter.cs
@@ -23,16 +23,11 @@ using static WireMock.Util.CSharpFormatter;

 namespace WireMock.Serialization;

-internal class MappingConverter
+internal class MappingConverter(MatcherMapper mapper)
 {
    private static readonly string AcceptOnMatch = MatchBehaviour.AcceptOnMatch.GetFullyQualifiedEnumValue();

-    private readonly MatcherMapper _mapper;
-
-    public MappingConverter(MatcherMapper mapper)
-    {
-        _mapper = Guard.NotNull(mapper);
-    }
+    private readonly MatcherMapper _mapper = Guard.NotNull(mapper);

    public string ToCSharpCode(IMapping mapping, MappingConverterSettings? settings = null)
    {
@@ -77,26 +72,26 @@ internal class MappingConverter
        sb.AppendLine("    .Given(Request.Create()");
        sb.AppendLine($"        .UsingMethod({To1Or2Or3Arguments(methodMatcher?.MatchBehaviour, methodMatcher?.MatchOperator, methodMatcher?.Methods, HttpRequestMethod.GET)})");

-        if (pathMatcher is { Matchers: { } })
+        if (pathMatcher?.Matchers != null)
        {
            sb.AppendLine($"        .WithPath({To1Or2Arguments(pathMatcher.MatchOperator, pathMatcher.Matchers)})");
        }
-        else if (urlMatcher is { Matchers: { } })
+        else if (urlMatcher?.Matchers != null)
        {
            sb.AppendLine($"        .WithUrl({To1Or2Arguments(urlMatcher.MatchOperator, urlMatcher.Matchers)})");
        }

-        foreach (var paramsMatcher in paramsMatchers)
+        foreach (var paramsMatcher in paramsMatchers.Where(pm => pm.Matchers != null))
        {
-            sb.AppendLine($"        .WithParam({To1Or2Or3Arguments(paramsMatcher.Key, paramsMatcher.MatchBehaviour, paramsMatcher.Matchers!)})");
+            sb.AppendLine($"        .WithParam({To2Or3Arguments(paramsMatcher.Key, paramsMatcher.MatchBehaviour, paramsMatcher.Matchers!)})");
        }

-        if (clientIPMatcher is { Matchers: { } })
+        if (clientIPMatcher?.Matchers != null)
        {
            sb.AppendLine($"        .WithClientIP({ToValueArguments(GetStringArray(clientIPMatcher.Matchers))})");
        }

-        foreach (var headerMatcher in headerMatchers.Where(h => h.Matchers is { }))
+        foreach (var headerMatcher in headerMatchers.Where(h => h.Matchers != null))
        {
            var headerBuilder = new StringBuilder($"\"{headerMatcher.Name}\", {ToValueArguments(GetStringArray(headerMatcher.Matchers!))}, true");
            if (headerMatcher.MatchOperator != MatchOperator.Or)
@@ -106,7 +101,7 @@ internal class MappingConverter
            sb.AppendLine($"        .WithHeader({headerBuilder})");
        }

-        foreach (var cookieMatcher in cookieMatchers.Where(h => h.Matchers is { }))
+        foreach (var cookieMatcher in cookieMatchers.Where(c => c.Matchers != null))
        {
            sb.AppendLine($"        .WithCookie(\"{cookieMatcher.Name}\", {ToValueArguments(GetStringArray(cookieMatcher.Matchers!))}, true)");
        }
@@ -117,7 +112,7 @@ internal class MappingConverter
        }

 #if GRAPHQL
-        if (requestMessageGraphQLMatcher is { Matchers: { } })
+        if (requestMessageGraphQLMatcher?.Matchers != null)
        {
            if (requestMessageGraphQLMatcher.Matchers.OfType<GraphQLMatcher>().FirstOrDefault() is { } graphQLMatcher && graphQLMatcher.GetPatterns().Any())
            {
@@ -127,7 +122,7 @@ internal class MappingConverter
 #endif

 #if MIMEKIT
-        if (requestMessageMultiPartMatcher is { Matchers: { } })
+        if (requestMessageMultiPartMatcher?.Matchers != null)
        {
            if (requestMessageMultiPartMatcher.Matchers.OfType<MimePartMatcher>().Any())
            {
@@ -137,13 +132,13 @@ internal class MappingConverter
 #endif

 #if PROTOBUF
-        if (requestMessageProtoBufMatcher is { Matcher: { } })
+        if (requestMessageProtoBufMatcher?.Matcher != null)
        {
            sb.AppendLine("        // .WithBodyAsProtoBuf() is not yet supported");
        }
 #endif

-        if (requestMessageBodyMatcher is { Matchers: { } })
+        if (requestMessageBodyMatcher?.Matchers != null)
        {
            var firstMatcher = requestMessageBodyMatcher.Matchers.FirstOrDefault();

@@ -154,15 +149,15 @@ internal class MappingConverter
                    break;

                case JsonMatcher jsonMatcher:
-                {
-                    var matcherType = jsonMatcher.GetType().Name;
-                    sb.AppendLine($"        .WithBody(new {matcherType}(");
-                    sb.AppendLine($"            value: {ConvertToAnonymousObjectDefinition(jsonMatcher.Value, 3)},");
-                    sb.AppendLine($"            ignoreCase: {ToCSharpBooleanLiteral(jsonMatcher.IgnoreCase)},");
-                    sb.AppendLine($"            regex: {ToCSharpBooleanLiteral(jsonMatcher.Regex)}");
-                    sb.AppendLine(@"        ))");
-                    break;
-                }
+                    {
+                        var matcherType = jsonMatcher.GetType().Name;
+                        sb.AppendLine($"        .WithBody(new {matcherType}(");
+                        sb.AppendLine($"            value: {ConvertToAnonymousObjectDefinition(jsonMatcher.Value, 3)},");
+                        sb.AppendLine($"            ignoreCase: {ToCSharpBooleanLiteral(jsonMatcher.IgnoreCase)},");
+                        sb.AppendLine($"            regex: {ToCSharpBooleanLiteral(jsonMatcher.Regex)}");
+                        sb.AppendLine(@"        ))");
+                        break;
+                    }
            }
        }

@@ -309,7 +304,7 @@ internal class MappingConverter
            Response = new ResponseModel()
        };

-        if (methodMatcher is { Methods: { } })
+        if (methodMatcher != null)
        {
            mappingModel.Request.Methods = methodMatcher.Methods;
            mappingModel.Request.MethodsRejectOnMatch = methodMatcher.MatchBehaviour == MatchBehaviour.RejectOnMatch ? true : null;
@@ -321,7 +316,7 @@ internal class MappingConverter
            mappingModel.Request.HttpVersion = httpVersionMatcher.HttpVersion;
        }

-        if (clientIPMatcher is { Matchers: { } })
+        if (clientIPMatcher?.Matchers != null)
        {
            var clientIPMatchers = _mapper.Map(clientIPMatcher.Matchers);
            mappingModel.Request.Path = new ClientIPModel
@@ -331,7 +326,7 @@ internal class MappingConverter
            };
        }

-        if (pathMatcher is { Matchers: { } })
+        if (pathMatcher?.Matchers != null)
        {
            var pathMatchers = _mapper.Map(pathMatcher.Matchers);
            mappingModel.Request.Path = new PathModel
@@ -340,7 +335,7 @@ internal class MappingConverter
                MatchOperator = pathMatchers?.Length > 1 ? pathMatcher.MatchOperator.ToString() : null
            };
        }
-        else if (urlMatcher is { Matchers: { } })
+        else if (urlMatcher?.Matchers != null)
        {
            var urlMatchers = _mapper.Map(urlMatcher.Matchers);
            mappingModel.Request.Url = new UrlModel
@@ -538,7 +533,7 @@ internal class MappingConverter
        return stringMatchers.SelectMany(m => m.GetPatterns()).Select(p => p.GetPattern()).ToArray();
    }

-    private static string To1Or2Or3Arguments(string key, MatchBehaviour? matchBehaviour, IReadOnlyList<IStringMatcher> matchers)
+    private static string To2Or3Arguments(string key, MatchBehaviour? matchBehaviour, IReadOnlyList<IStringMatcher> matchers)
    {
        var sb = new StringBuilder($"\"{key}\", ");

@@ -547,7 +542,7 @@ internal class MappingConverter
            sb.AppendFormat("{0}, ", matchBehaviour.Value.GetFullyQualifiedEnumValue());
        }

-        sb.AppendFormat("{0}", ToValueArguments(GetStringArray(matchers), string.Empty));
+        sb.AppendFormat("{0}", MappingConverterUtils.ToCSharpCodeArguments(matchers));

        return sb.ToString();
    }
@@ -566,7 +561,16 @@ internal class MappingConverter

    private static string To1Or2Arguments(MatchOperator? matchOperator, IReadOnlyList<IStringMatcher> matchers)
    {
-        return To1Or2Arguments(matchOperator, GetStringArray(matchers), string.Empty);
+        var sb = new StringBuilder();
+
+        if (matchOperator.HasValue && matchOperator != MatchOperator.Or)
+        {
+            sb.AppendFormat("{0}, ", matchOperator.Value.GetFullyQualifiedEnumValue());
+        }
+
+        sb.AppendFormat("{0}", MappingConverterUtils.ToCSharpCodeArguments(matchers));
+
+        return sb.ToString();
    }

    private static string To1Or2Arguments(MatchOperator? matchOperator, string[]? values, string defaultValue)
--- a/src/WireMock.Net/Server/WireMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/WireMockServer.Admin.cs
@@ -18,6 +18,7 @@ using WireMock.Http;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
+using WireMock.Owin;
 using WireMock.RequestBuilders;
 using WireMock.ResponseProviders;
 using WireMock.Serialization;
@@ -321,29 +322,27 @@ public partial class WireMockServer

        InitSettings(_settings);

-        // _options
-        if (settings.GlobalProcessingDelay != null)
-        {
-            _options.RequestProcessingDelay = TimeSpan.FromMilliseconds(settings.GlobalProcessingDelay.Value);
-        }
-        _options.AllowBodyForAllHttpMethods = settings.AllowBodyForAllHttpMethods;
-        _options.AllowPartialMapping = settings.AllowPartialMapping;
-        _options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
-        _options.MaxRequestLogCount = settings.MaxRequestLogCount;
-        _options.RequestLogExpirationDuration = settings.RequestLogExpirationDuration;
-
-        // _settings & _options
 #if USE_ASPNETCORE
        if (Enum.TryParse<CorsPolicyOptions>(settings.CorsPolicyOptions, true, out var corsPolicyOptions))
        {
            _settings.CorsPolicyOptions = corsPolicyOptions;
-            _options.CorsPolicyOptions = corsPolicyOptions;
        }
-
-        _options.ClientCertificateMode = _settings.ClientCertificateMode;
-        _options.AcceptAnyClientCertificate = _settings.AcceptAnyClientCertificate;
 #endif

+        WireMockMiddlewareOptionsHelper.InitFromSettings(_settings, _options, o =>
+        {
+            if (settings.GlobalProcessingDelay != null)
+            {
+                o.RequestProcessingDelay = TimeSpan.FromMilliseconds(settings.GlobalProcessingDelay.Value);
+            }
+
+#if USE_ASPNETCORE
+            o.CorsPolicyOptions = corsPolicyOptions;
+            o.ClientCertificateMode = _settings.ClientCertificateMode;
+            o.AcceptAnyClientCertificate = _settings.AcceptAnyClientCertificate;
+#endif
+        });
+
        return ResponseMessageBuilder.Create(200, "Settings updated");
    }
    #endregion Settings
@@ -624,7 +623,7 @@ public partial class WireMockServer
    {
        var requestModel = DeserializeObject<RequestModel>(requestMessage);

-        var request = (Request)InitRequestBuilder(requestModel, false)!;
+        var request = (Request)InitRequestBuilder(requestModel);

        var dict = new Dictionary<ILogEntry, RequestMatchResult>();
        foreach (var logEntry in LogEntries.Where(le => !le.RequestMessage.Path.StartsWith("/__admin/")))
--- a/src/WireMock.Net/Server/WireMockServer.ConvertMapping.cs
+++ b/src/WireMock.Net/Server/WireMockServer.ConvertMapping.cs
@@ -36,17 +36,13 @@ public partial class WireMockServer
        }
    }

-    private Guid? ConvertMappingAndRegisterAsRespondProvider(MappingModel mappingModel, Guid? guid = null, string? path = null)
+    private Guid ConvertMappingAndRegisterAsRespondProvider(MappingModel mappingModel, Guid? guid = null, string? path = null)
    {
        Guard.NotNull(mappingModel);
        Guard.NotNull(mappingModel.Request);
        Guard.NotNull(mappingModel.Response);

-        var requestBuilder = InitRequestBuilder(mappingModel.Request, true);
-        if (requestBuilder == null)
-        {
-            return null;
-        }
+        var requestBuilder = InitRequestBuilder(mappingModel.Request);

        var respondProvider = Given(requestBuilder, mappingModel.SaveToFile == true);

@@ -126,9 +122,9 @@ public partial class WireMockServer
        return respondProvider.Guid;
    }

-    private IRequestBuilder? InitRequestBuilder(RequestModel requestModel, bool pathOrUrlRequired)
+    private IRequestBuilder InitRequestBuilder(RequestModel requestModel)
    {
-        IRequestBuilder requestBuilder = Request.Create();
+        var requestBuilder = Request.Create();

        if (requestModel.ClientIP != null)
        {
@@ -146,13 +142,11 @@ public partial class WireMockServer
            }
        }

-        bool pathOrUrlMatchersValid = false;
        if (requestModel.Path != null)
        {
            if (requestModel.Path is string path)
            {
                requestBuilder = requestBuilder.WithPath(path);
-                pathOrUrlMatchersValid = true;
            }
            else
            {
@@ -161,7 +155,6 @@ public partial class WireMockServer
                {
                    var matchOperator = StringUtils.ParseMatchOperator(pathModel.MatchOperator);
                    requestBuilder = requestBuilder.WithPath(matchOperator, pathModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-                    pathOrUrlMatchersValid = true;
                }
            }
        }
@@ -170,7 +163,6 @@ public partial class WireMockServer
            if (requestModel.Url is string url)
            {
                requestBuilder = requestBuilder.WithUrl(url);
-                pathOrUrlMatchersValid = true;
            }
            else
            {
@@ -179,17 +171,10 @@ public partial class WireMockServer
                {
                    var matchOperator = StringUtils.ParseMatchOperator(urlModel.MatchOperator);
                    requestBuilder = requestBuilder.WithUrl(matchOperator, urlModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-                    pathOrUrlMatchersValid = true;
                }
            }
        }

-        if (pathOrUrlRequired && !pathOrUrlMatchersValid)
-        {
-            _settings.Logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
-            return null;
-        }
-
        if (requestModel.Methods != null)
        {
            var matchBehaviour = requestModel.MethodsRejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
@@ -233,7 +218,7 @@ public partial class WireMockServer
        {
            foreach (var paramModel in requestModel.Params.Where(p => p is { Matchers: { } }))
            {
-                bool ignoreCase = paramModel.IgnoreCase == true;
+                var ignoreCase = paramModel.IgnoreCase == true;
                requestBuilder = requestBuilder.WithParam(paramModel.Name, ignoreCase, paramModel.Matchers!.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
            }
        }
@@ -253,7 +238,7 @@ public partial class WireMockServer

    private static IResponseBuilder InitResponseBuilder(ResponseModel responseModel)
    {
-        IResponseBuilder responseBuilder = Response.Create();
+        var responseBuilder = Response.Create();

        if (responseModel.Delay > 0)
        {
--- a/src/WireMock.Net/Server/WireMockServer.cs
+++ b/src/WireMock.Net/Server/WireMockServer.cs
@@ -20,7 +20,6 @@ using WireMock.Exceptions;
 using WireMock.Handlers;
 using WireMock.Http;
 using WireMock.Logging;
-using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.Owin;
 using WireMock.RequestBuilders;
@@ -369,9 +368,10 @@ public partial class WireMockServer : IWireMockServer
            }
        }

-        WireMockMiddlewareOptionsHelper.InitFromSettings(settings, _options);
-
-        _options.LogEntries.CollectionChanged += LogEntries_CollectionChanged;
+        WireMockMiddlewareOptionsHelper.InitFromSettings(settings, _options, o =>
+        {
+            o.LogEntries.CollectionChanged += LogEntries_CollectionChanged;
+        });

        _matcherMapper = new MatcherMapper(_settings);
        _mappingConverter = new MappingConverter(_matcherMapper);
@@ -649,13 +649,11 @@ public partial class WireMockServer : IWireMockServer
    {
        if (settings.AllowBodyForAllHttpMethods == true)
        {
-            _options.AllowBodyForAllHttpMethods = _settings.AllowBodyForAllHttpMethods;
            _settings.Logger.Info("AllowBodyForAllHttpMethods is set to True");
        }

        if (settings.AllowOnlyDefinedHttpStatusCodeInResponse == true)
        {
-            _options.AllowOnlyDefinedHttpStatusCodeInResponse = _settings.AllowOnlyDefinedHttpStatusCodeInResponse;
            _settings.Logger.Info("AllowOnlyDefinedHttpStatusCodeInResponse is set to True");
        }

--- a/src/WireMock.Net/Util/HttpVersionParser.cs
+++ b/src/WireMock.Net/Util/HttpVersionParser.cs
@@ -1,8 +1,8 @@
 // Copyright © WireMock.Net

-using System;
 using System.Text.RegularExpressions;
 using Stef.Validation;
+using WireMock.Constants;

 namespace WireMock.Util;

@@ -11,7 +11,7 @@ namespace WireMock.Util;
 /// </summary>
 internal static class HttpVersionParser
 {
-    private static readonly Regex HttpVersionRegex = new(@"HTTP/(\d+(\.\d+)?(?!\.))", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Compiled, TimeSpan.FromMilliseconds(100));
+    private static readonly Regex HttpVersionRegex = new(@"HTTP/(\d+(\.\d+)?(?!\.))", RegexOptions.IgnoreCase | RegexOptions.CultureInvariant | RegexOptions.Compiled, WireMockConstants.DefaultRegexTimeout);

    /// <summary>
    /// Try to extract the version (as a string) from the protocol.
--- a/src/WireMock.Net/Util/MappingConverterUtils.cs
+++ b/src/WireMock.Net/Util/MappingConverterUtils.cs
@@ -0,0 +1,23 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Linq;
+using AnyOfTypes;
+using WireMock.Extensions;
+using WireMock.Matchers;
+using WireMock.Models;
+
+namespace WireMock.Util;
+
+internal static class MappingConverterUtils
+{
+    internal static string ToCSharpCodeArguments(IReadOnlyList<IMatcher> matchers)
+    {
+        return string.Join(", ", matchers.Select(m => m.GetCSharpCodeArguments()));
+    }
+
+    internal static string ToCSharpCodeArguments(AnyOf<string, StringPattern>[] patterns)
+    {
+        return string.Join(", ", patterns.Select(p => CSharpFormatter.ToCSharpStringLiteral(p.GetPattern())));
+    }
+}
--- a/src/WireMock.Net/Util/PortUtils.cs
+++ b/src/WireMock.Net/Util/PortUtils.cs
@@ -5,6 +5,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using System.Net.Sockets;
 using System.Text.RegularExpressions;
+using WireMock.Constants;

 namespace WireMock.Util;

@@ -13,7 +14,7 @@ namespace WireMock.Util;
 /// </summary>
 internal static class PortUtils
 {
-    private static readonly Regex UrlDetailsRegex = new(@"^((?<proto>\w+)://)(?<host>[^/]+?):(?<port>\d+)\/?$", RegexOptions.Compiled);
+    private static readonly Regex UrlDetailsRegex = new(@"^((?<proto>\w+)://)(?<host>[^/]+?):(?<port>\d+)\/?$", RegexOptions.Compiled, WireMockConstants.DefaultRegexTimeout);

    /// <summary>
    /// Finds a free TCP port.
--- a/src/WireMock.Net/Util/RegexUtils.cs
+++ b/src/WireMock.Net/Util/RegexUtils.cs
@@ -1,16 +1,14 @@
 // Copyright © WireMock.Net

-using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using WireMock.Constants;
 using WireMock.RegularExpressions;

 namespace WireMock.Util;

 internal static class RegexUtils
 {
-    private static readonly TimeSpan RegexTimeOut = new(0, 0, 10);
-
    public static Dictionary<string, string> GetNamedGroups(Regex regex, string input)
    {
        var namedGroupsDictionary = new Dictionary<string, string>();
@@ -38,11 +36,11 @@ internal static class RegexUtils
        {
            if (useRegexExtended)
            {
-                var regexExtended = new RegexExtended(pattern!, RegexOptions.None, RegexTimeOut);
+                var regexExtended = new RegexExtended(pattern!, RegexOptions.None, WireMockConstants.DefaultRegexTimeout);
                return (true, regexExtended.IsMatch(input));
            }

-            var regex = new Regex(pattern, RegexOptions.None, RegexTimeOut);
+            var regex = new Regex(pattern, RegexOptions.None, WireMockConstants.DefaultRegexTimeout);
            return (true, regex.IsMatch(input));
        }
        catch
--- a/src/WireMock.Net/Util/TinyMapperUtils.cs
+++ b/src/WireMock.Net/Util/TinyMapperUtils.cs
@@ -1,24 +1,56 @@
 // Copyright © WireMock.Net

-using Riok.Mapperly.Abstractions;
+using Nelibur.ObjectMapper;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Settings;
 using WireMock.Settings;

 namespace WireMock.Util;

-[Mapper]
-internal static partial class TinyMapperUtils
+internal sealed class TinyMapperUtils
 {
-    public static partial ProxyAndRecordSettingsModel? Map(ProxyAndRecordSettings? instance);
+    public static TinyMapperUtils Instance { get; } = new();

-    public static partial ProxyAndRecordSettings? Map(ProxyAndRecordSettingsModel? model);
+    private TinyMapperUtils()
+    {
+        TinyMapper.Bind<ProxyAndRecordSettings, ProxyAndRecordSettingsModel>();
+        TinyMapper.Bind<WebProxySettings, WebProxySettingsModel>();
+        TinyMapper.Bind<WebProxySettings, WebProxyModel>();
+        TinyMapper.Bind<ProxyUrlReplaceSettings, ProxyUrlReplaceSettingsModel>();

-    public static partial ProxyUrlReplaceSettingsModel? Map(ProxyUrlReplaceSettings? instance);
+        TinyMapper.Bind<ProxyAndRecordSettingsModel, ProxyAndRecordSettings>();
+        TinyMapper.Bind<WebProxySettingsModel, WebProxySettings>();
+        TinyMapper.Bind<WebProxyModel, WebProxySettings>();
+        TinyMapper.Bind<ProxyUrlReplaceSettingsModel, ProxyUrlReplaceSettings>();
+    }

-    public static partial ProxyUrlReplaceSettings? Map(ProxyUrlReplaceSettingsModel? model);
+    public ProxyAndRecordSettingsModel? Map(ProxyAndRecordSettings? instance)
+    {
+        return instance == null ? null : TinyMapper.Map<ProxyAndRecordSettingsModel>(instance);
+    }

-    public static partial WebProxyModel? Map(WebProxySettings? instance);
+    public ProxyAndRecordSettings? Map(ProxyAndRecordSettingsModel? model)
+    {
+        return model == null ? null : TinyMapper.Map<ProxyAndRecordSettings>(model);
+    }

-    public static partial WebProxySettings? Map(WebProxyModel? model);
+    public ProxyUrlReplaceSettingsModel? Map(ProxyUrlReplaceSettings? instance)
+    {
+        return instance == null ? null : TinyMapper.Map<ProxyUrlReplaceSettingsModel>(instance);
+    }
+
+    public ProxyUrlReplaceSettings? Map(ProxyUrlReplaceSettingsModel? model)
+    {
+        return model == null ? null : TinyMapper.Map<ProxyUrlReplaceSettings>(model);
+    }
+
+    public WebProxyModel? Map(WebProxySettings? instance)
+    {
+        return instance == null ? null : TinyMapper.Map<WebProxyModel>(instance);
+    }
+
+    public WebProxySettings? Map(WebProxyModel? model)
+    {
+        return model == null ? null : TinyMapper.Map<WebProxySettings>(model);
+    }
 }
--- a/src/WireMock.Net/WireMock.Net.csproj
+++ b/src/WireMock.Net/WireMock.Net.csproj
@@ -63,10 +63,10 @@
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
        <PackageReference Include="NJsonSchema.Extensions" Version="0.1.0" />
        <PackageReference Include="NSwag.Core" Version="13.16.1" />
-        <PackageReference Include="Riok.Mapperly" Version="3.6.0" />
        <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
        <PackageReference Include="JmesPath.Net" Version="1.0.125" />
        <PackageReference Include="AnyOf" Version="0.3.0" />
+        <PackageReference Include="TinyMapper" Version="3.0.3" />
    </ItemGroup>

    <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
--- a/test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj
+++ b/test/WireMock.Net.Aspire.TestAppHost/WireMock.Net.Aspire.TestAppHost.csproj
@@ -18,7 +18,7 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="8.0.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="8.2.0" />
    </ItemGroup>

    <ItemGroup>
--- a/test/WireMock.Net.Aspire.Tests/DockerUtils.cs
+++ b/test/WireMock.Net.Aspire.Tests/DockerUtils.cs
@@ -8,10 +8,7 @@ namespace WireMock.Net.Aspire.Tests;
 [ExcludeFromCodeCoverage]
 internal static class DockerUtils
 {
-    public static bool IsDockerRunningLinuxContainerMode()
-    {
-        return IsDockerRunning() && IsLinuxContainerMode();
-    }
+    public static Lazy<bool> IsDockerRunningLinuxContainerMode => new(() => IsDockerRunning() && IsLinuxContainerMode());

    private static bool IsDockerRunning()
    {
--- a/test/WireMock.Net.Aspire.Tests/Facts/DockerIsRunningInLinuxContainerModeFact.cs
+++ b/test/WireMock.Net.Aspire.Tests/Facts/DockerIsRunningInLinuxContainerModeFact.cs
@@ -0,0 +1,16 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.Aspire.Tests.Facts;
+
+public sealed class DockerIsRunningInLinuxContainerModeFact : FactAttribute
+{
+    private const string SkipReason = "Docker is not running in Linux container mode. Skipping test.";
+
+    public DockerIsRunningInLinuxContainerModeFact()
+    {
+        if (!DockerUtils.IsDockerRunningLinuxContainerMode.Value)
+        {
+            Skip = SkipReason;
+        }
+    }
+}
--- a/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs
+++ b/test/WireMock.Net.Aspire.Tests/IntegrationTests.cs
@@ -3,6 +3,7 @@
 using System.Net.Http.Json;
 using FluentAssertions;
 using Projects;
+using WireMock.Net.Aspire.Tests.Facts;
 using Xunit.Abstractions;

 namespace WireMock.Net.Aspire.Tests;
@@ -11,15 +12,9 @@ public class IntegrationTests(ITestOutputHelper output)
 {
    private record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary);

-    [Fact]
+    [DockerIsRunningInLinuxContainerModeFact]
    public async Task StartAppHostWithWireMockAndCreateHttpClientToCallTheMockedWeatherForecastEndpoint()
    {
-        if (!DockerUtils.IsDockerRunningLinuxContainerMode())
-        {
-            output.WriteLine("Docker is not running in Linux container mode. Skipping test.");
-            return;
-        }
-
        // Arrange
        var appHostBuilder = await DistributedApplicationTestingBuilder.CreateAsync<WireMock_Net_Aspire_TestAppHost>();
        await using var app = await appHostBuilder.BuildAsync();
@@ -44,15 +39,9 @@ public class IntegrationTests(ITestOutputHelper output)
        weatherForecasts2.Should().HaveCount(5);
    }

-    [Fact]
+    [DockerIsRunningInLinuxContainerModeFact]
    public async Task StartAppHostWithWireMockAndCreateWireMockAdminClientToCallTheAdminEndpoint()
    {
-        if (!DockerUtils.IsDockerRunningLinuxContainerMode())
-        {
-            output.WriteLine("Docker is not running in Linux container mode. Skipping test.");
-            return;
-        }
-
        // Arrange
        var appHostBuilder = await DistributedApplicationTestingBuilder.CreateAsync<WireMock_Net_Aspire_TestAppHost>();
        await using var app = await appHostBuilder.BuildAsync();
--- a/test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj
+++ b/test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj
@@ -12,7 +12,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.Testing" Version="8.0.0" />
+        <PackageReference Include="Aspire.Hosting.Testing" Version="8.2.0" />
        <PackageReference Include="Codecov" Version="1.13.0" />
        <PackageReference Include="coverlet.msbuild" Version="6.0.2">
            <PrivateAssets>all</PrivateAssets>
--- a/test/WireMock.Net.TUnitTests/TUnitTests.cs
+++ b/test/WireMock.Net.TUnitTests/TUnitTests.cs
@@ -0,0 +1,37 @@
+// Copyright © WireMock.Net
+
+using WireMock.Net.TUnit;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.TUnitTests;
+
+// ReSharper disable once InconsistentNaming
+public class TUnitTests
+{
+    [Test]
+    public async Task Test_TUnitWireMockLogger()
+    {
+        // Assign
+        var path = $"/foo_{Guid.NewGuid()}";
+
+        using var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            Logger = new TUnitWireMockLogger(TestContext.Current!.GetDefaultLogger())
+        });
+
+        server
+            .Given(Request.Create()
+                .WithPath(path)
+                .UsingGet())
+            .RespondWith(Response.Create().WithBody("TUnit"));
+
+        // Act
+        var response = await server.CreateClient().GetStringAsync($"{server.Url}{path}");
+
+        // Assert
+        await Assert.That(response).IsEqualTo("TUnit");
+    }
+}
--- a/test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj
+++ b/test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="TUnit" Version="0.1.817" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.TUnit\WireMock.Net.TUnit.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+</Project>
--- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappingsAsync.cs
+++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.GetMappingsAsync.cs
@@ -47,6 +47,7 @@ message HelloReply {
                .WithPath("/grpc/greet.Greeter/SayHello")
                .WithBodyAsProtoBuf(ProtoDefinition, "greet.HelloRequest", protoBufJsonMatcher)
            )
+            .WithGuid(_guidUtilsMock.Object.NewGuid())
            .RespondWith(Response.Create()
                .WithHeader("Content-Type", "application/grpc")
                .WithBodyAsProtoBuf(ProtoDefinition, "greet.HelloReply",
@@ -66,6 +67,7 @@ message HelloReply {
                .WithBodyAsProtoBuf("greet.HelloRequest", protoBufJsonMatcher)
            )
            .WithProtoDefinition(ProtoDefinition)
+            .WithGuid(_guidUtilsMock.Object.NewGuid())
            .RespondWith(Response.Create()
                .WithHeader("Content-Type", "application/grpc")
                .WithBodyAsProtoBuf("greet.HelloReply",
@@ -86,6 +88,7 @@ message HelloReply {
                .WithBodyAsProtoBuf("greet.HelloRequest", protoBufJsonMatcher)
            )
            .WithProtoDefinition("my-greeter")
+            .WithGuid(_guidUtilsMock.Object.NewGuid())
            .RespondWith(Response.Create()
                .WithHeader("Content-Type", "application/grpc")
                .WithBodyAsProtoBuf("greet.HelloReply",
@@ -106,6 +109,7 @@ message HelloReply {
                .WithBodyAsProtoBuf("greet.HelloRequest")
            )
            .WithProtoDefinition("my-greeter")
+            .WithGuid(_guidUtilsMock.Object.NewGuid())
            .RespondWith(Response.Create()
                .WithHeader("Content-Type", "application/grpc")
                .WithBodyAsProtoBuf("greet.HelloReply",
--- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.IWireMockAdminApi_GetMappingCodeByGuidAsync.verified.txt
+++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.IWireMockAdminApi_GetMappingCodeByGuidAsync.verified.txt
@@ -2,8 +2,8 @@
 server
    .Given(Request.Create()
        .UsingMethod("GET")
-        .WithPath("/foo1")
-        .WithParam("p1", "xyz")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/foo1", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("p1", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "xyz"))
    )
    .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
    .RespondWith(Response.Create()
--- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.IWireMockAdminApi_GetMappingsCode.verified.txt
+++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.IWireMockAdminApi_GetMappingsCode.verified.txt
@@ -2,25 +2,7 @@
 server
    .Given(Request.Create()
        .UsingMethod("POST")
-        .WithPath("/users/post1")
-        .WithBody(new JsonMatcher(
-            value: new
-            {
-                city = "Amsterdam",
-                country = "The Netherlands"
-            },
-            ignoreCase: false,
-            regex: false
-        ))
-    )
-    .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
-    .RespondWith(Response.Create()
-    );
-
-server
-    .Given(Request.Create()
-        .UsingMethod("POST")
-        .WithPath("/users/post2")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/users/post2", false, WireMock.Matchers.MatchOperator.Or))
        .WithBody(new JsonPartialMatcher(
            value: new
            {
@@ -37,23 +19,11 @@ server
 Some ""value"" in Line2")
    );

-server
-    .Given(Request.Create()
-        .UsingMethod("GET")
-        .WithPath("/foo1")
-        .WithParam("p1", "xyz")
-    )
-    .WithGuid("f74fd144-df53-404f-8e35-da22a640bd5f")
-    .RespondWith(Response.Create()
-        .WithStatusCode(200)
-        .WithBody("1")
-    );
-
 server
    .Given(Request.Create()
        .UsingMethod("POST")
-        .WithPath("/foo2")
-        .WithParam("p2", "abc")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/foo2", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("p2", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "abc"))
        .WithHeader("h1", "W/\"234f2q3r\"", true)
    )
    .WithGuid("4126dec8-470b-4eff-93bb-c24f83b8b1fd")
@@ -64,10 +34,28 @@ server
        .WithBody("2")
    );

+server
+    .Given(Request.Create()
+        .UsingMethod("POST")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/users/post1", false, WireMock.Matchers.MatchOperator.Or))
+        .WithBody(new JsonMatcher(
+            value: new
+            {
+                city = "Amsterdam",
+                country = "The Netherlands"
+            },
+            ignoreCase: false,
+            regex: false
+        ))
+    )
+    .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
+    .RespondWith(Response.Create()
+    );
+
 server
    .Given(Request.Create()
        .UsingMethod("DELETE")
-        .WithUrl("https://localhost/test")
+        .WithUrl(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "https://localhost/test", false, WireMock.Matchers.MatchOperator.Or))
    )
    .WithGuid("c9929240-7ae8-4a5d-8ed8-0913479f6eeb")
    .RespondWith(Response.Create()
@@ -108,3 +96,15 @@ text
        })
    );

+server
+    .Given(Request.Create()
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/foo1", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("p1", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "xyz"))
+    )
+    .WithGuid("f74fd144-df53-404f-8e35-da22a640bd5f")
+    .RespondWith(Response.Create()
+        .WithStatusCode(200)
+        .WithBody("1")
+    );
+
--- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs
+++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs
@@ -30,6 +30,7 @@ using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
 using WireMock.Types;
+using WireMock.Util;
 using Xunit;

 namespace WireMock.Net.Tests.AdminApi;
@@ -39,6 +40,14 @@ public partial class WireMockAdminApiTests
 {
    private static readonly VerifySettings VerifySettings = new();

+    private readonly Mock<IGuidUtils> _guidUtilsMock = new();
+
+    public WireMockAdminApiTests()
+    {
+        var startGuid = 1000;
+        _guidUtilsMock.Setup(g => g.NewGuid()).Returns(() => new Guid($"98fae52e-76df-47d9-876f-2ee32e93{startGuid++}"));
+    }
+
    static WireMockAdminApiTests()
    {
        VerifyNewtonsoftJson.Enable(VerifySettings);
--- a/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs
+++ b/test/WireMock.Net.Tests/Facts/IgnoreOnContinuousIntegrationFact.cs
@@ -0,0 +1,22 @@
+// Copyright © WireMock.Net
+
+using System;
+using Xunit;
+
+namespace WireMock.Net.Tests.Facts;
+
+public sealed class IgnoreOnContinuousIntegrationFact : FactAttribute
+{
+    private const string SkipReason = "Ignore when run via CI/CD";
+    private static readonly bool IsContinuousIntegrationAzure = bool.TryParse(Environment.GetEnvironmentVariable("TF_BUILD"), out var isTF) && isTF;
+    private static readonly bool IsContinuousIntegrationGithub = bool.TryParse(Environment.GetEnvironmentVariable("GITHUB_ACTIONS"), out var isGH) && isGH;
+    private static readonly bool IsContinuousIntegration = IsContinuousIntegrationAzure || IsContinuousIntegrationGithub;
+
+    public IgnoreOnContinuousIntegrationFact()
+    {
+        if (IsContinuousIntegration)
+        {
+            Skip = SkipReason;
+        }
+    }
+}
--- a/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs
+++ b/test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs
@@ -49,6 +49,26 @@ public class HttpRequestMessageHelperTests
        Check.That(await message.Content.ReadAsByteArrayAsync().ConfigureAwait(false)).ContainsExactly(Encoding.UTF8.GetBytes("hi"));
    }

+    [Fact]
+    public async Task HttpRequestMessageHelper_Create_TextPlain()
+    {
+        // Assign
+        var body = new BodyData
+        {
+            BodyAsString = "0123", // or 83 in decimal
+            BodyAsJson = 83,
+            DetectedBodyType = BodyType.Json,
+            DetectedBodyTypeFromContentType = BodyType.String
+        };
+        var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", ClientIp, body);
+
+        // Act
+        var message = HttpRequestMessageHelper.Create(request, "http://url");
+
+        // Assert
+        Check.That(await message.Content!.ReadAsStringAsync().ConfigureAwait(false)).Equals("0123");
+    }
+
    [Fact]
    public async Task HttpRequestMessageHelper_Create_Json()
    {
@@ -64,7 +84,7 @@ public class HttpRequestMessageHelperTests
        var message = HttpRequestMessageHelper.Create(request, "http://url");

        // Assert
-        Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
+        Check.That(await message.Content!.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
    }

    [Fact]
--- a/test/WireMock.Net.Tests/MappingBuilderTests.GetMappings.verified.txt
+++ b/test/WireMock.Net.Tests/MappingBuilderTests.GetMappings.verified.txt
@@ -32,6 +32,35 @@
      Body: { msg: "Hello world!"}
    }
  },
+  {
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931001,
+    UpdatedAt: 2023-01-14 15:16:17,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /users/post1,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        POST
+      ],
+      Body: {
+        Matcher: {
+          Name: JsonMatcher,
+          Pattern: {
+            Request: Hello?
+          },
+          IgnoreCase: false,
+          Regex: false
+        }
+      }
+    },
+    Response: {}
+  },
  {
    Guid: 98fae52e-76df-47d9-876f-2ee32e931002,
    UpdatedAt: 2023-01-14 15:16:17,
@@ -106,31 +135,33 @@
    Response: {}
  },
  {
-    Guid: 98fae52e-76df-47d9-876f-2ee32e931001,
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931004,
    UpdatedAt: 2023-01-14 15:16:17,
    Request: {
      Path: {
        Matchers: [
          {
            Name: WildcardMatcher,
-            Pattern: /users/post1,
+            Pattern: /regex,
            IgnoreCase: false
          }
        ]
      },
      Methods: [
-        POST
+        GET
      ],
-      Body: {
-        Matcher: {
-          Name: JsonMatcher,
-          Pattern: {
-            Request: Hello?
-          },
-          IgnoreCase: false,
-          Regex: false
+      Params: [
+        {
+          Name: foo,
+          Matchers: [
+            {
+              Name: RegexMatcher,
+              Pattern: .*,
+              IgnoreCase: false
+            }
+          ]
        }
-      }
+      ]
    },
    Response: {}
  }
--- a/test/WireMock.Net.Tests/MappingBuilderTests.ToCSharpCode_Builder.verified.txt
+++ b/test/WireMock.Net.Tests/MappingBuilderTests.ToCSharpCode_Builder.verified.txt
@@ -2,8 +2,8 @@
 builder
    .Given(Request.Create()
        .UsingMethod("GET")
-        .WithPath("/foo")
-        .WithParam("test", "it.Length < 10")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/foo", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("test", new LinqMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, WireMock.Matchers.MatchOperator.Or, "it.Length < 10"))
    )
    .WithGuid("41372914-1838-4c67-916b-b9aacdd096ce")
    .RespondWith(Response.Create()
@@ -13,7 +13,24 @@ builder
 builder
    .Given(Request.Create()
        .UsingMethod("POST")
-        .WithPath("/users/post2")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/users/post1", false, WireMock.Matchers.MatchOperator.Or))
+        .WithBody(new JsonMatcher(
+            value: new
+            {
+                Request = "Hello?"
+            },
+            ignoreCase: false,
+            regex: false
+        ))
+    )
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931001")
+    .RespondWith(Response.Create()
+    );
+
+builder
+    .Given(Request.Create()
+        .UsingMethod("POST")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/users/post2", false, WireMock.Matchers.MatchOperator.Or))
        .WithBody(new JsonMatcher(
            value: new
            {
@@ -31,7 +48,7 @@ builder
 builder
    .Given(Request.Create()
        .UsingMethod("POST")
-        .WithPath("/form-urlencoded")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/form-urlencoded", false, WireMock.Matchers.MatchOperator.Or))
        .WithHeader("Content-Type", "application/x-www-form-urlencoded", true)
        .WithBody("name=John Doe")
    )
@@ -41,18 +58,11 @@ builder

 builder
    .Given(Request.Create()
-        .UsingMethod("POST")
-        .WithPath("/users/post1")
-        .WithBody(new JsonMatcher(
-            value: new
-            {
-                Request = "Hello?"
-            },
-            ignoreCase: false,
-            regex: false
-        ))
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/regex", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("foo", new RegexMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, ".*", false, true, WireMock.Matchers.MatchOperator.Or))
    )
-    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931001")
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931004")
    .RespondWith(Response.Create()
    );

--- a/test/WireMock.Net.Tests/MappingBuilderTests.ToCSharpCode_Server.verified.txt
+++ b/test/WireMock.Net.Tests/MappingBuilderTests.ToCSharpCode_Server.verified.txt
@@ -2,8 +2,8 @@
 server
    .Given(Request.Create()
        .UsingMethod("GET")
-        .WithPath("/foo")
-        .WithParam("test", "it.Length < 10")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/foo", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("test", new LinqMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, WireMock.Matchers.MatchOperator.Or, "it.Length < 10"))
    )
    .WithGuid("41372914-1838-4c67-916b-b9aacdd096ce")
    .RespondWith(Response.Create()
@@ -13,7 +13,24 @@ server
 server
    .Given(Request.Create()
        .UsingMethod("POST")
-        .WithPath("/users/post2")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/users/post1", false, WireMock.Matchers.MatchOperator.Or))
+        .WithBody(new JsonMatcher(
+            value: new
+            {
+                Request = "Hello?"
+            },
+            ignoreCase: false,
+            regex: false
+        ))
+    )
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931001")
+    .RespondWith(Response.Create()
+    );
+
+server
+    .Given(Request.Create()
+        .UsingMethod("POST")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/users/post2", false, WireMock.Matchers.MatchOperator.Or))
        .WithBody(new JsonMatcher(
            value: new
            {
@@ -31,7 +48,7 @@ server
 server
    .Given(Request.Create()
        .UsingMethod("POST")
-        .WithPath("/form-urlencoded")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/form-urlencoded", false, WireMock.Matchers.MatchOperator.Or))
        .WithHeader("Content-Type", "application/x-www-form-urlencoded", true)
        .WithBody("name=John Doe")
    )
@@ -41,18 +58,11 @@ server

 server
    .Given(Request.Create()
-        .UsingMethod("POST")
-        .WithPath("/users/post1")
-        .WithBody(new JsonMatcher(
-            value: new
-            {
-                Request = "Hello?"
-            },
-            ignoreCase: false,
-            regex: false
-        ))
+        .UsingMethod("GET")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "/regex", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("foo", new RegexMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, ".*", false, true, WireMock.Matchers.MatchOperator.Or))
    )
-    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931001")
+    .WithGuid("98fae52e-76df-47d9-876f-2ee32e931004")
    .RespondWith(Response.Create()
    );

--- a/test/WireMock.Net.Tests/MappingBuilderTests.ToJson.verified.txt
+++ b/test/WireMock.Net.Tests/MappingBuilderTests.ToJson.verified.txt
@@ -32,6 +32,34 @@
      Body: { msg: "Hello world!"}
    }
  },
+  {
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931001,
+    UpdatedAt: 2023-01-14T15:16:17,
+    Request: {
+      Path: {
+        Matchers: [
+          {
+            Name: WildcardMatcher,
+            Pattern: /users/post1,
+            IgnoreCase: false
+          }
+        ]
+      },
+      Methods: [
+        POST
+      ],
+      Body: {
+        Matcher: {
+          Name: JsonMatcher,
+          Pattern: {
+            Request: Hello?
+          },
+          IgnoreCase: false,
+          Regex: false
+        }
+      }
+    }
+  },
  {
    Guid: 98fae52e-76df-47d9-876f-2ee32e931002,
    UpdatedAt: 2023-01-14T15:16:17,
@@ -104,31 +132,33 @@
    }
  },
  {
-    Guid: 98fae52e-76df-47d9-876f-2ee32e931001,
+    Guid: 98fae52e-76df-47d9-876f-2ee32e931004,
    UpdatedAt: 2023-01-14T15:16:17,
    Request: {
      Path: {
        Matchers: [
          {
            Name: WildcardMatcher,
-            Pattern: /users/post1,
+            Pattern: /regex,
            IgnoreCase: false
          }
        ]
      },
      Methods: [
-        POST
+        GET
      ],
-      Body: {
-        Matcher: {
-          Name: JsonMatcher,
-          Pattern: {
-            Request: Hello?
-          },
-          IgnoreCase: false,
-          Regex: false
+      Params: [
+        {
+          Name: foo,
+          Matchers: [
+            {
+              Name: RegexMatcher,
+              Pattern: .*,
+              IgnoreCase: false
+            }
+          ]
        }
-      }
+      ]
    }
  }
 ]
--- a/test/WireMock.Net.Tests/MappingBuilderTests.cs
+++ b/test/WireMock.Net.Tests/MappingBuilderTests.cs
@@ -102,6 +102,13 @@ public class MappingBuilderTests
            .WithHeader("Content-Type", "application/x-www-form-urlencoded")
            .WithBody(new FormUrlEncodedMatcher(["name=John Doe", "email=johndoe@example.com"]))
        ).RespondWith(Response.Create());
+
+        _sut.Given(Request.Create()
+                .WithPath("/regex")
+                .WithParam("foo", new RegexMatcher(".*"))
+                .UsingGet()
+            )
+            .RespondWith(Response.Create());
    }

    [Fact]
@@ -190,9 +197,9 @@ public class MappingBuilderTests
        _sut.SaveMappingsToFolder(null);

        // Verify
-        _fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Exactly(4));
-        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(mappingFolder), Times.Exactly(4));
-        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(4));
+        _fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Exactly(5));
+        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(mappingFolder), Times.Exactly(5));
+        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(5));
        _fileSystemHandlerMock.VerifyNoOtherCalls();
    }

@@ -208,8 +215,8 @@ public class MappingBuilderTests

        // Verify
        _fileSystemHandlerMock.Verify(fs => fs.GetMappingFolder(), Times.Never);
-        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(path), Times.Exactly(4));
-        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(4));
+        _fileSystemHandlerMock.Verify(fs => fs.FolderExists(path), Times.Exactly(5));
+        _fileSystemHandlerMock.Verify(fs => fs.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Exactly(5));
        _fileSystemHandlerMock.VerifyNoOtherCalls();
    }
 }
--- a/test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Matchers/ExactObjectMatcherTests.cs
@@ -29,7 +29,7 @@ public class ExactObjectMatcherTests
        object checkValue = new byte[] { 1, 2 };

        // Act
-        var matcher = new ExactObjectMatcher(new byte[] { 1, 2 });
+        var matcher = new ExactObjectMatcher([1, 2]);
        var score = matcher.IsMatch(checkValue).Score;

        // Assert
--- a/test/WireMock.Net.Tests/Matchers/MatcherTests.cs
+++ b/test/WireMock.Net.Tests/Matchers/MatcherTests.cs
@@ -0,0 +1,177 @@
+using FluentAssertions;
+using WireMock.Matchers;
+using Xunit;
+
+namespace WireMock.Net.Tests.Matchers;
+
+public class MatcherTests
+{
+    [Fact]
+    public void ContentTypeMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new ContentTypeMatcher("application/json");
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().Be("new ContentTypeMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, \"application/json\", false)");
+    }
+
+    [Fact]
+    public void ExactMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new ExactMatcher("test");
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().Be("new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.Or, \"test\")");
+    }
+
+    [Fact]
+    public void ExactObjectMatcher_GetCSharpCodeArguments_ShouldReturnNotImplemented()
+    {
+        // Arrange
+        var matcher = new ExactObjectMatcher(new { Name = "test" });
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().Be("NotImplemented");
+    }
+
+    [Fact]
+    public void FormUrlEncodedMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new FormUrlEncodedMatcher("key=value");
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().Be("new FormUrlEncodedMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, \"key=value\", false, WireMock.Matchers.MatchOperator.Or)");
+    }
+
+    [Fact]
+    public void JmesPathMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new JmesPathMatcher("expression");
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().Be("new JmesPathMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, WireMock.Matchers.MatchOperator.Or, \"expression\")");
+    }
+
+    [Fact]
+    public void JsonMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new JsonMatcher(new { key = "value" });
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().StartWith("new JsonMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch,");
+    }
+
+    [Fact]
+    public void JsonPartialMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new JsonPartialMatcher(new { key = "value" });
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().StartWith("new JsonPartialMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch,");
+    }
+
+    [Fact]
+    public void JsonPartialWildcardMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new JsonPartialWildcardMatcher(new { key = "value" });
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().StartWith("new JsonPartialWildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch,");
+    }
+
+    [Fact]
+    public void LinqMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new LinqMatcher("it.Contains(\"test\"");
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().Be("new LinqMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, WireMock.Matchers.MatchOperator.Or, \"it.Contains(\\\"test\\\"\")");
+    }
+
+    [Fact]
+    public void RegexMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new RegexMatcher("pattern");
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().Be("new RegexMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, \"pattern\", false, true, WireMock.Matchers.MatchOperator.Or)");
+    }
+
+    [Fact]
+    public void SimMetricsMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new SimMetricsMatcher("test");
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().Be("new SimMetricsMatcher.Levenstein(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, \"test\", SimMetrics.Net.SimMetricType.Levenstein, WireMock.Matchers.MatchOperator.Average)");
+    }
+
+    [Fact]
+    public void WildcardMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new WildcardMatcher("pattern");
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().Be("new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, \"pattern\", false, WireMock.Matchers.MatchOperator.Or)");
+    }
+
+    [Fact]
+    public void XPathMatcher_GetCSharpCodeArguments_ShouldReturnCorrectArguments()
+    {
+        // Arrange
+        var matcher = new XPathMatcher("pattern1");
+
+        // Act
+        var result = matcher.GetCSharpCodeArguments();
+
+        // Assert
+        result.Should().Be("new XPathMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, WireMock.Matchers.MatchOperator.Or, null, \"pattern1\")");
+    }
+}
--- a/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs
+++ b/test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs
@@ -25,278 +25,277 @@ using Response = Microsoft.AspNetCore.Http.HttpResponse;
 using Microsoft.Extensions.Primitives;
 #endif

-namespace WireMock.Net.Tests.Owin.Mappers
+namespace WireMock.Net.Tests.Owin.Mappers;
+
+public class OwinResponseMapperTests
 {
-    public class OwinResponseMapperTests
+    private static readonly Task CompletedTask = Task.FromResult(true);
+    private readonly OwinResponseMapper _sut;
+    private readonly Mock<IResponse> _responseMock;
+    private readonly Mock<Stream> _stream;
+    private readonly Mock<IHeaderDictionary> _headers;
+    private readonly Mock<IFileSystemHandler> _fileSystemHandlerMock;
+    private readonly Mock<IWireMockMiddlewareOptions> _optionsMock;
+
+    public OwinResponseMapperTests()
    {
-        private static readonly Task CompletedTask = Task.FromResult(true);
-        private readonly OwinResponseMapper _sut;
-        private readonly Mock<IResponse> _responseMock;
-        private readonly Mock<Stream> _stream;
-        private readonly Mock<IHeaderDictionary> _headers;
-        private readonly Mock<IFileSystemHandler> _fileSystemHandlerMock;
-        private readonly Mock<IWireMockMiddlewareOptions> _optionsMock;
+        _stream = new Mock<Stream>();
+        _stream.SetupAllProperties();
+        _stream.Setup(s => s.WriteAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(CompletedTask);

-        public OwinResponseMapperTests()
-        {
-            _stream = new Mock<Stream>();
-            _stream.SetupAllProperties();
-            _stream.Setup(s => s.WriteAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>())).Returns(CompletedTask);
+        _fileSystemHandlerMock = new Mock<IFileSystemHandler>();
+        _fileSystemHandlerMock.SetupAllProperties();

-            _fileSystemHandlerMock = new Mock<IFileSystemHandler>();
-            _fileSystemHandlerMock.SetupAllProperties();
+        _optionsMock = new Mock<IWireMockMiddlewareOptions>();
+        _optionsMock.SetupAllProperties();
+        _optionsMock.SetupGet(o => o.FileSystemHandler).Returns(_fileSystemHandlerMock.Object);

-            _optionsMock = new Mock<IWireMockMiddlewareOptions>();
-            _optionsMock.SetupAllProperties();
-            _optionsMock.SetupGet(o => o.FileSystemHandler).Returns(_fileSystemHandlerMock.Object);
-
-            _headers = new Mock<IHeaderDictionary>();
-            _headers.SetupAllProperties();
+        _headers = new Mock<IHeaderDictionary>();
+        _headers.SetupAllProperties();
 #if NET452
-            _headers.Setup(h => h.AppendValues(It.IsAny<string>(), It.IsAny<string[]>()));
+        _headers.Setup(h => h.AppendValues(It.IsAny<string>(), It.IsAny<string[]>()));
 #else
-            _headers.Setup(h => h.Add(It.IsAny<string>(), It.IsAny<StringValues>()));
+        _headers.Setup(h => h.Add(It.IsAny<string>(), It.IsAny<StringValues>()));
 #endif

-            _responseMock = new Mock<IResponse>();
-            _responseMock.SetupAllProperties();
-            _responseMock.SetupGet(r => r.Body).Returns(_stream.Object);
-            _responseMock.SetupGet(r => r.Headers).Returns(_headers.Object);
+        _responseMock = new Mock<IResponse>();
+        _responseMock.SetupAllProperties();
+        _responseMock.SetupGet(r => r.Body).Returns(_stream.Object);
+        _responseMock.SetupGet(r => r.Headers).Returns(_headers.Object);

-            _sut = new OwinResponseMapper(_optionsMock.Object);
-        }
+        _sut = new OwinResponseMapper(_optionsMock.Object);
+    }

-        [Fact]
-        public async Task OwinResponseMapper_MapAsync_Null()
+    [Fact]
+    public async Task OwinResponseMapper_MapAsync_Null()
+    {
+        // Act
+        await _sut.MapAsync(null, _responseMock.Object).ConfigureAwait(false);
+    }
+
+    [Theory]
+    [InlineData(300, 300)]
+    [InlineData(500, 500)]
+    public async Task OwinResponseMapper_MapAsync_Valid_StatusCode(object code, int expected)
+    {
+        // Arrange
+        var responseMessage = new ResponseMessage
        {
-            // Act
-            await _sut.MapAsync(null, _responseMock.Object).ConfigureAwait(false);
-        }
+            StatusCode = code
+        };

-        [Theory]
-        [InlineData(300, 300)]
-        [InlineData(500, 500)]
-        public async Task OwinResponseMapper_MapAsync_Valid_StatusCode(object code, int expected)
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+
+        // Assert
+        _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
+    }
+
+    [Theory]
+    [InlineData(0, 200)]
+    [InlineData(-1, 200)]
+    [InlineData(10000, 200)]
+    [InlineData(300, 300)]
+    public async Task OwinResponseMapper_MapAsync_Invalid_StatusCode_When_AllowOnlyDefinedHttpStatusCodeInResponseSet_Is_True(object code, int expected)
+    {
+        // Arrange
+        _optionsMock.SetupGet(o => o.AllowOnlyDefinedHttpStatusCodeInResponse).Returns(true);
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            var responseMessage = new ResponseMessage
-            {
-                StatusCode = code
-            };
+            StatusCode = code
+        };

-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);

-            // Assert
-            _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
-        }
+        // Assert
+        _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
+    }

-        [Theory]
-        [InlineData(0, 200)]
-        [InlineData(-1, 200)]
-        [InlineData(10000, 200)]
-        [InlineData(300, 300)]
-        public async Task OwinResponseMapper_MapAsync_Invalid_StatusCode_When_AllowOnlyDefinedHttpStatusCodeInResponseSet_Is_True(object code, int expected)
+    [Fact]
+    public async Task OwinResponseMapper_MapAsync_StatusCode_Is_Null()
+    {
+        // Arrange
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            _optionsMock.SetupGet(o => o.AllowOnlyDefinedHttpStatusCodeInResponse).Returns(true);
-            var responseMessage = new ResponseMessage
-            {
-                StatusCode = code
-            };
+            StatusCode = null
+        };

-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);

-            // Assert
-            _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
-        }
+        // Assert
+        _responseMock.VerifySet(r => r.StatusCode = It.IsAny<int>(), Times.Never);
+    }

-        [Fact]
-        public async Task OwinResponseMapper_MapAsync_StatusCode_Is_Null()
+    [Theory]
+    [InlineData(0, 0)]
+    [InlineData(-1, -1)]
+    [InlineData(10000, 10000)]
+    [InlineData(300, 300)]
+    public async Task OwinResponseMapper_MapAsync_StatusCode_Is_NotInEnumRange(object code, int expected)
+    {
+        // Arrange
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            var responseMessage = new ResponseMessage
-            {
-                StatusCode = null
-            };
+            StatusCode = code
+        };

-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);

-            // Assert
-            _responseMock.VerifySet(r => r.StatusCode = It.IsAny<int>(), Times.Never);
-        }
+        // Assert
+        _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
+    }

-        [Theory]
-        [InlineData(0, 0)]
-        [InlineData(-1, -1)]
-        [InlineData(10000, 10000)]
-        [InlineData(300, 300)]
-        public async Task OwinResponseMapper_MapAsync_StatusCode_Is_NotInEnumRange(object code, int expected)
+    [Fact]
+    public async Task OwinResponseMapper_MapAsync_NoBody()
+    {
+        // Arrange
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            var responseMessage = new ResponseMessage
-            {
-                StatusCode = code
-            };
+            Headers = new Dictionary<string, WireMockList<string>>()
+        };

-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);

-            // Assert
-            _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
-        }
+        // Assert
+        _stream.Verify(s => s.WriteAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()), Times.Never);
+    }

-        [Fact]
-        public async Task OwinResponseMapper_MapAsync_NoBody()
+    [Fact]
+    public async Task OwinResponseMapper_MapAsync_Body()
+    {
+        // Arrange
+        string body = "abcd";
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            var responseMessage = new ResponseMessage
-            {
-                Headers = new Dictionary<string, WireMockList<string>>()
-            };
+            Headers = new Dictionary<string, WireMockList<string>>(),
+            BodyData = new BodyData { DetectedBodyType = BodyType.String, BodyAsString = body }
+        };

-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);

-            // Assert
-            _stream.Verify(s => s.WriteAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()), Times.Never);
-        }
+        // Assert
+        _stream.Verify(s => s.WriteAsync(new byte[] { 97, 98, 99, 100 }, 0, 4, It.IsAny<CancellationToken>()), Times.Once);
+    }

-        [Fact]
-        public async Task OwinResponseMapper_MapAsync_Body()
+    [Fact]
+    public async Task OwinResponseMapper_MapAsync_BodyAsBytes()
+    {
+        // Arrange
+        var bytes = new byte[] { 48, 49 };
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            string body = "abcd";
-            var responseMessage = new ResponseMessage
-            {
-                Headers = new Dictionary<string, WireMockList<string>>(),
-                BodyData = new BodyData { DetectedBodyType = BodyType.String, BodyAsString = body }
-            };
+            Headers = new Dictionary<string, WireMockList<string>>(),
+            BodyData = new BodyData { DetectedBodyType = BodyType.Bytes, BodyAsBytes = bytes }
+        };

-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);

-            // Assert
-            _stream.Verify(s => s.WriteAsync(new byte[] { 97, 98, 99, 100 }, 0, 4, It.IsAny<CancellationToken>()), Times.Once);
-        }
+        // Assert
+        _stream.Verify(s => s.WriteAsync(bytes, 0, bytes.Length, It.IsAny<CancellationToken>()), Times.Once);
+    }

-        [Fact]
-        public async Task OwinResponseMapper_MapAsync_BodyAsBytes()
+    [Fact]
+    public async Task OwinResponseMapper_MapAsync_BodyAsJson()
+    {
+        // Arrange
+        var json = new { t = "x", i = (string?)null };
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            var bytes = new byte[] { 48, 49 };
-            var responseMessage = new ResponseMessage
-            {
-                Headers = new Dictionary<string, WireMockList<string>>(),
-                BodyData = new BodyData { DetectedBodyType = BodyType.Bytes, BodyAsBytes = bytes }
-            };
+            Headers = new Dictionary<string, WireMockList<string>>(),
+            BodyData = new BodyData { DetectedBodyType = BodyType.Json, BodyAsJson = json, BodyAsJsonIndented = false }
+        };

-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);

-            // Assert
-            _stream.Verify(s => s.WriteAsync(bytes, 0, bytes.Length, It.IsAny<CancellationToken>()), Times.Once);
-        }
+        // Assert
+        _stream.Verify(s => s.WriteAsync(new byte[] { 123, 34, 116, 34, 58, 34, 120, 34, 125 }, 0, 9, It.IsAny<CancellationToken>()), Times.Once);
+    }

-        [Fact]
-        public async Task OwinResponseMapper_MapAsync_BodyAsJson()
+    [Fact]
+    public async Task OwinResponseMapper_MapAsync_SetResponseHeaders()
+    {
+        // Arrange
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            var json = new { t = "x", i = (string?)null };
-            var responseMessage = new ResponseMessage
-            {
-                Headers = new Dictionary<string, WireMockList<string>>(),
-                BodyData = new BodyData { DetectedBodyType = BodyType.Json, BodyAsJson = json, BodyAsJsonIndented = false }
-            };
+            Headers = new Dictionary<string, WireMockList<string>> { { "h", new WireMockList<string>("x", "y") } }
+        };

-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);

-            // Assert
-            _stream.Verify(s => s.WriteAsync(new byte[] { 123, 34, 116, 34, 58, 34, 120, 34, 125 }, 0, 9, It.IsAny<CancellationToken>()), Times.Once);
-        }
-
-        [Fact]
-        public async Task OwinResponseMapper_MapAsync_SetResponseHeaders()
-        {
-            // Arrange
-            var responseMessage = new ResponseMessage
-            {
-                Headers = new Dictionary<string, WireMockList<string>> { { "h", new WireMockList<string>("x", "y") } }
-            };
-
-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
-
-            // Assert
+        // Assert
 #if NET452
-            _headers.Verify(h => h.AppendValues("h", new string[] { "x", "y" }), Times.Once);
+        _headers.Verify(h => h.AppendValues("h", new string[] { "x", "y" }), Times.Once);
 #else
-            var v = new StringValues();
-            _headers.Verify(h => h.TryGetValue("h", out v), Times.Once);
+        var v = new StringValues();
+        _headers.Verify(h => h.TryGetValue("h", out v), Times.Once);
 #endif
-        }
+    }

-        [Fact]
-        public void OwinResponseMapper_MapAsync_BodyAsFile_ThrowsException()
+    [Fact]
+    public void OwinResponseMapper_MapAsync_BodyAsFile_ThrowsException()
+    {
+        // Arrange
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            var responseMessage = new ResponseMessage
-            {
-                Headers = new Dictionary<string, WireMockList<string>>(),
-                BodyData = new BodyData { DetectedBodyType = BodyType.File, BodyAsFile = string.Empty }
-            };
-            _fileSystemHandlerMock.Setup(f => f.ReadResponseBodyAsFile(It.IsAny<string>())).Throws<FileNotFoundException>();
+            Headers = new Dictionary<string, WireMockList<string>>(),
+            BodyData = new BodyData { DetectedBodyType = BodyType.File, BodyAsFile = string.Empty }
+        };
+        _fileSystemHandlerMock.Setup(f => f.ReadResponseBodyAsFile(It.IsAny<string>())).Throws<FileNotFoundException>();

-            // Act
-            Func<Task> action = () => _sut.MapAsync(responseMessage, _responseMock.Object);
+        // Act
+        Func<Task> action = () => _sut.MapAsync(responseMessage, _responseMock.Object);

-            // Assert
-            action.Should().ThrowAsync<FileNotFoundException>();
-        }
+        // Assert
+        action.Should().ThrowAsync<FileNotFoundException>();
+    }

-        [Fact]
-        public async Task OwinResponseMapper_MapAsync_WithFault_EMPTY_RESPONSE()
+    [Fact]
+    public async Task OwinResponseMapper_MapAsync_WithFault_EMPTY_RESPONSE()
+    {
+        // Arrange
+        string body = "abc";
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            string body = "abc";
-            var responseMessage = new ResponseMessage
-            {
-                Headers = new Dictionary<string, WireMockList<string>>(),
-                BodyData = new BodyData { DetectedBodyType = BodyType.String, BodyAsString = body },
-                FaultType = FaultType.EMPTY_RESPONSE
-            };
+            Headers = new Dictionary<string, WireMockList<string>>(),
+            BodyData = new BodyData { DetectedBodyType = BodyType.String, BodyAsString = body },
+            FaultType = FaultType.EMPTY_RESPONSE
+        };

-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);

-            // Assert
-            _stream.Verify(s => s.WriteAsync(EmptyArray<byte>.Value, 0, 0, It.IsAny<CancellationToken>()), Times.Once);
-        }
+        // Assert
+        _stream.Verify(s => s.WriteAsync(EmptyArray<byte>.Value, 0, 0, It.IsAny<CancellationToken>()), Times.Once);
+    }

-        [Theory]
-        [InlineData("abcd", BodyType.String)]
-        [InlineData("", BodyType.String)]
-        [InlineData(null, BodyType.None)]
-        public async Task OwinResponseMapper_MapAsync_WithFault_MALFORMED_RESPONSE_CHUNK(string body, BodyType detected)
+    [Theory]
+    [InlineData("abcd", BodyType.String)]
+    [InlineData("", BodyType.String)]
+    [InlineData(null, BodyType.None)]
+    public async Task OwinResponseMapper_MapAsync_WithFault_MALFORMED_RESPONSE_CHUNK(string body, BodyType detected)
+    {
+        // Arrange
+        var responseMessage = new ResponseMessage
        {
-            // Arrange
-            var responseMessage = new ResponseMessage
-            {
-                Headers = new Dictionary<string, WireMockList<string>>(),
-                BodyData = new BodyData { DetectedBodyType = detected, BodyAsString = body },
-                StatusCode = 100,
-                FaultType = FaultType.MALFORMED_RESPONSE_CHUNK
-            };
+            Headers = new Dictionary<string, WireMockList<string>>(),
+            BodyData = new BodyData { DetectedBodyType = detected, BodyAsString = body },
+            StatusCode = 100,
+            FaultType = FaultType.MALFORMED_RESPONSE_CHUNK
+        };

-            // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
+        // Act
+        await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);

-            // Assert
-            _responseMock.VerifySet(r => r.StatusCode = 100, Times.Once);
-            _stream.Verify(s => s.WriteAsync(It.IsAny<byte[]>(), 0, It.Is<int>(count => count >= 0), It.IsAny<CancellationToken>()), Times.Once);
-        }
+        // Assert
+        _responseMock.VerifySet(r => r.StatusCode = 100, Times.Once);
+        _stream.Verify(s => s.WriteAsync(It.IsAny<byte[]>(), 0, It.Is<int>(count => count >= 0), It.IsAny<CancellationToken>()), Times.Once);
    }
 }
--- a/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyIntegrationTests.cs
+++ b/test/WireMock.Net.Tests/ResponseBuilders/ResponseWithProxyIntegrationTests.cs
@@ -0,0 +1,111 @@
+// Copyright © WireMock.Net
+
+#if NET8_0_OR_GREATER
+using System;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using FluentAssertions;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Hosting.Server;
+using Microsoft.AspNetCore.Hosting.Server.Features;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using WireMock.Net.Xunit;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace WireMock.Net.Tests.ResponseBuilders;
+
+public sealed class ResponseWithProxyIntegrationTests(ITestOutputHelper output)
+{
+    [Fact]
+    public async Task Response_UsingTextPlain()
+    {
+        // Given
+        using var server = await TestServer.New().Run();
+        var port = server.GetPort();
+        output.WriteLine($"Server running on port {port}");
+
+        var settings = new WireMockServerSettings
+        {
+            Port = 0,
+            Logger = new TestOutputHelperWireMockLogger(output)
+        };
+        using var mockServer = WireMockServer.Start(settings);
+        mockServer.Given(Request.Create().WithPath("/zipcode").UsingPatch())
+                  .RespondWith(Response.Create().WithProxy($"http://localhost:{port}"));
+
+        using var client = new HttpClient { BaseAddress = new Uri(mockServer.Urls[0]) };
+        using var content = new ByteArrayContent("0123"u8.ToArray());
+        content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
+
+        // When
+        var response = await client.PatchAsync("/zipcode", content);
+
+        // Then
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+        response.Content.Headers.GetValues("Content-Type").Should().BeEquivalentTo("text/plain; charset=utf-8");
+        var result = await response.Content.ReadAsStringAsync();
+        result.Should().Be("0123");
+    }
+
+    sealed class Disposable(Action dispose) : IDisposable
+    {
+        public void Dispose() => dispose();
+    }
+
+    sealed class TestServer(WebApplication app) : IDisposable
+    {
+        private Disposable _disposable = new(() => { });
+
+        public static TestServer New()
+        {
+            var builder = WebApplication.CreateBuilder();
+            builder.WebHost.ConfigureKestrel(opts => opts.ListenAnyIP(0));
+
+            var app = builder.Build();
+
+            app.MapPatch("/zipcode", async (HttpRequest req) =>
+            {
+                var memory = new MemoryStream();
+                await req.Body.CopyToAsync(memory);
+                var content = Encoding.UTF8.GetString(memory.ToArray());
+                return content;
+            });
+            return new(app);
+        }
+
+        public int GetPort()
+            => app.Services.GetRequiredService<IServer>().Features.Get<IServerAddressesFeature>()!.Addresses
+                  .Select(x => new Uri(x).Port)
+                  .First();
+
+        public async ValueTask<TestServer> Run()
+        {
+            var started = new TaskCompletionSource();
+            var host = app.Services.GetRequiredService<IHostApplicationLifetime>();
+            host.ApplicationStarted.Register(() => started.SetResult());
+            _ = Task.Run(() => app.RunAsync());
+            await started.Task;
+            _disposable = new(() => host.StopApplication());
+            return this;
+        }
+
+        public void Dispose()
+        {
+            _disposable.Dispose();
+        }
+    }
+}
+#endif
--- a/test/WireMock.Net.Tests/Serialization/CustomPathParamMatcher.cs
+++ b/test/WireMock.Net.Tests/Serialization/CustomPathParamMatcher.cs
@@ -92,11 +92,17 @@ public class CustomPathParamMatcher : IStringMatcher

    public MatchOperator MatchOperator { get; }

+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return "// TODO: CustomPathParamMatcher";
+    }
+
    private static string[] GetPathParts(string? path)
    {
        if (path is null)
        {
-            return new string[0];
+            return [];
        }

        var hashMarkIndex = path.IndexOf('#');
--- a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Builder_And_AddStartIsFalse.verified.txt
+++ b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Builder_And_AddStartIsFalse.verified.txt
@@ -1,8 +1,8 @@
 builder
    .Given(Request.Create()
        .UsingMethod("GET")
-        .WithPath("test_path")
-        .WithParam("q", "42")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "test_path", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("q", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "42"))
        .WithClientIP("112.123.100.99")
        .WithHeader("h-key", "h-value", true)
        .WithCookie("c-key", "c-value", true)
--- a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Builder_And_AddStartIsTrue.verified.txt
+++ b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Builder_And_AddStartIsTrue.verified.txt
@@ -2,8 +2,8 @@
 builder
    .Given(Request.Create()
        .UsingMethod("GET")
-        .WithPath("test_path")
-        .WithParam("q", "42")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "test_path", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("q", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "42"))
        .WithClientIP("112.123.100.99")
        .WithHeader("h-key", "h-value", true)
        .WithCookie("c-key", "c-value", true)
--- a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Server_And_AddStartIsFalse.verified.txt
+++ b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Server_And_AddStartIsFalse.verified.txt
@@ -1,8 +1,8 @@
 server
    .Given(Request.Create()
        .UsingMethod("GET")
-        .WithPath("test_path")
-        .WithParam("q", "42")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "test_path", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("q", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "42"))
        .WithClientIP("112.123.100.99")
        .WithHeader("h-key", "h-value", true)
        .WithCookie("c-key", "c-value", true)
--- a/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Server_And_AddStartIsTrue.verified.txt
+++ b/test/WireMock.Net.Tests/Serialization/MappingConverterTests.ToCSharpCode_With_Server_And_AddStartIsTrue.verified.txt
@@ -2,8 +2,8 @@
 server
    .Given(Request.Create()
        .UsingMethod("GET")
-        .WithPath("test_path")
-        .WithParam("q", "42")
+        .WithPath(new WildcardMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, "test_path", false, WireMock.Matchers.MatchOperator.Or))
+        .WithParam("q", new ExactMatcher(WireMock.Matchers.MatchBehaviour.AcceptOnMatch, false, WireMock.Matchers.MatchOperator.And, "42"))
        .WithClientIP("112.123.100.99")
        .WithHeader("h-key", "h-value", true)
        .WithCookie("c-key", "c-value", true)
--- a/test/WireMock.Net.Tests/WireMockServer.Admin.cs
+++ b/test/WireMock.Net.Tests/WireMockServer.Admin.cs
@@ -11,9 +11,11 @@ using FluentAssertions;
 using Moq;
 using Newtonsoft.Json;
 using NFluent;
-using WireMock.Admin.Settings;
+using RestEase;
+using WireMock.Client;
 using WireMock.Handlers;
 using WireMock.Logging;
+using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
@@ -244,6 +246,38 @@ public class WireMockServerAdminTests
        loggerMock.Verify(l => l.Info(It.Is<string>(s => s.StartsWith("The Static Mapping folder")), It.IsAny<object[]>()), Times.Once);
    }

+    [Fact]
+    public async Task WireMockServer_Admin_Mapping_WithoutPathOrUrl()
+    {
+        // Arrange
+        using var server = WireMockServer.StartWithAdminInterface();
+
+        // Act
+        server.Given(Request.Create().UsingGet())
+            .RespondWith(Response.Create());
+
+        // Assert
+        var mapping = server.Mappings.First(m => !m.IsAdminInterface);
+        var request = (Request) mapping.RequestMatcher;
+        var pathMatcher = request.GetRequestMessageMatcher<RequestMessagePathMatcher>();
+        pathMatcher.Should().BeNull();
+
+        var api = RestClient.For<IWireMockAdminApi>(server.Url);
+        var mappingModels = await api.GetMappingsAsync();
+        var mappingModel = mappingModels.First();
+        mappingModel.Request.Path.Should().BeNull();
+        mappingModel.Request.Url.Should().BeNull();
+
+        await api.DeleteMappingsAsync();
+
+        await api.PostMappingAsync(mappingModel);
+        await api.GetMappingsAsync();
+        mappingModels = await api.GetMappingsAsync();
+        mappingModel = mappingModels.First();
+        mappingModel.Request.Path.Should().BeNull();
+        mappingModel.Request.Url.Should().BeNull();
+    }
+
    [Fact]
    public void WireMockServer_Admin_Mappings_WithGuid_Get()
    {
--- a/test/WireMock.Net.Tests/WireMockServerTests.cs
+++ b/test/WireMock.Net.Tests/WireMockServerTests.cs
@@ -8,13 +8,17 @@ using System.Linq;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Net.NetworkInformation;
+using System.Net.Sockets;
 using System.Text;
 using System.Threading.Tasks;
 using FluentAssertions;
 using Newtonsoft.Json;
 using NFluent;
 using WireMock.Admin.Mappings;
+using WireMock.Http;
 using WireMock.Matchers;
+using WireMock.Net.Tests.Facts;
 using WireMock.Net.Tests.Serialization;
 using WireMock.Net.Xunit;
 using WireMock.RequestBuilders;
@@ -195,6 +199,66 @@ public partial class WireMockServerTests
    }
 #endif

+#if NET6_0_OR_GREATER
+    private static string[] GetIPAddressesByFamily(AddressFamily addressFamily)
+    {
+        return NetworkInterface.GetAllNetworkInterfaces()
+            .Where(ni => ni.OperationalStatus == OperationalStatus.Up)
+            .SelectMany(ni => ni.GetIPProperties().UnicastAddresses)
+            .Where(addr => addr.Address.AddressFamily == addressFamily)
+            .Select(addr => addr.Address.ToString())
+            .ToArray();
+    }
+
+    [IgnoreOnContinuousIntegrationFact]
+    public async Task WireMockServer_WithUrl0000_Should_Listen_On_All_IPs_IPv4()
+    {
+        // Arrange
+        var port = PortUtils.FindFreeTcpPort();
+        var IPv4 = GetIPAddressesByFamily(System.Net.Sockets.AddressFamily.InterNetwork);
+        var settings = new WireMockServerSettings
+        {
+            Urls = ["http://0.0.0.0:" + port],
+        };
+        using var server = WireMockServer.Start(settings);
+
+        server.Given(Request.Create().WithPath("/*")).RespondWith(Response.Create().WithBody("x"));
+
+        foreach (var address in IPv4)
+        {
+            // Act
+            var response = await new HttpClient().GetStringAsync("http://" + address + ":" + server.Ports[0] + "/foo").ConfigureAwait(false);
+
+            // Assert
+            response.Should().Be("x");
+        }
+    }
+
+    [IgnoreOnContinuousIntegrationFact]
+    public async Task WireMockServer_WithUrl0000_Should_Listen_On_All_IPs_IPv6()
+    {
+        // Arrange
+        var port = PortUtils.FindFreeTcpPort();
+        var IPv6 = GetIPAddressesByFamily(System.Net.Sockets.AddressFamily.InterNetworkV6);
+        var settings = new WireMockServerSettings
+        {
+            Urls = ["http://0.0.0.0:" + port],
+        };
+        using var server = WireMockServer.Start(settings);
+
+        server.Given(Request.Create().WithPath("/*")).RespondWith(Response.Create().WithBody("x"));
+
+        foreach (var address in IPv6)
+        {
+            // Act
+            var response = await new HttpClient().GetStringAsync("http://[" + address + "]:" + server.Ports[0] + "/foo").ConfigureAwait(false);
+
+            // Assert
+            response.Should().Be("x");
+        }
+    }
+#endif
+
    [Fact]
    public async Task WireMockServer_Should_respond_a_redirect_without_body()
    {
@@ -247,7 +311,7 @@ public partial class WireMockServerTests
        // Act
        var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false);

-        // Asser.
+        // Assert
        response.Should().Be("x");

        server.Stop();
@@ -273,7 +337,7 @@ public partial class WireMockServerTests
        await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false);
        watch.Stop();

-        // Asser.
+        // Assert
        watch.ElapsedMilliseconds.Should().BeGreaterOrEqualTo(0);

        server.Stop();
@@ -351,7 +415,7 @@ public partial class WireMockServerTests
    //}

    [Fact]
-    public async Task WireMockServer_Should_exclude_restrictedResponseHeader()
+    public async Task WireMockServer_Should_Exclude_RestrictedResponseHeader()
    {
        // Assign
        string path = $"/foo_{Guid.NewGuid()}";
@@ -371,6 +435,26 @@ public partial class WireMockServerTests
        server.Stop();
    }

+    [Fact] // #720
+    public async Task WireMockServer_Should_AllowResponseHeaderContentLength_For_HEAD()
+    {
+        // Assign
+        const string length = "42";
+        var path = $"/cl_{Guid.NewGuid()}";
+        using var server = WireMockServer.Start();
+
+        server
+            .Given(Request.Create().WithPath(path).UsingHead())
+            .RespondWith(Response.Create().WithHeader(HttpKnownHeaderNames.ContentLength, length));
+
+        // Act
+        var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, path);
+        var response = await server.CreateClient().SendAsync(httpRequestMessage).ConfigureAwait(false);
+
+        // Assert
+        response.Content.Headers.GetValues(HttpKnownHeaderNames.ContentLength).Should().Contain(length);
+    }
+
 #if !NET452 && !NET461
    [Theory]
    [InlineData("TRACE")]
@@ -641,4 +725,4 @@ public partial class WireMockServerTests
        server.Stop();
    }
 #endif
-}
+}
Author	SHA1	Message	Date
Stef Heyenrath	f89f0fa466	1.6.4	2024-09-25 08:56:44 +02:00
Stef Heyenrath	b892e85d2a	Add WireMock.Net.TUnit project (#1179 ) * Add WireMock.Net.TUnit project * fix * . * fix * bd * 0.1.812 * dotnet test * 0.1.817 * cat * type * type2 * find * -- --diagnostic * --no-build * fix?	2024-09-25 08:52:40 +02:00
Stef Heyenrath	836976ca19	Upgrade CS-Script to version 4.8.17 (#1178 )	2024-09-20 15:20:38 +02:00
Stef Heyenrath	c845f73dd0	Unpin Testcontainers version and upgrade to version 3.10.0 (#1177 )	2024-09-20 15:20:25 +02:00
Stef Heyenrath	2cbbef01ae	Refactor some code (IBodyDataExtensions)	2024-09-20 13:52:45 +02:00
Ruxo	dd80fd7822	Attempt to fix JSON parsing of text/plain content type (#1172 ) * UseContentType * Fix unit tests * Add a unit test and an integration test for the fix. * Simplify body type checking with GetBodyType extension. * Split IBodyDataExtension, and use imperative style instead of functional style * Remove excessive null forgiving operators * Adjust braces --------- Co-authored-by: Ruxo Zheng <rz@just.sent.as>	2024-09-20 13:19:32 +02:00
Stef Heyenrath	527278e60c	Update the .NET Aspire tests (#1170 ) * Skip unit tests when Docker is not running in Linux container mode using DockerIsRunningInLinuxContainerModeFact * IgnoreOnContinuousIntegrationFact	2024-09-10 16:14:05 +02:00
Stef Heyenrath	7d7f1f8fbb	Allow mapping without Path or Url (#1169 )	2024-09-09 20:48:09 +02:00
Stef Heyenrath	af124d556d	1.6.3	2024-09-07 09:36:33 +02:00
cocoon	60931f6273	Fix listen on AnyIP for url 0.0.0.0 (#1165 ) * fix listen to AnyIP if url is 0.0.0.0 * Add Test for listenin on AnyIP for url 0.0.0.0 * add missing using, use var, indent, remove empty line * remove assert for ipv4/v6 address list * test only if NET6_0_OR_GREATER * use same code style * add missing + * Asser. to Assert * split single test into one for IPv4 and one for IPv6 * Create IgnoreOnContinuousIntegrationFact.cs * Ignore tests if CI/CD * change to file - scoped namespace and add GITHUB_ACTIONS * use PortUtils.FindFreeTcpPort() * add and use GetIPAddressesByFamily * add using System.Net.Sockets * use #if for both unit tests and include new helper method inside	2024-09-07 09:31:19 +02:00
Stef Heyenrath	b99a80e782	Update README.md (Fix NuGet and MyGet badges)	2024-09-06 15:11:30 +02:00
Stef Heyenrath	07c9aebf44	1.6.2	2024-09-04 18:50:59 +02:00
Stef Heyenrath	8348a7b9a3	Also update IWireMockMiddlewareOptions when settings are updated via admin interface (#1166 ) * Also update IWireMockMiddlewareOptions when settings are updated via admin interface * ci	2024-09-04 18:47:25 +02:00
Stef Heyenrath	9a49e6a1cd	Upgrade Aspire to version 8.2.0 (#1163 )	2024-08-31 17:06:30 +02:00
Stef Heyenrath	f82891c996	Fix version from "WireMock.Net.Aspire"	2024-08-29 18:51:25 +02:00
Stef Heyenrath	da100298c1	Update MappingConverter to correctly write the Matcher as C# code (#1152 ) * Update MappingConverter to correctly write the Matcher as C# code * . * CSharpCodeMatcher * tests * .	2024-08-27 19:38:07 +02:00
Stef Heyenrath	95573eeb96	1.6.1	2024-08-22 20:33:39 +02:00
Stef Heyenrath	487d6d2db1	Use default timeout for Regex (#1160 )	2024-08-22 20:31:03 +02:00
Stef Heyenrath	d2b53893db	1.6.0	2024-08-16 13:19:07 +02:00
Stef Heyenrath	088444024f	Allow setting Content-Length header on the response (#1158 ) * Allow setting Content-Length header on the response * fix?	2024-08-16 12:14:42 +02:00