mm

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

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

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
+# 1.23.0 (05 January 2026)
+- [#1414](https://github.com/wiremock/WireMock.Net/pull/1414) - Pass the parameter matchOperator in Request.WithPath to its inner calls [bug] contributed by [gbamqzkdyg](https://github.com/gbamqzkdyg)
+- [#1416](https://github.com/wiremock/WireMock.Net/pull/1416) - Fix: Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers library contributed by [samlatham](https://github.com/samlatham)
+- [#1413](https://github.com/wiremock/WireMock.Net/issues/1413) - Parameter `matchOperator` is not respected in the method Request.WithPath [bug]
+- [#1415](https://github.com/wiremock/WireMock.Net/issues/1415) - HandlebarsSettings AllowedHandlebarsHelpers Configuration Not Applied [bug]
+
+# 1.22.0 (02 January 2026)
+- [#1412](https://github.com/wiremock/WireMock.Net/pull/1412) - chore(testcontainers): bump up Testcontainers to version 4.10.0 [feature] contributed by [vhatsura](https://github.com/vhatsura)
+- [#1411](https://github.com/wiremock/WireMock.Net/issues/1411) - WireMock.Net.Testcontainers isn't compatible with Testcontainers 4.10.0 [bug]
+
+# 1.21.0 (25 December 2025)
+- [#1408](https://github.com/wiremock/WireMock.Net/pull/1408) - Fix readyness-check for Testcontainers [bug] contributed by [StefH](https://github.com/StefH)
+
+# 1.20.0 (24 December 2025)
+- [#1399](https://github.com/wiremock/WireMock.Net/pull/1399) - Upgrade RamlToOpenApiConverter and YamlDotNet [feature] contributed by [StefH](https://github.com/StefH)
+- [#1400](https://github.com/wiremock/WireMock.Net/pull/1400) - Add WireMock.Net.NUnit project [feature] contributed by [StefH](https://github.com/StefH)
+- [#1405](https://github.com/wiremock/WireMock.Net/pull/1405) - Fix Testcontainers AddProtoDefinition [bug] contributed by [StefH](https://github.com/StefH)
+- [#1398](https://github.com/wiremock/WireMock.Net/issues/1398) - Upgrade YamlDotNet dependency [feature]
+- [#1404](https://github.com/wiremock/WireMock.Net/issues/1404) - An exception occurs when adding multiple proto definitions in the TestContainer. [bug]
+
+# 1.19.0 (12 December 2025)
+- [#1391](https://github.com/wiremock/WireMock.Net/pull/1391) - Update WireMockContainerBuilder (WithImage and WithCustomImage) [feature] contributed by [StefH](https://github.com/StefH)
+- [#1392](https://github.com/wiremock/WireMock.Net/pull/1392) - WireMockContainerBuilder: allow all docker images named wiremock [feature] contributed by [StefH](https://github.com/StefH)
+- [#1390](https://github.com/wiremock/WireMock.Net/issues/1390) - Unable to build WireMockContainerBuilder with custom image [feature]
+
 # 1.18.0 (09 December 2025)
 - [#1388](https://github.com/wiremock/WireMock.Net/pull/1388) - Add WithBodyAsType to RequestMatcher [feature] contributed by [StefH](https://github.com/StefH)

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

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

@@ -51,17 +51,17 @@

    <ItemGroup>
        <!-- CVE-2019-0820 -->
-        <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
+        <!--<PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />-->

        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
    </ItemGroup>

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

-SET version=1.18.0
+SET version=1.23.0

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

--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,5 +1,7 @@
-# 1.18.0 (09 December 2025)
- #1388 Add WithBodyAsType to RequestMatcher [feature]
- #330 Feature: Add support for CSharpCode Transformer [wontfix]
+# 1.23.0 (05 January 2026)
+- #1414 Pass the parameter matchOperator in Request.WithPath to its inner calls [bug]
+- #1416 Fix: Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers library
+- #1413 Parameter `matchOperator` is not respected in the method Request.WithPath [bug]
+- #1415 HandlebarsSettings AllowedHandlebarsHelpers Configuration Not Applied [bug]

 The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 | &nbsp;&nbsp;**Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/wiremock/WireMock.Net/issues) |
 | | |
 | ***Quality*** | &nbsp; |
-| &nbsp;&nbsp;**Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=7) |
+| &nbsp;&nbsp;**Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=61) |
 | &nbsp;&nbsp;**Quality** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=alert_status)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net) [![CodeFactor](https://www.codefactor.io/repository/github/wiremock/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock/wiremock.net) |
 | &nbsp;&nbsp;**Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=bugs)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=BUG) [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=code_smells)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=CODE_SMELL) |
 | &nbsp;&nbsp;**Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=coverage)](https://sonarcloud.io/component_measures?id=WireMock-Net_WireMock.Net&metric=coverage) [![codecov](https://codecov.io/gh/wiremock/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/wiremock/WireMock.Net)|
@@ -55,6 +55,7 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 | &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
 | &nbsp;&nbsp;**WireMock.Net.xUnit.v3** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit.v3)](https://www.nuget.org/packages/WireMock.Net.xUnit.v3) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit.v3?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit.v3)
 | &nbsp;&nbsp;**WireMock.Net.TUnit** | [![NuGet Badge WireMock.Net.TUnit](https://img.shields.io/nuget/v/WireMock.Net.TUnit)](https://www.nuget.org/packages/WireMock.Net.TUnit) | [![MyGet Badge WireMock.Net.TUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.TUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.TUnit)
+| &nbsp;&nbsp;**WireMock.Net.NUnit** | [![NuGet Badge WireMock.Net.NUnit](https://img.shields.io/nuget/v/WireMock.Net.NUnit)](https://www.nuget.org/packages/WireMock.Net.NUnit) | [![MyGet Badge WireMock.Net.TUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.NUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.NUnit)
 | | | |
 | &nbsp;&nbsp;**WireMock.Net.Extensions.Routing** | [![NuGet Badge WireMock.Net.Extensions.Routing](https://img.shields.io/nuget/v/WireMock.Net.Extensions.Routing)](https://www.nuget.org/packages/WireMock.Net.Extensions.Routing) | [![MyGet Badge WireMock.Net.Extensions.Routing](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Extensions.Routing?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Extensions.Routing)
 | &nbsp;&nbsp;**WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/nuget/v/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Matchers.CSharpCode?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
--- a/Solution.sln
+++ b/Solution.sln
@@ -1,7 +1,7 @@

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

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

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

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

  steps:
  - script: |
--- a/azure-pipelines-nuget.yml
+++ b/azure-pipelines-nuget.yml
@@ -1,5 +1,5 @@
 pool:
-  vmImage: 'windows-2022'
+  vmImage: 'windows-2025'

 variables:
  Prerelease: ''
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/HowTo.txt
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/HowTo.txt
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/Program.cs
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/Program.cs
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/WireMock.Net.Console.NET8.WithCertificate.csproj
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/WireMock.Net.Console.NET8.WithCertificate.csproj
@@ -7,7 +7,7 @@

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

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/cert-rsa.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/cert-rsa.pem
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/cert.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/cert.pem
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/private-key-rsa.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/private-key-rsa.pem
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/private-key.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/private-key.pem
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/public-key-rsa.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/public-key-rsa.pem
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/public-key.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/public-key.pem
--- a/examples/WireMock.Net.Console.NET8/MainApp.cs
+++ b/examples/WireMock.Net.Console.NET8/MainApp.cs
@@ -376,9 +376,9 @@ namespace WireMock.Net.ConsoleApplication
                PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); },

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

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

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

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

-#if MIMEKIT
+//#if MIMEKIT
            var textPlainContentTypeMatcher = new ContentTypeMatcher("text/plain");
            var textPlainContentMatcher = new ExactMatcher("This is some plain text");
            var textPlainMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textPlainContentTypeMatcher, null, null, textPlainContentMatcher);
@@ -588,7 +588,7 @@ namespace WireMock.Net.ConsoleApplication
                .RespondWith(Response.Create()
                    .WithBody("MultiPart is ok")
                );
-#endif
+//#endif
            // 400 ms
            server
                .Given(Request.Create()
--- a/examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj
+++ b/examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj
@@ -1,34 +1,34 @@
 <Project Sdk="Microsoft.NET.Sdk">

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    <ItemGroup>
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs
@@ -47,5 +47,5 @@ public class LogRequestMatchModel
    /// <value>
    /// The match details.
    /// </value>
-    public IList<object> MatchDetails { get; set; }
+    public IList<object> MatchDetails { get; set; } = [];
 }
--- a/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
@@ -2,7 +2,6 @@

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

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

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

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

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

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

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

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

 namespace WireMock.Types;

-#if NETSTANDARD1_3_OR_GREATER || NET461
 /// <summary>
 /// Describes the client certificate requirements for a HTTPS connection.
 /// This enum is the same as https://learn.microsoft.com/en-us/dotnet/api/microsoft.aspnetcore.server.kestrel.https.clientcertificatemode
@@ -29,5 +28,4 @@ public enum ClientCertificateMode
    /// It may be requested by the application later.
    /// </summary>
    DelayCertificate,
-}
-#endif
+}
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -4,7 +4,8 @@
        <Description>Commonly used interfaces, models, enumerations and types.</Description>
        <AssemblyTitle>WireMock.Net.Abstractions</AssemblyTitle>
        <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net45;net451;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <!--<TargetFrameworks>net45;net451;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <NoWarn>$(NoWarn);1591;8603</NoWarn>
        <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
@@ -33,32 +34,22 @@
        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    </PropertyGroup>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

        object? result;

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

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

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

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

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

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

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

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

 </Project>
--- a/src/WireMock.Net.MimePart/Models/MimeMessageDataWrapper.cs
+++ b/src/WireMock.Net.MimePart/Models/MimeMessageDataWrapper.cs
@@ -135,6 +135,6 @@ internal class MimeMessageDataWrapper : IMimeMessageData
    /// <inheritdoc/>
    public override string ToString()
    {
-        return _message.ToString();
+        return _message.ToString() ?? string.Empty;
    }
 }
--- a/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj
+++ b/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj
@@ -4,7 +4,8 @@
        <Description>MultiPart Mime support for WireMock.Net using MimeKitLite</Description>
        <AssemblyTitle>WireMock.Net.MimePart</AssemblyTitle>
        <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net6.0;net8.0</TargetFrameworks>
+        <!--<TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net6.0;net8.0</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <PackageTags>wiremock;matchers;matcher;mime;multipart;mimekit</PackageTags>
        <RootNamespace>WireMock</RootNamespace>
@@ -36,24 +37,16 @@
    </PropertyGroup>

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

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

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

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

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

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

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

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

        return HttpClientFactory2.Create(handler);
    }
--- a/src/WireMock.Net.Minimal/Http/WireMockHttpClientFactory.cs
+++ b/src/WireMock.Net.Minimal/Http/WireMockHttpClientFactory.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
-#if NET5_0_OR_GREATER
+
+#if NET8_0_OR_GREATER
 using System;
 using System.Net.Http;
 using WireMock.Server;
--- a/src/WireMock.Net.Minimal/HttpsCertificate/CertificateLoader.cs
+++ b/src/WireMock.Net.Minimal/HttpsCertificate/CertificateLoader.cs
@@ -43,11 +43,8 @@ internal static class CertificateLoader
            }
            finally
            {
-#if NETSTANDARD || NET46
                certStore.Dispose();
-#else
                certStore.Close();
-#endif
            }
        }

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

@@ -123,11 +110,8 @@ internal static class CertificateLoader
        }
        finally
        {
-#if NETSTANDARD || NET46
            certStore.Dispose();
-#else
            certStore.Close();
-#endif
        }
    }
 }
--- a/src/WireMock.Net.Minimal/Matchers/XPathMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/XPathMatcher.cs
@@ -11,9 +11,7 @@ using WireMock.Models;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Util;
-#if !NETSTANDARD1_3
 using Wmhelp.XPath2;
-#endif

 namespace WireMock.Matchers;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

        return RunHost(_cts.Token);
    }

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

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

                IsStarted = true;
            });

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

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

        IsStarted = false;
