2.13.0

* Fix: Fully respect configured custom admin path

* Add tests for custom admin path behaviour

* Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

---------

Co-authored-by: Peter Benko <peter.benko@gmail.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Stef Heyenrath <Stef.Heyenrath@gmail.com>
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

.github/copilot-instructions.md

@@ -1,4 +1,5 @@
 # Copilot Instructions
 
 ## Project Guidelines
-- All new byte[xx] calls should use using var data = ArrayPool<byte>.Shared.Lease(xx); instead of directly allocating byte arrays
+- When running tests in this workspace, do not run tests for the net48 target framework.
+- When changing System.Text.Json code in this workspace, verify API availability for netstandard2.0 and netstandard2.1 instead of assuming newer APIs exist.

.github/instructions/instructions.md

@@ -0,0 +1,15 @@
+---
+description: 'Guidelines for this solution'
+applyTo: '**/*.csproj, **/*.cs'
+---
+
+# Multi .NET Framework Targeting
+
+## Instructions
+- The main project "WireMock.Net.Minimal" targets `netstandard2.0` and `net8.0`. Ensure that any new code or dependencies are compatible with these frameworks.
+
+
+# C# Guidelines
+
+## Instructions
+- When a new ByteArray is needed, do not use `var data = new byte[bufferSize];`. Always use `var data = ArrayPool<byte>.Shared.Lease(bufferSize);`.

.github/workflows/PublishToNuGet.yml

@@ -0,0 +1,40 @@
+name: Publish to NuGet
+
+on:
+  workflow_dispatch:
+
+jobs:
+  publish:
+    name: Build, Pack, and Publish
+    runs-on: windows-2022
+    permissions:
+      id-token: write # enable GitHub OIDC token issuance for this job
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Build projects
+      shell: pwsh
+      run: |
+        Get-ChildItem ./src -Recurse -Filter *.csproj |
+        ForEach-Object {
+          dotnet build $_.FullName -c Release
+        }
+
+    - name: Pack projects
+      shell: pwsh
+      run: |
+        Get-ChildItem ./src -Recurse -Filter *.csproj |
+        ForEach-Object {
+          dotnet pack $_.FullName -c Release --no-build -o ./packages
+        }
+
+    - name: NuGet login (OIDC → temp API key)
+      uses: NuGet/login@v1
+      id: login
+      with:
+        user: ${{ secrets.NUGET_USER }}
+
+    - name: Push to NuGet
+      run: dotnet nuget push "**/packages/*.nupkg" --api-key ${{steps.login.outputs.NUGET_API_KEY}} --source "https://api.nuget.org/v3/index.json" --skip-duplicate

CHANGELOG.md