-#if NETSTANDARD1_3
-        return Task.CompletedTask;
-#else
        return _host.StopAsync();
-#endif
    }
-}
-#endif
+}
--- a/src/WireMock.Net.Minimal/Owin/GlobalExceptionMiddleware.cs
+++ b/src/WireMock.Net.Minimal/Owin/GlobalExceptionMiddleware.cs
@@ -3,68 +3,44 @@
 using System;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
-#if !USE_ASPNETCORE
-using Microsoft.Owin;
-using IContext = Microsoft.Owin.IOwinContext;
-using OwinMiddleware = Microsoft.Owin.OwinMiddleware;
-using Next = Microsoft.Owin.OwinMiddleware;
-#else
-using OwinMiddleware = System.Object;
-using IContext = Microsoft.AspNetCore.Http.HttpContext;
-using Next = Microsoft.AspNetCore.Http.RequestDelegate;
-#endif
 using WireMock.Owin.Mappers;
 using Stef.Validation;
+using Microsoft.AspNetCore.Http;

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

-#if !USE_ASPNETCORE
-        public GlobalExceptionMiddleware(Next next, IWireMockMiddlewareOptions options, IOwinResponseMapper responseMapper) : base(next)
-        {
-            _options = Guard.NotNull(options);
-            _responseMapper = Guard.NotNull(responseMapper);;
-        }
-#else
-        public GlobalExceptionMiddleware(Next next, IWireMockMiddlewareOptions options, IOwinResponseMapper responseMapper)
-        {
-            Next = next;
-            _options = Guard.NotNull(options);
-            _responseMapper = Guard.NotNull(responseMapper);
-        }
-#endif
+    public RequestDelegate? Next { get; }

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

-#if !USE_ASPNETCORE
-        public override Task Invoke(IContext ctx)
-#else
-        public Task Invoke(IContext ctx)
-#endif
+    private async Task InvokeInternalAsync(HttpContext ctx)
+    {
+        try
        {
-            return InvokeInternalAsync(ctx);
-        }
-
-        private async Task InvokeInternalAsync(IContext ctx)
-        {
-            try
+            if (Next != null)
            {
-                if (Next != null)
-                {
-                    await Next.Invoke(ctx).ConfigureAwait(false);
-                }
-            }
-            catch (Exception ex)
-            {
-                _options.Logger.Error("HttpStatusCode set to 500 {0}", ex);
-                await _responseMapper.MapAsync(ResponseMessageBuilder.Create(500, JsonConvert.SerializeObject(ex)), ctx.Response).ConfigureAwait(false);
+                await Next.Invoke(ctx).ConfigureAwait(false);
            }
        }
+        catch (Exception ex)
+        {
+            _options.Logger.Error("HttpStatusCode set to 500 {0}", ex);
+            await _responseMapper.MapAsync(ResponseMessageBuilder.Create(500, JsonConvert.SerializeObject(ex)), ctx.Response).ConfigureAwait(false);
+        }
    }
-}
+}
--- a/src/WireMock.Net.Minimal/Owin/HostUrlOptions.cs
+++ b/src/WireMock.Net.Minimal/Owin/HostUrlOptions.cs
@@ -55,10 +55,10 @@ internal class HostUrlOptions

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

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

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

 namespace WireMock.Owin;

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

    int? MaxRequestLogCount { get; set; }

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

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

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

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

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

    IFileSystemHandler? FileSystemHandler { get; set; }

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

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

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

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

 namespace WireMock.Owin.Mappers;

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

 namespace WireMock.Owin.Mappers;

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

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

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

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

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

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

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

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

-        private static async Task HandleSseStringAsync(IResponseMessage responseMessage, IResponse response, IBodyData bodyData)
+        private static async Task HandleSseStringAsync(IResponseMessage responseMessage, HttpResponse response, IBodyData bodyData)
        {
            if (bodyData.SseStringQueue == null)
            {
@@ -202,7 +203,7 @@ namespace WireMock.Owin.Mappers
            return null;
        }

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

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

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

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

 using System;
-using System.Threading.Tasks;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
 using Stef.Validation;
-using WireMock.Logging;
-using WireMock.Matchers;
-using WireMock.Http;
-using WireMock.Owin.Mappers;
-using WireMock.Serialization;
-using WireMock.ResponseBuilders;
-using WireMock.Settings;
-using System.Collections.Generic;
 using WireMock.Constants;
 using WireMock.Exceptions;
+using WireMock.Http;
+using WireMock.Logging;
+using WireMock.Matchers;
+using WireMock.Owin.Mappers;
+using WireMock.ResponseBuilders;
+using WireMock.Serialization;
+using WireMock.Settings;
 using WireMock.Util;
-#if !USE_ASPNETCORE
-using IContext = Microsoft.Owin.IOwinContext;
-using OwinMiddleware = Microsoft.Owin.OwinMiddleware;
-using Next = Microsoft.Owin.OwinMiddleware;
-#else
-using OwinMiddleware = System.Object;
-using IContext = Microsoft.AspNetCore.Http.HttpContext;
-using Next = Microsoft.AspNetCore.Http.RequestDelegate;
-#endif
+//#if !USE_ASPNETCORE
+//using IContext = Microsoft.Owin.IOwinContext;
+//using OwinMiddleware = Microsoft.Owin.OwinMiddleware;
+//using Next = Microsoft.Owin.OwinMiddleware;
+//#else
+//using OwinMiddleware = System.Object;
+//using IContext = Microsoft.AspNetCore.Http.HttpContext;
+//using Next = Microsoft.AspNetCore.Http.RequestDelegate;
+//#endif

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

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

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

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

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

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

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

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

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

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

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

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

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

 namespace WireMock.Owin;

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

    public int? MaxRequestLogCount { get; set; }

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

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

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

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

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

    /// <inheritdoc cref="IWireMockMiddlewareOptions.FileSystemHandler"/>
    public IFileSystemHandler? FileSystemHandler { get; set; }
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.WithPath.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.WithPath.cs
@@ -21,7 +21,7 @@ public partial class Request
    {
        Guard.NotNullOrEmpty(matchers);

-        _requestMatchers.Add(new RequestMessagePathMatcher(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, matchers));
+        _requestMatchers.Add(new RequestMessagePathMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, matchers));
        return this;
    }

--- a/src/WireMock.Net.Minimal/RequestMessage.cs
+++ b/src/WireMock.Net.Minimal/RequestMessage.cs
@@ -6,9 +6,10 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-#if USE_ASPNETCORE
 using System.Security.Cryptography.X509Certificates;
-#endif
+//#if USE_ASPNETCORE
+//using System.Security.Cryptography.X509Certificates;
+//#endif
 using Stef.Validation;
 using WireMock.Models;
 using WireMock.Owin;
@@ -82,11 +83,11 @@ public class RequestMessage : IRequestMessage
    /// <inheritdoc />
    public byte[]? BodyAsBytes { get; }

-#if MIMEKIT
+//#if MIMEKIT
    /// <inheritdoc />
    [Newtonsoft.Json.JsonIgnore] // Issue 1001
    public Models.Mime.IMimeMessageData? BodyAsMimeMessage { get; }
-#endif
+//#endif

    /// <inheritdoc />
    public string? DetectedBodyType { get; }
@@ -109,10 +110,10 @@ public class RequestMessage : IRequestMessage
    /// <inheritdoc />
    public string Origin { get; }

-#if USE_ASPNETCORE
+//#if USE_ASPNETCORE
    /// <inheritdoc />
    public X509Certificate2? ClientCertificate { get; }
-#endif
+//#endif

    /// <summary>
    /// Used for Unit Testing
@@ -136,9 +137,9 @@ public class RequestMessage : IRequestMessage
        IDictionary<string, string[]>? headers = null,
        IDictionary<string, string>? cookies = null,
        string httpVersion = "1.1"
-#if USE_ASPNETCORE
+//#if USE_ASPNETCORE
        , X509Certificate2? clientCertificate = null
-#endif
+//#endif
    )
    {
        Guard.NotNull(urlDetails);
@@ -178,16 +179,16 @@ public class RequestMessage : IRequestMessage
        Query = QueryStringParser.Parse(RawQuery, options?.QueryParameterMultipleValueSupport);
        QueryIgnoreCase = new Dictionary<string, WireMockList<string>>(Query, StringComparer.OrdinalIgnoreCase);

-#if USE_ASPNETCORE
+//#if USE_ASPNETCORE
        ClientCertificate = clientCertificate;
-#endif
+//#endif

-#if MIMEKIT
+//#if MIMEKIT
        if (TypeLoader.TryLoadStaticInstance<IMimeKitUtils>(out var mimeKitUtils) && mimeKitUtils.TryGetMimeMessage(this, out var mimeMessage))
        {
            BodyAsMimeMessage = mimeMessage;
        }
-#endif
+//#endif
    }

    /// <inheritdoc />