@@ -1,3 +1,73 @@
+# 2.13.0 (19 July 2026)
+- [#1488](https://github.com/wiremock/WireMock.Net/pull/1488) - feat(xunit logging): TestOutputHelperWireMockLogger [feature] contributed by [Stepami](https://github.com/Stepami)
+- [#1490](https://github.com/wiremock/WireMock.Net/pull/1490) - Fix: Fully respect configured custom admin path (merge PR #1483) [feature] contributed by [Copilot](https://github.com/apps/copilot-swe-agent)
+- [#1482](https://github.com/wiremock/WireMock.Net/issues/1482) - WireMock.Minimal.Owin does not respect custom pathing for determining admin paths [bug]
+
+# 2.12.0 (07 July 2026)
+- [#1479](https://github.com/wiremock/WireMock.Net/pull/1479) - Upgrade Microsoft.OpenApi to 3.7.0 and YamlDotNet to 18.1.0 [security] contributed by [StefH](https://github.com/StefH)
+- [#1480](https://github.com/wiremock/WireMock.Net/pull/1480) - Upgrade RamlToOpenApiConverter.SourceOnly to 0.21.0 [feature] contributed by [StefH](https://github.com/StefH)
+- [#1484](https://github.com/wiremock/WireMock.Net/pull/1484) - Update Scriban.Signed package version to 7.2.5 [security] contributed by [johnthcall](https://github.com/johnthcall)
+- [#1487](https://github.com/wiremock/WireMock.Net/pull/1487) - Response.Create() sets the DateTime to UtcNow [bug] contributed by [StefH](https://github.com/StefH)
+- [#1486](https://github.com/wiremock/WireMock.Net/issues/1486) - ResponseMessage.DateTime defaults to DateTime.MinValue, causing premature log entry purging for *matched* requests [bug]
+
+# 2.11.0 (12 June 2026)
+- [#1475](https://github.com/wiremock/WireMock.Net/pull/1475) - Update NuGet packages (Aspire, MessagePack and more) [security] contributed by [StefH](https://github.com/StefH)
+- [#1476](https://github.com/wiremock/WireMock.Net/pull/1476) - Fix BodyParser [bug] contributed by [StefH](https://github.com/StefH)
+- [#1473](https://github.com/wiremock/WireMock.Net/issues/1473) - JsonPartialWildCardMatcher With DateTime Regex Stopped Matching (Regression?) [bug]
+
+# 2.10.0 (07 June 2026)
+- [#1472](https://github.com/wiremock/WireMock.Net/pull/1472) - Update JsonConverter to 0.13.0 [bug] contributed by [StefH](https://github.com/StefH)
+
+# 2.9.0 (02 June 2026)
+- [#1470](https://github.com/wiremock/WireMock.Net/pull/1470) - Fix WireMock.Net.Aspire project when using Aspire 13.4.0 [bug] contributed by [StefH](https://github.com/StefH)
+- [#1469](https://github.com/wiremock/WireMock.Net/issues/1469) - WireMock.Net doesn't play well with Aspire 13.4.0 [bug]
+
+# 2.8.0 (31 May 2026)
+- [#1447](https://github.com/wiremock/WireMock.Net/pull/1447) - Add SystemTextJsonMatchers [feature] contributed by [StefH](https://github.com/StefH)
+- [#1466](https://github.com/wiremock/WireMock.Net/pull/1466) - Bump System.Text.RegularExpressions from 4.3.0 to 4.3.1 in Aspire Example project [dependencies, .NET] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#1467](https://github.com/wiremock/WireMock.Net/pull/1467) - Bump System.Net.Http from 4.3.0 to 4.3.4 in Aspire Example project [dependencies, .NET] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#1468](https://github.com/wiremock/WireMock.Net/pull/1468) - Update JsonMatcher to support IgnoreArrayOrder [feature] contributed by [StefH](https://github.com/StefH)
+- [#1439](https://github.com/wiremock/WireMock.Net/issues/1439) - JSON reference properties cannot be used when using System.Text.Json serialization [bug]
+- [#1445](https://github.com/wiremock/WireMock.Net/issues/1445) - Configurable JSON DE-serialization support (Newtonsoft.Json vs System.Text.Json) [feature]
+- [#1460](https://github.com/wiremock/WireMock.Net/issues/1460) - Option to ignore array order when comparing json body [feature]
+
+# 2.7.0 (24 May 2026)
+- [#1457](https://github.com/wiremock/WireMock.Net/pull/1457) - Update OpenTelemetry.Api from 1.14.0 to 1.15.3 in unit test project [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#1459](https://github.com/wiremock/WireMock.Net/pull/1459) - chore: update Handlebars 2.5.2 to 2.5.5 [dependencies] contributed by [kamisoft-fr](https://github.com/kamisoft-fr)
+- [#1461](https://github.com/wiremock/WireMock.Net/pull/1461) - Update Testcontainers nuget package to 4.12.0 [dependencies] contributed by [MD-V](https://github.com/MD-V)
+- [#1462](https://github.com/wiremock/WireMock.Net/pull/1462) - Update Scriban.Signed to latest [dependencies] contributed by [StefH](https://github.com/StefH)
+- [#1458](https://github.com/wiremock/WireMock.Net/issues/1458) - update Handlebars Humanizer package version [feature]
+
+# 2.6.0 (11 May 2026)
+- [#1455](https://github.com/wiremock/WireMock.Net/pull/1455) - Fix request storing when RequestLogExpirationDuration is set [bug]  [bug] contributed by [pbenko-xitaso](https://github.com/pbenko-xitaso)
+- [#1454](https://github.com/wiremock/WireMock.Net/issues/1454) - No requests stored in Standalone when RequestLogExpirationDuration is set [bug]
+
+# 2.5.0 (04 May 2026)
+- [#1451](https://github.com/wiremock/WireMock.Net/pull/1451) - Feature/early mismatch [feature] contributed by [Stepami](https://github.com/Stepami)
+- [#1452](https://github.com/wiremock/WireMock.Net/pull/1452) - Bump log4net from 2.0.15 to 3.3.0 in example console app [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#1453](https://github.com/wiremock/WireMock.Net/pull/1453) - Fix CVE-2026-40021: upgrade log4net to 3.3.0 in examples/WireMock.Net.Service/packages.config [dependencies] contributed by [Copilot](https://github.com/apps/copilot-swe-agent)
+- [#1442](https://github.com/wiremock/WireMock.Net/issues/1442) - Bug: [grpc] WithBodyAsProtoBuf exception on match [bug]
+
+# 2.4.0 (24 April 2026)
+- [#1437](https://github.com/wiremock/WireMock.Net/pull/1437) - Added feature to enable and disable mappings [feature] contributed by [jayaraman-venkatesan](https://github.com/jayaraman-venkatesan)
+- [#1450](https://github.com/wiremock/WireMock.Net/pull/1450) - Bump OpenTelemetry.Exporter.OpenTelemetryProtocol from 1.14.0 to 1.15.x [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#1421](https://github.com/wiremock/WireMock.Net/issues/1421) - Deactivate mapping without deleting it [feature]
+
+# 2.3.0 (20 April 2026)
+- [#1436](https://github.com/wiremock/WireMock.Net/pull/1436) - Moving Scenario state change before global response delay is set [feature] contributed by [jayaraman-venkatesan](https://github.com/jayaraman-venkatesan)
+- [#1440](https://github.com/wiremock/WireMock.Net/pull/1440) - Bump log4net from 2.0.15 to 3.3.0 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#1443](https://github.com/wiremock/WireMock.Net/pull/1443) - Fix ExactMatcher and JsonMatcher not working for ISO dates as string [bug] contributed by [StefH](https://github.com/StefH)
+- [#1444](https://github.com/wiremock/WireMock.Net/pull/1444) - Update instructions.md [refactor] contributed by [StefH](https://github.com/StefH)
+- [#1448](https://github.com/wiremock/WireMock.Net/pull/1448) - Use DefaultJsonSerializer for BodyAsJson-Response [bug] contributed by [StefH](https://github.com/StefH)
+- [#1205](https://github.com/wiremock/WireMock.Net/issues/1205) - System.Private.Uri 4.3.0 Blackduck security High vulnerability [bug]
+- [#1260](https://github.com/wiremock/WireMock.Net/issues/1260) - Scenario state change before a response delay timeout ends [bug]
+- [#1441](https://github.com/wiremock/WireMock.Net/issues/1441) - ExactMatcher and JsonMatcher not working for ISO dates in v2.2.0 [bug]
+- [#1446](https://github.com/wiremock/WireMock.Net/issues/1446) - WithBodyAsJson does not return correctly formatted json when using SystemTextJsonConverter [bug]
+
+# 2.2.0 (30 March 2026)
+- [#1433](https://github.com/wiremock/WireMock.Net/pull/1433) - Add comments for ScenarioStateStore related code [refactor] contributed by [StefH](https://github.com/StefH)
+- [#1434](https://github.com/wiremock/WireMock.Net/pull/1434) - Upgrade Scriban.Signed [security] contributed by [StefH](https://github.com/StefH)
+
 # 2.1.0 (29 March 2026)
 - [#1425](https://github.com/wiremock/WireMock.Net/pull/1425) - Add helpers for query params fluent MappingModelBuilder [feature] contributed by [biltongza](https://github.com/biltongza)
 - [#1430](https://github.com/wiremock/WireMock.Net/pull/1430) - Add injectable IScenarioStateStore for distributed scenario state [feature] contributed by [m4tchl0ck](https://github.com/m4tchl0ck)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>2.1.0</VersionPrefix>
+        <VersionPrefix>2.13.0</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/wiremock/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -51,8 +51,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2025.2.4" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2026.2.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.103" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="10.0.301" PrivateAssets="All" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">

Generate-ReleaseNotes.cmd

@@ -1,7 +1,7 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=2.1.0
+SET version=2.13.0
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels wontfix test question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%
 
-GitHubReleaseNotes --output PackageReleaseNotes.txt --skip-empty-releases --exclude-labels test question invalid doc duplicate example environment --template PackageReleaseNotes.template --version %version% --token %GH_TOKEN%
+GitHubReleaseNotes --output PackageReleaseNotes.txt --skip-empty-releases --exclude-labels wontfix test question invalid doc duplicate example environment --template PackageReleaseNotes.template --version %version% --token %GH_TOKEN%

PackageReleaseNotes.txt

@@ -1,7 +1,6 @@
-# 2.1.0 (29 March 2026)
+# 2.13.0 (19 July 2026)
-- #1425 Add helpers for query params fluent MappingModelBuilder [feature]
+- #1488 feat(xunit logging): TestOutputHelperWireMockLogger [feature]
-- #1430 Add injectable IScenarioStateStore for distributed scenario state [feature]
+- #1490 Fix: Fully respect configured custom admin path (merge PR #1483) [feature]
-- #1431 Fix WireMockLogger implementation in dotnet-WireMock [bug]
+- #1482 WireMock.Minimal.Owin does not respect custom pathing for determining admin paths [bug]
-- #1432 Add WireMockAspNetCoreLogger to log Kestrel warnings/errors [feature]
 
 The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md

README.md

@@ -39,8 +39,9 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 | | |
 | ***Quality*** |   |
 |   **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) |
+|   **Build GitHub** | [![Run Tests](https://github.com/wiremock/WireMock.Net/actions/workflows/ci.yml/badge.svg)](https://github.com/wiremock/WireMock.Net/actions/workflows/ci.yml)
 |   **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) |
-|   **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) |
+|   **SonarQube** | [![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) |
 |   **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)|
 |   **TIOBE** | [TIOBE Quality Indicator](https://ticsdemo.tiobe.com/tiobeweb/DEMO/TqiDashboard.html#axes=Project(WireMock.Net),Sub()&metric=tqi)
 
@@ -64,6 +65,7 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 | | | |
 |   **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)
 |   **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)
+|   **WireMock.Net.Matchers.SystemTextJsonPath** | [![NuGet Badge WireMock.Net.Matchers.SystemTextJsonPath](https://img.shields.io/nuget/v/WireMock.Net.Matchers.SystemTextJsonPath)](https://www.nuget.org/packages/WireMock.Net.Matchers.SystemTextJsonPath) | [![MyGet Badge WireMock.Net.Matchers.SystemTextJsonPath](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Matchers.SystemTextJsonPath?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.SystemTextJsonPath)
 |   **WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/nuget/v/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.OpenApiParser?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
 |   **WireMock.Net.MimePart** | [![NuGet Badge WireMock.Net.MimePart](https://img.shields.io/nuget/v/WireMock.Net.MimePart)](https://www.nuget.org/packages/WireMock.Net.MimePart) | [![MyGet Badge WireMock.Net.MimePart](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.MimePart?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.MimePart)
 |   **WireMock.Net.GraphQL** | [![NuGet Badge WireMock.Net.GraphQL](https://img.shields.io/nuget/v/WireMock.Net.GraphQL)](https://www.nuget.org/packages/WireMock.Net.GraphQL) | [![MyGet Badge WireMock.Net.GraphQL](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.GraphQL?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.GraphQL)
@@ -76,7 +78,7 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 
 <br />
 
-🔺 **WireMock.Net.Minimal** does not include *WireMock.Net.MimePart*, *WireMock.Net.GraphQL*, *WireMock.Net.ProtoBuf* and *WireMock.Net.OpenTelemetry*.
+🔺 **WireMock.Net.Minimal** does not include *WireMock.Net.MimePart*, *WireMock.Net.GraphQL*, *WireMock.Net.ProtoBuf*, *WireMock.Net.OpenTelemetry* and *WireMock.Net.Matchers.SystemTextJsonPath*.
 
 ---
 

WireMock.Net Solution.sln

@@ -1,4 +1,3 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 18
 VisualStudioVersion = 18.0.11205.157
@@ -38,8 +37,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Client", "examples\WireMock.Net.Client\WireMock.Net.Client.csproj", "{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Service", "examples\Wiremock.Net.Service\WireMock.Net.Service.csproj", "{7F0B2446-0363-4720-AF46-F47F83B557DC}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.RequestLogTest", "examples\WireMock.Net.Console.RequestLogTest\WireMock.Net.Console.RequestLogTest.csproj", "{A9D039B9-7509-4CF1-9EFD-87EB82998575}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.OpenApiParser.ConsoleApp", "examples\WireMock.Net.OpenApiParser.ConsoleApp\WireMock.Net.OpenApiParser.ConsoleApp.csproj", "{5C09FB93-1535-4F92-AF26-21E8A061EE4A}"
@@ -76,10 +73,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Testcontainers
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.TestcontainersExample", "examples\WireMock.Net.TestcontainersExample\WireMock.Net.TestcontainersExample.csproj", "{56A38798-C48B-4A4A-B805-071E05C02CE1}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0147029F-FA4A-44B3-B79A-3C3574054EE4}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultipartUploader", "tools\MultipartUploader\MultipartUploader.csproj", "{07C30227-ADEC-4BDE-8CDC-849D85A690BB}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NET8", "examples\WireMock.Net.Console.NET8\WireMock.Net.Console.NET8.csproj", "{1EA72C0F-92E9-486B-8FFE-53F992BFC4AA}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueProxy", "examples\WireMockAzureQueueProxy\WireMockAzureQueueProxy.csproj", "{7FC0B409-2682-40EE-B3B9-3930D6769D01}"
@@ -156,6 +149,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.TestWebApplica
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.RestClient.AwesomeAssertions", "src\WireMock.Net.RestClient.AwesomeAssertions\WireMock.Net.RestClient.AwesomeAssertions.csproj", "{F4B2B967-98D7-4D93-9A5C-5EF7B84B941A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Matchers.SystemTextJsonPath", "src\WireMock.Net.Matchers.SystemTextJsonPath\WireMock.Net.Matchers.SystemTextJsonPath.csproj", "{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Service", "examples\WireMock.Net.Service\WireMock.Net.Service.csproj", "{7F0B2446-0363-4720-AF46-F47F83B557DC}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -238,18 +235,6 @@ Global
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|x64.Build.0 = Release|Any CPU
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|x86.ActiveCfg = Release|Any CPU
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|x86.Build.0 = Release|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x64.Build.0 = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x86.Build.0 = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x64.ActiveCfg = Release|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x64.Build.0 = Release|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x86.ActiveCfg = Release|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x86.Build.0 = Release|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -394,18 +379,6 @@ Global
 		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|x64.Build.0 = Release|Any CPU
 		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|x86.ActiveCfg = Release|Any CPU
 		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|x86.Build.0 = Release|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Debug|x64.Build.0 = Debug|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Debug|x86.Build.0 = Debug|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Release|x64.ActiveCfg = Release|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Release|x64.Build.0 = Release|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Release|x86.ActiveCfg = Release|Any CPU
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Release|x86.Build.0 = Release|Any CPU
 		{1EA72C0F-92E9-486B-8FFE-53F992BFC4AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1EA72C0F-92E9-486B-8FFE-53F992BFC4AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1EA72C0F-92E9-486B-8FFE-53F992BFC4AA}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -850,6 +823,30 @@ Global
 		{F4B2B967-98D7-4D93-9A5C-5EF7B84B941A}.Release|x64.Build.0 = Release|Any CPU
 		{F4B2B967-98D7-4D93-9A5C-5EF7B84B941A}.Release|x86.ActiveCfg = Release|Any CPU
 		{F4B2B967-98D7-4D93-9A5C-5EF7B84B941A}.Release|x86.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x64.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Debug|x86.Build.0 = Debug|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x64.Build.0 = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.ActiveCfg = Release|Any CPU
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}.Release|x86.Build.0 = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x64.Build.0 = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x86.Build.0 = Debug|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x64.ActiveCfg = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x64.Build.0 = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x86.ActiveCfg = Release|Any CPU
+		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -861,7 +858,6 @@ Global
 		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{B6269AAC-170A-4346-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
@@ -876,7 +872,6 @@ Global
 		{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}
-		{07C30227-ADEC-4BDE-8CDC-849D85A690BB} = {0147029F-FA4A-44B3-B79A-3C3574054EE4}
 		{1EA72C0F-92E9-486B-8FFE-53F992BFC4AA} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{7FC0B409-2682-40EE-B3B9-3930D6769D01} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
@@ -914,6 +909,8 @@ Global
 		{2CE8E3A6-59CC-FE9C-9399-AD54E1FA862B} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{3B05CC76-C3CB-8667-6B65-3129DFB25681} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{F4B2B967-98D7-4D93-9A5C-5EF7B84B941A} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{A1B2C3D4-E5F6-7890-ABCD-EF1234567890} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

azure-pipelines-ci.yml

@@ -1,3 +1,9 @@
+parameters:
+- name: runWindowsReleaseToMyGet
+  displayName: Run Windows Release to MyGet
+  type: boolean
+  default: false
+
 variables:
   Prerelease: 'ci'
   buildId: "1$(Build.BuildId)"
@@ -131,6 +137,7 @@ jobs:
 
 - job: Windows_Release_to_MyGet
   dependsOn: Windows_Build_Test
+  condition: and(succeeded(), ${{ parameters.runWindowsReleaseToMyGet }})
 
   pool:
     vmImage: 'windows-2025'

examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />
+    <Sdk Name="Aspire.AppHost.Sdk" Version="13.4.0" />
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -18,7 +18,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.3" />
+
+        <!-- CVE-2026-48109 -->
+        <PackageReference Include="MessagePack" Version="2.5.302" />
     </ItemGroup>
 
     <ItemGroup>

examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />
+    <Sdk Name="Aspire.AppHost.Sdk" Version="13.4.0" />
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
@@ -15,7 +15,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" />
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.4.3" />
+
+        <!-- CVE-2026-48109 -->
+        <PackageReference Include="MessagePack" Version="2.5.302" />
     </ItemGroup>
 
 </Project>

examples-Aspire/AspireApp1.ServiceDefaults/AspireApp1.ServiceDefaults.csproj

@@ -12,11 +12,11 @@
 
     <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.4.0" />
     <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.15.3" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.15.2" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.15.1" />
   </ItemGroup>
 
 </Project>

examples-Aspire/AspireApp1.Tests/AspireApp1.Tests.csproj

@@ -12,6 +12,8 @@
     <PackageReference Include="Aspire.Hosting.Testing" Version="13.1.0" />
     <PackageReference Include="coverlet.collector" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="System.Net.Http" Version="4.3.4" />
+    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
     <PackageReference Include="xunit" Version="2.5.3" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
   </ItemGroup>

examples/WireMock.Net.Console.GrpcClient/WireMock.Net.Console.GrpcClient.csproj

@@ -9,9 +9,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Google.Protobuf" Version="3.25.1" />
+        <PackageReference Include="Google.Protobuf" Version="3.33.5" />
-        <PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.76.0" />
-        <PackageReference Include="Grpc.Tools" Version="2.60.0">
+        <PackageReference Include="Grpc.Tools" Version="2.78.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

examples/WireMock.Net.Console.MimePart/Program.cs

@@ -9,7 +9,7 @@ namespace WireMock.Net.Console.MimePart;
 
 static class Program
 {
-    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly()!);
     private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
 
     static async Task Main(params string[] args)

examples/WireMock.Net.Console.MimePart/WireMock.Net.Console.MimePart.csproj

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

examples/WireMock.Net.Console.NET8/MainApp.cs

@@ -1115,7 +1115,7 @@ namespace WireMock.Net.ConsoleApplication
                     {
                         BodyData = new BodyData
                         {
-                            BodyAsString = "random200or505:" + code + ", HeadersFromRequest = " + string.Join(",", request.Headers),
+                            BodyAsString = "random200or505:" + code + ", HeadersFromRequest = " + request.Headers != null ? string.Join(",", request.Headers!.Select(h => $"{h.Key}:{h.Value}")) : "none",
                             DetectedBodyType = BodyType.String,
                         },
                         StatusCode = code

examples/WireMock.Net.Console.NET8/Program.cs

@@ -1,8 +1,6 @@
 // Copyright © WireMock.Net
 
-using System.IO;
 using System.Reflection;
-using System.Threading.Tasks;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
@@ -12,8 +10,7 @@ namespace WireMock.Net.Console.NET8;
 
 static class Program
 {
-    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly()!);
-    private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
 
     static async Task Main(params string[] args)
     {

examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj

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

examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj

@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WireMock.Net" Version="1.25.0" />
+    <PackageReference Include="WireMock.Net" Version="2.12.0" />
   </ItemGroup>
 
 </Project>

examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj

@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.3.0" />
+        <PackageReference Include="Microsoft.OpenApi.YamlReader" Version="3.7.0" />
         
         <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
         <ProjectReference Include="..\..\src\WireMock.Net.OpenApiParser\WireMock.Net.OpenApiParser.csproj" />
@@ -14,10 +14,7 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Release'">
-        <PackageReference Include="Microsoft.OpenApi" Version="2.3.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.OpenApi" Version="3.7.0" PrivateAssets="All" />
-        <!--<PackageReference Include="Microsoft.OpenApi.YamlReader" Version="2.3.0" PrivateAssets="All" />
-        <PackageReference Include="System.Text.Json" Version="8.0.5" />
-        <PackageReference Include="SharpYaml" Version="2.1.3" />-->
     </ItemGroup>
 
     <ItemGroup>

examples/WireMock.Net.OpenTelemetryDemo/WireMock.Net.OpenTelemetryDemo.csproj

@@ -8,9 +8,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.14.0" />
+        <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.15.3" />
-        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.14.0" />
+        <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.15.1" />
-        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.14.0" />
+        <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.15.3" />
     </ItemGroup>
 
     <ItemGroup>

examples/WireMock.Net.Service/WireMock.Net.Service.csproj

@@ -32,13 +32,10 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>Wiremock.Net.Service.Program</StartupObject>
+  </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Configuration.Install" />
@@ -88,13 +85,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="log4net">
-      <Version>3.3.0</Version>
+      <Version>3.3.2</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Core">
-      <Version>2.3.9</Version>
+      <Version>2.3.11</Version>
     </PackageReference>
     <PackageReference Include="WireMock.Net">
-      <Version>1.25.0</Version>
+      <Version>2.12.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

examples/WireMock.Net.Service/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.15" targetFramework="net48" />
+  <package id="log4net" version="3.3.0" targetFramework="net48" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />

examples/WireMock.Net.TestcontainersExample/Program.cs

@@ -246,8 +246,8 @@ internal class Program
             throw new InvalidOperationException($"The {nameof(TestcontainersSettings.OS.DockerEndpointAuthConfig)} is null. Check if Docker is started.");
         }
 
-        using var dockerClientConfig = TestcontainersSettings.OS.DockerEndpointAuthConfig.GetDockerClientConfiguration();
+        var dockerClientBuilder = TestcontainersSettings.OS.DockerEndpointAuthConfig.GetDockerClientBuilder();
-        using var dockerClient = dockerClientConfig.CreateClient();
+        using var dockerClient = dockerClientBuilder.Build();
 
         var version = await dockerClient.System.GetVersionAsync();
         return version.Os.IndexOf("Windows", StringComparison.OrdinalIgnoreCase) >= 0 ? OSPlatform.Windows : OSPlatform.Linux;

examples/WireMock.Net.WebApplication.IIS/App.cs

@@ -1,29 +1,18 @@
 // Copyright © WireMock.Net
 
-using Microsoft.Extensions.Hosting;
-using System.Threading;
-using System.Threading.Tasks;
-
 namespace WireMock.Net.WebApplication;
 
-public class App : IHostedService
+public class App(IWireMockService service) : IHostedService
 {
-    private readonly IWireMockService _service;
-        
-    public App(IWireMockService service)
-    {
-        _service = service;
-    }
-
     public Task StartAsync(CancellationToken cancellationToken)
     {
-        _service.Start();
+        service.Start();
         return Task.CompletedTask;
     }
 
     public Task StopAsync(CancellationToken cancellationToken)
     {
-        _service.Stop();
+        service.Stop();
         return Task.CompletedTask;
     }
 }

examples/WireMock.Net.WebApplication.IIS/Program.cs

@@ -1,9 +1,5 @@
 // Copyright © WireMock.Net
 
-using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-using Microsoft.Extensions.Logging;
 using WireMock.Settings;
 
 namespace WireMock.Net.WebApplication;

examples/WireMock.Net.WebApplication.IIS/WireMock.Net.WebApplication.IIS.csproj

@@ -11,11 +11,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
         <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     </ItemGroup>
 

examples/WireMock.Net.WebApplication.IIS/WireMockService.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;
 using WireMock.Admin.Requests;

examples/WireMock.Net.WebApplication.IIS/appsettings.json

@@ -15,7 +15,7 @@
     "WireMockServerSettings": {
         "StartAdminInterface": true,
         "Urls": [
-            "http://localhost"
+            "http://localhost:0"
         ]
     }
 }

examples/WireMock.Net.WebApplication.IIS/web.config

@@ -1,12 +1,17 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <!--
+    <!--
     Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
-  -->
+    -->
-  <system.webServer>
+    <system.webServer>
-    <handlers>
+        <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
+            <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
-    </handlers>
+        </handlers>
-    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+        <httpProtocol>
-  </system.webServer>
+            <customHeaders>
+                <add name="X-Frame-Options" value="SAMEORIGIN" />
+            </customHeaders>
+        </httpProtocol>
+        <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+    </system.webServer>
 </configuration>

src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs

@@ -55,12 +55,17 @@ public class MappingModel
     /// In case the value is null state will not be changed.
     /// </summary>
     public string? SetStateTo { get; set; }
-    
+
     /// <summary>
     /// The number of times this match should be matched before the state will be changed to the specified one.
     /// </summary>
     public int? TimesInSameState { get; set; }
 
+    /// <summary>
+    /// Value to determine if the mapping is disabled. Defaults to <c>null</c> (not disabled).
+    /// </summary>
+    public bool? IsDisabled { get; set; }
+
     /// <summary>
     /// The request model.
     /// </summary>
@@ -100,7 +105,7 @@ public class MappingModel
     /// </summary>
     public object? Data { get; set; }
 
-    /// <summary> 
+    /// <summary>
     /// The probability when this request should be matched. Value is between 0 and 1. [Optional]
     /// </summary>
     public double? Probability { get; set; }

src/WireMock.Net.Abstractions/Admin/Mappings/RequestModel.cs

@@ -1,5 +1,7 @@
 // Copyright © WireMock.Net
 
+using WireMock.Matchers.Request;
+
 namespace WireMock.Admin.Mappings;
 
 /// <summary>
@@ -61,9 +63,15 @@ public class RequestModel
     /// Gets or sets the Params.
     /// </summary>
     public IList<ParamModel>? Params { get; set; }
-        
+
     /// <summary>
     /// Gets or sets the body.
     /// </summary>
     public BodyModel? Body { get; set; }
+
+    /// <summary>
+    /// Type of the request matcher to return an immediate mismatch during mapping processing.
+    /// Optional.
+    /// </summary>
+    public RequestMatcherType? EarlyMatcherType { get; set; }
 }

src/WireMock.Net.Abstractions/Handlers/IScenarioStateStore.cs

@@ -1,7 +1,5 @@
 // Copyright © WireMock.Net
 
-using System;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 
 namespace WireMock.Handlers;
@@ -23,4 +21,4 @@ public interface IScenarioStateStore
     bool TryRemove(string name);
 
     void Clear();
-}
+}

src/WireMock.Net.Abstractions/Matchers/Request/IRequestMatcher.cs

@@ -7,6 +7,11 @@ namespace WireMock.Matchers.Request;
 /// </summary>
 public interface IRequestMatcher
 {
+    /// <summary>
+    /// Gets the request matcher's type.
+    /// </summary>
+    public RequestMatcherType Type { get; }
+
     /// <summary>
     /// Determines whether the specified RequestMessage is match.
     /// </summary>

src/WireMock.Net.Abstractions/Matchers/Request/RequestMatcherType.cs

@@ -0,0 +1,84 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// List of predefined request matcher types.
+/// </summary>
+public enum RequestMatcherType
+{
+    /// <summary>
+    /// RequestMessageBodyMatcher
+    /// </summary>
+    Body = 0,
+
+    /// <summary>
+    /// RequestMessageBodyMatcher{T}
+    /// </summary>
+    BodyOfT = 1,
+
+    /// <summary>
+    /// RequestMessageClientIPMatcher
+    /// </summary>
+    ClientIP = 2,
+
+    /// <summary>
+    /// RequestMessageCookieMatcher
+    /// </summary>
+    Cookie = 3,
+
+    /// <summary>
+    /// RequestMessageGraphQLMatcher
+    /// </summary>
+    GraphQL = 4,
+
+    /// <summary>
+    /// RequestMessageHeaderMatcher
+    /// </summary>
+    Header = 5,
+
+    /// <summary>
+    /// RequestMessageHttpVersionMatcher
+    /// </summary>
+    HttpVersion = 6,
+
+    /// <summary>
+    /// RequestMessageMethodMatcher
+    /// </summary>
+    Method = 7,
+
+    /// <summary>
+    /// RequestMessageMultiPartMatcher
+    /// </summary>
+    MultiPart = 8,
+
+    /// <summary>
+    /// RequestMessageParamMatcher
+    /// </summary>
+    Param = 9,
+
+    /// <summary>
+    /// RequestMessagePathMatcher
+    /// </summary>
+    Path = 10,
+
+    /// <summary>
+    /// RequestMessageProtoBufMatcher
+    /// </summary>
+    ProtoBuf = 11,
+
+    /// <summary>
+    /// RequestMessageScenarioAndStateMatcher
+    /// </summary>
+    ScenarioAndState = 12,
+
+    /// <summary>
+    /// RequestMessageUrlMatcher
+    /// </summary>
+    Url = 13,
+
+    /// <summary>
+    /// RequestMessageCompositeMatcher
+    /// </summary>
+    Composite = 14
+}

src/WireMock.Net.Abstractions/Types/WireMockList.cs

@@ -1,11 +1,11 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
-
 namespace WireMock.Types;
 
 /// <summary>
-/// A special List which overrides the ToString() to return first value.
+/// A special List which overrides the ToString() to return first value in case of a single element.
+/// Else it will return a comma separated list of all values.
+/// If null or empty, it will return an empty string.
 /// </summary>
 /// <typeparam name="T">The generic type</typeparam>
 /// <seealso cref="List{T}" />
@@ -61,11 +61,11 @@ public class WireMockList<T> : List<T>
                 {
                     return strValue;
                 }
-
+               
-                return this[0]?.ToString();
+                return this[0]?.ToString() ?? string.Empty;
 
             default:
-                var strings = this.Select(x => x as string ?? x?.ToString());
+                var strings = this.Select(x => x as string ?? x?.ToString() ?? string.Empty);
                 return string.Join(", ", strings);
         }
     }

src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj

@@ -39,7 +39,7 @@
     </ItemGroup>-->
 
     <ItemGroup>
-        <PackageReference Include="FluentBuilder" Version="0.14.0">
+        <PackageReference Include="FluentBuilder" Version="0.15.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj

@@ -45,7 +45,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Aspire.Hosting" Version="13.1.0" />
+        <PackageReference Include="Aspire.Hosting" Version="13.4.3" />
+
+        <!-- CVE-2026-48109 -->
+        <PackageReference Include="MessagePack" Version="2.5.302" />
     </ItemGroup>
 
     <ItemGroup>

src/WireMock.Net.Aspire/WireMockHealthCheck.cs

@@ -21,11 +21,6 @@ public class WireMockHealthCheck(WireMockServerResource resource) : IHealthCheck
             return HealthCheckResult.Unhealthy("WireMock.Net is not healthy");
         }
 
-        if (resource.ApiMappingState == WireMockMappingState.NotSubmitted)
-        {
-            return HealthCheckResult.Unhealthy("WireMock.Net has not received mappings");
-        }
-
         return HealthCheckResult.Healthy();
     }
 
@@ -41,4 +36,4 @@ public class WireMockHealthCheck(WireMockServerResource resource) : IHealthCheck
             return false;
         }
     }
-}
+}

src/WireMock.Net.Aspire/WireMockLifecycleSubscriber.cs

@@ -21,7 +21,13 @@ internal class WireMockLifecycleSubscriber(ILoggerFactory loggerFactory) : IDist
 
                 var endpoint = wireMockServerResource.GetEndpoint();
                 Debug.Assert(endpoint.IsAllocated);
+            }
+        });
 
+        eventing.Subscribe<ResourceReadyEvent>(async (@event, ct) =>
+        {
+            if (@event.Resource is WireMockServerResource wireMockServerResource)
+            {
                 await wireMockServerResource.WaitForHealthAsync(ct);
 
                 await wireMockServerResource.CallAddProtoDefinitionsAsync(ct);

src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs

@@ -31,19 +31,19 @@ public partial class WireMockAssertions
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(object body, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(object body, IJsonMatcher? jsonMatcher = null, string because = "", params object[] becauseArgs)
     {
-        return WithBodyAsJson(new JsonMatcher(body), because, becauseArgs);
+        return WithBodyAsJson(jsonMatcher ?? new JsonMatcher(body), because, becauseArgs);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(string body, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(string body, IJsonMatcher? jsonMatcher = null, string because = "", params object[] becauseArgs)
     {
-        return WithBodyAsJson(new JsonMatcher(body), because, becauseArgs);
+        return WithBodyAsJson(jsonMatcher ?? new JsonMatcher(body), because, becauseArgs);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(IObjectMatcher matcher, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(IJsonMatcher matcher, string because = "", params object[] becauseArgs)
     {
         var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsJson, matcher);
 
@@ -126,15 +126,44 @@ public partial class WireMockAssertions
 
     private static string? FormatBody(object? body)
     {
-        return body switch
+        if (body == null)
         {
-            null => null,
+            return null;
-            string str => str,
+        }
-            AnyOf<string, StringPattern>[] stringPatterns => FormatBodies(stringPatterns.Select(p => p.GetPattern())),
+
-            byte[] bytes => $"byte[{bytes.Length}] {{...}}",
+        if (body is string str)
-            JToken jToken => jToken.ToString(Formatting.None),
+        {
-            _ => JToken.FromObject(body).ToString(Formatting.None)
+            return str;
-        };
+        }
+
+        if (body is AnyOf<string, StringPattern>[] stringPatterns)
+        {
+            return FormatBodies(stringPatterns.Select(p => p.GetPattern()));
+        }
+
+        if (body is byte[] bytes)
+        {
+            return $"byte[{bytes.Length}] {{...}}";
+        }
+
+        if (body is JToken jToken)
+        {
+            return jToken.ToString(Formatting.None);
+        }
+
+        // System.IO.FileNotFoundException : Could not load file or assembly 'System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. The system cannot find the file specified.
+        var typeName = body.GetType().FullName;
+        if (typeName == "System.Text.Json.JsonElement")
+        {
+            return ((dynamic)body).GetRawText();
+        }
+
+        if (typeName == "System.Text.Json.JsonDocument")
+        {
+            return ((dynamic)body).RootElement.GetRawText();
+        }
+
+        return JToken.FromObject(body).ToString(Formatting.None);
     }
 
     private static string? FormatBodies(IEnumerable<object?> bodies)

src/WireMock.Net.Extensions.Routing/WireMock.Net.Extensions.Routing.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <Description>WireMock.Net.Routing extends WireMock.Net with modern, minimal-API-style routing for .NET</Description>
         <Authors>Gennadii Saltyshchak</Authors>
@@ -25,7 +25,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="JsonConverter.Abstractions" Version="0.8.0" />
+      <PackageReference Include="JsonConverter.Abstractions" Version="0.13.0" />
     </ItemGroup>
 
     <ItemGroup>

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithBody.cs

@@ -31,19 +31,19 @@ public partial class WireMockAssertions
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(object body, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(object body, IJsonMatcher? jsonMatcher = null, string because = "", params object[] becauseArgs)
     {
-        return WithBodyAsJson(new JsonMatcher(body), because, becauseArgs);
+        return WithBodyAsJson(jsonMatcher ?? new JsonMatcher(body), because, becauseArgs);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(string body, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(string body, IJsonMatcher? jsonMatcher = null, string because = "", params object[] becauseArgs)
     {
-        return WithBodyAsJson(new JsonMatcher(body), because, becauseArgs);
+        return WithBodyAsJson(jsonMatcher ?? new JsonMatcher(body), because, becauseArgs);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(IObjectMatcher matcher, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(IJsonMatcher matcher, string because = "", params object[] becauseArgs)
     {
         var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsJson, matcher);
 
@@ -126,15 +126,44 @@ public partial class WireMockAssertions
 
     private static string? FormatBody(object? body)
     {
-        return body switch
+        if (body == null)
         {
-            null => null,
+            return null;
-            string str => str,
+        }
-            AnyOf<string, StringPattern>[] stringPatterns => FormatBodies(stringPatterns.Select(p => p.GetPattern())),
+
-            byte[] bytes => $"byte[{bytes.Length}] {{...}}",
+        if (body is string str)
-            JToken jToken => jToken.ToString(Formatting.None),
+        {
-            _ => JToken.FromObject(body).ToString(Formatting.None)
+            return str;
-        };
+        }
+
+        if (body is AnyOf<string, StringPattern>[] stringPatterns)
+        {
+            return FormatBodies(stringPatterns.Select(p => p.GetPattern()));
+        }
+
+        if (body is byte[] bytes)
+        {
+            return $"byte[{bytes.Length}] {{...}}";
+        }
+
+        if (body is JToken jToken)
+        {
+            return jToken.ToString(Formatting.None);
+        }
+
+        // System.IO.FileNotFoundException : Could not load file or assembly 'System.Text.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51'. The system cannot find the file specified.
+        var typeName = body.GetType().FullName;
+        if (typeName == "System.Text.Json.JsonElement")
+        {
+            return ((dynamic)body).GetRawText();
+        }
+
+        if (typeName == "System.Text.Json.JsonDocument")
+        {
+            return ((dynamic)body).RootElement.GetRawText();
+        }
+
+        return JToken.FromObject(body).ToString(Formatting.None);
     }
 
     private static string? FormatBodies(IEnumerable<object?> bodies)

src/WireMock.Net.Matchers.SystemTextJsonPath/Matchers/SystemTextJsonPathMatcher.cs

@@ -0,0 +1,184 @@
+// Copyright © WireMock.Net
+
+using System.Text.Json;
+using System.Text.Json.Nodes;
+using AnyOfTypes;
+using Json.Path;
+using Stef.Validation;
+using WireMock.Extensions;
+using WireMock.Models;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// SystemTextJsonPathMatcher - behaves the same as JsonPathMatcher but uses System.Text.Json and Json.Path instead of Newtonsoft.Json.
+/// </summary>
+/// <seealso cref="ISystemTextJsonPathMatcher" />
+public class SystemTextJsonPathMatcher : ISystemTextJsonPathMatcher
+{
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
+    /// <inheritdoc />
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc />
+    public object Value { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SystemTextJsonPathMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public SystemTextJsonPathMatcher(params string[] patterns)
+        : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, patterns.ToAnyOfPatterns())
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SystemTextJsonPathMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public SystemTextJsonPathMatcher(params AnyOf<string, StringPattern>[] patterns)
+        : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, patterns)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SystemTextJsonPathMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="patterns">The patterns.</param>
+    public SystemTextJsonPathMatcher(
+        MatchBehaviour matchBehaviour,
+        MatchOperator matchOperator = MatchOperator.Or,
+        params AnyOf<string, StringPattern>[] patterns)
+    {
+        _patterns = Guard.NotNull(patterns);
+        MatchBehaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+        Value = patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(string? input)
+    {
+        var score = MatchScores.Mismatch;
+        Exception? exception = null;
+
+        if (!string.IsNullOrWhiteSpace(input))
+        {
+            try
+            {
+                var node = JsonNode.Parse(input!);
+                score = IsMatchInternal(node);
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+            }
+        }
+
+        return MatchResult.From(Name, MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(object? input)
+    {
+        var score = MatchScores.Mismatch;
+        Exception? exception = null;
+
+        // When input is null or byte[], return Mismatch.
+        if (input != null && input is not byte[])
+        {
+            try
+            {
+                JsonNode? node = input switch
+                {
+                    JsonNode jsonNode => jsonNode,
+                    string str => JsonNode.Parse(str),
+                    _ => JsonNode.Parse(JsonSerializer.Serialize(input))
+                };
+
+                score = IsMatchInternal(node);
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+            }
+        }
+
+        return MatchResult.From(Name, MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
+    }
+
+    /// <inheritdoc />
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc />
+    public string Name => nameof(SystemTextJsonPathMatcher);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
+    }
+
+    private double IsMatchInternal(JsonNode? node)
+    {
+        // JsonPath.Net requires the node to be inside an object or array for filter expressions.
+        // Similar to JsonPathMatcher's ConvertJTokenToJArrayIfNeeded, wrap a plain object in an array
+        // when it's an object with a single non-array child property.
+        var evaluationNode = WrapIfNeeded(node);
+
+        var values = _patterns
+            .Select(pattern =>
+            {
+                var path = JsonPath.Parse(pattern.GetPattern());
+                var result = path.Evaluate(evaluationNode);
+                return result.Matches is { Count: > 0 };
+            })
+            .ToArray();
+
+        return MatchScores.ToScore(values, MatchOperator);
+    }
+
+    // Mirrors JsonPathMatcher.ConvertJTokenToJArrayIfNeeded:
+    // If the node is an object with exactly one property whose value is not already an array,
+    // wrap that value in an array so that filter expressions (e.g. [?(@.x == y)]) can match.
+    private static JsonNode? WrapIfNeeded(JsonNode? node)
+    {
+        if (node is not JsonObject obj)
+        {
+            return node;
+        }
+
+        var properties = obj.ToList();
+        if (properties.Count != 1)
+        {
+            return node;
+        }
+
+        var single = properties[0];
+        if (single.Value is JsonArray)
+        {
+            return node;
+        }
+
+        var clonedValue = JsonNode.Parse(single.Value?.ToJsonString() ?? "null");
+        return new JsonObject
+        {
+            [single.Key] = new JsonArray(clonedValue)
+        };
+    }
+}

src/WireMock.Net.Matchers.SystemTextJsonPath/Properties/AssemblyInfo.cs

@@ -0,0 +1,5 @@
+// Copyright © WireMock.Net
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]

src/WireMock.Net.Matchers.SystemTextJsonPath/WireMock.Net.Matchers.SystemTextJsonPath.csproj

@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>A SystemTextJsonPathMatcher which can be used to match WireMock.Net Requests using JsonPath.Net.</Description>
+        <AssemblyTitle>WireMock.Net.Matchers.SystemTextJsonPath</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>wiremock;matchers;matcher;jsonpath;systemtextjson</PackageTags>
+        <RootNamespace>WireMock</RootNamespace>
+        <PackageId>WireMock.Net.Matchers.SystemTextJsonPath</PackageId>
+        <ProjectGuid>{A1B2C3D4-E5F6-7890-ABCD-EF1234567890}</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>
+        <!--<DelaySign>true</DelaySign>-->
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Shared\WireMock.Net.Shared.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="JsonPath.Net" Version="3.0.2" />
+    </ItemGroup>
+
+</Project>

src/WireMock.Net.MimePart/Matchers/MimePartMatcher.cs

@@ -1,7 +1,8 @@
 // Copyright © WireMock.Net
 
-using System;
+using JsonConverter.Abstractions;
-using System.Collections.Generic;
+using JsonConverter.Newtonsoft.Json;
+using Newtonsoft.Json;
 using WireMock.Matchers.Helpers;
 using WireMock.Models.Mime;
 using WireMock.Util;
@@ -15,6 +16,8 @@ public class MimePartMatcher : IMimePartMatcher
 {
     private readonly IList<(string Name, Func<IMimePartData, MatchResult> func)> _matcherFunctions;
 
+    private readonly IJsonConverter _jsonConverter;
+
     /// <inheritdoc />
     public string Name => nameof(MimePartMatcher);
 
@@ -41,7 +44,8 @@ public class MimePartMatcher : IMimePartMatcher
         IStringMatcher? contentTypeMatcher,
         IStringMatcher? contentDispositionMatcher,
         IStringMatcher? contentTransferEncodingMatcher,
-        IMatcher? contentMatcher
+        IMatcher? contentMatcher,
+        IJsonConverter? jsonConverter = null
     )
     {
         MatchBehaviour = matchBehaviour;
@@ -49,6 +53,7 @@ public class MimePartMatcher : IMimePartMatcher
         ContentDispositionMatcher = contentDispositionMatcher;
         ContentTransferEncodingMatcher = contentTransferEncodingMatcher;
         ContentMatcher = contentMatcher;
+        _jsonConverter = jsonConverter ?? new NewtonsoftJsonConverter();
 
         _matcherFunctions = [];
         if (ContentTypeMatcher != null)
@@ -107,7 +112,8 @@ public class MimePartMatcher : IMimePartMatcher
             ContentType = GetContentTypeAsString(mimePart.ContentType),
             DeserializeJson = true,
             ContentEncoding = null, // mimePart.ContentType?.CharsetEncoding.ToString(),
-            DecompressGZipAndDeflate = true
+            DecompressGZipAndDeflate = true,
+            DefaultJsonConverter = _jsonConverter
         };
 
         var bodyData = BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false).GetAwaiter().GetResult();

src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj

@@ -36,7 +36,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Stef.Validation" Version="0.2.0" />
+        <PackageReference Include="Stef.Validation" Version="0.3.0" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(Configuration)' == 'Debug'">

src/WireMock.Net.Minimal/Handlers/FileBasedScenarioStateStore.cs

@@ -1,43 +1,53 @@
 // Copyright © WireMock.Net
 
-using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
 using Newtonsoft.Json;
+using Stef.Validation;
 
 namespace WireMock.Handlers;
 
+/// <summary>
+/// Provides a file-based implementation of <see cref="IScenarioStateStore" /> that persists scenario states to disk and allows concurrent access.
+/// </summary>
 public class FileBasedScenarioStateStore : IScenarioStateStore
 {
     private readonly ConcurrentDictionary<string, ScenarioState> _scenarios = new(StringComparer.OrdinalIgnoreCase);
     private readonly string _scenariosFolder;
     private readonly object _lock = new();
 
+    /// <summary>
+    /// Initializes a new instance of the FileBasedScenarioStateStore class using the specified root folder as the base directory for scenario state storage.
+    /// </summary>
+    /// <param name="rootFolder">The root directory under which scenario state data will be stored. Must be a valid file system path.</param>
     public FileBasedScenarioStateStore(string rootFolder)
     {
+        Guard.NotNullOrEmpty(rootFolder);
+
         _scenariosFolder = Path.Combine(rootFolder, "__admin", "scenarios");
         Directory.CreateDirectory(_scenariosFolder);
         LoadScenariosFromDisk();
     }
 
+    /// <inheritdoc />
     public bool TryGet(string name, [NotNullWhen(true)] out ScenarioState? state)
     {
         return _scenarios.TryGetValue(name, out state);
     }
 
+    /// <inheritdoc />
     public IReadOnlyList<ScenarioState> GetAll()
     {
         return _scenarios.Values.ToArray();
     }
 
+    /// <inheritdoc />
     public bool ContainsKey(string name)
     {
         return _scenarios.ContainsKey(name);
     }
 
+    /// <inheritdoc />
     public bool TryAdd(string name, ScenarioState scenarioState)
     {
         if (_scenarios.TryAdd(name, scenarioState))
@@ -49,6 +59,7 @@ public class FileBasedScenarioStateStore : IScenarioStateStore
         return false;
     }
 
+    /// <inheritdoc />
     public ScenarioState AddOrUpdate(string name, Func<string, ScenarioState> addFactory, Func<string, ScenarioState, ScenarioState> updateFactory)
     {
         lock (_lock)
@@ -59,6 +70,7 @@ public class FileBasedScenarioStateStore : IScenarioStateStore
         }
     }
 
+    /// <inheritdoc />
     public ScenarioState? Update(string name, Action<ScenarioState> updateAction)
     {
         lock (_lock)
@@ -74,6 +86,7 @@ public class FileBasedScenarioStateStore : IScenarioStateStore
         }
     }
 
+    /// <inheritdoc />
     public bool TryRemove(string name)
     {
         if (_scenarios.TryRemove(name, out _))
@@ -85,6 +98,7 @@ public class FileBasedScenarioStateStore : IScenarioStateStore
         return false;
     }
 
+    /// <inheritdoc />
     public void Clear()
     {
         _scenarios.Clear();
@@ -128,4 +142,4 @@ public class FileBasedScenarioStateStore : IScenarioStateStore
             }
         }
     }
-}
+}

src/WireMock.Net.Minimal/Http/HttpResponseMessageHelper.cs

@@ -1,8 +1,7 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
 using System.Net;
-using System.Net.Http;
+using JsonConverter.Abstractions;
 using WireMock.Util;
 
 namespace WireMock.Http;
@@ -15,7 +14,8 @@ internal static class HttpResponseMessageHelper
         Uri originalUri,
         bool deserializeJson,
         bool decompressGzipAndDeflate,
-        bool deserializeFormUrlEncoded)
+        bool deserializeFormUrlEncoded,
+        IJsonConverter jsonConverter)
     {
         var responseMessage = new ResponseMessage { StatusCode = (int)httpResponseMessage.StatusCode };
 
@@ -45,7 +45,8 @@ internal static class HttpResponseMessageHelper
                     DeserializeJson = deserializeJson,
                     ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
                     DecompressGZipAndDeflate = decompressGzipAndDeflate,
-                    DeserializeFormUrlEncoded = deserializeFormUrlEncoded
+                    DeserializeFormUrlEncoded = deserializeFormUrlEncoded,
+                    DefaultJsonConverter = jsonConverter
                 };
                 responseMessage.BodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
             }

src/WireMock.Net.Minimal/IResponseMessageBuilder.cs

@@ -0,0 +1,16 @@
+// Copyright © WireMock.Net
+
+using System.Net;
+
+namespace WireMock;
+
+internal interface IResponseMessageBuilder
+{
+    ResponseMessage Create(HttpStatusCode statusCode, string? status, Guid? guid = null);
+
+    ResponseMessage Create(int statusCode, string? status, Guid? guid = null);
+
+    ResponseMessage Create(int statusCode, string? status, string? error, Guid? guid = null);
+
+    ResponseMessage Create(HttpStatusCode statusCode);
+}

src/WireMock.Net.Minimal/Mapping.cs

@@ -62,6 +62,9 @@ public class Mapping : IMapping
     /// <inheritdoc />
     public bool IsProxy => Provider is ProxyAsyncResponseProvider;
 
+    /// <inheritdoc />
+    public bool IsDisabled { get; set; }
+
     /// <inheritdoc />
     public bool LogMapping => Provider is not (DynamicResponseProvider or DynamicAsyncResponseProvider);
 

src/WireMock.Net.Minimal/MappingBuilder.cs

@@ -27,6 +27,7 @@ public class MappingBuilder : IMappingBuilder
     private readonly MappingToFileSaver _mappingToFileSaver;
     private readonly IGuidUtils _guidUtils;
     private readonly IDateTimeUtils _dateTimeUtils;
+    private readonly IResponseMessageBuilder _responseMessageBuilder;
 
     /// <summary>
     /// Create a MappingBuilder
@@ -43,6 +44,7 @@ public class MappingBuilder : IMappingBuilder
 
         _guidUtils = new GuidUtils();
         _dateTimeUtils = new DateTimeUtils();
+        _responseMessageBuilder = new ResponseMessageBuilder(_dateTimeUtils);
     }
 
     internal MappingBuilder(
@@ -51,7 +53,8 @@ public class MappingBuilder : IMappingBuilder
         MappingConverter mappingConverter,
         MappingToFileSaver mappingToFileSaver,
         IGuidUtils guidUtils,
-        IDateTimeUtils dateTimeUtils
+        IDateTimeUtils dateTimeUtils,
+        IResponseMessageBuilder responseMessageBuilder
     )
     {
         _settings = Guard.NotNull(settings);
@@ -60,12 +63,13 @@ public class MappingBuilder : IMappingBuilder
         _mappingToFileSaver = Guard.NotNull(mappingToFileSaver);
         _guidUtils = Guard.NotNull(guidUtils);
         _dateTimeUtils = Guard.NotNull(dateTimeUtils);
+        _responseMessageBuilder = Guard.NotNull(responseMessageBuilder);
     }
 
     /// <inheritdoc />
     public IRespondWithAProvider Given(IRequestMatcher requestMatcher, bool saveToFile = false)
     {
-        return new RespondWithAProvider(RegisterMapping, Guard.NotNull(requestMatcher), _settings, _guidUtils, _dateTimeUtils, saveToFile);
+        return new RespondWithAProvider(RegisterMapping, Guard.NotNull(requestMatcher), _settings, _guidUtils, _dateTimeUtils, _responseMessageBuilder, saveToFile);
     }
 
     /// <inheritdoc />

src/WireMock.Net.Minimal/Matchers/AbstractJsonPartialMatcher.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
 using Newtonsoft.Json.Linq;
 using WireMock.Util;
 

src/WireMock.Net.Minimal/Matchers/AbstractSystemTextJsonPartialMatcher.cs

@@ -0,0 +1,173 @@
+// Copyright © WireMock.Net
+
+using System.Text.Json;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// Generic AbstractSystemTextJsonPartialMatcher - uses System.Text.Json instead of Newtonsoft.Json.
+/// </summary>
+public abstract class AbstractSystemTextJsonPartialMatcher : SystemTextJsonMatcher
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AbstractSystemTextJsonPartialMatcher"/> class.
+    /// </summary>
+    protected AbstractSystemTextJsonPartialMatcher(string value, bool ignoreCase = false, bool regex = false)
+        : base(value, ignoreCase, regex)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AbstractSystemTextJsonPartialMatcher"/> class.
+    /// </summary>
+    protected AbstractSystemTextJsonPartialMatcher(object value, bool ignoreCase = false, bool regex = false)
+        : base(value, ignoreCase, regex)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AbstractSystemTextJsonPartialMatcher"/> class.
+    /// </summary>
+    protected AbstractSystemTextJsonPartialMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false)
+        : base(matchBehaviour, value, ignoreCase, regex)
+    {
+    }
+
+    /// <inheritdoc />
+    protected override bool IsMatch(JsonElement value, JsonElement? input)
+    {
+        if (input == null)
+        {
+            return false;
+        }
+
+        var inputElement = input.Value;
+
+        // Regex on a string value
+        if (Regex && value.ValueKind == JsonValueKind.String)
+        {
+            var valueAsString = value.GetString()!;
+            var inputAsString = GetStringValue(inputElement);
+
+            var (valid, result) = RegexUtils.MatchRegex(valueAsString, inputAsString);
+            if (valid)
+            {
+                return result;
+            }
+        }
+
+        // Guid comparison: both strings, both parseable as Guid
+        if (value.ValueKind == JsonValueKind.String && inputElement.ValueKind == JsonValueKind.String)
+        {
+            var valueStr = value.GetString()!;
+            var inputStr = inputElement.GetString()!;
+            if (Guid.TryParse(valueStr, out var vg) && Guid.TryParse(inputStr, out var ig))
+            {
+                return IsMatch(vg.ToString(), ig.ToString());
+            }
+        }
+
+        // Type mismatch (after regex/guid checks)
+        if (value.ValueKind != inputElement.ValueKind)
+        {
+            return false;
+        }
+
+        switch (value.ValueKind)
+        {
+            case JsonValueKind.Object:
+            {
+                var nestedValues = value.EnumerateObject().ToArray();
+                if (nestedValues.Length == 0)
+                {
+                    return true;
+                }
+
+                return nestedValues.All(pair =>
+                {
+                    var selected = SelectElement(inputElement, pair.Name);
+                    return selected != null && IsMatch(pair.Value, selected.Value);
+                });
+            }
+
+            case JsonValueKind.Array:
+            {
+                var valuesArray = value.EnumerateArray().ToArray();
+                if (valuesArray.Length == 0)
+                {
+                    return true;
+                }
+
+                var tokenArray = inputElement.EnumerateArray().ToArray();
+                if (tokenArray.Length == 0)
+                {
+                    return false;
+                }
+
+                return valuesArray.All(subFilter => tokenArray.Any(subToken => IsMatch(subFilter, subToken)));
+            }
+
+            default:
+                return IsMatch(GetStringValue(value), GetStringValue(inputElement));
+        }
+    }
+
+    /// <summary>
+    /// Check if two strings are a match (matching can be done exact or wildcard).
+    /// </summary>
+    protected abstract bool IsMatch(string value, string input);
+
+    /// <summary>
+    /// Selects a <see cref="JsonElement"/> from an object using a key that may be a plain property name,
+    /// a dotted path (e.g. "a.b.c") or bracket notation (e.g. "['name.with.dot']"),
+    /// mirroring Newtonsoft's <c>SelectToken</c> + direct indexer fallback.
+    /// </summary>
+    private static JsonElement? SelectElement(JsonElement input, string key)
+    {
+        if (input.ValueKind != JsonValueKind.Object)
+        {
+            return null;
+        }
+
+        // Direct property access (also handles keys containing colons or dots that are literal property names)
+        if (input.TryGetProperty(key, out var direct))
+        {
+            return direct;
+        }
+
+        // Bracket notation: ['property.name.with.dots']
+        if (key.StartsWith("['") && key.EndsWith("']"))
+        {
+            var propertyName = key.Substring(2, key.Length - 4);
+            return input.TryGetProperty(propertyName, out var bracketValue) ? bracketValue : null;
+        }
+
+        // Dotted path: a.b.c
+        if (key.Contains('.'))
+        {
+            var parts = key.Split('.');
+            var current = input;
+            foreach (var part in parts)
+            {
+                if (current.ValueKind != JsonValueKind.Object || !current.TryGetProperty(part, out var next))
+                {
+                    return null;
+                }
+
+                current = next;
+            }
+
+            return current;
+        }
+
+        return null;
+    }
+
+    private static string GetStringValue(JsonElement element)
+    {
+        return element.ValueKind == JsonValueKind.String
+            ? element.GetString()!
+            : element.GetRawText();
+    }
+}

src/WireMock.Net.Minimal/Matchers/JSONPathMatcher.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
 using AnyOfTypes;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;
@@ -13,9 +12,8 @@ namespace WireMock.Matchers;
 /// <summary>
 /// JsonPathMatcher
 /// </summary>
-/// <seealso cref="IStringMatcher" />
+/// <seealso cref="IJsonPathMatcher" />
-/// <seealso cref="IObjectMatcher" />
+public class JsonPathMatcher : IJsonPathMatcher
-public class JsonPathMatcher : IStringMatcher, IObjectMatcher
 {
     private readonly AnyOf<string, StringPattern>[] _patterns;
 

src/WireMock.Net.Minimal/Matchers/JsonMatcher.cs

@@ -1,11 +1,12 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
+using System.Collections;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;
 using WireMock.Extensions;
+using WireMock.Serialization;
 using WireMock.Util;
-using JsonUtils = WireMock.Util.JsonUtils;
 
 namespace WireMock.Matchers;
 
@@ -31,6 +32,11 @@ public class JsonMatcher : IJsonMatcher
     /// </summary>
     public bool Regex { get; }
 
+    /// <summary>
+    /// Ignore array order when comparing
+    /// </summary>
+    public bool IgnoreArrayOrder { get; }
+
     private readonly JToken _valueAsJToken;
 
     /// <summary>
@@ -39,7 +45,8 @@ public class JsonMatcher : IJsonMatcher
     /// <param name="value">The string value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    public JsonMatcher(string value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
+    /// <param name="ignoreArrayOrder">Ignore array element order when comparing.</param>
+    public JsonMatcher(string value, bool ignoreCase = false, bool regex = false, bool ignoreArrayOrder = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex, ignoreArrayOrder)
     {
     }
 
@@ -49,7 +56,8 @@ public class JsonMatcher : IJsonMatcher
     /// <param name="value">The object value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    public JsonMatcher(object value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
+    /// <param name="ignoreArrayOrder">Ignore array element order when comparing.</param>
+    public JsonMatcher(object value, bool ignoreCase = false, bool regex = false, bool ignoreArrayOrder = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex, ignoreArrayOrder)
     {
     }
 
@@ -60,16 +68,18 @@ public class JsonMatcher : IJsonMatcher
     /// <param name="value">The value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false)
+    /// <param name="ignoreArrayOrder">Ignore array element order when comparing.</param>
+    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false, bool ignoreArrayOrder = false)
     {
         Guard.NotNull(value);
 
         MatchBehaviour = matchBehaviour;
         IgnoreCase = ignoreCase;
         Regex = regex;
+        IgnoreArrayOrder = ignoreArrayOrder;
 
         Value = value;
-        _valueAsJToken = JsonUtils.ConvertValueToJToken(value);
+        _valueAsJToken = ConvertValueToJToken(value);
     }
 
     /// <inheritdoc />
@@ -83,7 +93,7 @@ public class JsonMatcher : IJsonMatcher
         {
             try
             {
-                var inputAsJToken = JsonUtils.ConvertValueToJToken(input);
+                var inputAsJToken = ConvertValueToJToken(input);
 
                 var match = IsMatch(RenameJToken(_valueAsJToken), RenameJToken(inputAsJToken));
                 score = MatchScores.ToScore(match);
@@ -103,9 +113,10 @@ public class JsonMatcher : IJsonMatcher
         return $"new {Name}" +
                $"(" +
                $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " + 
+               $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +
                $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
-               $"{CSharpFormatter.ToCSharpBooleanLiteral(Regex)}" +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(Regex)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreArrayOrder)}" +
                $")";
     }
 
@@ -182,6 +193,13 @@ public class JsonMatcher : IJsonMatcher
                     return false;
                 }
 
+                if (IgnoreArrayOrder)
+                {
+                    // Sort both arrays by their string representation and compare
+                    valueArray = valueArray.OrderBy(t => t.ToString()).ToArray();
+                    inputArray = inputArray.OrderBy(t => t.ToString()).ToArray();
+                }
+
                 return !valueArray.Where((valueToken, index) => !IsMatch(valueToken, inputArray[index])).Any();
 
             default:
@@ -241,6 +259,18 @@ public class JsonMatcher : IJsonMatcher
         return new JObject(renamedProperties);
     }
 
+    private static JToken ConvertValueToJToken(object value)
+    {
+        // Check if JToken, string, IEnumerable or object
+        return value switch
+        {
+            JToken tokenValue => tokenValue,
+            string stringValue => JsonConvert.DeserializeObject<JToken>(stringValue, JsonSerializationConstants.JsonDeserializerSettingsWithDateParsingNone)!,
+            IEnumerable enumerableValue => JArray.FromObject(enumerableValue),
+            _ => JObject.FromObject(value),
+        };
+    }
+
     private static string? ToUpper(string? input)
     {
         return input?.ToUpperInvariant();

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageBodyMatcher.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
 using Stef.Validation;
 using WireMock.Matchers.Helpers;
 using WireMock.Util;
@@ -142,6 +141,9 @@ public class RequestMessageBodyMatcher : IRequestMatcher
         MatchOperator = matchOperator;
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.Body;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageBodyMatcher`1.cs

@@ -31,6 +31,9 @@ public class RequestMessageBodyMatcher<T> : IRequestMatcher
         Func = Guard.NotNull(func);
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.BodyOfT;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageClientIPMatcher.cs

@@ -74,6 +74,9 @@ public class RequestMessageClientIPMatcher : IRequestMatcher
         Funcs = Guard.NotNull(funcs);
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.ClientIP;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageCompositeMatcher.cs

@@ -20,6 +20,11 @@ public abstract class RequestMessageCompositeMatcher : IRequestMatcher
     /// </value>
     private IEnumerable<IRequestMatcher> RequestMatchers { get; }
 
+    /// <summary>
+    /// Selected type to choose the matcher from <see cref="RequestMatchers"/> which will immediately return a mismatch.
+    /// </summary>
+    internal RequestMatcherType? EarlyMatcherType { get; private protected set; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="RequestMessageCompositeMatcher"/> class.
     /// </summary>
@@ -31,6 +36,9 @@ public abstract class RequestMessageCompositeMatcher : IRequestMatcher
         _type = type;
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.Composite;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {
@@ -39,6 +47,13 @@ public abstract class RequestMessageCompositeMatcher : IRequestMatcher
             return MatchScores.Mismatch;
         }
 
+        var earlyMatcher = new RequestMessageEarlyMatcher(EarlyMatcherType, RequestMatchers);
+        var earlyMatchResult = earlyMatcher.GetMatchingScore(requestMessage, requestMatchResult);
+        if (!MatchScores.IsPerfect(earlyMatchResult))
+        {
+            return MatchScores.Mismatch;
+        }
+
         if (_type == CompositeMatcherType.And)
         {
             return RequestMatchers.Average(requestMatcher => requestMatcher.GetMatchingScore(requestMessage, requestMatchResult));

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageCookieMatcher.cs

@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net
 
 using Stef.Validation;
-using System.Linq;
 
 namespace WireMock.Matchers.Request;
 
@@ -93,6 +92,9 @@ public class RequestMessageCookieMatcher : IRequestMatcher
         Name = string.Empty; // Not used when Func, but set to a non-null valid value.
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.Cookie;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageEarlyMatcher.cs

@@ -0,0 +1,35 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// Return the mismatch if the matching score of matchers is not perfect.
+/// </summary>
+internal sealed class RequestMessageEarlyMatcher(
+    RequestMatcherType? earlyMatcherType,
+    IEnumerable<IRequestMatcher> requestMatchers) : IRequestMatcher
+{
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.Composite;
+
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        if (earlyMatcherType is null)
+        {
+            return MatchScores.Perfect;
+        }
+
+        var earlyMatchers = requestMatchers
+            .Where(m => m.Type == earlyMatcherType)
+            .ToList();
+
+        if (earlyMatchers.Count is 0)
+        {
+            return MatchScores.Perfect;
+        }
+
+        var compositeMatcher = new RequestBuilders.Request(earlyMatchers);
+        return compositeMatcher.GetMatchingScore(requestMessage, requestMatchResult);
+    }
+}

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageHeaderMatcher.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
 using Stef.Validation;
 using WireMock.Types;
 
@@ -12,7 +11,7 @@ namespace WireMock.Matchers.Request;
 /// <inheritdoc cref="IRequestMatcher"/>
 public class RequestMessageHeaderMatcher : IRequestMatcher
 {
-    private const string _name = nameof(RequestMessageCookieMatcher);
+    private const string _name = nameof(RequestMessageHeaderMatcher);
 
     /// <summary>
     /// MatchBehaviour
@@ -106,6 +105,9 @@ public class RequestMessageHeaderMatcher : IRequestMatcher
         Name = string.Empty; // Not used when Func, but set to a non-null valid value.
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.Header;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageHttpVersionMatcher.cs

@@ -65,6 +65,9 @@ public class RequestMessageHttpVersionMatcher : IRequestMatcher
         MatcherOnStringFunc = Guard.NotNull(func);
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.HttpVersion;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMethodMatcher.cs

@@ -46,6 +46,9 @@ internal class RequestMessageMethodMatcher : IRequestMatcher
         MatchOperator = matchOperator;
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.Method;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMultiPartMatcher.cs

@@ -55,6 +55,9 @@ public class RequestMessageMultiPartMatcher : IRequestMatcher
         MatchOperator = matchOperator;
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.MultiPart;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageParamMatcher.cs

@@ -82,6 +82,9 @@ public class RequestMessageParamMatcher : IRequestMatcher
         Funcs = Guard.NotNull(funcs);
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.Param;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessagePathMatcher.cs

@@ -72,6 +72,9 @@ public class RequestMessagePathMatcher : IRequestMatcher
         Funcs = Guard.NotNull(funcs);
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.Path;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageScenarioAndStateMatcher.cs

@@ -29,6 +29,9 @@ internal class RequestMessageScenarioAndStateMatcher : IRequestMatcher
         _executionConditionState = executionConditionState;
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.ScenarioAndState;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageUrlMatcher.cs

@@ -72,6 +72,9 @@ public class RequestMessageUrlMatcher : IRequestMatcher
         Funcs = Guard.NotNull(funcs);
     }
 
+    /// <inheritdoc />
+    public RequestMatcherType Type => RequestMatcherType.Url;
+
     /// <inheritdoc />
     public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
     {

src/WireMock.Net.Minimal/Matchers/SystemTextJsonMatcher.cs

@@ -0,0 +1,299 @@
+// Copyright © WireMock.Net
+
+using System.Collections;
+using System.Text.Json;
+using Stef.Validation;
+using WireMock.Extensions;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// SystemTextJsonMatcher - behaves the same as <see cref="JsonMatcher"/> but uses System.Text.Json instead of Newtonsoft.Json.
+/// </summary>
+public class SystemTextJsonMatcher : IJsonMatcher
+{
+    private static readonly JsonSerializerOptions DefaultSerializerOptions = new()
+    {
+        PropertyNameCaseInsensitive = false
+    };
+
+    /// <inheritdoc />
+    public virtual string Name => nameof(SystemTextJsonMatcher);
+
+    /// <inheritdoc />
+    public object Value { get; }
+
+    /// <inheritdoc />
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
+    public bool IgnoreCase { get; }
+
+    /// <summary>
+    /// Support Regex
+    /// </summary>
+    public bool Regex { get; }
+
+    /// <summary>
+    /// Ignore array order when comparing
+    /// </summary>
+    public bool IgnoreArrayOrder { get; }
+
+    private readonly JsonElement _valueAsJsonElement;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SystemTextJsonMatcher"/> class.
+    /// </summary>
+    /// <param name="value">The string value to check for equality.</param>
+    /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+    /// <param name="regex">Support Regex.</param>
+    /// <param name="ignoreArrayOrder">Ignore array element order when comparing.</param>
+    public SystemTextJsonMatcher(string value, bool ignoreCase = false, bool regex = false, bool ignoreArrayOrder = false)
+        : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex, ignoreArrayOrder)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SystemTextJsonMatcher"/> class.
+    /// </summary>
+    /// <param name="value">The object value to check for equality.</param>
+    /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+    /// <param name="regex">Support Regex.</param>
+    /// <param name="ignoreArrayOrder">Ignore array element order when comparing.</param>
+    public SystemTextJsonMatcher(object value, bool ignoreCase = false, bool regex = false, bool ignoreArrayOrder = false)
+        : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex, ignoreArrayOrder)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SystemTextJsonMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="value">The value to check for equality.</param>
+    /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+    /// <param name="regex">Support Regex.</param>
+    /// <param name="ignoreArrayOrder">Ignore array element order when comparing.</param>
+    public SystemTextJsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false, bool ignoreArrayOrder = false)
+    {
+        Guard.NotNull(value);
+
+        MatchBehaviour = matchBehaviour;
+        IgnoreCase = ignoreCase;
+        Regex = regex;
+        IgnoreArrayOrder = ignoreArrayOrder;
+
+        Value = value;
+        _valueAsJsonElement = ConvertToJsonElement(value);
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(object? input)
+    {
+        var score = MatchScores.Mismatch;
+        Exception? error = null;
+
+        // When input is null or byte[], return Mismatch.
+        if (input != null && input is not byte[])
+        {
+            try
+            {
+                var inputAsJsonElement = ConvertToJsonElement(input);
+
+                var match = IsMatch(NormalizeElement(_valueAsJsonElement), NormalizeElement(inputAsJsonElement));
+                score = MatchScores.ToScore(match);
+            }
+            catch (Exception ex)
+            {
+                error = ex;
+            }
+        }
+
+        return MatchResult.From(Name, MatchBehaviourHelper.Convert(MatchBehaviour, score), error);
+    }
+
+    /// <inheritdoc />
+    public virtual string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(Regex)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreArrayOrder)}" +
+               $")";
+    }
+
+    /// <summary>
+    /// Compares the input against the matcher value
+    /// </summary>
+    protected virtual bool IsMatch(JsonElement value, JsonElement? input)
+    {
+        if (input == null)
+        {
+            return false;
+        }
+
+        var inputElement = input.Value;
+
+        // If using Regex and the value is a string, use the MatchRegex method.
+        if (Regex && value.ValueKind == JsonValueKind.String)
+        {
+            var valueAsString = value.GetString()!;
+            var inputAsString = inputElement.ValueKind == JsonValueKind.String
+                ? inputElement.GetString()!
+                : inputElement.GetRawText();
+
+            var (valid, result) = RegexUtils.MatchRegex(valueAsString, inputAsString);
+            if (valid)
+            {
+                return result;
+            }
+        }
+
+        // If the value is a Guid (string) and input is a string, or vice versa, compare as strings.
+        if (value.ValueKind == JsonValueKind.String && inputElement.ValueKind == JsonValueKind.String)
+        {
+            var valueStr = value.GetString()!;
+            var inputStr = inputElement.GetString()!;
+
+            if (Guid.TryParse(valueStr, out var valueGuid) && Guid.TryParse(inputStr, out var inputGuid))
+            {
+                return valueGuid == inputGuid;
+            }
+        }
+
+        switch (value.ValueKind)
+        {
+            case JsonValueKind.Object:
+                {
+                    if (inputElement.ValueKind != JsonValueKind.Object)
+                    {
+                        return false;
+                    }
+
+                    var valueProperties = value.EnumerateObject().ToDictionary(p => p.Name, p => p.Value);
+                    var inputProperties = inputElement.EnumerateObject().ToDictionary(p => p.Name, p => p.Value);
+
+                    if (valueProperties.Count != inputProperties.Count)
+                    {
+                        return false;
+                    }
+
+                    foreach (var pair in valueProperties)
+                    {
+                        if (!inputProperties.TryGetValue(pair.Key, out var inputPropValue))
+                        {
+                            return false;
+                        }
+
+                        if (!IsMatch(pair.Value, inputPropValue))
+                        {
+                            return false;
+                        }
+                    }
+
+                    return true;
+                }
+
+            case JsonValueKind.Array:
+                {
+                    if (inputElement.ValueKind != JsonValueKind.Array)
+                    {
+                        return false;
+                    }
+
+                    var valueArray = value.EnumerateArray().ToArray();
+                    var inputArray = inputElement.EnumerateArray().ToArray();
+
+                    if (valueArray.Length != inputArray.Length)
+                    {
+                        return false;
+                    }
+
+                    if (IgnoreArrayOrder)
+                    {
+                        // Sort both arrays by their string representation and compare
+                        valueArray = valueArray.OrderBy(e => e.GetRawText()).ToArray();
+                        inputArray = inputArray.OrderBy(e => e.GetRawText()).ToArray();
+                    }
+
+                    return !valueArray.Where((valueToken, index) => !IsMatch(valueToken, inputArray[index])).Any();
+                }
+
+            default:
+                return value.GetRawText() == inputElement.GetRawText();
+        }
+    }
+
+    private JsonElement NormalizeElement(JsonElement element)
+    {
+        if (!IgnoreCase)
+        {
+            return element;
+        }
+
+        var normalized = NormalizeValue(element);
+        return ConvertToJsonElement(normalized);
+    }
+
+    private object NormalizeValue(JsonElement element)
+    {
+        switch (element.ValueKind)
+        {
+            case JsonValueKind.Object:
+                {
+                    var dict = new Dictionary<string, object?>();
+                    foreach (var prop in element.EnumerateObject())
+                    {
+                        var normalizedKey = prop.Name.ToUpperInvariant();
+                        dict[normalizedKey] = NormalizeValue(prop.Value);
+                    }
+
+                    return dict;
+                }
+
+            case JsonValueKind.Array:
+                {
+                    if (Regex)
+                    {
+                        return element.EnumerateArray().Select(e => (object)e.GetRawText()).ToArray();
+                    }
+
+                    return element.EnumerateArray().Select(NormalizeValue).ToArray();
+                }
+
+            case JsonValueKind.String:
+                {
+                    var str = element.GetString()!;
+                    return Regex ? str : str.ToUpperInvariant();
+                }
+
+            default:
+                return element.GetRawText();
+        }
+    }
+
+    private static JsonElement ConvertToJsonElement(object value)
+    {
+        switch (value)
+        {
+            case JsonElement jsonElement:
+                return jsonElement;
+
+            case JsonDocument jsonDocument:
+                return jsonDocument.RootElement;
+
+            case string stringValue:
+                return JsonDocument.Parse(stringValue).RootElement;
+
+            case IEnumerable enumerableValue when value is not string:
+                return JsonSerializer.SerializeToElement(enumerableValue, DefaultSerializerOptions);
+
+            default:
+                var json = JsonSerializer.Serialize(value, DefaultSerializerOptions);
+                return JsonDocument.Parse(json).RootElement;
+        }
+    }
+}

src/WireMock.Net.Minimal/Matchers/SystemTextJsonPartialMatcher.cs

@@ -0,0 +1,52 @@
+// Copyright © WireMock.Net
+
+using WireMock.Extensions;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// SystemTextJsonPartialMatcher - uses System.Text.Json instead of Newtonsoft.Json.
+/// </summary>
+public class SystemTextJsonPartialMatcher : AbstractSystemTextJsonPartialMatcher
+{
+    /// <inheritdoc />
+    public override string Name => nameof(SystemTextJsonPartialMatcher);
+
+    /// <inheritdoc />
+    public SystemTextJsonPartialMatcher(string value, bool ignoreCase = false, bool regex = false)
+        : base(value, ignoreCase, regex)
+    {
+    }
+
+    /// <inheritdoc />
+    public SystemTextJsonPartialMatcher(object value, bool ignoreCase = false, bool regex = false)
+        : base(value, ignoreCase, regex)
+    {
+    }
+
+    /// <inheritdoc />
+    public SystemTextJsonPartialMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false)
+        : base(matchBehaviour, value, ignoreCase, regex)
+    {
+    }
+
+    /// <inheritdoc />
+    protected override bool IsMatch(string value, string input)
+    {
+        var exactStringMatcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, IgnoreCase, MatchOperator.Or, value);
+        return exactStringMatcher.IsMatch(input).IsPerfect();
+    }
+
+    /// <inheritdoc />
+    public override string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(Regex)}" +
+               $")";
+    }
+}

src/WireMock.Net.Minimal/Matchers/SystemTextJsonPartialWildcardMatcher.cs

@@ -0,0 +1,52 @@
+// Copyright © WireMock.Net
+
+using WireMock.Extensions;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// SystemTextJsonPartialWildcardMatcher - uses System.Text.Json instead of Newtonsoft.Json.
+/// </summary>
+public class SystemTextJsonPartialWildcardMatcher : AbstractSystemTextJsonPartialMatcher
+{
+    /// <inheritdoc />
+    public override string Name => nameof(SystemTextJsonPartialWildcardMatcher);
+
+    /// <inheritdoc />
+    public SystemTextJsonPartialWildcardMatcher(string value, bool ignoreCase = false, bool regex = false)
+        : base(value, ignoreCase, regex)
+    {
+    }
+
+    /// <inheritdoc />
+    public SystemTextJsonPartialWildcardMatcher(object value, bool ignoreCase = false, bool regex = false)
+        : base(value, ignoreCase, regex)
+    {
+    }
+
+    /// <inheritdoc />
+    public SystemTextJsonPartialWildcardMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false)
+        : base(matchBehaviour, value, ignoreCase, regex)
+    {
+    }
+
+    /// <inheritdoc />
+    protected override bool IsMatch(string value, string input)
+    {
+        var wildcardStringMatcher = new WildcardMatcher(MatchBehaviour.AcceptOnMatch, value, IgnoreCase);
+        return wildcardStringMatcher.IsMatch(input).IsPerfect();
+    }
+
+    /// <inheritdoc />
+    public override string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(Regex)}" +
+               $")";
+    }
+}

src/WireMock.Net.Minimal/Owin/AdminPaths.cs

@@ -0,0 +1,59 @@
+// Copyright © WireMock.Net
+
+using System.Text.RegularExpressions;
+using WireMock.Matchers;
+
+namespace WireMock.Owin;
+
+internal sealed class AdminPaths(string? adminPath) : IAdminPaths
+{
+    private const string DefaultAdminPathPrefix = "/__admin";
+
+    private readonly string _prefix = adminPath ?? DefaultAdminPathPrefix;
+
+    public string Files => $"{_prefix}/files";
+
+    public string Health => $"{_prefix}/health";
+
+    public string Mappings => $"{_prefix}/mappings";
+
+    public string MappingsCode => $"{_prefix}/mappings/code";
+
+    public string MappingsWireMockOrg => $"{_prefix}/mappings/wiremock.org";
+
+    public string Requests => $"{_prefix}/requests";
+
+    public string Settings => $"{_prefix}/settings";
+
+    public string Scenarios => $"{_prefix}/scenarios";
+
+    public string OpenApi => $"{_prefix}/openapi";
+
+    public string ProtoDefinitions => $"{_prefix}/protodefinitions";
+
+    private string PrefixRegexEscaped => Regex.Escape(_prefix);
+
+    public RegexMatcher MappingsGuidPathMatcher => new($@"^{PrefixRegexEscaped}\/mappings\/([0-9A-Fa-f]{{8}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{12}})$");
+
+    public RegexMatcher MappingsGuidEnablePathMatcher => new($@"^{PrefixRegexEscaped}\/mappings\/([0-9A-Fa-f]{{8}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{12}})\/enable$");
+
+    public RegexMatcher MappingsGuidDisablePathMatcher => new($@"^{PrefixRegexEscaped}\/mappings\/([0-9A-Fa-f]{{8}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{12}})\/disable$");
+
+    public RegexMatcher MappingsCodeGuidPathMatcher => new($@"^{PrefixRegexEscaped}\/mappings\/code\/([0-9A-Fa-f]{{8}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{12}})$");
+
+    public RegexMatcher RequestsGuidPathMatcher => new($@"^{PrefixRegexEscaped}\/requests\/([0-9A-Fa-f]{{8}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{12}})$");
+
+    public RegexMatcher ScenariosNameMatcher => new($@"^{PrefixRegexEscaped}\/scenarios\/.+$");
+
+    public RegexMatcher ScenariosNameWithStateMatcher => new($@"^{PrefixRegexEscaped}\/scenarios\/.+\/state$");
+
+    public RegexMatcher ScenariosNameWithResetMatcher => new($@"^{PrefixRegexEscaped}\/scenarios\/.+\/reset$");
+
+    public RegexMatcher FilesFilenamePathMatcher => new($@"^{PrefixRegexEscaped}\/files\/.+$");
+
+    public RegexMatcher ProtoDefinitionsIdPathMatcher => new($@"^{PrefixRegexEscaped}\/protodefinitions\/.+$");
+
+    public bool Includes(string? path) => path?.StartsWith($"{_prefix}/") ?? false;
+
+    public override string ToString() => _prefix;
+}

src/WireMock.Net.Minimal/Owin/AspNetCoreSelfHost.cs

@@ -66,12 +66,14 @@ internal partial class AspNetCoreSelfHost
             .ConfigureServices(services =>
             {
                 services.AddSingleton(_wireMockMiddlewareOptions);
+                services.AddSingleton(_wireMockMiddlewareOptions.AdminPaths);
                 services.AddSingleton<IMappingMatcher, MappingMatcher>();
                 services.AddSingleton<IRandomizerDoubleBetween0And1, RandomizerDoubleBetween0And1>();
                 services.AddSingleton<IOwinRequestMapper, OwinRequestMapper>();
                 services.AddSingleton<IOwinResponseMapper, OwinResponseMapper>();
                 services.AddSingleton<IGuidUtils, GuidUtils>();
                 services.AddSingleton<IDateTimeUtils, DateTimeUtils>();
+                services.AddSingleton<IResponseMessageBuilder, ResponseMessageBuilder>();
                 services.AddSingleton<LogEntryMapper>();
                 services.AddSingleton<IWireMockMiddlewareLogger, WireMockMiddlewareLogger>();
 

src/WireMock.Net.Minimal/Owin/GlobalExceptionMiddleware.cs

@@ -11,12 +11,14 @@ internal class GlobalExceptionMiddleware
 {
     private readonly IWireMockMiddlewareOptions _options;
     private readonly IOwinResponseMapper _responseMapper;
+    private readonly IResponseMessageBuilder _responseMessageBuilder;
 
-    public GlobalExceptionMiddleware(RequestDelegate next, IWireMockMiddlewareOptions options, IOwinResponseMapper responseMapper)
+    public GlobalExceptionMiddleware(RequestDelegate next, IWireMockMiddlewareOptions options, IOwinResponseMapper responseMapper, IResponseMessageBuilder responseMessageBuilder)
     {
         Next = next;
         _options = Guard.NotNull(options);
         _responseMapper = Guard.NotNull(responseMapper);
+        _responseMessageBuilder = Guard.NotNull(responseMessageBuilder);
     }
 
     public RequestDelegate Next { get; }
@@ -35,7 +37,7 @@ internal class GlobalExceptionMiddleware
         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 _responseMapper.MapAsync(_responseMessageBuilder.Create(500, JsonConvert.SerializeObject(ex)), ctx.Response).ConfigureAwait(false);
         }
     }
 }

src/WireMock.Net.Minimal/Owin/IAdminPaths.cs

@@ -0,0 +1,48 @@
+using WireMock.Matchers;
+
+namespace WireMock.Owin;
+
+internal interface IAdminPaths
+{
+    string Files { get; }
+
+    string Health { get; }
+
+    string Mappings { get; }
+
+    string MappingsCode { get; }
+
+    string MappingsWireMockOrg { get; }
+
+    RegexMatcher MappingsGuidPathMatcher { get; }
+
+    RegexMatcher MappingsGuidEnablePathMatcher { get; }
+
+    RegexMatcher MappingsGuidDisablePathMatcher { get; }
+
+    RegexMatcher MappingsCodeGuidPathMatcher { get; }
+
+    RegexMatcher RequestsGuidPathMatcher { get; }
+
+    RegexMatcher ScenariosNameMatcher { get; }
+
+    RegexMatcher ScenariosNameWithStateMatcher { get; }
+
+    RegexMatcher ScenariosNameWithResetMatcher { get; }
+
+    RegexMatcher FilesFilenamePathMatcher { get; }
+
+    RegexMatcher ProtoDefinitionsIdPathMatcher { get; }
+
+    string Requests { get; }
+
+    string Settings { get; }
+
+    string Scenarios { get; }
+
+    string OpenApi { get; }
+
+    string ProtoDefinitions { get; }
+
+    bool Includes(string? path);
+}

src/WireMock.Net.Minimal/Owin/IWireMockMiddlewareOptions.cs

@@ -2,6 +2,7 @@
 
 using System.Collections.Concurrent;
 using System.Security.Cryptography.X509Certificates;
+using JsonConverter.Abstractions;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using WireMock.Handlers;
@@ -99,4 +100,14 @@ internal interface IWireMockMiddlewareOptions
     /// WebSocket settings.
     /// </summary>
     WebSocketSettings? WebSocketSettings { get; set; }
+
+    /// <summary>
+    /// Gets or sets the default JSON converter used for serialization.
+    /// </summary>
+    /// <remarks>
+    /// Set this property to customize how objects are serialized to and deserialized from JSON during mapping.
+    /// </remarks>
+    IJsonConverter DefaultJsonSerializer { get; set; }
+
+    IAdminPaths AdminPaths { get; set; }
 }

src/WireMock.Net.Minimal/Owin/Mappers/OwinRequestMapper.cs

@@ -53,7 +53,8 @@ internal class OwinRequestMapper : IOwinRequestMapper
                 ContentType = request.ContentType,
                 DeserializeJson = !options.DisableJsonBodyParsing.GetValueOrDefault(false),
                 ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
-                DecompressGZipAndDeflate = !options.DisableRequestBodyDecompressing.GetValueOrDefault(false)
+                DecompressGZipAndDeflate = !options.DisableRequestBodyDecompressing.GetValueOrDefault(false),
+                DefaultJsonConverter = options.DefaultJsonSerializer
             };
 
             body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);

src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs

@@ -3,249 +3,242 @@
 using System.Globalization;
 using System.Net;
 using System.Text;
+using JsonConverter.Abstractions;
 using Microsoft.AspNetCore.Http;
-using Newtonsoft.Json;
 using RandomDataGenerator.FieldOptions;
 using RandomDataGenerator.Randomizers;
-using Stef.Validation;
 using WireMock.Http;
 using WireMock.ResponseBuilders;
 using WireMock.ResponseProviders;
 using WireMock.Types;
 using WireMock.Util;
 
-namespace WireMock.Owin.Mappers
+namespace WireMock.Owin.Mappers;
+
+/// <summary>
+/// OwinResponseMapper
+/// </summary>
+internal class OwinResponseMapper(IWireMockMiddlewareOptions options) : IOwinResponseMapper
 {
-    /// <summary>
+    private readonly IRandomizerNumber<double> _randomizerDouble = RandomizerFactory.GetRandomizer(new FieldOptionsDouble { Min = 0, Max = 1 });
-    /// OwinResponseMapper
+    private readonly IRandomizerBytes _randomizerBytes = RandomizerFactory.GetRandomizer(new FieldOptionsBytes { Min = 100, Max = 200 });
-    /// </summary>
+    private readonly Encoding _utf8NoBom = new UTF8Encoding(false);
-    internal class OwinResponseMapper : IOwinResponseMapper
+
+    // https://msdn.microsoft.com/en-us/library/78h415ay(v=vs.110).aspx
+    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) =>
+                {
+                    // Only set the Content-Length header if the response does not have a body
+                    if (!hasBody && long.TryParse(v.FirstOrDefault(), out var contentLength))
+                    {
+                        r.ContentLength = contentLength;
+                    }
+                }
+            }
+        };
+
+    /// <inheritdoc />
+    public async Task MapAsync(IResponseMessage? responseMessage, HttpResponse response)
     {
-        private readonly IRandomizerNumber<double> _randomizerDouble = RandomizerFactory.GetRandomizer(new FieldOptionsDouble { Min = 0, Max = 1 });
+        if (responseMessage == null || responseMessage is WebSocketHandledResponse)
-        private readonly IRandomizerBytes _randomizerBytes = RandomizerFactory.GetRandomizer(new FieldOptionsBytes { Min = 100, Max = 200 });
-        private readonly IWireMockMiddlewareOptions _options;
-        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<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) =>
-                    {
-                        // Only set the Content-Length header if the response does not have a body
-                        if (!hasBody && long.TryParse(v.FirstOrDefault(), out var contentLength))
-                        {
-                            r.ContentLength = contentLength;
-                        }
-                    }
-                }
-            };
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="options">The IWireMockMiddlewareOptions.</param>
-        public OwinResponseMapper(IWireMockMiddlewareOptions options)
         {
-            _options = Guard.NotNull(options);
+            return;
         }
 
-        /// <inheritdoc />
+        var bodyData = responseMessage.BodyData;
-        public async Task MapAsync(IResponseMessage? responseMessage, HttpResponse response)
+        if (bodyData?.GetDetectedBodyType() == BodyType.SseString)
         {
-            if (responseMessage == null || responseMessage is WebSocketHandledResponse)
+            await HandleSseStringAsync(responseMessage, response, bodyData);
-            {
+            return;
-                return;
+        }
-            }
 
-            var bodyData = responseMessage.BodyData;
+        byte[]? bytes;
-            if (bodyData?.GetDetectedBodyType() == BodyType.SseString)
+        switch (responseMessage.FaultType)
-            {
+        {
-                await HandleSseStringAsync(responseMessage, response, bodyData);
+            case FaultType.EMPTY_RESPONSE:
-                return;
+                bytes = IsFault(responseMessage) ? [] : await GetNormalBodyAsync(responseMessage).ConfigureAwait(false);
-            }
+                break;
 
-            byte[]? bytes;
+            case FaultType.MALFORMED_RESPONSE_CHUNK:
-            switch (responseMessage.FaultType)
+                bytes = await GetNormalBodyAsync(responseMessage).ConfigureAwait(false) ?? [];
-            {
+                if (IsFault(responseMessage))
-                case FaultType.EMPTY_RESPONSE:
-                    bytes = IsFault(responseMessage) ? [] : await GetNormalBodyAsync(responseMessage).ConfigureAwait(false);
-                    break;
-
-                case FaultType.MALFORMED_RESPONSE_CHUNK:
-                    bytes = await GetNormalBodyAsync(responseMessage).ConfigureAwait(false) ?? [];
-                    if (IsFault(responseMessage))
-                    {
-                        bytes = bytes.Take(bytes.Length / 2).Union(_randomizerBytes.Generate()).ToArray();
-                    }
-                    break;
-
-                default:
-                    bytes = await GetNormalBodyAsync(responseMessage).ConfigureAwait(false);
-                    break;
-            }
-
-            if (responseMessage.StatusCode is HttpStatusCode or int)
-            {
-                response.StatusCode = MapStatusCode((int) responseMessage.StatusCode);
-            }
-            else if (responseMessage.StatusCode is string statusCodeAsString)
-            {
-                // Note: this case will also match on null
-                _ = int.TryParse(statusCodeAsString, out var statusCodeTypeAsInt);
-                response.StatusCode = MapStatusCode(statusCodeTypeAsInt);
-            }
-
-            SetResponseHeaders(responseMessage, bytes != null, response);
-
-            if (bytes != null)
-            {
-                try
                 {
-                    await response.Body.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
+                    bytes = bytes.Take(bytes.Length / 2).Union(_randomizerBytes.Generate()).ToArray();
                 }
-                catch (Exception ex)
+                break;
+
+            default:
+                bytes = await GetNormalBodyAsync(responseMessage).ConfigureAwait(false);
+                break;
+        }
+
+        if (responseMessage.StatusCode is HttpStatusCode or int)
+        {
+            response.StatusCode = MapStatusCode((int)responseMessage.StatusCode);
+        }
+        else if (responseMessage.StatusCode is string statusCodeAsString)
+        {
+            // Note: this case will also match on null
+            _ = int.TryParse(statusCodeAsString, out var statusCodeTypeAsInt);
+            response.StatusCode = MapStatusCode(statusCodeTypeAsInt);
+        }
+
+        SetResponseHeaders(responseMessage, bytes != null, response);
+
+        if (bytes != null)
+        {
+            try
+            {
+                await response.Body.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
+            }
+            catch (Exception ex)
+            {
+                options.Logger.Warn("Error writing response body. Exception : {0}", ex);
+            }
+        }
+
+        SetResponseTrailingHeaders(responseMessage, response);
+    }
+
+    private static async Task HandleSseStringAsync(IResponseMessage responseMessage, HttpResponse response, IBodyData bodyData)
+    {
+        if (bodyData.SseStringQueue == null)
+        {
+            return;
+        }
+
+        SetResponseHeaders(responseMessage, true, response);
+
+        string? text;
+        do
+        {
+            if (bodyData.SseStringQueue.TryRead(out text))
+            {
+                await response.WriteAsync(text);
+                await response.Body.FlushAsync();
+            }
+        } while (text != null);
+    }
+
+    private int MapStatusCode(int code)
+    {
+        if (options.AllowOnlyDefinedHttpStatusCodeInResponse == true && !Enum.IsDefined(typeof(HttpStatusCode), code))
+        {
+            return (int)HttpStatusCode.OK;
+        }
+
+        return code;
+    }
+
+    private bool IsFault(IResponseMessage responseMessage)
+    {
+        return responseMessage.FaultPercentage == null || _randomizerDouble.Generate() <= responseMessage.FaultPercentage;
+    }
+
+    private async Task<byte[]?> GetNormalBodyAsync(IResponseMessage responseMessage)
+    {
+        var bodyData = responseMessage.BodyData;
+        switch (bodyData?.GetDetectedBodyType())
+        {
+            case BodyType.String:
+            case BodyType.FormUrlEncoded:
+                return (bodyData.Encoding ?? _utf8NoBom).GetBytes(bodyData.BodyAsString!);
+
+            case BodyType.Json:
+                var jsonConverterOptions = new JsonConverterOptions
                 {
-                    _options.Logger.Warn("Error writing response body. Exception : {0}", ex);
+                    WriteIndented = bodyData.BodyAsJsonIndented == true,
-                }
+                    IgnoreNullValues = true
-            }
+                };
 
-            SetResponseTrailingHeaders(responseMessage, response);
+                var jsonBody = options.DefaultJsonSerializer.Serialize(bodyData.BodyAsJson!, jsonConverterOptions);
-        }
+                return (bodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);
 
-        private static async Task HandleSseStringAsync(IResponseMessage responseMessage, HttpResponse response, IBodyData bodyData)
+            case BodyType.ProtoBuf:
-        {
+                if (TypeLoader.TryLoadStaticInstance<IProtoBufUtils>(out var protoBufUtils))
-            if (bodyData.SseStringQueue == null)
-            {
-                return;
-            }
-
-            SetResponseHeaders(responseMessage, true, response);
-
-            string? text;
-            do
-            {
-                if (bodyData.SseStringQueue.TryRead(out text))
                 {
-                    await response.WriteAsync(text);
+                    var protoDefinitions = bodyData.ProtoDefinition?.Invoke().Texts;
-                    await response.Body.FlushAsync();
+                    return await protoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);
                 }
-            } while (text != null);
+                break;
+
+            case BodyType.Bytes:
+                return bodyData.BodyAsBytes;
+
+            case BodyType.File:
+                return options.FileSystemHandler?.ReadResponseBodyAsFile(bodyData.BodyAsFile!);
+
+            case BodyType.MultiPart:
+                options.Logger.Warn("MultiPart body type is not handled!");
+                break;
+
+            case BodyType.None:
+                break;
         }
 
-        private int MapStatusCode(int code)
+        return null;
+    }
+
+    private static void SetResponseHeaders(IResponseMessage responseMessage, bool hasBody, HttpResponse response)
+    {
+        // Force setting the Date header (#577)
+        AppendResponseHeader(
+            response,
+            HttpKnownHeaderNames.Date,
+            [DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture)]
+        );
+
+        // Set other headers
+        foreach (var item in responseMessage.Headers!)
         {
-            if (_options.AllowOnlyDefinedHttpStatusCodeInResponse == true && !Enum.IsDefined(typeof(HttpStatusCode), code))
+            var headerName = item.Key;
+            var value = item.Value;
+            if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
             {
-                return (int)HttpStatusCode.OK;
+                action.Invoke(response, hasBody, value);
             }
-
+            else
-            return code;
-        }
-
-        private bool IsFault(IResponseMessage responseMessage)
-        {
-            return responseMessage.FaultPercentage == null || _randomizerDouble.Generate() <= responseMessage.FaultPercentage;
-        }
-
-        private async Task<byte[]?> GetNormalBodyAsync(IResponseMessage responseMessage)
-        {
-            var bodyData = responseMessage.BodyData;
-            switch (bodyData?.GetDetectedBodyType())
             {
-                case BodyType.String:
+                // Check if this response header can be added (#148, #227 and #720)
-                case BodyType.FormUrlEncoded:
+                if (!HttpKnownHeaderNames.IsRestrictedResponseHeader(headerName))
-                    return (bodyData.Encoding ?? _utf8NoBom).GetBytes(bodyData.BodyAsString!);
-
-                case BodyType.Json:
-                    var formatting = bodyData.BodyAsJsonIndented == true ? Formatting.Indented : Formatting.None;
-                    var jsonBody = JsonConvert.SerializeObject(bodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
-                    return (bodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);
-
-                case BodyType.ProtoBuf:
-                    if (TypeLoader.TryLoadStaticInstance<IProtoBufUtils>(out var protoBufUtils))
-                    {
-                        var protoDefinitions = bodyData.ProtoDefinition?.Invoke().Texts;
-                        return await protoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);
-                    }
-                    break;
-
-                case BodyType.Bytes:
-                    return bodyData.BodyAsBytes;
-
-                case BodyType.File:
-                    return _options.FileSystemHandler?.ReadResponseBodyAsFile(bodyData.BodyAsFile!);
-
-                case BodyType.MultiPart:
-                    _options.Logger.Warn("MultiPart body type is not handled!");
-                    break;
-
-                case BodyType.None:
-                    break;
-            }
-
-            return null;
-        }
-
-        private static void SetResponseHeaders(IResponseMessage responseMessage, bool hasBody, HttpResponse response)
-        {
-            // Force setting the Date header (#577)
-            AppendResponseHeader(
-                response,
-                HttpKnownHeaderNames.Date,
-                [DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture)]
-            );
-
-            // Set other headers
-            foreach (var item in responseMessage.Headers!)
-            {
-                var headerName = item.Key;
-                var value = item.Value;
-                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
                 {
-                    action.Invoke(response, hasBody, value);
+                    AppendResponseHeader(response, headerName, value.ToArray());
-                }
-                else
-                {
-                    // Check if this response header can be added (#148, #227 and #720)
-                    if (!HttpKnownHeaderNames.IsRestrictedResponseHeader(headerName))
-                    {
-                        AppendResponseHeader(response, headerName, value.ToArray());
-                    }
                 }
             }
         }
-
+    }
-        private static void SetResponseTrailingHeaders(IResponseMessage responseMessage, HttpResponse response)
+
-        {
+    private static void SetResponseTrailingHeaders(IResponseMessage responseMessage, HttpResponse response)
-            if (responseMessage.TrailingHeaders == null)
+    {
-            {
+        if (responseMessage.TrailingHeaders == null)
-                return;
+        {
-            }
+            return;
-
+        }
-#if TRAILINGHEADERS
+
-            foreach (var (headerName, value) in responseMessage.TrailingHeaders)
+#if TRAILINGHEADERS
-            {
+        foreach (var (headerName, value) in responseMessage.TrailingHeaders)
-                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
+        {
-                {
+            if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
-                    action.Invoke(response, false, value);
+            {
-                }
+                action.Invoke(response, false, value);
-                else
+            }
-                {
+            else
-                    // Check if this trailing header can be added to the response
+            {
-                    if (response.SupportsTrailers() && !HttpKnownHeaderNames.IsRestrictedResponseHeader(headerName))
+                // Check if this trailing header can be added to the response
-                    {
+                if (response.SupportsTrailers() && !HttpKnownHeaderNames.IsRestrictedResponseHeader(headerName))
-                        response.AppendTrailer(headerName, new Microsoft.Extensions.Primitives.StringValues(value.ToArray()));
+                {
-                    }
+                    response.AppendTrailer(headerName, new Microsoft.Extensions.Primitives.StringValues(value.ToArray()));
-                }
+                }
-            }
+            }
-#endif
+        }
-        }
+#endif
-
+    }
-        private static void AppendResponseHeader(HttpResponse response, string headerName, string[] values)
+
-        {
+    private static void AppendResponseHeader(HttpResponse response, string headerName, string[] values)
-            response.Headers.Append(headerName, values);
+    {
-        }
+        response.Headers.Append(headerName, values);
     }
 }

src/WireMock.Net.Minimal/Owin/MappingMatcher.cs

@@ -19,6 +19,7 @@ internal class MappingMatcher(IWireMockMiddlewareOptions options, IRandomizerDou
         var possibleMappings = new List<MappingMatcherResult>();
 
         var mappings = _options.Mappings.Values
+            .Where(m => !m.IsDisabled)
             .Where(m => m.TimeSettings.IsValid())
             .Where(m => m.Probability is null || _randomizerDoubleBetween0And1.Generate() <= m.Probability)
             .ToArray();

src/WireMock.Net.Minimal/Owin/WireMockMiddleware.cs

@@ -21,12 +21,14 @@ internal class WireMockMiddleware(
     RequestDelegate next,
 #pragma warning restore CS9113 // Parameter is unread.
     IWireMockMiddlewareOptions options,
+    IAdminPaths adminPaths,
     IOwinRequestMapper requestMapper,
     IOwinResponseMapper responseMapper,
     IMappingMatcher mappingMatcher,
     IWireMockMiddlewareLogger logger,
     IGuidUtils guidUtils,
-    IDateTimeUtils dateTimeUtils
+    IDateTimeUtils dateTimeUtils,
+    IResponseMessageBuilder responseMessageBuilder
 )
 {
     private readonly object _lock = new();
@@ -63,7 +65,7 @@ internal class WireMockMiddleware(
         Activity? activity = null;
 
         // Check if we should trace this request (optionally exclude admin requests)
-        var shouldTrace = tracingEnabled && !(excludeAdmin && request.Path.StartsWith("/__admin/"));
+        var shouldTrace = tracingEnabled && !(excludeAdmin && adminPaths.Includes(request.Path));
 
         if (shouldTrace)
         {
@@ -97,7 +99,7 @@ internal class WireMockMiddleware(
             {
                 logRequest = true;
                 options.Logger.Warn("HttpStatusCode set to 404 : No matching mapping found");
-                response = ResponseMessageBuilder.Create(HttpStatusCode.NotFound, WireMockConstants.NoMatchingFound);
+                response = responseMessageBuilder.Create(HttpStatusCode.NotFound, WireMockConstants.NoMatchingFound);
                 return;
             }
 
@@ -109,7 +111,7 @@ internal class WireMockMiddleware(
                 if (!authorizationHeaderPresent)
                 {
                     options.Logger.Error("HttpStatusCode set to 401, authorization header is missing.");
-                    response = ResponseMessageBuilder.Create(HttpStatusCode.Unauthorized, null);
+                    response = responseMessageBuilder.Create(HttpStatusCode.Unauthorized, null);
                     return;
                 }
 
@@ -117,11 +119,19 @@ internal class WireMockMiddleware(
                 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);
+                    response = responseMessageBuilder.Create(HttpStatusCode.Unauthorized, null);
                     return;
                 }
             }
 
+            // Transition scenario state immediately after matching, before any delay (global or
+            // per-mapping) so that concurrent retries arriving during a delay period see the
+            // updated state and match the correct next mapping instead of re-matching this one.
+            if (targetMapping.Scenario != null)
+            {
+                UpdateScenarioState(targetMapping);
+            }
+
             if (!targetMapping.IsAdminInterface && options.RequestProcessingDelay > TimeSpan.Zero)
             {
                 await Task.Delay(options.RequestProcessingDelay.Value).ConfigureAwait(false);
@@ -147,11 +157,6 @@ internal class WireMockMiddleware(
                 }
             }
 
-            if (targetMapping.Scenario != null)
-            {
-                UpdateScenarioState(targetMapping);
-            }
-
             if (!targetMapping.IsAdminInterface && targetMapping.Webhooks?.Length > 0)
             {
                 await SendToWebhooksAsync(targetMapping, request, response).ConfigureAwait(false);
@@ -162,7 +167,7 @@ internal class WireMockMiddleware(
             options.Logger.Error($"Providing a Response for Mapping '{result.Match?.Mapping.Guid}' failed. HttpStatusCode set to 500. Exception: {ex}");
             WireMockActivitySource.RecordException(activity, ex);
 
-            response = ResponseMessageBuilder.Create(500, ex.Message);
+            response = responseMessageBuilder.Create(500, ex.Message);
         }
         finally
         {
@@ -176,7 +181,7 @@ internal class WireMockMiddleware(
             {
                 options.Logger.Error("HttpStatusCode set to 404 : No matching mapping found", ex);
 
-                var notFoundResponse = ResponseMessageBuilder.Create(HttpStatusCode.NotFound, WireMockConstants.NoMatchingFound);
+                var notFoundResponse = responseMessageBuilder.Create(HttpStatusCode.NotFound, WireMockConstants.NoMatchingFound);
                 await responseMapper.MapAsync(notFoundResponse, ctx.Response).ConfigureAwait(false);
             }
         }

src/WireMock.Net.Minimal/Owin/WireMockMiddlewareLogger.cs

@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net
 
 using System.Diagnostics;
-using System.Linq;
 using WireMock.Logging;
 using WireMock.Owin.ActivityTracing;
 using WireMock.Serialization;
@@ -10,39 +9,44 @@ using WireMock.Util;
 namespace WireMock.Owin;
 
 internal class WireMockMiddlewareLogger(
-    IWireMockMiddlewareOptions _options,
+    IWireMockMiddlewareOptions options,
-    LogEntryMapper _logEntryMapper,
+    LogEntryMapper logEntryMapper,
-    IGuidUtils _guidUtils
+    IGuidUtils guidUtils,
+    IAdminPaths adminPaths,
+    IDateTimeUtils dateTimeUtils
 ) : IWireMockMiddlewareLogger
 {
     public void LogRequestAndResponse(bool logRequest, RequestMessage request, IResponseMessage? response, MappingMatcherResult? match, MappingMatcherResult? partialMatch, Activity? activity)
     {
+        var mapping = match?.Mapping;
+        var partialMapping = partialMatch?.Mapping;
+
         var logEntry = new LogEntry
         {
-            Guid = _guidUtils.NewGuid(),
+            Guid = guidUtils.NewGuid(),
             RequestMessage = request,
             ResponseMessage = response,
 
-            MappingGuid = match?.Mapping?.Guid,
+            MappingGuid = mapping?.Guid,
-            MappingTitle = match?.Mapping?.Title,
+            MappingTitle = mapping?.Title,
             RequestMatchResult = match?.RequestMatchResult,
 
-            PartialMappingGuid = partialMatch?.Mapping?.Guid,
+            PartialMappingGuid = partialMapping?.Guid,
-            PartialMappingTitle = partialMatch?.Mapping?.Title,
+            PartialMappingTitle = partialMapping?.Title,
             PartialMatchResult = partialMatch?.RequestMatchResult
         };
 
-        WireMockActivitySource.EnrichWithLogEntry(activity, logEntry, _options.ActivityTracingOptions);
+        WireMockActivitySource.EnrichWithLogEntry(activity, logEntry, options.ActivityTracingOptions);
         activity?.Dispose();
 
         LogLogEntry(logEntry, logRequest);
 
         try
         {
-            if (_options.SaveUnmatchedRequests == true && match?.RequestMatchResult is not { IsPerfectMatch: true })
+            if (options.SaveUnmatchedRequests == true && match?.RequestMatchResult is not { IsPerfectMatch: true })
             {
                 var filename = $"{logEntry.Guid}.LogEntry.json";
-                _options.FileSystemHandler?.WriteUnmatchedRequest(filename, JsonUtils.Serialize(logEntry));
+                options.FileSystemHandler?.WriteUnmatchedRequest(filename, options.DefaultJsonSerializer.Serialize(logEntry));
             }
         }
         catch
@@ -53,34 +57,35 @@ internal class WireMockMiddlewareLogger(
 
     public void LogLogEntry(LogEntry entry, bool addRequest)
     {
-        _options.Logger.DebugRequestResponse(_logEntryMapper.Map(entry), entry.RequestMessage?.Path.StartsWith("/__admin/") == true);
+        var isAdminRequest = adminPaths.Includes(entry.RequestMessage?.Path);
+        options.Logger.DebugRequestResponse(logEntryMapper.Map(entry), isAdminRequest);
 
         // 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)
+        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)
+        if (options.MaxRequestLogCount is > 0)
         {
-            var logEntries = _options.LogEntries.ToList();
+            var logEntries = options.LogEntries.ToList();
 
             foreach (var logEntry in logEntries
                 .OrderBy(le => le.RequestMessage?.DateTime ?? le.ResponseMessage?.DateTime)
-                .Take(logEntries.Count - _options.MaxRequestLogCount.Value))
+                .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)
+        if (options.RequestLogExpirationDuration is > 0)
         {
-            var logEntries = _options.LogEntries.ToList();
+            var logEntries = options.LogEntries.ToList();
 
-            var checkTime = DateTime.UtcNow.AddHours(-_options.RequestLogExpirationDuration.Value);
+            var checkTime = dateTimeUtils.UtcNow.AddHours(-options.RequestLogExpirationDuration.Value);
             foreach (var logEntry in logEntries.Where(le => le.RequestMessage?.DateTime < checkTime || le.ResponseMessage?.DateTime < checkTime))
             {
                 TryRemoveLogEntry(logEntry);
@@ -92,7 +97,7 @@ internal class WireMockMiddlewareLogger(
     {
         try
         {
-            _options.LogEntries.Add(logEntry);
+            options.LogEntries.Add(logEntry);
         }
         catch
         {
@@ -104,7 +109,7 @@ internal class WireMockMiddlewareLogger(
     {
         try
         {
-            _options.LogEntries.Remove(logEntry);
+            options.LogEntries.Remove(logEntry);
         }
         catch
         {

src/WireMock.Net.Minimal/Owin/WireMockMiddlewareOptions.cs

@@ -2,6 +2,8 @@
 
 using System.Collections.Concurrent;
 using System.Security.Cryptography.X509Certificates;
+using JsonConverter.Abstractions;
+using JsonConverter.Newtonsoft.Json;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using WireMock.Handlers;
@@ -108,5 +110,12 @@ internal class WireMockMiddlewareOptions : IWireMockMiddlewareOptions
     /// <inheritdoc />
     public ConcurrentDictionary<Guid, WebSocketConnectionRegistry> WebSocketRegistries { get; } = new();
 
+    /// <inheritdoc />
     public WebSocketSettings? WebSocketSettings { get; set; }
+
+    /// <inheritdoc />
+    public IJsonConverter DefaultJsonSerializer { get; set; } = new NewtonsoftJsonConverter();
+
+    /// <inheritdoc />
+    public IAdminPaths AdminPaths { get; set; } = new AdminPaths(null);
 }

src/WireMock.Net.Minimal/Owin/WireMockMiddlewareOptionsHelper.cs

@@ -34,6 +34,7 @@ internal static class WireMockMiddlewareOptionsHelper
         options.QueryParameterMultipleValueSupport = settings.QueryParameterMultipleValueSupport;
         options.RequestLogExpirationDuration = settings.RequestLogExpirationDuration;
         options.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;
+        options.AdminPaths = new AdminPaths(settings.AdminPath);
 
 #if USE_ASPNETCORE
         options.AdditionalServiceRegistration = settings.AdditionalServiceRegistration;

src/WireMock.Net.Minimal/Properties/AssemblyInfo.cs

@@ -7,4 +7,4 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
 
 // Needed for Moq in the UnitTest project
-[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] 
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]

src/WireMock.Net.Minimal/Proxy/ProxyHelper.cs

@@ -48,7 +48,8 @@ internal class ProxyHelper(WireMockServerSettings settings)
             originalUri,
             deserializeJson,
             decompressGzipAndDeflate,
-            deserializeFormUrlEncoded
+            deserializeFormUrlEncoded,
+            _settings.DefaultJsonSerializer
         ).ConfigureAwait(false);
 
         IMapping? newMapping = null;

src/WireMock.Net.Minimal/RequestBuilders/Request.cs

@@ -34,7 +34,7 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
     /// Initializes a new instance of the <see cref="Request"/> class.
     /// </summary>
     /// <param name="requestMatchers">The request matchers.</param>
-    private Request(IList<IRequestMatcher> requestMatchers) : base(requestMatchers)
+    internal Request(IList<IRequestMatcher> requestMatchers) : base(requestMatchers)
     {
         _requestMatchers = Guard.NotNull(requestMatchers);
     }
@@ -81,6 +81,13 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
         return this;
     }
 
+    /// <inheritdoc />
+    public IRequestBuilder WithEarlyMismatch(RequestMatcherType? earlyMatcherType)
+    {
+        EarlyMatcherType = earlyMatcherType;
+        return this;
+    }
+
     internal bool TryGetProtoBufMatcher([NotNullWhen(true)] out IProtoBufMatcher? protoBufMatcher)
     {
         protoBufMatcher = GetRequestMessageMatcher<RequestMessageProtoBufMatcher>()?.Matcher;

src/WireMock.Net.Minimal/ResponseBuilders/Response.WithBody.cs

@@ -2,8 +2,10 @@
 
 using System.Text;
 using JsonConverter.Abstractions;
+using JsonConverter.Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Models;
+using WireMock.Serialization;
 using WireMock.Types;
 using WireMock.Util;
 
@@ -119,11 +121,13 @@ public partial class Response
     }
 
     /// <inheritdoc />
-    public IResponseBuilder WithBody(string body, string? destination = BodyDestinationFormat.SameAsSource, Encoding? encoding = null)
+    public IResponseBuilder WithBody(string body, string? destination = BodyDestinationFormat.SameAsSource, Encoding? encoding = null, IJsonConverter? jsonConverter = null, JsonConverterOptions? options = null)
     {
         Guard.NotNull(body);
 
         encoding ??= Encoding.UTF8;
+        jsonConverter ??= new NewtonsoftJsonConverter();
+        options ??= JsonSerializationConstants.JsonConverterOptionsWithDateParsingNone;
 
         ResponseMessage.BodyDestination = destination;
         ResponseMessage.BodyData = new BodyData
@@ -140,7 +144,7 @@ public partial class Response
 
             case BodyDestinationFormat.Json:
                 ResponseMessage.BodyData.DetectedBodyType = BodyType.Json;
-                ResponseMessage.BodyData.BodyAsJson = JsonUtils.DeserializeObject(body);
+                ResponseMessage.BodyData.BodyAsJson = jsonConverter.Deserialize<object>(body, options);
                 break;
 
             default:

src/WireMock.Net.Minimal/ResponseBuilders/Response.cs

@@ -11,7 +11,6 @@ using WireMock.RequestBuilders;
 using WireMock.Settings;
 using WireMock.Transformers;
 using WireMock.Types;
-using WireMock.Util;
 
 namespace WireMock.ResponseBuilders;
 
@@ -86,7 +85,11 @@ public partial class Response : IResponseBuilder
     [PublicAPI]
     public static IResponseBuilder Create(ResponseMessage? responseMessage = null)
     {
-        var message = responseMessage ?? new ResponseMessage();
+        var message = responseMessage ?? new ResponseMessage
+        {
+            DateTime = DateTime.UtcNow // We set it here to the current time.
+        };
+
         return new Response(message);
     }
 
@@ -197,7 +200,7 @@ public partial class Response : IResponseBuilder
 
         if (ProxyAndRecordSettings != null && _httpClientForProxy != null)
         {
-            string RemoveFirstOccurrence(string source, string find)
+            static string RemoveFirstOccurrence(string source, string find)
             {
                 int place = source.IndexOf(find, StringComparison.OrdinalIgnoreCase);
                 return place >= 0 ? source.Remove(place, find.Length) : source;
@@ -265,7 +268,7 @@ public partial class Response : IResponseBuilder
                     var decoded = await protoBufMatcher.DecodeAsync(requestMessage.BodyData?.BodyAsBytes).ConfigureAwait(false);
                     if (decoded != null)
                     {
-                        requestMessageImplementation.BodyAsJson = JsonUtils.ConvertValueToJToken(decoded);
+                        requestMessageImplementation.BodyAsJson = settings.DefaultJsonSerializer.ToJsonToken(decoded);
                     }
                 }
             }

src/WireMock.Net.Minimal/ResponseMessageBuilder.cs

@@ -9,29 +9,30 @@ using WireMock.Util;
 
 namespace WireMock;
 
-internal static class ResponseMessageBuilder
+internal class ResponseMessageBuilder(IDateTimeUtils dateTimeUtils) : IResponseMessageBuilder
 {
     private static readonly IDictionary<string, WireMockList<string>> ContentTypeJsonHeaders = new Dictionary<string, WireMockList<string>>
     {
         { HttpKnownHeaderNames.ContentType, new WireMockList<string> { WireMockConstants.ContentTypeJson } }
     };
 
-    internal static ResponseMessage Create(HttpStatusCode statusCode, string? status, Guid? guid = null)
+    public ResponseMessage Create(HttpStatusCode statusCode, string? status, Guid? guid = null)
     {
-        return Create((int)statusCode, status, guid);
+        return Create((int)statusCode, status, null, guid);
     }
 
-    internal static ResponseMessage Create(int statusCode, string? status, Guid? guid = null)
+    public ResponseMessage Create(int statusCode, string? status, Guid? guid = null)
     {
         return Create(statusCode, status, null, guid);
     }
 
-    internal static ResponseMessage Create(int statusCode, string? status, string? error, Guid? guid = null)
+    public ResponseMessage Create(int statusCode, string? status, string? error, Guid? guid = null)
     {
         var response = new ResponseMessage
         {
             StatusCode = statusCode,
-            Headers = ContentTypeJsonHeaders
+            Headers = ContentTypeJsonHeaders,
+            DateTime = dateTimeUtils.UtcNow
         };
 
         if (status != null || error != null)
@@ -51,7 +52,7 @@ internal static class ResponseMessageBuilder
         return response;
     }
 
-    internal static ResponseMessage Create(HttpStatusCode statusCode)
+    public ResponseMessage Create(HttpStatusCode statusCode)
     {
         return new ResponseMessage
         {

src/WireMock.Net.Minimal/ResponseProviders/WebSocketResponseProvider.cs

@@ -16,7 +16,7 @@ using WireMock.WebSockets;
 
 namespace WireMock.ResponseProviders;
 
-internal class WebSocketResponseProvider(WebSocketBuilder builder, IGuidUtils guidUtils, IDateTimeUtils dateTimeUtils) : IResponseProvider
+internal class WebSocketResponseProvider(WebSocketBuilder builder, IGuidUtils guidUtils, IDateTimeUtils dateTimeUtils, IResponseMessageBuilder responseMessageBuilder) : IResponseProvider
 {
     public async Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(
         IMapping mapping,
@@ -27,7 +27,7 @@ internal class WebSocketResponseProvider(WebSocketBuilder builder, IGuidUtils gu
         // Check if this is a WebSocket upgrade request
         if (!context.WebSockets.IsWebSocketRequest)
         {
-            return (ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Bad Request: Not a WebSocket upgrade request"), null);
+            return (responseMessageBuilder.Create(HttpStatusCode.BadRequest, "Bad Request: Not a WebSocket upgrade request"), null);
         }
 
         if (!context.Items.TryGetValue<IWireMockMiddlewareOptions>(nameof(IWireMockMiddlewareOptions), out var options))
@@ -110,7 +110,7 @@ internal class WebSocketResponseProvider(WebSocketBuilder builder, IGuidUtils gu
             // If we haven't upgraded yet, we can return HTTP error
             if (!context.Response.HasStarted)
             {
-                return (ResponseMessageBuilder.Create(HttpStatusCode.InternalServerError, $"WebSocket error: {ex.Message}"), null);
+                return (responseMessageBuilder.Create(HttpStatusCode.InternalServerError, $"WebSocket error: {ex.Message}"), null);
             }
 
             // Already upgraded - return marker

src/WireMock.Net.Minimal/Serialization/MappingConverter.cs

@@ -66,6 +66,12 @@ internal class MappingConverter(MatcherMapper mapper)
 
         // Request
         sb.AppendLine("    .Given(Request.Create()");
+
+        if (request.EarlyMatcherType != null)
+        {
+            sb.AppendLine($"        .WithEarlyMismatch({request.EarlyMatcherType.Value.GetFullyQualifiedEnumValue()})");
+        }
+
         sb.AppendLine($"        .UsingMethod({To1Or2Or3Arguments(methodMatcher?.MatchBehaviour, methodMatcher?.MatchOperator, methodMatcher?.Methods, HttpRequestMethod.GET)})");
 
         if (pathMatcher?.Matchers != null)
@@ -275,6 +281,7 @@ internal class MappingConverter(MatcherMapper mapper)
             TimesInSameState = !string.IsNullOrWhiteSpace(mapping.NextState) ? mapping.TimesInSameState : null,
             Data = mapping.Data,
             Probability = mapping.Probability,
+            IsDisabled = mapping.IsDisabled ? true : null,
             Request = new RequestModel
             {
                 Headers = headerMatchers.Any() ? headerMatchers.Select(hm => new HeaderModel
@@ -299,7 +306,9 @@ internal class MappingConverter(MatcherMapper mapper)
                     IgnoreCase = pm.IgnoreCase ? true : null,
                     RejectOnMatch = pm.MatchBehaviour == MatchBehaviour.RejectOnMatch ? true : null,
                     Matchers = _mapper.Map(pm.Matchers)
-                }).ToList() : null
+                }).ToList() : null,
+
+                EarlyMatcherType = request.EarlyMatcherType
             },
             Response = new ResponseModel()
         };

src/WireMock.Net.Minimal/Serialization/MappingSerializer.cs

@@ -1,10 +1,7 @@
 // Copyright © WireMock.Net
 
 using JsonConverter.Abstractions;
-using Newtonsoft.Json.Linq;
+using JsonConverter.Abstractions.Models;
-#if NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER || NET6_0_OR_GREATER || NET461
-using System.Text.Json;
-#endif
 
 namespace WireMock.Serialization;
 
@@ -12,37 +9,23 @@ internal class MappingSerializer(IJsonConverter jsonConverter)
 {
     internal T[] DeserializeJsonToArray<T>(string value)
     {
-        return DeserializeObjectToArray<T>(jsonConverter.Deserialize<object>(value)!);
+        switch (JsonTypeHelper.GetJsonType(value))
+        {
+            case JsonType.Array:
+                return jsonConverter.Deserialize<T[]>(value, JsonSerializationConstants.JsonConverterOptionsWithDateParsingNone)!;
+
+            case JsonType.Object:
+                var singleResult = jsonConverter.Deserialize<T>(value, JsonSerializationConstants.JsonConverterOptionsWithDateParsingNone);
+                return [singleResult!];
+
+            default:
+                throw new InvalidOperationException("Cannot deserialize the provided value to an array or object.");
+        }
     }
 
-    internal static T[] DeserializeObjectToArray<T>(object value)
+    internal T[] DeserializeObjectToArray<T>(object value)
     {
-        if (value is JArray jArray)
+        var json = jsonConverter.Serialize(value, JsonSerializationConstants.JsonConverterOptionsWithDateParsingNone);
-        {
+        return DeserializeJsonToArray<T>(json);
-            return jArray.ToObject<T[]>()!;
-        }
-
-        if (value is JObject jObject)
-        {
-            var singleResult = jObject.ToObject<T>();
-            return [singleResult!];
-        }
-
-#if NETSTANDARD2_0_OR_GREATER || NETCOREAPP3_1_OR_GREATER || NET6_0_OR_GREATER || NET461
-        if (value is JsonElement jElement)
-        {
-            if (jElement.ValueKind == JsonValueKind.Array)
-            {
-                return jElement.Deserialize<T[]>()!;
-            }
-
-            if (jElement.ValueKind == JsonValueKind.Object)
-            {
-                var singleResult = jElement.Deserialize<T>();
-                return [singleResult!];
-            }
-        }
-#endif
-        throw new InvalidOperationException("Cannot deserialize the provided value to an array or object.");
     }
 }

src/WireMock.Net.Minimal/Serialization/MatcherMapper.cs

@@ -106,9 +106,29 @@ internal class MatcherMapper
                 var valueForJsonPartialWildcardMatcher = matcherModel.Pattern ?? matcherModel.Patterns;
                 return new JsonPartialWildcardMatcher(matchBehaviour, valueForJsonPartialWildcardMatcher!, ignoreCase, useRegex);
 
+            case nameof(SystemTextJsonMatcher):
+                var valueForSystemTextJsonMatcher = matcherModel.Pattern ?? matcherModel.Patterns;
+                return new SystemTextJsonMatcher(matchBehaviour, valueForSystemTextJsonMatcher!, ignoreCase, useRegex);
+
+            case nameof(SystemTextJsonPartialMatcher):
+                var valueForSystemTextJsonPartialMatcher = matcherModel.Pattern ?? matcherModel.Patterns;
+                return new SystemTextJsonPartialMatcher(matchBehaviour, valueForSystemTextJsonPartialMatcher!, ignoreCase, useRegex);
+
+            case nameof(SystemTextJsonPartialWildcardMatcher):
+                var valueForSystemTextJsonPartialWildcardMatcher = matcherModel.Pattern ?? matcherModel.Patterns;
+                return new SystemTextJsonPartialWildcardMatcher(matchBehaviour, valueForSystemTextJsonPartialWildcardMatcher!, ignoreCase, useRegex);
+
             case nameof(JsonPathMatcher):
                 return new JsonPathMatcher(matchBehaviour, matchOperator, stringPatterns);
 
+            case "SystemTextJsonPathMatcher":
+                if (TypeLoader.TryLoadNewInstance<ISystemTextJsonPathMatcher>(out var systemTextJsonPathMatcher, matchBehaviour, matchOperator, stringPatterns))
+                {
+                    return systemTextJsonPathMatcher;
+                }
+
+                throw new InvalidOperationException("The 'SystemTextJsonPathMatcher' cannot be loaded. Please install the WireMock.Net.Matchers.SystemTextJsonPath package.");
+
             case nameof(JmesPathMatcher):
                 return new JmesPathMatcher(matchBehaviour, matchOperator, stringPatterns);
 
@@ -171,6 +191,10 @@ internal class MatcherMapper
                 model.Regex = jsonMatcher.Regex;
                 break;
 
+            case SystemTextJsonMatcher stjMatcher:
+                model.Regex = stjMatcher.Regex;
+                break;
+
             case XPathMatcher xpathMatcher:
                 model.XmlNamespaceMap = xpathMatcher.XmlNamespaceMap;
                 break;

src/WireMock.Net.Minimal/Serialization/PactMapper.cs

@@ -1,6 +1,8 @@
 // Copyright © WireMock.Net
 
 using System.Linq;
+using System.Text;
+using Newtonsoft.Json;
 using WireMock.Admin.Mappings;
 using WireMock.Extensions;
 using WireMock.Pact.Models.V2;
@@ -49,7 +51,7 @@ internal static class PactMapper
             pact.Interactions.Add(interaction);
         }
 
-        return (filename, JsonUtils.SerializeAsPactFile(pact));
+        return (filename, SerializeAsPactFile(pact));
     }
 
     private static PactRequest MapRequest(RequestModel request, string path)
@@ -152,7 +154,7 @@ internal static class PactMapper
     /// </summary>
     private static object? TryDeserializeJsonStringAsObject(string? value)
     {
-        return value != null ? JsonUtils.TryDeserializeObject<object?>(value) ?? value : null;
+        return value != null ? TryDeserializeObject<object?>(value) ?? value : null;
     }
 
     //private static string GetPatternAsStringFromMatchers(MatcherModel[]? matchers, string defaultValue)
@@ -164,4 +166,22 @@ internal static class PactMapper
 
     //    return defaultValue;
     //}
+
+    private static byte[] SerializeAsPactFile(object value)
+    {
+        var json = JsonConvert.SerializeObject(value, JsonSerializationConstants.JsonSerializerSettingsPact);
+        return Encoding.UTF8.GetBytes(json);
+    }
+
+    private static T? TryDeserializeObject<T>(string json)
+    {
+        try
+        {
+            return JsonConvert.DeserializeObject<T>(json);
+        }
+        catch
+        {
+            return default;
+        }
+    }
 }

src/WireMock.Net.Minimal/Serialization/SwaggerMapper.cs

@@ -1,7 +1,8 @@
 // Copyright © WireMock.Net
 
-using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using NJsonSchema;
 using NJsonSchema.Extensions;
 using NSwag;
@@ -281,7 +282,7 @@ internal static class SwaggerMapper
         if (matcher is { Name: nameof(JsonMatcher) })
         {
             var pattern = GetPatternAsStringFromMatcher(matcher);
-            if (JsonUtils.TryParseAsJObject(pattern, out var jObject))
+            if (TryParseAsJObject(pattern, out var jObject))
             {
                 return jObject;
             }
@@ -292,6 +293,39 @@ internal static class SwaggerMapper
         return null;
     }
 
+    private static bool IsJson(string? value)
+    {
+        if (string.IsNullOrWhiteSpace(value))
+        {
+            return false;
+        }
+
+        value = value!.Trim();
+
+        return (value.StartsWith("{") && value.EndsWith("}")) || (value.StartsWith("[") && value.EndsWith("]"));
+    }
+
+    private static bool TryParseAsJObject(string? strInput, [NotNullWhen(true)] out JObject? value)
+    {
+        value = null;
+
+        if (!IsJson(strInput))
+        {
+            return false;
+        }
+
+        try
+        {
+            // Try to convert this string into a JObject
+            value = JObject.Parse(strInput!);
+            return true;
+        }
+        catch
+        {
+            return false;
+        }
+    }
+
     private static string GetContentType(RequestModel request)
     {
         var contentType = request.Headers?.FirstOrDefault(h => h.Name == "Content-Type");