@@ -199,7 +200,6 @@ public class RequestMessage : IRequestMessage
        }

        var query = !ignoreCase ? Query : new Dictionary<string, WireMockList<string>>(Query, StringComparer.OrdinalIgnoreCase);
-
-        return query.ContainsKey(key) ? query[key] : null;
+        return query.TryGetValue(key, out var value) ? value : null;
    }
 }
--- a/src/WireMock.Net.Minimal/Serialization/MatcherMapper.cs
+++ b/src/WireMock.Net.Minimal/Serialization/MatcherMapper.cs
@@ -218,7 +218,7 @@ internal class MatcherMapper
                model.ContentTypeMatcher = Map(mimePartMatcher.ContentTypeMatcher);
                break;

-#if PROTOBUF
+//#if PROTOBUF
            case IProtoBufMatcher protoBufMatcher:
                protoBufMatcher.ProtoDefinition().Value(id => model.Pattern = id, texts =>
                {
@@ -235,7 +235,7 @@ internal class MatcherMapper
                model.ProtoBufMessageType = protoBufMatcher.MessageType;
                model.ContentMatcher = Map(protoBufMatcher.Matcher);
                break;
-#endif
+//#endif
        }

        afterMap?.Invoke(model);
--- a/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs
+++ b/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs
@@ -295,11 +295,9 @@ public partial class WireMockServer
            WatchStaticMappings = _settings.WatchStaticMappings,
            WatchStaticMappingsInSubdirectories = _settings.WatchStaticMappingsInSubdirectories,

-#if USE_ASPNETCORE
            AcceptAnyClientCertificate = _settings.AcceptAnyClientCertificate,
            ClientCertificateMode = _settings.ClientCertificateMode,
            CorsPolicyOptions = _settings.CorsPolicyOptions?.ToString()
-#endif
        };

        model.ProxyAndRecordSettings = TinyMapperUtils.Instance.Map(_settings.ProxyAndRecordSettings);
@@ -333,12 +331,12 @@ public partial class WireMockServer

        InitSettings(_settings);

-#if USE_ASPNETCORE
+//#if USE_ASPNETCORE
        if (Enum.TryParse<CorsPolicyOptions>(settings.CorsPolicyOptions, true, out var corsPolicyOptions))
        {
            _settings.CorsPolicyOptions = corsPolicyOptions;
        }
-#endif
+//#endif

        WireMockMiddlewareOptionsHelper.InitFromSettings(_settings, _options, o =>
        {
@@ -347,11 +345,11 @@ public partial class WireMockServer
                o.RequestProcessingDelay = TimeSpan.FromMilliseconds(settings.GlobalProcessingDelay.Value);
            }

-#if USE_ASPNETCORE
+//#if USE_ASPNETCORE
            o.CorsPolicyOptions = corsPolicyOptions;
-            o.ClientCertificateMode = _settings.ClientCertificateMode;
+            o.ClientCertificateMode = (Microsoft.AspNetCore.Server.Kestrel.Https.ClientCertificateMode) _settings.ClientCertificateMode;
            o.AcceptAnyClientCertificate = _settings.AcceptAnyClientCertificate;
-#endif
+//#endif
        });

        return ResponseMessageBuilder.Create(200, "Settings updated");
@@ -900,6 +898,6 @@ public partial class WireMockServer
        }

        var singleResult = ((JObject)value).ToObject<T>();
-        return new[] { singleResult! };
+        return [singleResult!];
    }
 }
--- a/src/WireMock.Net.Minimal/Server/WireMockServer.OpenApiParser.cs
+++ b/src/WireMock.Net.Minimal/Server/WireMockServer.OpenApiParser.cs
@@ -1,11 +1,11 @@
 // Copyright © WireMock.Net

 using System.Net;
-#if OPENAPIPARSER
+//#if OPENAPIPARSER
 using System;
 using System.Linq;
 using WireMock.Net.OpenApiParser;
-#endif
+//#endif

 namespace WireMock.Server;

@@ -13,7 +13,7 @@ public partial class WireMockServer
 {
    private IResponseMessage OpenApiConvertToMappings(IRequestMessage requestMessage)
    {
-#if OPENAPIPARSER
+//#if OPENAPIPARSER
        try
        {
            var mappingModels = new WireMockOpenApiParser().FromText(requestMessage.Body!, out var diagnostic);
@@ -24,14 +24,14 @@ public partial class WireMockServer
            _settings.Logger.Error("HttpStatusCode set to {0} {1}", HttpStatusCode.BadRequest, e);
            return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, e.Message);
        }
-#else
-        return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Not supported for .NETStandard 1.3 and .NET 4.6.x or lower.");
-#endif
+//#else
+//        return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Not supported for .NETStandard 1.3 and .NET 4.6.x or lower.");
+//#endif
    }

    private IResponseMessage OpenApiSaveToMappings(IRequestMessage requestMessage)
    {
-#if OPENAPIPARSER
+//#if OPENAPIPARSER
        try
        {
            var mappingModels = new WireMockOpenApiParser().FromText(requestMessage.Body!, out var diagnostic);
@@ -49,8 +49,8 @@ public partial class WireMockServer
            _settings.Logger.Error("HttpStatusCode set to {0} {1}", HttpStatusCode.BadRequest, e);
            return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, e.Message);
        }
-#else
-        return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Not supported for .NETStandard 1.3 and .NET 4.6.x or lower.");
-#endif
+//#else
+//        return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Not supported for .NETStandard 1.3 and .NET 4.6.x or lower.");
+//#endif
    }
 }
--- a/src/WireMock.Net.Minimal/Server/WireMockServer.cs
+++ b/src/WireMock.Net.Minimal/Server/WireMockServer.cs
@@ -62,7 +62,7 @@ public partial class WireMockServer : IWireMockServer

    /// <inheritdoc />
    [PublicAPI]
-    public int Port => Ports?.FirstOrDefault() ?? default;
+    public int Port => Ports?.FirstOrDefault() ?? 0;

    /// <inheritdoc />
    [PublicAPI]
@@ -411,16 +411,16 @@ public partial class WireMockServer : IWireMockServer
            _dateTimeUtils
        );

-#if USE_ASPNETCORE
+        //#if USE_ASPNETCORE
        _options.AdditionalServiceRegistration = _settings.AdditionalServiceRegistration;
        _options.CorsPolicyOptions = _settings.CorsPolicyOptions;
-        _options.ClientCertificateMode = _settings.ClientCertificateMode;
+        _options.ClientCertificateMode = (Microsoft.AspNetCore.Server.Kestrel.Https.ClientCertificateMode)_settings.ClientCertificateMode;
        _options.AcceptAnyClientCertificate = _settings.AcceptAnyClientCertificate;

        _httpServer = new AspNetCoreSelfHost(_options, urlOptions);
-#else
-        _httpServer = new OwinSelfHost(_options, urlOptions);
-#endif
+        //#else
+        //        _httpServer = new OwinSelfHost(_options, urlOptions);
+        //#endif
        var startTask = _httpServer.StartAsync();

        using (var ctsStartTimeout = new CancellationTokenSource(settings.StartTimeout))
@@ -541,15 +541,15 @@ public partial class WireMockServer : IWireMockServer
        Guard.NotNull(tenant);
        Guard.NotNull(audience);

-#if NETSTANDARD1_3
-        throw new NotSupportedException("AzureADAuthentication is not supported for NETStandard 1.3");
-#else
+//#if NETSTANDARD1_3
+//        throw new NotSupportedException("AzureADAuthentication is not supported for NETStandard 1.3");
+//#else
        _options.AuthenticationMatcher = new AzureADAuthenticationMatcher(
            new System.IdentityModel.Tokens.Jwt.JwtSecurityTokenHandler(),
            new Microsoft.IdentityModel.Protocols.ConfigurationManager<Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectConfiguration>($"https://login.microsoftonline.com/{tenant}/.well-known/openid-configuration", new Microsoft.IdentityModel.Protocols.OpenIdConnect.OpenIdConnectConfigurationRetriever()),
            tenant,
            audience);
-#endif
+//#endif
    }

    /// <inheritdoc cref="IWireMockServer.SetBasicAuthentication(string, string)" />
--- a/src/WireMock.Net.Minimal/Transformers/Handlebars/WireMockHandlebarsHelpers.cs
+++ b/src/WireMock.Net.Minimal/Transformers/Handlebars/WireMockHandlebarsHelpers.cs
@@ -24,7 +24,7 @@ internal static class WireMockHandlebarsHelpers
                GetBaseDirectory(),
            };

-#if !NETSTANDARD1_3_OR_GREATER
+//#if !NETSTANDARD1_3_OR_GREATER
            void Add(string? path, ICollection<string> customHelperPaths)
            {
                if (!string.IsNullOrEmpty(path))
@@ -36,9 +36,11 @@ internal static class WireMockHandlebarsHelpers
            Add(Path.GetDirectoryName(System.Reflection.Assembly.GetCallingAssembly().Location), paths);
            Add(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), paths);
            Add(Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName), paths);
-#endif
+//#endif
            o.CustomHelperPaths = paths;

+            o.Categories = settings.HandlebarsSettings?.AllowedHandlebarsHelpers ?? HandlebarsSettings.DefaultAllowedHandlebarsHelpers;
+
            o.CustomHelpers = new Dictionary<string, IHelpers>();
            if (settings.HandlebarsSettings?.AllowedCustomHandlebarsHelpers.HasFlag(CustomHandlebarsHelpers.File) == true)
            {
@@ -49,7 +51,7 @@ internal static class WireMockHandlebarsHelpers

    private static string GetBaseDirectory()
    {
-#if NETSTANDARD1_3_OR_GREATER || NET6_0_OR_GREATER
+#if NET8_0_OR_GREATER
        return AppContext.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar);
 #else
        return AppDomain.CurrentDomain.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar);
--- a/src/WireMock.Net.Minimal/Util/CultureInfoExtensions.cs
+++ b/src/WireMock.Net.Minimal/Util/CultureInfoExtensions.cs
@@ -18,12 +18,12 @@ internal static class CultureInfoUtils

        try
        {
-#if !NETSTANDARD1_3
+//#if !NETSTANDARD1_3
            if (int.TryParse(value, out var culture))
            {
                return new CultureInfo(culture);
            }
-#endif
+//#endif
            if (string.Equals(value, nameof(CultureInfo.CurrentCulture), StringComparison.OrdinalIgnoreCase))
            {
                return CultureInfo.CurrentCulture;
--- a/src/WireMock.Net.Minimal/Util/PortUtils.cs
+++ b/src/WireMock.Net.Minimal/Util/PortUtils.cs
@@ -37,9 +37,9 @@ internal static class PortUtils
        }
        finally
        {
-#if !NETSTANDARD1_3
+//#if !NETSTANDARD1_3
            portSocket.Close();
-#endif
+//#endif
            portSocket.Dispose();
        }
    }
@@ -75,9 +75,9 @@ internal static class PortUtils
        {
            foreach (var socket in sockets)
            {
-#if !NETSTANDARD1_3
+//#if !NETSTANDARD1_3
                socket.Close();
-#endif
+//#endif
                socket.Dispose();
            }
        }
--- a/src/WireMock.Net.Minimal/Util/UrlUtils.cs
+++ b/src/WireMock.Net.Minimal/Util/UrlUtils.cs
@@ -1,13 +1,14 @@
 // Copyright © WireMock.Net

 using System;
+using Microsoft.AspNetCore.Http;
 using WireMock.Models;
 using Stef.Validation;
-#if !USE_ASPNETCORE
-using Microsoft.Owin;
-#else
-using Microsoft.AspNetCore.Http;
-#endif
+//#if !USE_ASPNETCORE
+//using Microsoft.Owin;
+//#else
+//using Microsoft.AspNetCore.Http;
+//#endif

 namespace WireMock.Util;

--- a/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
+++ b/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
@@ -3,7 +3,8 @@
        <Description>Minimal version from the lightweight Http Mocking Server for .NET</Description>
        <AssemblyTitle>WireMock.Net.Minimal</AssemblyTitle>
        <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+        <!--<TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <AssemblyName>WireMock.Net.Minimal</AssemblyName>
        <PackageId>WireMock.Net.Minimal</PackageId>
@@ -28,105 +29,31 @@
        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
    </PropertyGroup>

-    <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-        <DefineConstants>$(DefineConstants);NETSTANDARD;USE_ASPNETCORE</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
-        <DefineConstants>$(DefineConstants);USE_ASPNETCORE</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-        <DefineConstants>$(DefineConstants);USE_ASPNETCORE;NET46</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net46'">
-        <DefineConstants>$(DefineConstants);OPENAPIPARSER</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net46' and '$(TargetFramework)' != 'net461'">
-        <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
-    </PropertyGroup>
-
-    <PropertyGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net46' ">
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' ">
        <DefineConstants>$(DefineConstants);TRAILINGHEADERS</DefineConstants>
    </PropertyGroup>

    <ItemGroup>
-      <Compile Remove="Matchers\LinqMatcher.cs" />
+        <Compile Remove="Matchers\LinqMatcher.cs" />
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="JsonConverter.Abstractions" Version="0.7.0" />
-        <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="SimMetrics.Net" Version="1.0.5" />
        <PackageReference Include="JmesPath.Net" Version="1.0.330" />
-        <PackageReference Include="AnyOf" Version="0.4.0" />
        <PackageReference Include="TinyMapper.Signed" Version="4.0.0" />
-        <PackageReference Include="Nullable" Version="1.3.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
        <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.34.0" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
-        <!-- Required for WebRequestHandler -->
-        <Reference Include="System.Net.Http.WebRequest" />
-
-        <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
-        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-        <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-        <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
-        <PackageReference Include="Microsoft.Owin" Version="4.2.2" />
-        <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
-        <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
-        <PackageReference Include="System.Net.Http" Version="4.3.4" />
-        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-        <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-        <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-        <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-
-        <!-- https://github.com/wiremock/WireMock.Net/issues/507 -->
-        <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-        <PackageReference Include="System.Collections.Specialized" Version="4.3.0" />
-        <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
-        <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.3" />
-        <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-        <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-        <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
        <PackageReference Include="Scriban.Signed" Version="5.5.0" />
-        <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-
-        <!-- https://github.com/wiremock/WireMock.Net/issues/507 -->
-        <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
    </ItemGroup>

-    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0'">
        <FrameworkReference Include="Microsoft.AspNetCore.App" />
-        <PackageReference Include="Scriban.Signed" Version="5.5.0" />
    </ItemGroup>

-    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-        <PackageReference Include="System.ComponentModel" Version="4.3.0" />
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net48'">
+        <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.3.0" />
+        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
    </ItemGroup>

    <ItemGroup>
@@ -147,21 +74,10 @@
        </Compile>
    </ItemGroup>

-    <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' ">
-        <PackageReference Include="Handlebars.Net.Helpers.Xslt" Version="2.5.2" />
-    </ItemGroup>
-
-    <!--<ItemGroup>
-        --><!-- CVE-2021-26701 and https://github.com/wiremock/WireMock.Net/issues/697 --><!--
-        <PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
-    </ItemGroup>-->
-
    <ItemGroup>
        <ProjectReference Include="..\WireMock.Net.Shared\WireMock.Net.Shared.csproj" />
        <ProjectReference Include="..\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net46'">
        <ProjectReference Include="..\WireMock.Net.OpenApiParser\WireMock.Net.OpenApiParser.csproj" />
    </ItemGroup>
+
 </Project>
--- a/src/WireMock.Net.NUnit/TestContextWireMockLogger.cs
+++ b/src/WireMock.Net.NUnit/TestContextWireMockLogger.cs
@@ -0,0 +1,71 @@
+// Copyright © WireMock.Net
+
+using System;
+using JsonConverter.Abstractions;
+using JsonConverter.Newtonsoft.Json;
+using NUnit.Framework;
+using WireMock.Admin.Requests;
+using WireMock.Logging;
+
+namespace WireMock.Net.NUnit;
+
+/// <summary>
+/// When using NUnit, this class enables to log the output from WireMock.Net using the <see cref="TestContext"/>.
+/// </summary>
+public sealed class TestContextWireMockLogger(IJsonConverter? jsonConverter = null) : IWireMockLogger
+{
+    private readonly JsonConverterOptions _jsonConverterOptions = new() { WriteIndented = true, IgnoreNullValues = true };
+    private readonly IJsonConverter _jsonConverter = jsonConverter ?? new NewtonsoftJsonConverter();
+
+    /// <inheritdoc />
+    public void Debug(string formatString, params object[] args)
+    {
+        TestContext.WriteLine(Format("Debug", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Info(string formatString, params object[] args)
+    {
+        TestContext.WriteLine(Format("Info", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Warn(string formatString, params object[] args)
+    {
+        TestContext.WriteLine(Format("Warning", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Error(string formatString, params object[] args)
+    {
+        TestContext.WriteLine(Format("Error", formatString, args));
+    }
+
+    /// <inheritdoc />
+    public void Error(string message, Exception exception)
+    {
+        TestContext.WriteLine(Format("Error", $"{message} {{0}}", exception));
+
+        if (exception is AggregateException ae)
+        {
+            ae.Handle(ex =>
+            {
+                TestContext.WriteLine(Format("Error", "Exception {0}", ex));
+                return true;
+            });
+        }
+    }
+
+    /// <inheritdoc />
+    public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+    {
+        var message = _jsonConverter.Serialize(logEntryModel, _jsonConverterOptions);
+        TestContext.WriteLine(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.NUnit/WireMock.Net.NUnit.csproj
+++ b/src/WireMock.Net.NUnit/WireMock.Net.NUnit.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <Description>Some extensions for NUnit</Description>
+        <AssemblyTitle>WireMock.Net.NUnit</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AssemblyName>WireMock.Net.NUnit</AssemblyName>
+        <RootNamespace>WireMock.Net.NUnit</RootNamespace>
+        <PackageId>WireMock.Net.NUnit</PackageId>
+        <PackageTags>tdd;wiremock;test;unittest;nunit</PackageTags>
+        <ProjectGuid>{2DBBD70D-8051-441F-92BB-3F9B8B4B4983}</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="JsonConverter.Newtonsoft.Json" Version="0.8.0" />
+        <PackageReference Include="NUnit" Version="4.4.0" />
+        <PackageReference Include="Stef.Validation" Version="0.1.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+    </ItemGroup>
+</Project>
--- a/src/WireMock.Net.OpenApiParser/Extensions/OpenApiSchemaExtensions.cs
+++ b/src/WireMock.Net.OpenApiParser/Extensions/OpenApiSchemaExtensions.cs
@@ -5,9 +5,7 @@ using System.Linq;
 using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Interfaces;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;
 using WireMock.Net.OpenApiParser.Types;

 namespace WireMock.Net.OpenApiParser.Extensions;
--- a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
+++ b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
@@ -6,8 +6,7 @@ using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;
 using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Admin.Mappings;
--- a/src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs
@@ -1,7 +1,7 @@
 // Copyright © WireMock.Net

 using System;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;

 namespace WireMock.Net.OpenApiParser.Settings;

--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs
@@ -1,7 +1,7 @@
 // Copyright © WireMock.Net

 using System;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;
 using RandomDataGenerator.FieldOptions;
 using RandomDataGenerator.Randomizers;

--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
@@ -1,8 +1,7 @@
 // Copyright © WireMock.Net

 using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;

 namespace WireMock.Net.OpenApiParser.Settings;

--- a/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
+++ b/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
@@ -3,8 +3,7 @@
 using System;
 using System.Linq;
 using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
+using Microsoft.OpenApi;
 using Stef.Validation;
 using WireMock.Net.OpenApiParser.Extensions;
 using WireMock.Net.OpenApiParser.Settings;
--- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
+++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
@@ -2,17 +2,20 @@

    <PropertyGroup>
        <Description>An OpenApi (swagger) parser to generate MappingModel or mapping.json file.</Description>
-        <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+        <!--<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <PackageTags>wiremock;openapi;OAS;raml;converter;parser;openapiparser</PackageTags>
        <ProjectGuid>{E5B03EEF-822C-4295-952B-4479AD30082B}</ProjectGuid>
        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <!--<SignAssembly>true</SignAssembly>
-        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
-        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>-->
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
    </PropertyGroup>

+    <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+    </PropertyGroup>
+
    <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
    </PropertyGroup>
@@ -23,26 +26,27 @@

    <ItemGroup>
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="PolySharp" Version="1.15.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+
+        <!-- Keep at 6.14.0 -->
+        <PackageReference Include="Polyfill" Version="6.14.0">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <PackageReference Include="RamlToOpenApiConverter.SourceOnly" Version="0.8.0" />
-        <PackageReference Include="YamlDotNet" Version="8.1.0" />
+        <PackageReference Include="RamlToOpenApiConverter.SourceOnly" Version="0.11.0" />
+        <PackageReference Include="YamlDotNet" Version="16.3.0" />
        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.19" />
        <PackageReference Include="Stef.Validation" Version="0.1.1" />
    </ItemGroup>

    <ItemGroup Condition="'$(Configuration)' == 'Debug'">
-        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.0.0-preview.17" />
+        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.3.0" />
    </ItemGroup>

    <ItemGroup Condition="'$(Configuration)' == 'Release'">
-        <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.40" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.OpenApi" Version="2.0.0-preview.17" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.0.0-preview.17" PrivateAssets="All" />
-        <PackageReference Include="System.Text.Json" Version="8.0.5" />
-        <PackageReference Include="SharpYaml" Version="2.1.1" />
+        <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.43" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.OpenApi" Version="2.3.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.3.0" PrivateAssets="All" />
+        <PackageReference Include="SharpYaml" Version="2.1.3" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using JetBrains.Annotations;
-using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi;
 using Microsoft.OpenApi.Reader;
 using Microsoft.OpenApi.YamlReader;
 using RamlToOpenApiConverter;
--- a/src/WireMock.Net.ProtoBuf/Matchers/ProtoBufMatcher.cs
+++ b/src/WireMock.Net.ProtoBuf/Matchers/ProtoBufMatcher.cs
@@ -96,14 +96,14 @@ public class ProtoBufMatcher : IProtoBufMatcher
        }

        var protoDefinitions = ProtoDefinition().Texts;
-       
+
        var resolver = new WireMockProtoFileResolver(protoDefinitions);
        var request = new ConvertToObjectRequest(protoDefinitions[0], MessageType, input)
            .WithProtoFileResolver(resolver);

        try
        {
-            return await ProtoBufToJsonConverter.ConvertAsync(request, cancellationToken).ConfigureAwait(false);
+            return await ProtoBufToJsonConverter.ConvertAsync(request, cancellationToken);
        }
        catch
        {
--- a/src/WireMock.Net.ProtoBuf/Util/ProtoDefinitionDataHelper.cs
+++ b/src/WireMock.Net.ProtoBuf/Util/ProtoDefinitionDataHelper.cs
@@ -40,7 +40,7 @@ internal static class ProtoDefinitionDataHelper

            // Build comment and get content from file.
            var comment = $"// {protoRelativePath}";
-#if NETSTANDARD2_0 || NET462
+#if NETSTANDARD2_0 || NET462 || NET48
            var content = File.ReadAllText(filePath);
 #else
            var content = await File.ReadAllTextAsync(filePath, cancellationToken);
--- a/src/WireMock.Net.ProtoBuf/WireMock.Net.ProtoBuf.csproj
+++ b/src/WireMock.Net.ProtoBuf/WireMock.Net.ProtoBuf.csproj
@@ -4,7 +4,8 @@
        <Description>ProtoBuf and gRPC support for WireMock.Net</Description>
        <AssemblyTitle>WireMock.Net.ProtoBuf</AssemblyTitle>
        <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>netstandard2.1;net462;net6.0;net8.0</TargetFrameworks>
+        <!--<TargetFrameworks>netstandard2.1;net462;net6.0;net8.0</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <PackageTags>wiremock;matchers;matcher;protobuf;grpc</PackageTags>
        <RootNamespace>WireMock</RootNamespace>
@@ -26,7 +27,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="ProtoBufJsonConverter" Version="0.10.0" />
+        <PackageReference Include="ProtoBufJsonConverter" Version="0.11.0" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj
+++ b/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj
@@ -4,7 +4,8 @@
        <Description>A RestClient using RestEase to access the admin interface.</Description>
        <AssemblyTitle>WireMock.Net.RestClient</AssemblyTitle>
        <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net45;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <!--<TargetFrameworks>net45;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>-->
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
        <GenerateDocumentationFile>true</GenerateDocumentationFile>
        <AssemblyName>WireMock.Net.RestClient</AssemblyName>
        <PackageId>WireMock.Net.RestClient</PackageId>
@@ -33,9 +34,9 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.7.0" />
+        <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.7.2" />
        <PackageReference Include="RestEase" Version="1.6.4" />
-        <PackageReference Include="Stef.Validation" Version="0.1.1" />
+        <PackageReference Include="Stef.Validation" Version="0.2.0" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.Shared/IMapping.cs
+++ b/src/WireMock.Net.Shared/IMapping.cs
@@ -147,7 +147,7 @@ public interface IMapping
    /// ProvideResponseAsync
    /// </summary>
    /// <param name="requestMessage">The request message.</param>
-    /// <returns>The <see cref="ResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
+    /// <returns>The <see cref="IResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
    Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IRequestMessage requestMessage);

    /// <summary>
--- a/src/WireMock.Net.Shared/RegularExpressions/RegexExtended.cs
+++ b/src/WireMock.Net.Shared/RegularExpressions/RegexExtended.cs
@@ -10,9 +10,9 @@ namespace WireMock.RegularExpressions;
 /// <summary>
 /// Extension to the <see cref="Regex"/> object, adding support for GUID tokens for matching on.
 /// </summary>
-#if !NETSTANDARD1_3
+//#if !NETSTANDARD1_3
 [Serializable]
-#endif
+//#endif
 internal class RegexExtended : Regex
 {
    /// <inheritdoc cref="Regex"/>
@@ -32,7 +32,7 @@ internal class RegexExtended : Regex
    {
    }

-#if !NETSTANDARD1_3 && !NET8_0_OR_GREATER
+#if !NET8_0_OR_GREATER
    /// <inheritdoc cref="Regex"/>
    protected RegexExtended(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) :
        base(info, context)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	276f329eed	mm	2026-01-05 21:38:14 +01:00
Stef Heyenrath	f5d53453e5	1.23.0	2026-01-05 21:34:11 +01:00
samlatham	0e60e3f3f9	Fix: Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers (#1416 ) Pass AllowedHandlebarsHelpers configuration to Handlebars.Net.Helpers so that optional handlebars helpers can be enabled. Co-authored-by: Sam Latham <sam.latham@citrix.com>	2026-01-05 21:24:48 +01:00
Luca Ma	9cee6dde00	Pass the parameter matchOperator in Request.WithPath to its inner calls (#1414 ) Co-authored-by: Luca Ma <lucama@microsoft.com>	2026-01-04 08:03:19 +01:00
Stef Heyenrath	c88e7378a7	1.22.0	2026-01-02 21:30:59 +01:00
Vadim Hatsura	b090296559	chore(testcontainers): bump up Testcontainers to version 4.10.0 (#1412 )	2026-01-02 21:25:28 +01:00
Stef Heyenrath	e5afd69f7c	1.21.0	2025-12-25 15:00:54 +01:00
Stef Heyenrath	3b3f3604f7	Merge branch 'master' into version-2.x	2025-12-25 13:57:44 +01:00
Stef Heyenrath	f38133d7a4	Fix readyness-check for Testcontainers (#1408 ) * Add XUnit Logging to TestcontainersTests * .	2025-12-25 13:56:29 +01:00
Stef Heyenrath	d311813851	Merge branch 'master' into version-2.x	2025-12-24 17:00:27 +01:00
Stef Heyenrath	597c95000e	vmImage: 'windows-2025' (#1407 )	2025-12-24 16:59:02 +01:00
Stef Heyenrath	c8e1c66bf2	Merge branch 'master' into version-2.x	2025-12-24 15:30:29 +01:00
Stef Heyenrath	4617b99c30	[Collection("Grpc")]	2025-12-24 12:32:56 +01:00
Stef Heyenrath	76d6f92be2	mm	2025-12-24 12:18:53 +01:00
Stef Heyenrath	ffd4d89946	Re-enable TestcontainersTestsGrpc (#1406 ) * Re-enable TestcontainersTestsGrpc * //[Collection("Grpc")]	2025-12-24 12:16:56 +01:00
Stef Heyenrath	2d46c86f47	1.20.0	2025-12-24 10:11:53 +01:00
Stef Heyenrath	75f4fbe9d0	Fix Testcontainers AddProtoDefinition (#1405 ) * Fix Testcontainers AddProtoDefinition * . * UntilHttpRequestIsSucceeded * WireMockContainer.ContainerPort * System.Net/System.Net.Http * ... * WithWaitStrategy * MaxHealthCheckRetries * for * _adminApi * static * ... * testOutputHelper.WriteLine("Dumping WireMock logs:"); * Console.WriteLine( * testOutputHelper.WriteLine("Dumping WireMock.Net mappings:"); * fix WithWaitStrategy * [Fact] * <PackageReference Include="ProtoBufJsonConverter" Version="0.11.0" /> * [Collection("Grpc")] / [Fact(Skip = "TODO")] * ...	2025-12-24 10:09:30 +01:00
Stef Heyenrath	3f349cca4c	WireMock.Net.NUnit	2025-12-21 10:17:13 +01:00
Stef Heyenrath	19b85c7856	Merge branch 'master' into version-2.x	2025-12-21 09:50:31 +01:00
Stef Heyenrath	16e3872402	Run the Grpc TestcontainersTests sequential (#1402 )	2025-12-21 09:40:16 +01:00
Stef Heyenrath	da912be37e	mm	2025-12-20 13:46:11 +01:00
Stef Heyenrath	4c797c328f	Add WireMock.Net.NUnit project (#1400 ) * Add WireMock.Net.NUnit project * <Version>0.0.1-preview-01</Version> * --v	2025-12-20 13:43:54 +01:00
Stef Heyenrath	ca9fceab67	mm	2025-12-20 12:10:45 +01:00
Stef Heyenrath	a5e75a7278	Fix Grpc tests (#1401 ) * Fix some Grpc tests * await Task.Delay(1000); * ports	2025-12-20 12:08:41 +01:00
Stef Heyenrath	56f65c19e2	Upgrade RamlToOpenApiConverter and YamlDotNet (#1399 ) * Upgrade RamlToOpenApiConverter and YamlDotNet * fix	2025-12-19 18:33:58 +01:00
Stef Heyenrath	c662bb7ad5	mm	2025-12-19 17:56:26 +01:00
Stef Heyenrath	6aef4816a5	WireMockServer_WithRequiredClientCertificates_Should_Work_Correct --> IgnoreOnContinuousIntegrationFact	2025-12-19 17:52:20 +01:00
Stef Heyenrath	197a211a52	TestcontainersTests	2025-12-13 11:48:48 +01:00
Stef Heyenrath	7d6fd35716	Merge branch 'master' into version-2.x	2025-12-12 11:19:09 +01:00
Stef Heyenrath	3cfeec6035	1.19.0	2025-12-12 11:16:38 +01:00
Stef Heyenrath	b57d5e7548	WireMockContainerBuilder: allow only docker images named wiremock (#1392 )	2025-12-11 22:21:39 +01:00
Stef Heyenrath	36b89afce5	fix CI link in Readme	2025-12-11 11:25:28 +01:00
Stef Heyenrath	e2acac55a4	Update WireMockContainerBuilder (WithImage and WithCustomImage) (#1391 ) * Update WireMockContainerBuilder (WithImage and WithCustomImage) * .	2025-12-11 10:55:31 +01:00
Stef Heyenrath	1b0b42d538	Merge branch 'master' into version-2.x	2025-12-08 19:16:51 +01:00
Stef Heyenrath	5f7b50a5b8	mm	2025-12-07 10:52:17 +01:00
Stef Heyenrath	2e37e822a8	Merge branch 'master' into version-2.x	2025-11-17 20:15:20 +01:00
Stef Heyenrath	1bc693512f	HashSet	2025-10-22 12:26:39 +02:00
Stef Heyenrath	398dfe3eff	mm	2025-10-22 11:01:42 +02:00
Stef Heyenrath	02228e5f8a	mm	2025-10-06 17:08:28 +02:00
Stef Heyenrath	27d1a4b494	mm	2025-10-06 09:18:20 +02:00
Stef	3e170778c8	HttpClientBuilder / ssl3	2025-10-05 16:55:22 +02:00
Stef	9fa1f4081e	mm	2025-10-05 15:19:18 +02:00
Stef Heyenrath	37e140b342	#endif	2025-09-07 19:51:42 +02:00
Stef Heyenrath	4fd3ee1dfd	.	2025-08-31 12:51:33 +02:00
Stef Heyenrath	5b43a4f341	NO ConfigureAwait(false) + cleanup	2025-08-31 12:39:51 +02:00
Stef Heyenrath	0960d7cebd	openapi	2025-08-31 12:21:21 +02:00
Stef Heyenrath	b111b019bc	cleanup + fix tests for net8	2025-08-31 11:39:03 +02:00
Stef Heyenrath	bb561c94d0	cleanup some #if for NETSTANDARD1_3	2025-08-31 11:07:25 +02:00
Stef Heyenrath	5c221ff4fa	12	2025-08-31 10:03:51 +02:00
Stef Heyenrath	3077e7bee1	Setup .NET 9	2025-08-31 09:43:48 +02:00
Stef Heyenrath	ec54599827	mm + ...	2025-08-31 09:21:08 +02:00
Stef Heyenrath	034766a2d6	Version 2.x	2025-08-30 10:24:07 +02:00