1.8.18

Fixes an issue with matching JSON bodies as bytes (#1339 )
2026-01-13 13:53:34 +01:00 · 2025-08-04 18:03:44 +02:00 · 2025-08-04 18:03:23 +02:00 · 2025-08-02 20:11:13 +02:00 · 2025-07-23 09:40:55 +02:00 · 2025-07-23 09:34:31 +02:00
385 changed files with 13320 additions and 11559 deletions
--- a/.axoCover/settings.json
+++ b/.axoCover/settings.json
@@ -1,15 +0,0 @@
-{
-  "TestRunner": "",
-  "TestPlatform": "x86",
-  "TestApartmentState": "STA",
-  "TestSettings": "",
-  "ExcludeAttributes": "System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute",
-  "ExcludeFiles": "",
-  "ExcludeDirectories": "",
-  "Filters": "+[*]*",
-  "IsIncludingSolutionAssemblies": true,
-  "IsExcludingTestAssemblies": false,
-  "IsCoveringByTest": true,
-  "IsMergingByHash": true,
-  "IsSkippingAutoProps": true
-}
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -1,5 +1,8 @@
 name: CreateRelease

+permissions:
+  contents: write
+
 on:
  push:
    tags:
@@ -10,6 +13,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
      - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,9 @@ jobs:
    - name: 'WireMock.Net.Tests'
      run: dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0

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

@@ -46,6 +49,9 @@ jobs:
    - name: 'WireMock.Net.Tests'
      run: dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0

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

--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,11 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
-        }
-    ]
-}
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -1,17 +0,0 @@
-{
-    // See https://go.microsoft.com/fwlink/?LinkId=733558
-    // for the documentation about the tasks.json format
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "taskName": "build_WireMock.Net.StandAlone.NETCoreApp",
-            "command": "dotnet build ${workspaceRoot}/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj -f netcoreapp2.0 ",
-            "type": "shell",
-            "group": "build",
-            "presentation": {
-                "reveal": "silent"
-            },
-            "problemMatcher": "$msCompile"
-        }
-    ]
-}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,66 @@
+# 1.8.18 (04 August 2025)
+- [#1339](https://github.com/wiremock/WireMock.Net/pull/1339) - Fixes an issue with matching JSON bodies as bytes [bug] contributed by [smfields](https://github.com/smfields)
+- [#1338](https://github.com/wiremock/WireMock.Net/issues/1338) - Specifying .WithBody(byte[]) fails to match for JSON bodies [bug]
+
+# 1.8.17 (23 July 2025)
+- [#1337](https://github.com/wiremock/WireMock.Net/pull/1337) - Make CSharpCodeMatcher public [bug] contributed by [StefH](https://github.com/StefH)
+- [#1336](https://github.com/wiremock/WireMock.Net/issues/1336) - Is CSharpCodeMatcher actually usable? [bug]
+
+# 1.8.16 (19 July 2025)
+- [#1332](https://github.com/wiremock/WireMock.Net/pull/1332) - Use correct Handlebars.Net.Helpers.Xslt (2.5.2) [bug] contributed by [StefH](https://github.com/StefH)
+- [#1328](https://github.com/wiremock/WireMock.Net/issues/1328) - ReflectionTypeLoadException occurs when running multiple unit tests (Nunit 3) [bug]
+
+# 1.8.15 (18 July 2025)
+- [#1331](https://github.com/wiremock/WireMock.Net/pull/1331) - Correctly map the Pact Interaction Description property [bug] contributed by [StefH](https://github.com/StefH)
+- [#1330](https://github.com/wiremock/WireMock.Net/issues/1330) - Generated Pact-compatible consumer contract does not contain description [bug]
+
+# 1.8.14 (13 July 2025)
+- [#1325](https://github.com/wiremock/WireMock.Net/pull/1325) - Add method CreateHttpClientFactory [feature] contributed by [StefH](https://github.com/StefH)
+- [#1326](https://github.com/wiremock/WireMock.Net/pull/1326) - Implement IMimeMessageData [feature] contributed by [StefH](https://github.com/StefH)
+- [#1329](https://github.com/wiremock/WireMock.Net/pull/1329) - Fix HandlebarsContext.ParseAndEvaluate [bug] contributed by [StefH](https://github.com/StefH)
+- [#1327](https://github.com/wiremock/WireMock.Net/issues/1327) - Response Body Does Not Evaluate Multiple Handlebars Templates [bug]
+
+# 1.8.13 (23 June 2025)
+- [#1322](https://github.com/wiremock/WireMock.Net/pull/1322) - Add Scenario set State method [feature] contributed by [StefH](https://github.com/StefH)
+- [#1321](https://github.com/wiremock/WireMock.Net/issues/1321) - Feature: Setting individual scenario state via Admin API [feature]
+
+# 1.8.12 (15 June 2025)
+- [#1317](https://github.com/wiremock/WireMock.Net/pull/1317) - Set description when converting MappingModel to IRespondWithAProvider [feature] contributed by [BodrickLight](https://github.com/BodrickLight)
+- [#1320](https://github.com/wiremock/WireMock.Net/pull/1320) - Fix TypeLoader [bug] contributed by [StefH](https://github.com/StefH)
+- [#1319](https://github.com/wiremock/WireMock.Net/issues/1319) - Why is IRequestMessage.BodyAsMimeMessage null in new versions (&gt; 1.8.7) [bug]
+
+# 1.8.11 (11 June 2025)
+- [#1311](https://github.com/wiremock/WireMock.Net/pull/1311) - Bump Testcontainers version to 4.5.0 [feature] contributed by [scrocquesel](https://github.com/scrocquesel)
+- [#1313](https://github.com/wiremock/WireMock.Net/pull/1313) - Update RandomDataGenerator.Net to 1.0.19 [feature] contributed by [StefH](https://github.com/StefH)
+- [#1315](https://github.com/wiremock/WireMock.Net/pull/1315) - Fix for WithTransformer and JsonBody as list [bug] contributed by [StefH](https://github.com/StefH)
+- [#1310](https://github.com/wiremock/WireMock.Net/issues/1310) - Binary compat issue with testcontainers 4.5.0 [bug]
+- [#1312](https://github.com/wiremock/WireMock.Net/issues/1312) - WithTransformer breaks when the response BodyAsJson is a List [bug]
+
+# 1.8.10 (10 June 2025)
+- [#1306](https://github.com/wiremock/WireMock.Net/pull/1306) - Update RequestModelBuilder (add WithHeader) [feature] contributed by [StefH](https://github.com/StefH)
+- [#1308](https://github.com/wiremock/WireMock.Net/pull/1308) - For some projects, change dependency to WireMock.Net.Minimal [feature] contributed by [StefH](https://github.com/StefH)
+- [#1309](https://github.com/wiremock/WireMock.Net/pull/1309) - Update AwesomeAssertions to version 9 [feature] contributed by [StefH](https://github.com/StefH)
+- [#1305](https://github.com/wiremock/WireMock.Net/issues/1305) - AdminApiMappingBuilder do not expose WithHeader for Request [feature]
+- [#1307](https://github.com/wiremock/WireMock.Net/issues/1307) - Update WireMock.Net.AwesomeAssertions to use latest version from AwesomeAssertions [feature]
+
+# 1.8.9 (28 May 2025)
+- [#1303](https://github.com/wiremock/WireMock.Net/pull/1303) - Add option to provide X509Certificate [feature] contributed by [StefH](https://github.com/StefH)
+- [#1302](https://github.com/wiremock/WireMock.Net/issues/1302) - Support In-Memory SSL Certificate [feature]
+
+# 1.8.8 (24 May 2025)
+- [#1300](https://github.com/wiremock/WireMock.Net/pull/1300) - Create WireMock.Net.MimePart project [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.8.7 (22 May 2025)
+- [#1297](https://github.com/wiremock/WireMock.Net/pull/1297) - Fix BodyParser to correctly check for json [bug] contributed by [StefH](https://github.com/StefH)
+- [#1299](https://github.com/wiremock/WireMock.Net/pull/1299) - Use TinyMapper.Signed [bug] contributed by [StefH](https://github.com/StefH)
+- [#1301](https://github.com/wiremock/WireMock.Net/pull/1301) - Fix errors when converting response bodies with top-level JSON arrays to C# code [bug] contributed by [asaf92](https://github.com/asaf92)
+- [#973](https://github.com/wiremock/WireMock.Net/issues/973) - TinyMapper error [bug]
+- [#1272](https://github.com/wiremock/WireMock.Net/issues/1272) - WithMappingFromOpenApiFile fails with exception when example item present in text-plain response in OAS contract
+- [#1295](https://github.com/wiremock/WireMock.Net/issues/1295) - Content-Type `multipart/form-data` header not proxied [bug]
+- [#1298](https://github.com/wiremock/WireMock.Net/issues/1298) - TinyMapper error redux [bug]
+
 # 1.8.6 (15 May 2025)
 - [#1296](https://github.com/wiremock/WireMock.Net/pull/1296) - Content-Type multipart/form-data header should also be proxied [bug] contributed by [StefH](https://github.com/StefH)
- [#1295](https://github.com/wiremock/WireMock.Net/issues/1295) - Content-Type `multipart/form-data` header not proxied [bug]

 # 1.8.5 (14 May 2025)
 - [#1290](https://github.com/wiremock/WireMock.Net/pull/1290) - Use ILRepack to include Microsoft.OpenApi as internal [feature] contributed by [StefH](https://github.com/StefH)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <VersionPrefix>1.8.6</VersionPrefix>
+        <VersionPrefix>1.8.18</VersionPrefix>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/wiremock/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes

-SET version=1.8.6
+SET version=1.8.18

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

--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,5 +1,5 @@
-# 1.8.6 (15 May 2025)
- #1296 Content-Type multipart/form-data header should also be proxied [bug]
- #1295 Content-Type `multipart/form-data` header not proxied [bug]
+# 1.8.18 (04 August 2025)
+- #1339 Fixes an issue with matching JSON bodies as bytes [bug]
+- #1338 Specifying .WithBody(byte[]) fails to match for JSON bodies [bug]

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

 For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/wiremock/WireMock.Net/wiki/What-Is-WireMock.Net).
@@ -30,9 +30,9 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | | |
 | ***Quality*** | &nbsp; |
 | &nbsp;&nbsp;**Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=7) |
-| &nbsp;&nbsp;**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-net/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net) |
+| &nbsp;&nbsp;**Quality** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=alert_status)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net) [![CodeFactor](https://www.codefactor.io/repository/github/wiremock/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock/wiremock.net) |
 | &nbsp;&nbsp;**Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=bugs)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=BUG) [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=code_smells)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=CODE_SMELL) |
-| &nbsp;&nbsp;**Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=coverage)](https://sonarcloud.io/component_measures?id=WireMock-Net_WireMock.Net&metric=coverage) [![codecov](https://codecov.io/gh/WireMock-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/WireMock.Net)|
+| &nbsp;&nbsp;**Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=coverage)](https://sonarcloud.io/component_measures?id=WireMock-Net_WireMock.Net&metric=coverage) [![codecov](https://codecov.io/gh/wiremock/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/wiremock/WireMock.Net)|
 | &nbsp;&nbsp;**TIOBE** | [TIOBE Quality Indicator](https://ticsdemo.tiobe.com/tiobeweb/DEMO/TqiDashboard.html#axes=Project(WireMock.Net),Sub()&metric=tqi)

 ### :package: NuGet packages
@@ -40,6 +40,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | | Official | Preview [:information_source:](https://github.com/wiremock/WireMock.Net/wiki/MyGet-preview-versions) |
 | - | - | - |
 | &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://img.shields.io/nuget/v/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
+| &nbsp;&nbsp;**WireMock.Net.Minimal** 🔺| [![NuGet Badge WireMock.Net.Minimal](https://img.shields.io/nuget/v/WireMock.Net.Minimal)](https://www.nuget.org/packages/WireMock.Net.Minimal) |  [![MyGet Badge WireMock.Net](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Minimal?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Minimal)
 | &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://img.shields.io/nuget/v/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.StandAlone?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
 | &nbsp;&nbsp;**WireMock.Net.Testcontainers** | [![NuGet Badge WireMock.Net.Testcontainers](https://img.shields.io/nuget/v/WireMock.Net.Testcontainers)](https://www.nuget.org/packages/WireMock.Net.Testcontainers) | [![MyGet Badge WireMock.Net.Testcontainers](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Testcontainers?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Testcontainers)
 | &nbsp;&nbsp;**WireMock.Net.Aspire** | [![NuGet Badge WireMock.Net.Aspire](https://img.shields.io/nuget/v/WireMock.Net.Aspire)](https://www.nuget.org/packages/WireMock.Net.Aspire) | [![MyGet Badge WireMock.Net.Aspire](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Aspire?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Aspire)
@@ -52,10 +53,15 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | | | |
 | &nbsp;&nbsp;**WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/nuget/v/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Matchers.CSharpCode?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
 | &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/nuget/v/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.OpenApiParser?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
+| &nbsp;&nbsp;**WireMock.Net.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)
 | | | |
 | &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://img.shields.io/nuget/v/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
 | &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://img.shields.io/nuget/v/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Org.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)

+<br />
+
+🔺 **WireMock.Net.Minimal** does not include: **WireMock.Net.MimePart**
+
 ---

 ## :exclamation: Breaking changes
@@ -65,6 +71,7 @@ A breaking change is introduced which is related to System.Linq.Dynamic.Core Dyn
 - The `LinqMatcher` is not allowed.
 - The [Handlebars.Net.Helpers.DynamicLinq](https://www.nuget.org/packages/Handlebars.Net.Helpers.DynamicLinq) package is not included anymore.

+
 ### 1.8.0
 Some breaking changes are introduced in this version:

@@ -125,3 +132,8 @@ For more details see also [Docker](https://github.com/wiremock/WireMock.Net-dock

 #### HTTPS / SSL
 More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/wiremock/WireMock.Net/wiki/Using-HTTPS-(SSL))
+
+---
+
+## Powered by
+[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://jb.gg/OpenSource)
--- a/Solution.sln
+++ b/Solution.sln
@@ -38,12 +38,8 @@ 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.Console.Proxy.Net452", "examples\WireMock.Net.Console.Proxy.Net452\WireMock.Net.Console.Proxy.Net452.csproj", "{26433A8F-BF01-4962-97EB-81BFFBB61096}"
-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("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net452.Classic", "examples\WireMock.Net.Console.Net452.Classic\WireMock.Net.Console.Net452.Classic.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
-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}"
@@ -130,6 +126,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.AwesomeAsserti
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.OpenApiParser", "src\WireMock.Net.OpenApiParser\WireMock.Net.OpenApiParser.csproj", "{E5B03EEF-822C-4295-952B-4479AD30082B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.MimePart", "src\WireMock.Net.MimePart\WireMock.Net.MimePart.csproj", "{F8B4A93E-46EF-4237-88FE-15FDAB7635D4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Shared", "src\WireMock.Net.Shared\WireMock.Net.Shared.csproj", "{D3804228-91F4-4502-9595-39584E5A0177}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Minimal", "src\WireMock.Net.Minimal\WireMock.Net.Minimal.csproj", "{BFEF8990-65B3-4274-310F-7355F0B84035}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ConsoleApp.UsingNuGet", "examples\WireMock.Net.ConsoleApp.UsingNuGet\WireMock.Net.ConsoleApp.UsingNuGet.csproj", "{1F80A6E6-D146-4E40-9EA8-49DB8494239F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Tests.UsingNuGet", "test\WireMock.Net.Tests.UsingNuGet\WireMock.Net.Tests.UsingNuGet.csproj", "{BBA332C6-28A9-42E7-9C4D-A0816E52A198}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -160,18 +166,10 @@ Global
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.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}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -308,6 +306,26 @@ Global
 		{E5B03EEF-822C-4295-952B-4479AD30082B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E5B03EEF-822C-4295-952B-4479AD30082B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E5B03EEF-822C-4295-952B-4479AD30082B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8B4A93E-46EF-4237-88FE-15FDAB7635D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8B4A93E-46EF-4237-88FE-15FDAB7635D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8B4A93E-46EF-4237-88FE-15FDAB7635D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8B4A93E-46EF-4237-88FE-15FDAB7635D4}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A0177}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A0177}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A0177}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D3804228-91F4-4502-9595-39584E5A0177}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BFEF8990-65B3-4274-310F-7355F0B84035}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BFEF8990-65B3-4274-310F-7355F0B84035}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BFEF8990-65B3-4274-310F-7355F0B84035}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BFEF8990-65B3-4274-310F-7355F0B84035}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -319,9 +337,7 @@ 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}
-		{26433A8F-BF01-4962-97EB-81BFFBB61096} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{668F689E-57B4-422E-8846-C0FF643CA268} = {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}
@@ -358,6 +374,11 @@ Global
 		{A5FEF4F7-7DA2-4962-89A8-16BA942886E5} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{7753670F-7C7F-44BF-8BC7-08325588E60C} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{E5B03EEF-822C-4295-952B-4479AD30082B} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{F8B4A93E-46EF-4237-88FE-15FDAB7635D4} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{D3804228-91F4-4502-9595-39584E5A0177} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{BFEF8990-65B3-4274-310F-7355F0B84035} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198} = {0BB8B634-407A-4610-A91F-11586990767A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -109,6 +109,13 @@ jobs:
      packageType: 'sdk'
      version: '8.0.x'

+  - task: DotNetCoreCLI@2
+    displayName: 'WireMock.Net.Tests.UsingNuGet'
+    inputs:
+      command: 'test'
+      projects: './test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj'
+      arguments: '--configuration Release'
+
  - task: DotNetCoreCLI@2
    displayName: 'WireMock.Net.Tests with Coverage'
    inputs:
--- a/examples/WireMock.Net.Console.Net452.Classic/CustomFileSystemFileHandler.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/CustomFileSystemFileHandler.cs
--- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
--- a/examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj
+++ b/examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj
@@ -6,11 +6,6 @@
      <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs" Link="MainApp.cs" />
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs" Link="CustomFileSystemFileHandler.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <Content Include="__admin\mappings\*.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/examples/WireMock.Net.Console.Net452.Classic/App.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/App.config
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-    </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="HandlebarsDotNet.Helpers.Core" publicKeyToken="00d131fae0c250bc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.3.3.0" newVersion="2.3.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Handlebars" publicKeyToken="22225d0bf33cd661" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
--- a/examples/WireMock.Net.Console.Net452.Classic/Program.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/Program.cs
@@ -1,16 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.IO;
-using log4net.Config;
-
-namespace WireMock.Net.ConsoleApplication;
-
-static class Program
-{
-    static void Main(params string[] args)
-    {
-        XmlConfigurator.Configure(new FileInfo("log4net.config"));
-
-        MainApp.Run();
-    }
-}
--- a/examples/WireMock.Net.Console.Net452.Classic/Properties/AssemblyInfo.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/Properties/AssemblyInfo.cs
@@ -1,37 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("WireMock.Net.Console.Net452.Classic")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WireMock.Net.Console.Net452.Classic")]
-[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("668f689e-57b4-422e-8846-c0ff643ca268")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{668F689E-57B4-422E-8846-C0FF643CA268}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WireMock.Net.ConsoleApplication</RootNamespace>
-    <AssemblyName>WireMock.Net.ConsoleApplication</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>..\..\resources\WireMock.Net-Logo.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
-    </Reference>
-    <Reference Include="Handlebars, Version=2.1.6.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.6\lib\net451\Handlebars.dll</HintPath>
-    </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.3\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.3\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.17.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.17\lib\net45\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
-    </Reference>
-    <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="Stef.Validation, Version=0.1.1.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Stef.Validation.0.1.1\lib\net40\Stef.Validation.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomFileSystemFileHandler.cs" />
-    <Compile Include="MainApp.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-    <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="__admin\mappings\873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
-      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
-      <Name>WireMock.Net.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="log4net">
-      <Version>2.0.17</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
--- a/examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json
+++ b/examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json
@@ -1,21 +0,0 @@
-{
-    "Request": {
-        "Path": {
-            "Matchers": [
-                {
-                    "Name": "WildcardMatcher",
-                    "Pattern": "/static/mapping"
-                }
-            ]
-        },
-        "Methods": [
-            "get"
-        ]
-    },
-    "Response": {
-        "BodyAsJson": { "body": "static mapping" },
-        "Headers": {
-            "Content-Type": "application/json"
-        }
-    }
-}
--- a/examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json
+++ b/examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json
@@ -1,19 +0,0 @@
-{
-  "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
-  "Priority": 4,
-  "Request": {
-    "Path": {},
-    "Methods": [
-      "get"
-    ]
-  },
-  "Response": {
-    "StatusCode": 200,
-    "BodyDestination": "SameAsSource",
-    "Body": "NO PATH OR URL",
-    "UseTransformer": false,
-    "Headers": {
-      "Content-Type": "application/json"
-    }
-  }
-}
--- a/examples/WireMock.Net.Console.Net452.Classic/log4net.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/log4net.config
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
-  </configSections>
-  <appSettings>
-    <add key="log4net.Internal.Debug" value="true"/>
-  </appSettings>
-  <log4net>
-    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="ConsoleAppender" />
-    </root>
-  </log4net>
-</configuration>
--- a/examples/WireMock.Net.Console.Net452.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/packages.config
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AnyOf" version="0.3.0" targetFramework="net452" />
-  <package id="Handlebars.Net" version="2.1.6" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers" version="2.4.3" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.4.3" targetFramework="net452" />
-  <package id="log4net" version="2.0.17" targetFramework="net452" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
-  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
-  <package id="Stef.Validation" version="0.1.1" targetFramework="net452" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
-</packages>
--- a/examples/WireMock.Net.Console.Proxy.Net452/App.config
+++ b/examples/WireMock.Net.Console.Proxy.Net452/App.config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
-    </startup>
-</configuration>
--- a/examples/WireMock.Net.Console.Proxy.Net452/Program.cs
+++ b/examples/WireMock.Net.Console.Proxy.Net452/Program.cs
@@ -1,60 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Collections.Specialized;
-using System.Net.Http;
-using WireMock.Server;
-using WireMock.Settings;
-
-namespace WireMock.Net.Console.Proxy.Net452
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            string[] urls = { "http://localhost:9091/", "https://localhost:9443/" };
-            var server = WireMockServer.Start(new WireMockServerSettings
-            {
-                Urls = urls,
-                StartAdminInterface = true,
-                ReadStaticMappings = false,
-                ProxyAndRecordSettings = new ProxyAndRecordSettings
-                {
-                    Url = "http://postman-echo.com/post",
-                    //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
-                    SaveMapping = true,
-                    SaveMappingToFile = false,
-                    ExcludedHeaders = new[] { "dnt", "Content-Length" }
-                }
-            });
-
-            System.Console.WriteLine("Subscribing to LogEntriesChanged");
-            server.LogEntriesChanged += Server_LogEntriesChanged;
-
-            var uri = new Uri(urls[0]);
-            var form = new MultipartFormDataContent
-            {
-                { new StringContent("data"), "test", "test.txt" }
-            };
-            new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
-
-            System.Console.WriteLine("Unsubscribing to LogEntriesChanged");
-            server.LogEntriesChanged -= Server_LogEntriesChanged;
-
-            form = new MultipartFormDataContent
-            {
-                { new StringContent("data2"), "test2", "test2.txt" }
-            };
-            new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
-
-            System.Console.WriteLine("Press any key to stop the server");
-            System.Console.ReadKey();
-            server.Stop();
-        }
-
-        private static void Server_LogEntriesChanged(object sender, NotifyCollectionChangedEventArgs eventRecordArgs)
-        {
-            System.Console.WriteLine("Server_LogEntriesChanged : {0}", eventRecordArgs.NewItems.Count);
-        }
-    }
-}
--- a/examples/WireMock.Net.Console.Proxy.Net452/Properties/AssemblyInfo.cs
+++ b/examples/WireMock.Net.Console.Proxy.Net452/Properties/AssemblyInfo.cs
@@ -1,37 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("WireMock.Net.Console.Proxy.Net452")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WireMock.Net.Console.Proxy.Net452")]
-[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("26433a8f-bf01-4962-97eb-81bffbb61096")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj
+++ b/examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{26433A8F-BF01-4962-97EB-81BFFBB61096}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>WireMock.Net.Console.Proxy.Net452</RootNamespace>
-    <AssemblyName>WireMock.Net.Console.Proxy.Net452</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>WireMock.Net.Console.Proxy.Net452.Program</StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Condition="'$(Platform)' == 'x64'" Include="..\packages\Libuv.1.10.0\runtimes\win7-x64\native\libuv.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-      <Link>libuv.dll</Link>
-    </None>
-    <None Condition="'$(Platform)' == 'x86'" Include="..\packages\Libuv.1.10.0\runtimes\win7-x86\native\libuv.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-      <Link>libuv.dll</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
-    </Reference>
-    <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="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
--- a/examples/WireMock.Net.Console.Proxy.Net452/packages.config
+++ b/examples/WireMock.Net.Console.Proxy.Net452/packages.config
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
-</packages>
--- a/examples/WireMock.Net.ConsoleApp.UsingNuGet/Program.cs
+++ b/examples/WireMock.Net.ConsoleApp.UsingNuGet/Program.cs
@@ -0,0 +1,88 @@
+// Copyright © WireMock.Net
+
+using System.Net.Http.Headers;
+using System.Text;
+using WireMock.Matchers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+
+Directory.SetCurrentDirectory(Path.GetTempPath());
+
+using var server = WireMockServer.Start();
+
+var textPlainContent = "This is some plain text";
+var textPlainContentType = "text/plain";
+var textPlainContentTypeMatcher = new ContentTypeMatcher(textPlainContentType);
+var textPlainContentMatcher = new ExactMatcher(textPlainContent);
+var textPlainMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textPlainContentTypeMatcher, null, null, textPlainContentMatcher);
+
+var textJson = "{ \"Key\" : \"Value\" }";
+var textJsonContentType = "text/json";
+var textJsonContentTypeMatcher = new ContentTypeMatcher(textJsonContentType);
+var textJsonContentMatcher = new JsonMatcher(new { Key = "Value" }, true);
+var jsonMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textJsonContentTypeMatcher, null, null, textJsonContentMatcher);
+
+var imagePngBytes = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC");
+var imagePngContentMatcher = new ExactObjectMatcher(imagePngBytes);
+var imagePngMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, null, null, null, imagePngContentMatcher);
+
+var matchers = new IMatcher[]
+{
+    textPlainMatcher,
+    jsonMatcher,
+    imagePngMatcher
+};
+
+server
+    .Given(Request.Create()
+        .UsingPost()
+        .WithPath("/multipart")
+        .WithMultiPart(matchers)
+    )
+    .RespondWith(Response.Create()
+        .WithBodyAsJson(new
+        {
+            Method = "{{request.Method}}",
+            BodyAsMimeMessage = "{{request.BodyAsMimeMessage.TextBody}}"
+        })
+        .WithTransformer()
+    );
+
+server
+    .Given(Request.Create()
+        .UsingPost()
+        .WithPath("/multipart2")
+        .WithMultiPart(matchers)
+    )
+    .RespondWith(Response.Create()
+        .WithBody(request =>
+        {
+            if (request.BodyAsMimeMessage == null)
+            {
+                throw new InvalidProgramException("Not expected");
+            }
+            return "OK";
+        })
+        .WithTransformer()
+    );
+
+var formDataContent = new MultipartFormDataContent
+{
+    { new StringContent(textPlainContent, Encoding.UTF8, textPlainContentType), "text" },
+    { new StringContent(textJson, Encoding.UTF8, textJsonContentType), "json" }
+};
+
+var fileContent = new ByteArrayContent(imagePngBytes);
+fileContent.Headers.ContentType = new MediaTypeHeaderValue("image/png");
+formDataContent.Add(fileContent, "somefile", "image.png");
+
+var client = server.CreateClient();
+
+var response = await client.PostAsync("/multipart", formDataContent);
+var content = await response.Content.ReadAsStringAsync();
+Console.WriteLine(content);
+
+var response2 = await client.PostAsync("/multipart2", formDataContent);
+var content2 = await response2.Content.ReadAsStringAsync();
+Console.WriteLine(content2);
--- a/examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj
+++ b/examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="SonarAnalyzer.CSharp" Version="10.12.0.118525" />
+  </ItemGroup>
+
+  <!--<ItemGroup>
+    <PackageReference Include="WireMock.Net" Version="1.8.11" />
+  </ItemGroup>-->
+
+</Project>
--- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
+++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
@@ -113,20 +113,13 @@
    </None>
    <None Include="packages.config" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
-      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
-      <Name>WireMock.Net.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="log4net">
      <Version>3.0.3</Version>
    </PackageReference>
+    <PackageReference Include="WireMock.Net">
+      <Version>1.8.11</Version>
+    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/examples/WireMock.Net.TestcontainersExample/Program.cs
+++ b/examples/WireMock.Net.TestcontainersExample/Program.cs
@@ -159,9 +159,7 @@ internal class Program
    private static async Task TestWindowsCopyAsync()
    {
        var builder = new WireMockContainerBuilder()
-            .WithWatchStaticMappings(true)
-            .WithAutoRemove(true)
-            .WithCleanUp(true);
+            .WithWatchStaticMappings(true);

        var container = builder.Build();

@@ -186,8 +184,6 @@ internal class Program
        var mappings = await adminClient.GetMappingsAsync();
        Console.WriteLine("mappings = " + JsonConvert.SerializeObject(mappings, Formatting.Indented));

-        await Task.Delay(1_000);
-
        await container.StopAsync();
    }

@@ -205,9 +201,7 @@ internal class Program
            .WithNetwork(dummyNetwork)
            .WithAdminUserNameAndPassword("x", "y")
            .WithMappings(mappingsPath)
-            .WithWatchStaticMappings(true)
-            // .WithAutoRemove(true)
-            .WithCleanUp(true);
+            .WithWatchStaticMappings(true);

        if (image != null)
        {
--- a/resources/MyGet-Config.png
+++ b/resources/MyGet-Config.png
--- a/resources/MyGet-Use.png
+++ b/resources/MyGet-Use.png
--- a/resources/WireMock.Net-Logo.png
+++ b/resources/WireMock.Net-Logo.png
--- a/resources/WireMock.Net-LogoAspire.png
+++ b/resources/WireMock.Net-LogoAspire.png
--- a/resources/logo_32x32.png
+++ b/resources/logo_32x32.png
--- a/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateUpdateModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateUpdateModel.cs
@@ -0,0 +1,15 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Admin.Scenarios;
+
+/// <summary>
+/// ScenarioStateModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class ScenarioStateUpdateModel
+{
+    /// <summary>
+    /// Gets or sets the NextState.
+    /// </summary>
+    public string? State { get; set; }
+}
--- a/src/WireMock.Net.Abstractions/BuilderExtensions/RequestModelBuilder.cs
+++ b/src/WireMock.Net.Abstractions/BuilderExtensions/RequestModelBuilder.cs
@@ -138,4 +138,27 @@ public partial class RequestModelBuilder
            return builder.Build();
        });
    }
+
+    /// <summary>
+    /// WithHeader: matching based on name, pattern and matchBehaviour.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="rejectOnMatch">The match behaviour. Default value is <c>false</c>.</param>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder WithHeader(string name, string pattern, bool rejectOnMatch = false)
+    {
+        return WithHeaders(headersBuilder => headersBuilder
+            .Add(headerBuilder => headerBuilder
+                .WithName(name)
+                .WithMatchers(matchersBuilder => matchersBuilder
+                    .Add(matcherBuilder => matcherBuilder
+                        .WithName("WildcardMatcher")
+                        .WithPattern(pattern)
+                        .WithRejectOnMatch(rejectOnMatch)
+                    )
+                )
+            )
+        );
+    }
 }
--- a/src/WireMock.Net.Abstractions/IRequestMessage.cs
+++ b/src/WireMock.Net.Abstractions/IRequestMessage.cs
@@ -123,7 +123,7 @@ public interface IRequestMessage
    /// The original body as MimeMessage.
    /// Convenience getter for Handlebars and WireMockAssertions.
    /// </summary>
-    object? BodyAsMimeMessage { get; }
+    Models.Mime.IMimeMessageData? BodyAsMimeMessage { get; }
 #endif

    /// <summary>
--- a/src/WireMock.Net.Abstractions/Models/IBodyDataExtensions.cs
+++ b/src/WireMock.Net.Abstractions/Models/IBodyDataExtensions.cs
@@ -8,18 +8,8 @@ namespace WireMock.Util;
 // ReSharper disable once InconsistentNaming
 public static class IBodyDataExtensions
 {
-    public static BodyType GetBodyType(this IBodyData bodyData)
+    public static BodyType GetDetectedBodyType(this IBodyData bodyData)
    {
-        if (bodyData.DetectedBodyTypeFromContentType is not null and not BodyType.None)
-        {
-            return bodyData.DetectedBodyTypeFromContentType.Value;
-        }
-
-        if (bodyData.DetectedBodyType is not null and not BodyType.None)
-        {
-            return bodyData.DetectedBodyType.Value;
-        }
-
-        return BodyType.None;
+        return bodyData.DetectedBodyType ?? BodyType.None;
    }
 }
--- a/src/WireMock.Net.Abstractions/Models/Mime/IContentDispositionData.cs
+++ b/src/WireMock.Net.Abstractions/Models/Mime/IContentDispositionData.cs
@@ -0,0 +1,60 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// An interface exposing the public, readable properties of a ContentDisposition.
+/// </summary>
+public interface IContentDispositionData
+{
+    /// <summary>
+    /// Get the disposition.
+    /// </summary>
+    /// <value>The disposition.</value>
+    string Disposition { get; }
+
+    /// <summary>
+    /// Get a value indicating whether the <see cref="IMimeEntityData"/> is an attachment.
+    /// </summary>
+    /// <value><see langword="true" /> if the <see cref="IMimeEntityData"/> is an attachment; otherwise, <see langword="false" />.</value>
+    bool IsAttachment { get; }
+
+    /// <summary>
+    /// Get the list of parameters on the ContentDisposition.
+    /// </summary>
+    /// <value>The parameters.</value>
+    public IList<string> Parameters { get; }
+
+    /// <summary>
+    /// Get the name of the file.
+    /// </summary>
+    /// <value>The name of the file.</value>
+    string FileName { get; }
+
+    /// <summary>
+    /// Get the creation-date parameter.
+    /// </summary>
+    /// <value>The creation date.</value>
+    DateTimeOffset? CreationDate { get; }
+
+    /// <summary>
+    /// Get the modification-date parameter.
+    /// </summary>
+    /// <value>The modification date.</value>
+    DateTimeOffset? ModificationDate { get; }
+
+    /// <summary>
+    /// Get the read-date parameter.
+    /// </summary>
+    /// <value>The read date.</value>
+    DateTimeOffset? ReadDate { get; }
+
+    /// <summary>
+    /// Get the size parameter.
+    /// </summary>
+    /// <value>The size.</value>
+    long? Size { get; }
+}
--- a/src/WireMock.Net.Abstractions/Models/Mime/IContentTypeData.cs
+++ b/src/WireMock.Net.Abstractions/Models/Mime/IContentTypeData.cs
@@ -0,0 +1,67 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Text;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// An interface exposing the public, readable properties of a ContentType
+/// with complex types simplified to a generic object.
+/// </summary>
+public interface IContentTypeData
+{
+    /// <summary>
+    /// Get the type of the media.
+    /// </summary>
+    /// <value>The type of the media.</value>
+    string MediaType { get; }
+
+    /// <summary>
+    /// Get the media subtype.
+    /// </summary>
+    /// <value>The media subtype.</value>
+    string MediaSubtype { get; }
+
+    /// <summary>
+    /// Get the list of parameters on the ContentType.
+    /// </summary>
+    /// <value>The parameters.</value>
+    IList<string> Parameters { get; }
+
+    /// <summary>
+    /// Get the boundary parameter.
+    /// </summary>
+    /// <value>The boundary.</value>
+    string Boundary { get; }
+
+    /// <summary>
+    /// Get the charset parameter.
+    /// </summary>
+    /// <value>The charset.</value>
+    string Charset { get; }
+
+    /// <summary>
+    /// Get the charset parameter as an Encoding.
+    /// </summary>
+    /// <value>The charset encoding.</value>
+    Encoding CharsetEncoding { get; }
+
+    /// <summary>
+    /// Get the format parameter.
+    /// </summary>
+    /// <value>The format.</value>
+    string Format { get; }
+
+    /// <summary>
+    /// Get the simple mime-type.
+    /// </summary>
+    /// <value>The mime-type.</value>
+    string MimeType { get; }
+
+    /// <summary>
+    /// Get the name parameter.
+    /// </summary>
+    /// <value>The name.</value>
+    string Name { get; }
+}
--- a/src/WireMock.Net.Abstractions/Models/Mime/IMimeEntityData.cs
+++ b/src/WireMock.Net.Abstractions/Models/Mime/IMimeEntityData.cs
@@ -0,0 +1,54 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// A simplified interface exposing the public, readable properties of MimeEntity.
+/// </summary>
+public interface IMimeEntityData
+{
+    /// <summary>
+    /// Get the list of headers.
+    /// </summary>
+    /// <value>The list of headers.</value>
+    IList<string> Headers { get; }
+
+    /// <summary>
+    /// Get the content disposition.
+    /// </summary>
+    /// <value>The content disposition.</value>
+    IContentDispositionData? ContentDisposition { get; }
+
+    /// <summary>
+    /// Get the type of the content.
+    /// </summary>
+    /// <value>The type of the content.</value>
+    IContentTypeData? ContentType { get; }
+
+    /// <summary>
+    /// Get the base content URI.
+    /// </summary>
+    /// <value>The base content URI or <see langword="null"/>.</value>
+    Uri ContentBase { get; }
+
+    /// <summary>
+    /// Get the content location.
+    /// </summary>
+    /// <value>The content location or <see langword="null"/>.</value>
+    Uri ContentLocation { get; }
+
+    /// <summary>
+    /// Get the Content-Id.
+    /// </summary>
+    /// <value>The content identifier.</value>
+    string ContentId { get; }
+
+    /// <summary>
+    /// Get a value indicating whether this <see cref="IMimeEntityData"/> is an attachment.
+    /// </summary>
+    /// <value><see langword="true" /> if this <see cref="IMimeEntityData"/> is an attachment; otherwise, <see langword="false" />.</value>
+    bool IsAttachment { get; }
+}
--- a/src/WireMock.Net.Abstractions/Models/Mime/IMimeMessageData.cs
+++ b/src/WireMock.Net.Abstractions/Models/Mime/IMimeMessageData.cs
@@ -0,0 +1,186 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// A simplified interface exposing the public, readable properties of a MIME message.
+/// </summary>
+public interface IMimeMessageData
+{
+    /// <summary>
+    /// Get the list of headers.
+    /// </summary>
+    /// <value>The list of headers.</value>
+    IList<string> Headers { get; }
+
+    /// <summary>
+    /// Get the value of the Importance header.
+    /// </summary>
+    /// <value>The importance, as an integer.</value>
+    int Importance { get; }
+
+    /// <summary>
+    /// Get the value of the Priority header.
+    /// </summary>
+    /// <value>The priority, as an integer.</value>
+    int Priority { get; }
+
+    /// <summary>
+    /// Get the value of the X-Priority header.
+    /// </summary>
+    /// <value>The X-priority, as an integer.</value>
+    int XPriority { get; }
+
+    /// <summary>
+    /// Get the address in the Sender header.
+    /// </summary>
+    /// <value>The address in the Sender header.</value>
+    string Sender { get; }
+
+    /// <summary>
+    /// Get the address in the Resent-Sender header.
+    /// </summary>
+    /// <value>The address in the Resent-Sender header.</value>
+    string ResentSender { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the From header.
+    /// </summary>
+    /// <value>The list of addresses in the From header.</value>
+    IList<string> From { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-From header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-From header.</value>
+    IList<string> ResentFrom { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Reply-To header.
+    /// </summary>
+    /// <value>The list of addresses in the Reply-To header.</value>
+    IList<string> ReplyTo { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-Reply-To header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-Reply-To header.</value>
+    IList<string> ResentReplyTo { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the To header.
+    /// </summary>
+    /// <value>The list of addresses in the To header.</value>
+    IList<string> To { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-To header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-To header.</value>
+    IList<string> ResentTo { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Cc header.
+    /// </summary>
+    /// <value>The list of addresses in the Cc header.</value>
+    IList<string> Cc { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-Cc header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-Cc header.</value>
+    IList<string> ResentCc { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Bcc header.
+    /// </summary>
+    /// <value>The list of addresses in the Bcc header.</value>
+    IList<string> Bcc { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-Bcc header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-Bcc header.</value>
+    IList<string> ResentBcc { get; }
+        
+    /// <summary>
+    /// Get the subject of the message.
+    /// </summary>
+    /// <value>The subject of the message.</value>
+    string Subject { get; }
+
+    /// <summary>
+    /// Get the date of the message.
+    /// </summary>
+    /// <value>The date of the message.</value>
+    DateTimeOffset Date { get; }
+
+    /// <summary>
+    /// Get the Resent-Date of the message.
+    /// </summary>
+    /// <value>The Resent-Date of the message.</value>
+    DateTimeOffset ResentDate { get; }
+
+    /// <summary>
+    /// Get the list of references to other messages.
+    /// </summary>
+    /// <value>The references.</value>
+    IList<string> References { get; }
+
+    /// <summary>
+    /// Get the Message-Id that this message is replying to.
+    /// </summary>
+    /// <value>The message id that this message is in reply to.</value>
+    string InReplyTo { get; }
+
+    /// <summary>
+    /// Get the message identifier.
+    /// </summary>
+    /// <value>The message identifier.</value>
+    string MessageId { get; }
+
+    /// <summary>
+    /// Get the Resent-Message-Id header.
+    /// </summary>
+    /// <value>The Resent-Message-Id.</value>
+    string ResentMessageId { get; }
+
+    /// <summary>
+    /// Get the MIME-Version.
+    /// </summary>
+    /// <value>The MIME version.</value>
+    Version MimeVersion { get; }
+
+    /// <summary>
+    /// Get the body of the message.
+    /// </summary>
+    /// <value>The body of the message.</value>
+    IMimeEntityData Body { get; }
+
+    /// <summary>
+    /// Get the text body of the message if it exists.
+    /// </summary>
+    /// <value>The text body if it exists; otherwise, <see langword="null"/>.</value>
+    string TextBody { get; }
+
+    /// <summary>
+    /// Get the html body of the message if it exists.
+    /// </summary>
+    /// <value>The html body if it exists; otherwise, <see langword="null"/>.</value>
+    string HtmlBody { get; }
+
+    /// <summary>
+    /// Get the body parts of the message.
+    /// </summary>
+    /// <value>The body parts.</value>
+    IList<IMimePartData> BodyParts { get; }
+
+    /// <summary>
+    /// Get the attachments.
+    /// </summary>
+    /// <value>The attachments.</value>
+    IList<IMimeEntityData> Attachments { get; }
+}
--- a/src/WireMock.Net.Abstractions/Models/Mime/IMimePartData.cs
+++ b/src/WireMock.Net.Abstractions/Models/Mime/IMimePartData.cs
@@ -0,0 +1,57 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// A simplified interface exposing the public, readable properties of MimePart.
+/// </summary>
+public interface IMimePartData : IMimeEntityData
+{
+    /// <summary>
+    /// Get the description of the content if available.
+    /// </summary>
+    /// <value>The description of the content.</value>
+    string ContentDescription { get; }
+
+    /// <summary>
+    /// Get the duration of the content if available.
+    /// </summary>
+    /// <value>The duration of the content.</value>
+    int? ContentDuration { get; }
+
+    /// <summary>
+    /// Get the md5sum of the content.
+    /// </summary>
+    /// <value>The md5sum of the content.</value>
+    string ContentMd5 { get; }
+
+    /// <summary>
+    /// Get the content transfer encoding.
+    /// </summary>
+    /// <value>The content transfer encoding as a string.</value>
+    string ContentTransferEncoding { get; }
+
+    /// <summary>
+    /// Get the name of the file.
+    /// </summary>
+    /// <value>The name of the file.</value>
+    string FileName { get; }
+
+    /// <summary>
+    /// Get the MIME content.
+    /// </summary>
+    /// <value>The MIME content.</value>
+    IDictionary<string, object?> Content { get; }
+
+    /// <summary>
+    /// Open the decoded content stream.
+    /// </summary>
+    /// <remarks>
+    /// Provides a means of reading the decoded content without having to first write it to another stream.
+    /// </remarks>
+    /// <returns>The decoded content stream.</returns>
+    Stream Open();
+}
--- a/src/WireMock.Net.Abstractions/Models/StringPattern.cs
+++ b/src/WireMock.Net.Abstractions/Models/StringPattern.cs
--- a/src/WireMock.Net.Abstractions/Properties/AssemblyInfo.cs
+++ b/src/WireMock.Net.Abstractions/Properties/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+// Copyright © WireMock.Net
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
+
+// Needed for Moq in the UnitTest project
+[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")] 
--- a/src/WireMock.Net.Abstractions/Server/IWireMockServer.cs
+++ b/src/WireMock.Net.Abstractions/Server/IWireMockServer.cs
@@ -161,6 +161,11 @@ public interface IWireMockServer : IDisposable
    /// </summary>
    bool ResetScenario(string name);

+    /// <summary>
+    /// Sets a scenario to a state.
+    /// </summary>
+    bool SetScenarioState(string name, string? state);
+
    /// <summary>
    /// Resets the LogEntries.
    /// </summary>
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <Description>Commonly used models, enumerations and types.</Description>
+        <Description>Commonly used interfaces, models, enumerations and types.</Description>
        <AssemblyTitle>WireMock.Net.Abstractions</AssemblyTitle>
        <Authors>Stef Heyenrath</Authors>
        <TargetFrameworks>net45;net451;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
@@ -17,7 +17,6 @@
        <EmbedUntrackedSources>true</EmbedUntrackedSources>
        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
        <SignAssembly>true</SignAssembly>
        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
        <!--<DelaySign>true</DelaySign>-->
@@ -25,6 +24,10 @@
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
    </PropertyGroup>

+    <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    </PropertyGroup>
+
    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
        <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -35,37 +38,46 @@
    </PropertyGroup>

    <ItemGroup>
+        <!-- CVE-2018-8292 -->
+        <PackageReference Include="System.Net.Http " Version="4.3.4" />
+
        <!-- See also https://mstack.nl/blog/20210801-source-generators -->
        <PackageReference Include="FluentBuilder" Version="0.10.0">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-
-        <PackageReference Include="PolySharp" Version="1.14.1">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PackageReference Include="PolySharp" Version="1.15.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-
-        <!-- CVE-2018-8292 -->
-        <PackageReference Include="System.Net.Http " Version="4.3.4" />
+        <!--<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Stef.Validation" Version="0.1.1" />
+        <PackageReference Include="AnyOf" Version="0.4.0" />-->
    </ItemGroup>

    <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) and '$(TargetFramework)' != 'netstandard1.0'">
      <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
    </ItemGroup>

-    <ItemGroup Condition="'$(TargetFramework)' == 'net461'">
-        <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net46" Version="1.0.2">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-
-    <ItemGroup>
+    <!--<ItemGroup>
        <PackageReference Include="Nullable" Version="1.3.1">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
+    </ItemGroup>-->
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net461'">
+        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+
+        <!--<PackageReference Include="Nullable" Version="1.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>-->
+
+        <!--<PackageReference Include="PolySharp" Version="1.14.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>-->
    </ItemGroup>

 </Project>
--- a/src/WireMock.Net.AspNetCore.Middleware/WireMock.Net.AspNetCore.Middleware.csproj
+++ b/src/WireMock.Net.AspNetCore.Middleware/WireMock.Net.AspNetCore.Middleware.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
        <ImplicitUsings>enable</ImplicitUsings>
@@ -16,7 +16,6 @@
        <EmbedUntrackedSources>true</EmbedUntrackedSources>
        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
        <SignAssembly>true</SignAssembly>
        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
@@ -25,6 +24,10 @@
        <ApplicationIcon>../../resources/WireMock.Net-LogoAspire.ico</ApplicationIcon>
    </PropertyGroup>

+    <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    </PropertyGroup>
+
    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    </PropertyGroup>
@@ -39,7 +42,7 @@
    </ItemGroup>

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

 </Project>
--- a/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
+++ b/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
        <ImplicitUsings>enable</ImplicitUsings>
@@ -16,7 +16,6 @@
        <EmbedUntrackedSources>true</EmbedUntrackedSources>
        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
        <SignAssembly>true</SignAssembly>
        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
@@ -31,9 +30,13 @@
    </ItemGroup>

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

+    <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    </PropertyGroup>
+
    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    </PropertyGroup>
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockReceivedAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockReceivedAssertions.cs
@@ -1,6 +1,6 @@
 // Copyright © WireMock.Net

-using FluentAssertions.Primitives;
+using AwesomeAssertions.Primitives;
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
--- a/src/WireMock.Net.AwesomeAssertions/Usings.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Usings.cs
@@ -1,5 +1,5 @@
 // Copyright © WireMock.Net

 global using System.Linq;
-global using FluentAssertions;
-global using FluentAssertions.Execution;
+global using AwesomeAssertions;
+global using AwesomeAssertions.Execution;
--- a/src/WireMock.Net.AwesomeAssertions/WireMock.Net.AwesomeAssertions.csproj
+++ b/src/WireMock.Net.AwesomeAssertions/WireMock.Net.AwesomeAssertions.csproj
@@ -16,7 +16,6 @@
        <EmbedUntrackedSources>true</EmbedUntrackedSources>
        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
        <SignAssembly>true</SignAssembly>
        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
        <!--<DelaySign>true</DelaySign>-->
@@ -24,16 +23,20 @@
        <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>
-        <PackageReference Include="AwesomeAssertions" Version="8.1.0" />
+        <PackageReference Include="AwesomeAssertions" Version="9.0.0" />
    </ItemGroup>

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

 </Project>
--- a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
+++ b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
        <Description>FluentAssertions extensions for WireMock.Net</Description>
@@ -16,7 +16,6 @@
        <EmbedUntrackedSources>true</EmbedUntrackedSources>
        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
        <SignAssembly>true</SignAssembly>
        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
        <!--<DelaySign>true</DelaySign>-->
@@ -24,6 +23,10 @@
        <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>
@@ -37,7 +40,7 @@
    </ItemGroup>

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

 </Project>
--- a/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
+++ b/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
@@ -18,20 +18,20 @@ namespace WireMock.Matchers;
 /// CSharpCode / CS-Script Matcher
 /// </summary>
 /// <inheritdoc cref="ICSharpCodeMatcher"/>
-internal class CSharpCodeMatcher : ICSharpCodeMatcher
+public class CSharpCodeMatcher : ICSharpCodeMatcher
 {
    private const string TemplateForIsMatchWithString = "public class CodeHelper {{ public bool IsMatch(string it) {{ {0} }} }}";

    private const string TemplateForIsMatchWithDynamic = "public class CodeHelper {{ public bool IsMatch(dynamic it) {{ {0} }} }}";

    private readonly string[] _usings =
-    {
+    [
        "System",
        "System.Linq",
        "System.Collections.Generic",
        "Microsoft.CSharp",
        "Newtonsoft.Json.Linq"
-    };
+    ];

    /// <inheritdoc />
    public MatchBehaviour MatchBehaviour { get; }
@@ -63,17 +63,24 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
        Value = patterns;
    }

-    public MatchResult IsMatch(string? input)
+    /// <inheritdoc />
+    public MatchResult IsMatch(string? input) => IsMatchInternal(input);
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(object? input) => IsMatchInternal(input);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
    {
-        return IsMatchInternal(input);
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
    }

-    public MatchResult IsMatch(object? input)
-    {
-        return IsMatchInternal(input);
-    }
-
-    public MatchResult IsMatchInternal(object? input)
+    private MatchResult IsMatchInternal(object? input)
    {
        var score = MatchScores.Mismatch;
        Exception? exception = null;
@@ -93,17 +100,6 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
    }

-    /// <inheritdoc />
-    public string GetCSharpCodeArguments()
-    {
-        return $"new {Name}" +
-               $"(" +
-               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
-               $")";
-    }
-
    private bool IsMatch(dynamic input, string pattern)
    {
        var isMatchWithString = input is string;
--- a/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
+++ b/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
@@ -1,49 +1,52 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <Description>A CSharpCodeMatcher which can be used to match WireMock.Net Requests using C# code.</Description>
-    <AssemblyTitle>WireMock.Net.Matchers.CSharpCode</AssemblyTitle>
-    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <PackageTags>wiremock;matchers;matcher;csharp;csharpcode</PackageTags>
-    <RootNamespace>WireMock</RootNamespace>
-    <ProjectGuid>{B6269AAC-170A-4346-8B9A-444DED3D9A44}</ProjectGuid>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
-    <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>
+        <Description>A CSharpCodeMatcher which can be used to match WireMock.Net Requests using C# code.</Description>
+        <AssemblyTitle>WireMock.Net.Matchers.CSharpCode</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>wiremock;matchers;matcher;csharp;csharpcode</PackageTags>
+        <RootNamespace>WireMock</RootNamespace>
+        <ProjectGuid>{B6269AAC-170A-4346-8B9A-444DED3D9A44}</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)' == 'Release' ">
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    </PropertyGroup>

-  <!-- https://github.com/aspnet/RoslynCodeDomProvider/issues/51 -->
-  <!-- This is needed else we cannot build net452 in Azure DevOps Pipeline -->
-  <Target Name="CheckIfShouldKillVBCSCompiler" />
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
-  </ItemGroup>
+    <!-- https://github.com/aspnet/RoslynCodeDomProvider/issues/51 -->
+    <!-- This is needed else we cannot build net452 in Azure DevOps Pipeline -->
+    <Target Name="CheckIfShouldKillVBCSCompiler" />

-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
-    <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Minimal\WireMock.Net.Minimal.csproj" />
+    </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' or '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="CS-Script" Version="3.30.3" />
-  </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
+        <PackageReference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
+    </ItemGroup>

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

 </Project>
--- a/src/WireMock.Net.MimePart/ILRepack.targets
+++ b/src/WireMock.Net.MimePart/ILRepack.targets
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8" ?>
+
+<!-- See also https://github.com/ravibpatel/ILRepack.Lib.MSBuild.Task/issues/26 -->
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+    <Target Name="ILRepacker" AfterTargets="Build" Condition="'$(Configuration)' == 'Release'">
+        <ItemGroup>
+            <InputAssemblies Include="$(OutputPath)WireMock.Net.MimePart.dll" />
+            <InputAssemblies Include="@(ReferencePathWithRefAssemblies)" Condition="'%(filename)' == 'MimeKitLite'" />
+            <LibraryPath Include="%(ReferencePathWithRefAssemblies.RelativeDir)" />
+        </ItemGroup>
+    
+        <ItemGroup>
+            <DoNotInternalizeAssemblies Include="WireMock.Net.MimePart" />
+        </ItemGroup>
+    
+        <ILRepack
+            Parallel="true"
+            Internalize="true"
+            RenameInternalized="true"
+            InternalizeExclude="@(DoNotInternalizeAssemblies)"
+            InputAssemblies="@(InputAssemblies)"
+            LibraryPath="@(LibraryPath)"
+            TargetKind="Dll"
+            KeyFile="../../src/WireMock.Net/WireMock.Net.snk"
+            OutputFile="$(OutputPath)$(AssemblyName).dll"
+        />
+    </Target>
+</Project>
--- a/src/WireMock.Net.MimePart/Matchers/MimePartMatcher.cs
+++ b/src/WireMock.Net.MimePart/Matchers/MimePartMatcher.cs
@@ -1,12 +1,8 @@
 // Copyright © WireMock.Net

-#if MIMEKIT
 using System;
-using MimeKit;
-using WireMock.Extensions;
-using WireMock.Matchers;
 using WireMock.Matchers.Helpers;
-using WireMock.Models;
+using WireMock.Models.Mime;
 using WireMock.Util;

 namespace WireMock.Matchers;
@@ -14,31 +10,23 @@ namespace WireMock.Matchers;
 /// <summary>
 /// MimePartMatcher
 /// </summary>
-public class MimePartMatcher : IMatcher
+public class MimePartMatcher : IMimePartMatcher
 {
-    private readonly Func<MimePart, MatchResult>[] _funcs;
+    private readonly Func<IMimePartData, MatchResult>[] _funcs;

    /// <inheritdoc />
    public string Name => nameof(MimePartMatcher);

-    /// <summary>
-    /// ContentType Matcher (image/png; name=image.png.)
-    /// </summary>
+    /// <inheritdoc />
    public IStringMatcher? ContentTypeMatcher { get; }

-    /// <summary>
-    /// ContentDisposition Matcher (attachment; filename=image.png)
-    /// </summary>
+    /// <inheritdoc />
    public IStringMatcher? ContentDispositionMatcher { get; }

-    /// <summary>
-    /// ContentTransferEncoding Matcher (base64)
-    /// </summary>
+    /// <inheritdoc />
    public IStringMatcher? ContentTransferEncodingMatcher { get; }

-    /// <summary>
-    /// Content Matcher
-    /// </summary>
+    /// <inheritdoc />
    public IMatcher? ContentMatcher { get; }

    /// <inheritdoc />
@@ -64,25 +52,21 @@ public class MimePartMatcher : IMatcher
        _funcs =
        [
            mp => ContentTypeMatcher?.IsMatch(GetContentTypeAsString(mp.ContentType)) ?? MatchScores.Perfect,
-            mp => ContentDispositionMatcher?.IsMatch(mp.ContentDisposition.ToString().Replace("Content-Disposition: ", string.Empty)) ?? MatchScores.Perfect,
-            mp => ContentTransferEncodingMatcher?.IsMatch(mp.ContentTransferEncoding.ToString().ToLowerInvariant()) ?? MatchScores.Perfect,
+            mp => ContentDispositionMatcher?.IsMatch(mp.ContentDisposition?.ToString()?.Replace("Content-Disposition: ", string.Empty)) ?? MatchScores.Perfect,
+            mp => ContentTransferEncodingMatcher?.IsMatch(mp.ContentTransferEncoding.ToLowerInvariant()) ?? MatchScores.Perfect,
            MatchOnContent
        ];
    }

-    /// <summary>
-    /// Determines whether the specified MimePart is match.
-    /// </summary>
-    /// <param name="mimePart">The MimePart.</param>
-    /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
-    public MatchResult IsMatch(MimePart mimePart)
+    /// <inheritdoc />
+    public MatchResult IsMatch(IMimePartData value)
    {
        var score = MatchScores.Mismatch;
        Exception? exception = null;

        try
        {
-            if (Array.TrueForAll(_funcs, func => func(mimePart).IsPerfect()))
+            if (Array.TrueForAll(_funcs, func => func(value).IsPerfect()))
            {
                score = MatchScores.Perfect;
            }
@@ -101,7 +85,7 @@ public class MimePartMatcher : IMatcher
        return "NotImplemented";
    }

-    private MatchResult MatchOnContent(MimePart mimePart)
+    private MatchResult MatchOnContent(IMimePartData mimePart)
    {
        if (ContentMatcher == null)
        {
@@ -110,10 +94,10 @@ public class MimePartMatcher : IMatcher

        var bodyParserSettings = new BodyParserSettings
        {
-            Stream = mimePart.Content.Open(),
+            Stream = mimePart.Open(),
            ContentType = GetContentTypeAsString(mimePart.ContentType),
            DeserializeJson = true,
-            ContentEncoding = null, // mimePart.ContentType.CharsetEncoding.ToString(),
+            ContentEncoding = null, // mimePart.ContentType?.CharsetEncoding.ToString(),
            DecompressGZipAndDeflate = true
        };

@@ -121,9 +105,8 @@ public class MimePartMatcher : IMatcher
        return BodyDataMatchScoreCalculator.CalculateMatchScore(bodyData, ContentMatcher);
    }

-    private static string? GetContentTypeAsString(ContentType? contentType)
+    private static string? GetContentTypeAsString(IContentTypeData? contentType)
    {
-        return contentType?.ToString().Replace("Content-Type: ", string.Empty);
+        return contentType?.ToString()?.Replace("Content-Type: ", string.Empty);
    }
-}
-#endif
+}
--- a/src/WireMock.Net.MimePart/Models/ContentDispositionDataWrapper.cs
+++ b/src/WireMock.Net.MimePart/Models/ContentDispositionDataWrapper.cs
@@ -0,0 +1,63 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the IContentDispositionData interface
+/// by wrapping a ContentDisposition object.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of a ContentDisposition.
+/// </remarks>
+public class ContentDispositionDataWrapper : IContentDispositionData
+{
+    private readonly ContentDisposition _contentDisposition;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentDispositionDataWrapper"/> class.
+    /// </summary>
+    /// <param name="contentDisposition">The ContentDisposition to wrap.</param>
+    public ContentDispositionDataWrapper(ContentDisposition contentDisposition)
+    {
+        _contentDisposition = Guard.NotNull(contentDisposition);
+
+        Parameters = _contentDisposition.Parameters.Select(p => p.ToString()).ToList();
+    }
+
+    /// <inheritdoc/>
+    public string Disposition => _contentDisposition.Disposition;
+
+    /// <inheritdoc/>
+    public bool IsAttachment => _contentDisposition.IsAttachment;
+
+    /// <inheritdoc/>
+    public IList<string> Parameters { get; private set; }
+
+    /// <inheritdoc/>
+    public string FileName => _contentDisposition.FileName;
+
+    /// <inheritdoc/>
+    public DateTimeOffset? CreationDate => _contentDisposition.CreationDate;
+
+    /// <inheritdoc/>
+    public DateTimeOffset? ModificationDate => _contentDisposition.ModificationDate;
+
+    /// <inheritdoc/>
+    public DateTimeOffset? ReadDate => _contentDisposition.ReadDate;
+
+    /// <inheritdoc/>
+    public long? Size => _contentDisposition.Size;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _contentDisposition.ToString();
+    }
+}
--- a/src/WireMock.Net.MimePart/Models/ContentTypeDataWrapper.cs
+++ b/src/WireMock.Net.MimePart/Models/ContentTypeDataWrapper.cs
@@ -0,0 +1,65 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IContentTypeData"/> interface by wrapping a <see cref="ContentType"/> object.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of a <see cref="ContentType"/>.
+/// </remarks>
+public class ContentTypeDataWrapper : IContentTypeData
+{
+    private readonly ContentType _contentType;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentTypeDataWrapper"/> class.
+    /// </summary>
+    /// <param name="contentType">The ContentType to wrap.</param>
+    public ContentTypeDataWrapper(ContentType contentType)
+    {
+        _contentType = Guard.NotNull(contentType);
+
+        Parameters = _contentType.Parameters.Select(p => p.ToString()).ToList();
+    }
+
+    /// <inheritdoc/>
+    public string MediaType => _contentType.MediaType;
+
+    /// <inheritdoc/>
+    public string MediaSubtype => _contentType.MediaSubtype;
+
+    /// <inheritdoc/>
+    public IList<string> Parameters { get; private set; }
+
+    /// <inheritdoc/>
+    public string Boundary => _contentType.Boundary;
+
+    /// <inheritdoc/>
+    public string Charset => _contentType.Charset;
+
+    /// <inheritdoc/>
+    public Encoding CharsetEncoding => _contentType.CharsetEncoding;
+
+    /// <inheritdoc/>
+    public string Format => _contentType.Format;
+
+    /// <inheritdoc/>
+    public string MimeType => _contentType.MimeType;
+
+    /// <inheritdoc/>
+    public string Name => _contentType.Name;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _contentType.ToString();
+    }
+}
--- a/src/WireMock.Net.MimePart/Models/MimeEntityDataWrapper.cs
+++ b/src/WireMock.Net.MimePart/Models/MimeEntityDataWrapper.cs
@@ -0,0 +1,61 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IMimeEntityData" /> interface by wrapping an <see cref="IMimeEntity" /> interface.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of an <see cref="IMimeEntity"/>.
+/// </remarks>
+public class MimeEntityDataWrapper : IMimeEntityData
+{
+    private readonly IMimeEntity _entity;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MimeEntityDataWrapper"/> class.
+    /// </summary>
+    /// <param name="entity">The MIME entity to wrap.</param>
+    public MimeEntityDataWrapper(IMimeEntity entity)
+    {
+        _entity = Guard.NotNull(entity);
+
+        ContentDisposition = _entity.ContentDisposition != null ? new ContentDispositionDataWrapper(_entity.ContentDisposition) : null;
+        ContentType = _entity.ContentType != null ? new ContentTypeDataWrapper(_entity.ContentType) : null;
+        Headers = _entity.Headers.Select(h => h.ToString()).ToList();
+    }
+
+    /// <inheritdoc/>
+    public IList<string> Headers { get; private set; }
+
+    /// <inheritdoc/>
+    public IContentDispositionData? ContentDisposition { get; private set; }
+
+    /// <inheritdoc/>
+    public IContentTypeData? ContentType { get; private set; }
+
+    /// <inheritdoc/>
+    public Uri ContentBase => _entity.ContentBase;
+
+    /// <inheritdoc/>
+    public Uri ContentLocation => _entity.ContentLocation;
+
+    /// <inheritdoc/>
+    public string ContentId => _entity.ContentId;
+
+    /// <inheritdoc/>
+    public bool IsAttachment => _entity.IsAttachment;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _entity.ToString()!;
+    }
+}
--- a/src/WireMock.Net.MimePart/Models/MimeMessageDataWrapper.cs
+++ b/src/WireMock.Net.MimePart/Models/MimeMessageDataWrapper.cs
@@ -0,0 +1,140 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IMimeMessageData" /> interface by wrapping an <see cref="IMimeMessage" /> interface.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of an <see cref="IMimeMessage"/>.
+/// </remarks>
+internal class MimeMessageDataWrapper : IMimeMessageData
+{
+    private readonly IMimeMessage _message;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MimeMessageDataWrapper"/> class.
+    /// </summary>
+    /// <param name="message">The MIME message to wrap.</param>
+    public MimeMessageDataWrapper(IMimeMessage message)
+    {
+        _message = Guard.NotNull(message);
+
+        Bcc = _message.Bcc.Select(h => h.ToString()).ToList();
+        Cc = _message.Cc.Select(h => h.ToString()).ToList();
+        From = _message.From.Select(h => h.ToString()).ToList();
+        Headers = _message.Headers.Select(h => h.ToString()).ToList();
+        References = _message.References.ToList();
+        ReplyTo = _message.ReplyTo.Select(h => h.ToString()).ToList();
+        ResentBcc = _message.ResentBcc.Select(h => h.ToString()).ToList();
+        ResentCc = _message.ResentCc.Select(h => h.ToString()).ToList();
+        ResentFrom = _message.ResentFrom.Select(h => h.ToString()).ToList();
+        ResentReplyTo = _message.ResentReplyTo.Select(h => h.ToString()).ToList();
+        ResentTo = _message.ResentTo.Select(h => h.ToString()).ToList();
+        To = _message.To.Select(h => h.ToString()).ToList();
+
+        Body = new MimeEntityDataWrapper(_message.Body);
+        BodyParts = _message.BodyParts.OfType<MimePart>().Select(mp => new MimePartDataWrapper(mp)).ToList<IMimePartData>();
+        Attachments = _message.Attachments.Select(me => new MimeEntityDataWrapper(me)).ToList<IMimeEntityData>();
+    }
+
+    /// <inheritdoc/>
+    public IList<string> Headers { get; private set; }
+
+    /// <inheritdoc/>
+    public int Importance => (int)_message.Importance;
+
+    /// <inheritdoc/>
+    public int Priority => (int)_message.Priority;
+
+    /// <inheritdoc/>
+    public int XPriority => (int)_message.XPriority;
+
+    /// <inheritdoc/>
+    public string Sender => _message.Sender.Address;
+
+    /// <inheritdoc/>
+    public string ResentSender => _message.ResentSender.ToString();
+
+    /// <inheritdoc/>
+    public IList<string> From { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentFrom { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ReplyTo { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentReplyTo { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> To { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentTo { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> Cc { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentCc { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> Bcc { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentBcc { get; private set; }
+
+    /// <inheritdoc/>
+    public string Subject => _message.Subject;
+
+    /// <inheritdoc/>
+    public DateTimeOffset Date => _message.Date;
+
+    /// <inheritdoc/>
+    public DateTimeOffset ResentDate => _message.ResentDate;
+
+    /// <inheritdoc/>
+    public IList<string> References { get; private set; }
+
+    /// <inheritdoc/>
+    public string InReplyTo => _message.InReplyTo;
+
+    /// <inheritdoc/>
+    public string MessageId => _message.MessageId;
+
+    /// <inheritdoc/>
+    public string ResentMessageId => _message.ResentMessageId;
+
+    /// <inheritdoc/>
+    public Version MimeVersion => _message.MimeVersion;
+
+    /// <inheritdoc/>
+    public IMimeEntityData Body { get; private set; }
+
+    /// <inheritdoc/>
+    public string TextBody => _message.TextBody;
+
+    /// <inheritdoc/>
+    public string HtmlBody => _message.HtmlBody;
+
+    /// <inheritdoc/>
+    public IList<IMimePartData> BodyParts { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<IMimeEntityData> Attachments { get; private set; }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _message.ToString();
+    }
+}
--- a/src/WireMock.Net.MimePart/Models/MimePartDataWrapper.cs
+++ b/src/WireMock.Net.MimePart/Models/MimePartDataWrapper.cs
@@ -0,0 +1,64 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.IO;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IMimePartData" /> interface by wrapping an <see cref="IMimePart"/> interface.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of an <see cref="IMimePart"/>.
+/// </remarks>
+public class MimePartDataWrapper : MimeEntityDataWrapper, IMimePartData
+{
+    private readonly IMimePart _part;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MimePartDataWrapper"/> class.
+    /// </summary>
+    /// <param name="part">The MIME part to wrap.</param>
+    /// <exception cref="System.ArgumentNullException">
+    /// <paramref name="part"/> is <see langword="null"/>.
+    /// </exception>
+    public MimePartDataWrapper(IMimePart part) : base(part)
+    {
+        _part = Guard.NotNull(part);
+    }
+
+    /// <inheritdoc/>
+    public string ContentDescription => _part.ContentDescription;
+
+    /// <inheritdoc/>
+    public int? ContentDuration => _part.ContentDuration;
+
+    /// <inheritdoc/>
+    public string ContentMd5 => _part.ContentMd5;
+
+    /// <inheritdoc/>
+    public string ContentTransferEncoding => _part.ContentTransferEncoding.ToString();
+
+    /// <inheritdoc/>
+    public string FileName => _part.FileName;
+
+    /// <inheritdoc/>
+    public IDictionary<string, object?> Content => new Dictionary<string, object?>()
+    {
+        { nameof(MimePart.Content.Encoding),  _part.Content.Encoding },
+        { nameof(MimePart.Content.NewLineFormat),  _part.Content.NewLineFormat },
+        { nameof(MimePart.Content.Stream),  _part.Content.Stream }
+    };
+
+    /// <inheritdoc/>
+    public Stream Open() => _part.Content.Open();
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _part.ToString()!;
+    }
+}
--- a/src/WireMock.Net.MimePart/Properties/AssemblyInfo.cs
+++ b/src/WireMock.Net.MimePart/Properties/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+// Copyright © WireMock.Net
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
--- a/src/WireMock.Net.MimePart/Util/MimeKitUtils.cs
+++ b/src/WireMock.Net.MimePart/Util/MimeKitUtils.cs
@@ -1,7 +1,7 @@
 // Copyright © WireMock.Net

-#if MIMEKIT
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
@@ -9,19 +9,28 @@ using System.Text;
 using MimeKit;
 using Stef.Validation;
 using WireMock.Http;
+using WireMock.Models;
+using WireMock.Models.Mime;
 using WireMock.Types;

 namespace WireMock.Util;

-internal static class MimeKitUtils
+internal class MimeKitUtils : IMimeKitUtils
 {
-    public static bool TryGetMimeMessage(IRequestMessage requestMessage, [NotNullWhen(true)] out MimeMessage? mimeMessage)
+    /// <inheritdoc />
+    public IMimeMessageData LoadFromStream(Stream stream)
+    {
+        return new MimeMessageDataWrapper(MimeMessage.Load(Guard.NotNull(stream)));
+    }
+
+    /// <inheritdoc />
+    public bool TryGetMimeMessage(IRequestMessage requestMessage, [NotNullWhen(true)] out IMimeMessageData? mimeMessageData)
    {
        Guard.NotNull(requestMessage);

        if (requestMessage.BodyData != null &&
            requestMessage.Headers?.TryGetValue(HttpKnownHeaderNames.ContentType, out var contentTypeHeader) == true &&
-            StartsWithMultiPart(contentTypeHeader) // Only parse when "multipart/mixed"
+            StartsWithMultiPart(contentTypeHeader)
        )
        {
            var bytes = requestMessage.BodyData?.DetectedBodyType switch
@@ -37,14 +46,15 @@ internal static class MimeKitUtils

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

-            mimeMessage = MimeMessage.Load(new MemoryStream(fixedBytes));
+            mimeMessageData = LoadFromStream(new MemoryStream(fixedBytes));
            return true;
        }

-        mimeMessage = null;
+        mimeMessageData = null;
        return false;
    }

+
    private static bool StartsWithMultiPart(WireMockList<string> contentTypeHeader)
    {
        return contentTypeHeader.Any(ct => ct.TrimStart().StartsWith("multipart/", StringComparison.OrdinalIgnoreCase));
@@ -61,5 +71,4 @@ internal static class MimeKitUtils

        return result;
    }
-}
-#endif
+}
--- a/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj
+++ b/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj
@@ -0,0 +1,63 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>MultiPart Mime support for WireMock.Net using MimeKitLite</Description>
+        <AssemblyTitle>WireMock.Net.MimePart</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>netstandard2.0;netstandard2.1;net462;net47;net48;net6.0;net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>wiremock;matchers;matcher;mime;multipart;mimekit</PackageTags>
+        <RootNamespace>WireMock</RootNamespace>
+        <ProjectGuid>{F8B4A93E-46EF-4237-88FE-15FDAB7635D4}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+
+        <SignAssembly>true</SignAssembly>
+        <!--<DelaySign>true</DelaySign>-->
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Nullable" Version="1.3.1">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Stef.Validation" Version="0.1.1" />
+    </ItemGroup>
+
+    <!--<ItemGroup>
+        <PackageReference Include="MimeKitLite" Version="4.12.0" />
+    </ItemGroup>-->
+
+    <ItemGroup Condition="'$(Configuration)' == 'Debug'">
+        <PackageReference Include="MimeKitLite" Version="4.12.0" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(Configuration)' == 'Release'">
+        <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.40" PrivateAssets="All" />
+        <PackageReference Include="MimeKitLite" Version="4.12.0" PrivateAssets="All" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Shared\WireMock.Net.Shared.csproj" />
+    </ItemGroup>
+
+</Project>
--- a/src/WireMock.Net.Minimal/.filenesting.json
+++ b/src/WireMock.Net.Minimal/.filenesting.json
--- a/src/WireMock.Net.Minimal/Authentication/AzureADAuthenticationMatcher.cs
+++ b/src/WireMock.Net.Minimal/Authentication/AzureADAuthenticationMatcher.cs
@@ -45,7 +45,7 @@ internal class AzureADAuthenticationMatcher : IStringMatcher

    public AnyOf<string, StringPattern>[] GetPatterns()
    {
-        return EmptyArray<AnyOf<string, StringPattern>>.Value;
+        return [];
    }

    public MatchOperator MatchOperator => MatchOperator.Or;
@@ -57,7 +57,7 @@ internal class AzureADAuthenticationMatcher : IStringMatcher
            return MatchScores.Mismatch;
        }

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

        try
        {
--- a/src/WireMock.Net.Minimal/Authentication/BasicAuthenticationMatcher.cs
+++ b/src/WireMock.Net.Minimal/Authentication/BasicAuthenticationMatcher.cs
--- a/src/WireMock.Net.Minimal/Compatibility/StringExtensions.cs
+++ b/src/WireMock.Net.Minimal/Compatibility/StringExtensions.cs
@@ -12,7 +12,7 @@ internal static class StringExtensions
    public static string Replace(this string text, string oldValue, string newValue, StringComparison stringComparison)
    {
        var options = stringComparison == StringComparison.OrdinalIgnoreCase ? RegexOptions.IgnoreCase : RegexOptions.None;
-        return Regex.Replace(text, oldValue, newValue, options, WireMockConstants.DefaultRegexTimeout);
+        return Regex.Replace(text, oldValue, newValue, options, RegexConstants.DefaultTimeout);
    }
 }
 #endif
--- a/src/WireMock.Net.Minimal/Compatibility/WebProxy.cs
+++ b/src/WireMock.Net.Minimal/Compatibility/WebProxy.cs
--- a/src/WireMock.Net.Minimal/Constants/WireMockConstants.cs
+++ b/src/WireMock.Net.Minimal/Constants/WireMockConstants.cs
@@ -1,13 +1,9 @@
 // Copyright © WireMock.Net

-using System;
-
 namespace WireMock.Constants;

 internal static class WireMockConstants
 {
-    internal static readonly TimeSpan DefaultRegexTimeout = TimeSpan.FromSeconds(10);
-             
    internal const int AdminPriority = int.MinValue;
    internal const int MinPriority = -1_000_000;
    internal const int ProxyPriority = -2_000_000;
--- a/src/WireMock.Net.Minimal/Extensions/DictionaryExtensions.cs
+++ b/src/WireMock.Net.Minimal/Extensions/DictionaryExtensions.cs
--- a/src/WireMock.Net.Minimal/Extensions/StringExtensions.cs
+++ b/src/WireMock.Net.Minimal/Extensions/StringExtensions.cs
--- a/src/WireMock.Net.Minimal/Extensions/TimeSettingsExtensions.cs
+++ b/src/WireMock.Net.Minimal/Extensions/TimeSettingsExtensions.cs
--- a/src/WireMock.Net.Minimal/Handlers/LocalFileSystemHandler.cs
+++ b/src/WireMock.Net.Minimal/Handlers/LocalFileSystemHandler.cs
--- a/src/WireMock.Net.Minimal/Http/ByteArrayContentHelper.cs
+++ b/src/WireMock.Net.Minimal/Http/ByteArrayContentHelper.cs
--- a/src/WireMock.Net.Minimal/Http/HttpClientBuilder.cs
+++ b/src/WireMock.Net.Minimal/Http/HttpClientBuilder.cs
--- a/src/WireMock.Net.Minimal/Http/HttpClientFactory2.cs
+++ b/src/WireMock.Net.Minimal/Http/HttpClientFactory2.cs
--- a/src/WireMock.Net.Minimal/Http/HttpRequestMessageHelper.cs
+++ b/src/WireMock.Net.Minimal/Http/HttpRequestMessageHelper.cs
@@ -35,7 +35,7 @@ internal static class HttpRequestMessageHelper
        }

        var bodyData = requestMessage.BodyData;
-        httpRequestMessage.Content = bodyData?.GetBodyType() switch
+        httpRequestMessage.Content = bodyData?.DetectedBodyType switch
        {
            BodyType.Bytes => ByteArrayContentHelper.Create(bodyData.BodyAsBytes!, contentType),
            BodyType.Json => StringContentHelper.Create(JsonConvert.SerializeObject(bodyData.BodyAsJson), contentType),
@@ -61,7 +61,7 @@ internal static class HttpRequestMessageHelper
        if (contentLengthHeaderAllowed)
        {
            // Set Content to empty ByteArray to be able to set the Content-Length on the content in case of a HEAD method.
-            httpRequestMessage.Content ??= new ByteArrayContent(EmptyArray<byte>.Value);
+            httpRequestMessage.Content ??= new ByteArrayContent([]);
        }
        else
        {
--- a/src/WireMock.Net.Minimal/Http/HttpResponseMessageHelper.cs
+++ b/src/WireMock.Net.Minimal/Http/HttpResponseMessageHelper.cs
--- a/src/WireMock.Net.Minimal/Http/StringContentHelper.cs
+++ b/src/WireMock.Net.Minimal/Http/StringContentHelper.cs
--- a/src/WireMock.Net.Minimal/Http/WebhookSender.cs
+++ b/src/WireMock.Net.Minimal/Http/WebhookSender.cs
@@ -1,122 +1,122 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using Stef.Validation;
-using WireMock.Models;
-using WireMock.Settings;
-using WireMock.Transformers;
-using WireMock.Transformers.Handlebars;
-using WireMock.Transformers.Scriban;
-using WireMock.Types;
-using WireMock.Util;
-
-namespace WireMock.Http;
-
-internal class WebhookSender
-{
-    private const string ClientIp = "::1";
-    private static readonly ThreadLocal<Random> Random = new(() => new Random(DateTime.UtcNow.Millisecond));
-
-    private readonly WireMockServerSettings _settings;
-
-    public WebhookSender(WireMockServerSettings settings)
-    {
-        _settings = Guard.NotNull(settings);
-    }
-
-    public async Task<HttpResponseMessage> SendAsync(
-        HttpClient client,
-        IMapping mapping,
-        IWebhookRequest webhookRequest,
-        IRequestMessage originalRequestMessage,
-        IResponseMessage originalResponseMessage
-    )
-    {
-        Guard.NotNull(client);
-        Guard.NotNull(mapping);
-        Guard.NotNull(webhookRequest);
-        Guard.NotNull(originalRequestMessage);
-        Guard.NotNull(originalResponseMessage);
-
-        IBodyData? bodyData;
-        IDictionary<string, WireMockList<string>>? headers;
-        string requestUrl;
-        if (webhookRequest.UseTransformer == true)
-        {
-            ITransformer transformer;
-            switch (webhookRequest.TransformerType)
-            {
-                case TransformerType.Handlebars:
-                    var factoryHandlebars = new HandlebarsContextFactory(_settings);
-                    transformer = new Transformer(_settings, factoryHandlebars);
-                    break;
-
-                case TransformerType.Scriban:
-                case TransformerType.ScribanDotLiquid:
-                    var factoryDotLiquid = new ScribanContextFactory(_settings.FileSystemHandler, webhookRequest.TransformerType);
-                    transformer = new Transformer(_settings, factoryDotLiquid);
-                    break;
-
-                default:
-                    throw new NotImplementedException($"TransformerType '{webhookRequest.TransformerType}' is not supported.");
-            }
-
-            bodyData = transformer.TransformBody(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.BodyData, webhookRequest.TransformerReplaceNodeOptions);
-            headers = transformer.TransformHeaders(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Headers);
-            requestUrl = transformer.TransformString(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Url);
-
-            mapping.Settings.WebhookSettings?.PostTransform(mapping, requestUrl, bodyData, headers);
-        }
-        else
-        {
-            bodyData = webhookRequest.BodyData;
-            headers = webhookRequest.Headers;
-            requestUrl = webhookRequest.Url;
-        }
-
-        // Create RequestMessage
-        var requestMessage = new RequestMessage(
-            new UrlDetails(requestUrl),
-            webhookRequest.Method,
-            ClientIp,
-            bodyData,
-            headers?.ToDictionary(x => x.Key, x => x.Value.ToArray())
-        )
-        {
-            DateTime = DateTime.UtcNow
-        };
-
-        // Create HttpRequestMessage
-        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, requestUrl);
-
-        // Delay (if required)
-        if (TryGetDelay(webhookRequest, out var delay))
-        {
-            await Task.Delay(delay.Value).ConfigureAwait(false);
-        }
-
-        // Call the URL
-        return await client.SendAsync(httpRequestMessage).ConfigureAwait(false);
-    }
-
-    private static bool TryGetDelay(IWebhookRequest webhookRequest, [NotNullWhen(true)] out int? delay)
-    {
-        delay = webhookRequest.Delay;
-        var minimumDelay = webhookRequest.MinimumRandomDelay;
-        var maximumDelay = webhookRequest.MaximumRandomDelay;
-
-        if (minimumDelay is not null && maximumDelay is not null && maximumDelay >= minimumDelay)
-        {
-            delay = Random.Value!.Next(minimumDelay.Value, maximumDelay.Value);
-            return true;
-        }
-
-        return delay is not null;
-    }
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using Stef.Validation;
+using WireMock.Models;
+using WireMock.Settings;
+using WireMock.Transformers;
+using WireMock.Transformers.Handlebars;
+using WireMock.Transformers.Scriban;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.Http;
+
+internal class WebhookSender
+{
+    private const string ClientIp = "::1";
+    private static readonly ThreadLocal<Random> Random = new(() => new Random(DateTime.UtcNow.Millisecond));
+
+    private readonly WireMockServerSettings _settings;
+
+    public WebhookSender(WireMockServerSettings settings)
+    {
+        _settings = Guard.NotNull(settings);
+    }
+
+    public async Task<HttpResponseMessage> SendAsync(
+        HttpClient client,
+        IMapping mapping,
+        IWebhookRequest webhookRequest,
+        IRequestMessage originalRequestMessage,
+        IResponseMessage originalResponseMessage
+    )
+    {
+        Guard.NotNull(client);
+        Guard.NotNull(mapping);
+        Guard.NotNull(webhookRequest);
+        Guard.NotNull(originalRequestMessage);
+        Guard.NotNull(originalResponseMessage);
+
+        IBodyData? bodyData;
+        IDictionary<string, WireMockList<string>>? headers;
+        string requestUrl;
+        if (webhookRequest.UseTransformer == true)
+        {
+            ITransformer transformer;
+            switch (webhookRequest.TransformerType)
+            {
+                case TransformerType.Handlebars:
+                    var factoryHandlebars = new HandlebarsContextFactory(_settings);
+                    transformer = new Transformer(_settings, factoryHandlebars);
+                    break;
+
+                case TransformerType.Scriban:
+                case TransformerType.ScribanDotLiquid:
+                    var factoryDotLiquid = new ScribanContextFactory(_settings.FileSystemHandler, webhookRequest.TransformerType);
+                    transformer = new Transformer(_settings, factoryDotLiquid);
+                    break;
+
+                default:
+                    throw new NotImplementedException($"TransformerType '{webhookRequest.TransformerType}' is not supported.");
+            }
+
+            bodyData = transformer.TransformBody(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.BodyData, webhookRequest.TransformerReplaceNodeOptions);
+            headers = transformer.TransformHeaders(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Headers);
+            requestUrl = transformer.TransformString(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Url);
+
+            mapping.Settings.WebhookSettings?.PostTransform(mapping, requestUrl, bodyData, headers);
+        }
+        else
+        {
+            bodyData = webhookRequest.BodyData;
+            headers = webhookRequest.Headers;
+            requestUrl = webhookRequest.Url;
+        }
+
+        // Create RequestMessage
+        var requestMessage = new RequestMessage(
+            new UrlDetails(requestUrl),
+            webhookRequest.Method,
+            ClientIp,
+            bodyData,
+            headers?.ToDictionary(x => x.Key, x => x.Value.ToArray())
+        )
+        {
+            DateTime = DateTime.UtcNow
+        };
+
+        // Create HttpRequestMessage
+        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, requestUrl);
+
+        // Delay (if required)
+        if (TryGetDelay(webhookRequest, out var delay))
+        {
+            await Task.Delay(delay.Value).ConfigureAwait(false);
+        }
+
+        // Call the URL
+        return await client.SendAsync(httpRequestMessage).ConfigureAwait(false);
+    }
+
+    private static bool TryGetDelay(IWebhookRequest webhookRequest, [NotNullWhen(true)] out int? delay)
+    {
+        delay = webhookRequest.Delay;
+        var minimumDelay = webhookRequest.MinimumRandomDelay;
+        var maximumDelay = webhookRequest.MaximumRandomDelay;
+
+        if (minimumDelay is not null && maximumDelay is not null && maximumDelay >= minimumDelay)
+        {
+            delay = Random.Value!.Next(minimumDelay.Value, maximumDelay.Value);
+            return true;
+        }
+
+        return delay is not null;
+    }
 }
--- a/src/WireMock.Net.Minimal/Http/WireMockHttpClientFactory.cs
+++ b/src/WireMock.Net.Minimal/Http/WireMockHttpClientFactory.cs
@@ -0,0 +1,18 @@
+// Copyright © WireMock.Net
+#if NET5_0_OR_GREATER
+using System;
+using System.Net.Http;
+using WireMock.Server;
+
+namespace WireMock.Http;
+
+internal class WireMockHttpClientFactory(WireMockServer server, params DelegatingHandler[] handlers) : IHttpClientFactory
+{
+    private readonly Lazy<HttpClient> _lazyHttpClient = new(() => server.CreateClient());
+
+    public HttpClient CreateClient(string name)
+    {
+        return handlers.Length > 0 ? server.CreateClient(handlers) : _lazyHttpClient.Value;
+    }
+}
+#endif
--- a/src/WireMock.Net.Minimal/HttpsCertificate/CertificateLoader.cs
+++ b/src/WireMock.Net.Minimal/HttpsCertificate/CertificateLoader.cs
@@ -3,6 +3,7 @@
 using System;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
+using WireMock.Owin;

 namespace WireMock.HttpsCertificate;

@@ -13,19 +14,13 @@ internal static class CertificateLoader
    /// <summary>
    /// Used by the WireMock.Net server
    /// </summary>
-    public static X509Certificate2 LoadCertificate(
-        string? storeName,
-        string? storeLocation,
-        string? thumbprintOrSubjectName,
-        string? filePath,
-        string? passwordOrKey,
-        string host)
+    public static X509Certificate2 LoadCertificate(IWireMockMiddlewareOptions options, string host)
    {
-        if (!string.IsNullOrEmpty(storeName) && !string.IsNullOrEmpty(storeLocation))
+        if (!string.IsNullOrEmpty(options.X509StoreName) && !string.IsNullOrEmpty(options.X509StoreLocation))
        {
-            var thumbprintOrSubjectNameOrHost = thumbprintOrSubjectName ?? host;
+            var thumbprintOrSubjectNameOrHost = options.X509ThumbprintOrSubjectName ?? host;

-            var certStore = new X509Store((StoreName)Enum.Parse(typeof(StoreName), storeName), (StoreLocation)Enum.Parse(typeof(StoreLocation), storeLocation));
+            var certStore = new X509Store((StoreName)Enum.Parse(typeof(StoreName), options.X509StoreName!), (StoreLocation)Enum.Parse(typeof(StoreLocation), options.X509StoreLocation!));
            try
            {
                certStore.Open(OpenFlags.ReadOnly);
@@ -39,7 +34,7 @@ internal static class CertificateLoader
                    if (matchingCertificates.Count == 0)
                    {
                        // No certificates matched the search criteria.
-                        throw new FileNotFoundException($"No Certificate found with in store '{storeName}', location '{storeLocation}' for Thumbprint or SubjectName '{thumbprintOrSubjectNameOrHost}'.");
+                        throw new FileNotFoundException($"No Certificate found with in store '{options.X509StoreName}', location '{options.X509StoreLocation}' for Thumbprint or SubjectName '{thumbprintOrSubjectNameOrHost}'.");
                    }
                }

@@ -56,27 +51,28 @@ internal static class CertificateLoader
            }
        }

-        if (!string.IsNullOrEmpty(filePath))
+        if (!string.IsNullOrEmpty(options.X509CertificateFilePath))
        {
-            if (filePath!.EndsWith(ExtensionPem, StringComparison.OrdinalIgnoreCase))
+            if (options.X509CertificateFilePath.EndsWith(ExtensionPem, StringComparison.OrdinalIgnoreCase))
            {
                // PEM logic based on: https://www.scottbrady91.com/c-sharp/pem-loading-in-dotnet-core-and-dotnet
 #if NET5_0_OR_GREATER
-                if (!string.IsNullOrEmpty(passwordOrKey))
+                if (!string.IsNullOrEmpty(options.X509CertificatePassword))
                {
-                    var certPem = File.ReadAllText(filePath);
-                    var cert = X509Certificate2.CreateFromPem(certPem, passwordOrKey);
+                    var certPem = File.ReadAllText(options.X509CertificateFilePath);
+                    var cert = X509Certificate2.CreateFromPem(certPem, options.X509CertificatePassword);
                    const string defaultPasswordPem = "WireMock.Net";
+
                    return new X509Certificate2(cert.Export(X509ContentType.Pfx, defaultPasswordPem), defaultPasswordPem);
                }
-                return X509Certificate2.CreateFromPemFile(filePath);
+                return X509Certificate2.CreateFromPemFile(options.X509CertificateFilePath);

 #elif NETCOREAPP3_1
-                var cert = new X509Certificate2(filePath);
-                if (!string.IsNullOrEmpty(passwordOrKey))
+                var cert = new X509Certificate2(options.X509CertificateFilePath);
+                if (!string.IsNullOrEmpty(options.X509CertificatePassword))
                {
                    var key = System.Security.Cryptography.ECDsa.Create()!;
-                    key.ImportECPrivateKey(System.Text.Encoding.UTF8.GetBytes(passwordOrKey), out _);
+                    key.ImportECPrivateKey(System.Text.Encoding.UTF8.GetBytes(options.X509CertificatePassword), out _);
                    return cert.CopyWithPrivateKey(key);
                }
                return cert;
@@ -85,10 +81,17 @@ internal static class CertificateLoader
 #endif
            }

-            return !string.IsNullOrEmpty(passwordOrKey) ? new X509Certificate2(filePath, passwordOrKey) : new X509Certificate2(filePath);
+            return !string.IsNullOrEmpty(options.X509CertificatePassword) ?
+                new X509Certificate2(options.X509CertificateFilePath, options.X509CertificatePassword) :
+                new X509Certificate2(options.X509CertificateFilePath);
        }

-        throw new InvalidOperationException("X509StoreName and X509StoreLocation OR X509CertificateFilePath are mandatory. Note that X509CertificatePassword is optional.");
+        if (options.X509Certificate != null)
+        {
+            return options.X509Certificate;
+        }
+
+        throw new InvalidOperationException("X509StoreName and X509StoreLocation OR X509CertificateFilePath OR X509Certificate are mandatory. Note that X509CertificatePassword is optional.");
    }

    /// <summary>
--- a/src/WireMock.Net.Minimal/HttpsCertificate/PublicCertificateHelper.cs
+++ b/src/WireMock.Net.Minimal/HttpsCertificate/PublicCertificateHelper.cs
--- a/src/WireMock.Net.Minimal/IMapping.cs
+++ b/src/WireMock.Net.Minimal/IMapping.cs
@@ -86,7 +86,7 @@ public interface IMapping
    WireMockServerSettings Settings { get; }

    /// <summary>
-    /// Is State started ?
+    /// Indicates if the state is started or manually set to a value.
    /// </summary>
    bool IsStartState { get; }

--- a/src/WireMock.Net.Minimal/IMappingBuilder.cs
+++ b/src/WireMock.Net.Minimal/IMappingBuilder.cs
--- a/src/WireMock.Net.Minimal/Json/DynamicJsonClassOptions.cs
+++ b/src/WireMock.Net.Minimal/Json/DynamicJsonClassOptions.cs
--- a/src/WireMock.Net.Minimal/Json/FloatBehavior.cs
+++ b/src/WireMock.Net.Minimal/Json/FloatBehavior.cs
--- a/src/WireMock.Net.Minimal/Json/IntegerBehavior.cs
+++ b/src/WireMock.Net.Minimal/Json/IntegerBehavior.cs
--- a/src/WireMock.Net.Minimal/Logging/LogEntry.cs
+++ b/src/WireMock.Net.Minimal/Logging/LogEntry.cs
@@ -1,39 +1,39 @@
-// Copyright © WireMock.Net
-
-using System;
-using WireMock.Matchers.Request;
-
-namespace WireMock.Logging;
-
-/// <summary>
-/// LogEntry
-/// </summary>
-public class LogEntry : ILogEntry
-{
-    /// <inheritdoc cref="ILogEntry.Guid" />
-    public Guid Guid { get; set; }
-
-    /// <inheritdoc cref="ILogEntry.RequestMessage" />
-    public IRequestMessage RequestMessage { get; set; } = null!;
-
-    /// <inheritdoc cref="ILogEntry.ResponseMessage" />
-    public IResponseMessage ResponseMessage { get; set; } = null!;
-
-    /// <inheritdoc cref="ILogEntry.RequestMatchResult" />
-    public IRequestMatchResult RequestMatchResult { get; set; } = null!;
-
-    /// <inheritdoc cref="ILogEntry.MappingGuid" />
-    public Guid? MappingGuid { get; set; }
-
-    /// <inheritdoc cref="ILogEntry.MappingTitle" />
-    public string? MappingTitle { get; set; }
-
-    /// <inheritdoc cref="ILogEntry.PartialMappingGuid" />
-    public Guid? PartialMappingGuid { get; set; }
-
-    /// <inheritdoc cref="ILogEntry.PartialMappingTitle" />
-    public string? PartialMappingTitle { get; set; }
-
-    /// <inheritdoc cref="ILogEntry.PartialMatchResult" />
-    public IRequestMatchResult PartialMatchResult { get; set; } = null!;
+// Copyright © WireMock.Net
+
+using System;
+using WireMock.Matchers.Request;
+
+namespace WireMock.Logging;
+
+/// <summary>
+/// LogEntry
+/// </summary>
+public class LogEntry : ILogEntry
+{
+    /// <inheritdoc cref="ILogEntry.Guid" />
+    public Guid Guid { get; set; }
+
+    /// <inheritdoc cref="ILogEntry.RequestMessage" />
+    public IRequestMessage RequestMessage { get; set; } = null!;
+
+    /// <inheritdoc cref="ILogEntry.ResponseMessage" />
+    public IResponseMessage ResponseMessage { get; set; } = null!;
+
+    /// <inheritdoc cref="ILogEntry.RequestMatchResult" />
+    public IRequestMatchResult RequestMatchResult { get; set; } = null!;
+
+    /// <inheritdoc cref="ILogEntry.MappingGuid" />
+    public Guid? MappingGuid { get; set; }
+
+    /// <inheritdoc cref="ILogEntry.MappingTitle" />
+    public string? MappingTitle { get; set; }
+
+    /// <inheritdoc cref="ILogEntry.PartialMappingGuid" />
+    public Guid? PartialMappingGuid { get; set; }
+
+    /// <inheritdoc cref="ILogEntry.PartialMappingTitle" />
+    public string? PartialMappingTitle { get; set; }
+
+    /// <inheritdoc cref="ILogEntry.PartialMatchResult" />
+    public IRequestMatchResult PartialMatchResult { get; set; } = null!;
 }
--- a/src/WireMock.Net.Minimal/Logging/WireMockConsoleLogger.cs
+++ b/src/WireMock.Net.Minimal/Logging/WireMockConsoleLogger.cs
--- a/src/WireMock.Net.Minimal/Logging/WireMockNullLogger.cs
+++ b/src/WireMock.Net.Minimal/Logging/WireMockNullLogger.cs
--- a/src/WireMock.Net.Minimal/Mapping.cs
+++ b/src/WireMock.Net.Minimal/Mapping.cs
@@ -1,197 +1,197 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Threading.Tasks;
-using Stef.Validation;
-using WireMock.Matchers.Request;
-using WireMock.Models;
-using WireMock.ResponseProviders;
-using WireMock.Settings;
-
-namespace WireMock;
-
-/// <summary>
-/// The Mapping.
-/// </summary>
-public class Mapping : IMapping
-{
-    /// <inheritdoc />
-    public Guid Guid { get; }
-
-    /// <inheritdoc />
-    public DateTime? UpdatedAt { get; set; }
-
-    /// <inheritdoc />
-    public string? Title { get; }
-
-    /// <inheritdoc />
-    public string? Description { get; }
-
-    /// <inheritdoc />
-    public string? Path { get; set; }
-
-    /// <inheritdoc />
-    public int Priority { get; }
-
-    /// <inheritdoc />
-    public string? Scenario { get; private set; }
-
-    /// <inheritdoc />
-    public string? ExecutionConditionState { get; }
-
-    /// <inheritdoc />
-    public string? NextState { get; }
-
-    /// <inheritdoc />
-    public int? StateTimes { get; }
-
-    /// <inheritdoc />
-    public IRequestMatcher RequestMatcher { get; }
-
-    /// <inheritdoc />
-    public IResponseProvider Provider { get; }
-
-    /// <inheritdoc />
-    public WireMockServerSettings Settings { get; }
-
-    /// <inheritdoc />
-    public bool IsStartState => Scenario == null || Scenario != null && NextState != null && ExecutionConditionState == null;
-
-    /// <inheritdoc />
-    public bool IsAdminInterface => Provider is DynamicResponseProvider or DynamicAsyncResponseProvider or ProxyAsyncResponseProvider;
-
-    /// <inheritdoc />
-    public bool IsProxy => Provider is ProxyAsyncResponseProvider;
-
-    /// <inheritdoc />
-    public bool LogMapping => Provider is not (DynamicResponseProvider or DynamicAsyncResponseProvider);
-
-    /// <inheritdoc />
-    public IWebhook[]? Webhooks { get; }
-
-    /// <inheritdoc />
-    public bool? UseWebhooksFireAndForget { get; }
-
-    /// <inheritdoc />
-    public ITimeSettings? TimeSettings { get; }
-
-    /// <inheritdoc />
-    public object? Data { get; }
-
-    /// <inheritdoc />
-    public double? Probability { get; private set; }
-
-    /// <inheritdoc />
-    public IdOrTexts? ProtoDefinition { get; private set; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="Mapping"/> class.
-    /// </summary>
-    /// <param name="guid">The unique identifier.</param>
-    /// <param name="updatedAt">The datetime when this mapping was created.</param>
-    /// <param name="title">The unique title (can be null).</param>
-    /// <param name="description">The description (can be null).</param>
-    /// <param name="path">The full file path from this mapping title (can be null).</param>
-    /// <param name="settings">The WireMockServerSettings.</param>
-    /// <param name="requestMatcher">The request matcher.</param>
-    /// <param name="provider">The provider.</param>
-    /// <param name="priority">The priority for this mapping.</param>
-    /// <param name="scenario">The scenario. [Optional]</param>
-    /// <param name="executionConditionState">State in which the current mapping can occur. [Optional]</param>
-    /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
-    /// <param name="stateTimes">Only when the current state is executed this number, the next state which will occur. [Optional]</param>
-    /// <param name="webhooks">The Webhooks. [Optional]</param>
-    /// <param name="useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]</param>
-    /// <param name="timeSettings">The TimeSettings. [Optional]</param>
-    /// <param name="data">The data object. [Optional]</param>
-    public Mapping
-    (
-        Guid guid,
-        DateTime updatedAt,
-        string? title,
-        string? description,
-        string? path,
-        WireMockServerSettings settings,
-        IRequestMatcher requestMatcher,
-        IResponseProvider provider,
-        int priority,
-        string? scenario,
-        string? executionConditionState,
-        string? nextState,
-        int? stateTimes,
-        IWebhook[]? webhooks,
-        bool? useWebhooksFireAndForget,
-        ITimeSettings? timeSettings,
-        object? data
-    )
-    {
-        Guid = guid;
-        UpdatedAt = updatedAt;
-        Title = title;
-        Description = description;
-        Path = path;
-        Settings = settings;
-        RequestMatcher = requestMatcher;
-        Provider = provider;
-        Priority = priority;
-        Scenario = scenario;
-        ExecutionConditionState = executionConditionState;
-        NextState = nextState;
-        StateTimes = stateTimes;
-        Webhooks = webhooks;
-        UseWebhooksFireAndForget = useWebhooksFireAndForget;
-        TimeSettings = timeSettings;
-        Data = data;
-    }
-
-    /// <inheritdoc />
-    public Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IRequestMessage requestMessage)
-    {
-        return Provider.ProvideResponseAsync(this, requestMessage, Settings);
-    }
-
-    /// <inheritdoc />
-    public IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage, string? nextState)
-    {
-        var result = new RequestMatchResult();
-
-        RequestMatcher.GetMatchingScore(requestMessage, result);
-
-        // Only check state if Scenario is defined
-        if (Scenario != null)
-        {
-            var matcher = new RequestMessageScenarioAndStateMatcher(nextState, ExecutionConditionState);
-            matcher.GetMatchingScore(requestMessage, result);
-            //// If ExecutionConditionState is null, this means that request is the start from a scenario. So just return.
-            //if (ExecutionConditionState != null)
-            //{
-            //    // ExecutionConditionState is not null, so get score for matching with the nextState.
-            //    var matcher = new RequestMessageScenarioAndStateMatcher(nextState, ExecutionConditionState);
-            //    matcher.GetMatchingScore(requestMessage, result);
-            //}
-        }
-
-        return result;
-    }
-
-    /// <inheritdoc />
-    public IMapping WithProbability(double probability)
-    {
-        Probability = Guard.NotNull(probability);
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IMapping WithScenario(string scenario)
-    {
-        Scenario = Guard.NotNullOrWhiteSpace(scenario);
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IMapping WithProtoDefinition(IdOrTexts protoDefinition)
-    {
-        ProtoDefinition = protoDefinition;
-        return this;
-    }
+// Copyright © WireMock.Net
+
+using System;
+using System.Threading.Tasks;
+using Stef.Validation;
+using WireMock.Matchers.Request;
+using WireMock.Models;
+using WireMock.ResponseProviders;
+using WireMock.Settings;
+
+namespace WireMock;
+
+/// <summary>
+/// The Mapping.
+/// </summary>
+public class Mapping : IMapping
+{
+    /// <inheritdoc />
+    public Guid Guid { get; }
+
+    /// <inheritdoc />
+    public DateTime? UpdatedAt { get; set; }
+
+    /// <inheritdoc />
+    public string? Title { get; }
+
+    /// <inheritdoc />
+    public string? Description { get; }
+
+    /// <inheritdoc />
+    public string? Path { get; set; }
+
+    /// <inheritdoc />
+    public int Priority { get; }
+
+    /// <inheritdoc />
+    public string? Scenario { get; private set; }
+
+    /// <inheritdoc />
+    public string? ExecutionConditionState { get; }
+
+    /// <inheritdoc />
+    public string? NextState { get; }
+
+    /// <inheritdoc />
+    public int? StateTimes { get; }
+
+    /// <inheritdoc />
+    public IRequestMatcher RequestMatcher { get; }
+
+    /// <inheritdoc />
+    public IResponseProvider Provider { get; }
+
+    /// <inheritdoc />
+    public WireMockServerSettings Settings { get; }
+
+    /// <inheritdoc />
+    public bool IsStartState => Scenario == null || Scenario != null && NextState != null && ExecutionConditionState == null;
+
+    /// <inheritdoc />
+    public bool IsAdminInterface => Provider is DynamicResponseProvider or DynamicAsyncResponseProvider or ProxyAsyncResponseProvider;
+
+    /// <inheritdoc />
+    public bool IsProxy => Provider is ProxyAsyncResponseProvider;
+
+    /// <inheritdoc />
+    public bool LogMapping => Provider is not (DynamicResponseProvider or DynamicAsyncResponseProvider);
+
+    /// <inheritdoc />
+    public IWebhook[]? Webhooks { get; }
+
+    /// <inheritdoc />
+    public bool? UseWebhooksFireAndForget { get; }
+
+    /// <inheritdoc />
+    public ITimeSettings? TimeSettings { get; }
+
+    /// <inheritdoc />
+    public object? Data { get; }
+
+    /// <inheritdoc />
+    public double? Probability { get; private set; }
+
+    /// <inheritdoc />
+    public IdOrTexts? ProtoDefinition { get; private set; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Mapping"/> class.
+    /// </summary>
+    /// <param name="guid">The unique identifier.</param>
+    /// <param name="updatedAt">The datetime when this mapping was created.</param>
+    /// <param name="title">The unique title (can be null).</param>
+    /// <param name="description">The description (can be null).</param>
+    /// <param name="path">The full file path from this mapping title (can be null).</param>
+    /// <param name="settings">The WireMockServerSettings.</param>
+    /// <param name="requestMatcher">The request matcher.</param>
+    /// <param name="provider">The provider.</param>
+    /// <param name="priority">The priority for this mapping.</param>
+    /// <param name="scenario">The scenario. [Optional]</param>
+    /// <param name="executionConditionState">State in which the current mapping can occur. [Optional]</param>
+    /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
+    /// <param name="stateTimes">Only when the current state is executed this number, the next state which will occur. [Optional]</param>
+    /// <param name="webhooks">The Webhooks. [Optional]</param>
+    /// <param name="useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]</param>
+    /// <param name="timeSettings">The TimeSettings. [Optional]</param>
+    /// <param name="data">The data object. [Optional]</param>
+    public Mapping
+    (
+        Guid guid,
+        DateTime updatedAt,
+        string? title,
+        string? description,
+        string? path,
+        WireMockServerSettings settings,
+        IRequestMatcher requestMatcher,
+        IResponseProvider provider,
+        int priority,
+        string? scenario,
+        string? executionConditionState,
+        string? nextState,
+        int? stateTimes,
+        IWebhook[]? webhooks,
+        bool? useWebhooksFireAndForget,
+        ITimeSettings? timeSettings,
+        object? data
+    )
+    {
+        Guid = guid;
+        UpdatedAt = updatedAt;
+        Title = title;
+        Description = description;
+        Path = path;
+        Settings = settings;
+        RequestMatcher = requestMatcher;
+        Provider = provider;
+        Priority = priority;
+        Scenario = scenario;
+        ExecutionConditionState = executionConditionState;
+        NextState = nextState;
+        StateTimes = stateTimes;
+        Webhooks = webhooks;
+        UseWebhooksFireAndForget = useWebhooksFireAndForget;
+        TimeSettings = timeSettings;
+        Data = data;
+    }
+
+    /// <inheritdoc />
+    public Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IRequestMessage requestMessage)
+    {
+        return Provider.ProvideResponseAsync(this, requestMessage, Settings);
+    }
+
+    /// <inheritdoc />
+    public IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage, string? nextState)
+    {
+        var result = new RequestMatchResult();
+
+        RequestMatcher.GetMatchingScore(requestMessage, result);
+
+        // Only check state if Scenario is defined
+        if (Scenario != null)
+        {
+            var matcher = new RequestMessageScenarioAndStateMatcher(nextState, ExecutionConditionState);
+            matcher.GetMatchingScore(requestMessage, result);
+            //// If ExecutionConditionState is null, this means that request is the start from a scenario. So just return.
+            //if (ExecutionConditionState != null)
+            //{
+            //    // ExecutionConditionState is not null, so get score for matching with the nextState.
+            //    var matcher = new RequestMessageScenarioAndStateMatcher(nextState, ExecutionConditionState);
+            //    matcher.GetMatchingScore(requestMessage, result);
+            //}
+        }
+
+        return result;
+    }
+
+    /// <inheritdoc />
+    public IMapping WithProbability(double probability)
+    {
+        Probability = Guard.NotNull(probability);
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IMapping WithScenario(string scenario)
+    {
+        Scenario = Guard.NotNullOrWhiteSpace(scenario);
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IMapping WithProtoDefinition(IdOrTexts protoDefinition)
+    {
+        ProtoDefinition = protoDefinition;
+        return this;
+    }
 }
--- a/src/WireMock.Net.Minimal/MappingBuilder.cs
+++ b/src/WireMock.Net.Minimal/MappingBuilder.cs
--- a/src/WireMock.Net.Minimal/MappingRegistrationCallback.cs
+++ b/src/WireMock.Net.Minimal/MappingRegistrationCallback.cs
--- a/src/WireMock.Net.Minimal/Matchers/AbstractJsonPartialMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/AbstractJsonPartialMatcher.cs
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	0d510cdde8	1.8.18	2025-08-04 18:03:44 +02:00
Stef Heyenrath	52a396beef	1.8.18	2025-08-04 18:03:23 +02:00
Sam Fields	6ccfe68686	Fixes an issue with matching JSON bodies as bytes (#1339 ) * Fixes an issue with matching JSON bodies as bytes * Adding tests for exact object matching * Simplify the check for byte data	2025-08-02 20:11:13 +02:00
Stef Heyenrath	e400e92452	1.8.17	2025-07-23 09:40:55 +02:00
Stef Heyenrath	7a187dfb78	Add more examples for WithGraphQLSchema (#1335 )	2025-07-23 09:34:31 +02:00
Stef Heyenrath	e6ff8776fb	Make CSharpCodeMatcher public (#1337 )	2025-07-23 09:29:53 +02:00
Stef Heyenrath	c32e904f4d	1.8.16	2025-07-19 08:16:34 +02:00
Stef Heyenrath	e80d436dd6	Use corerct Handlebars.Net.Helpers.Xslt (2.5.2) (#1332 )	2025-07-18 10:57:58 +02:00
Stef Heyenrath	fcc95ff06f	1.8.15	2025-07-18 08:45:42 +02:00
Stef Heyenrath	020cc15420	Correctly map the Pact Interaction Description property (#1331 ) * Correctly map the Pact Interaction Description property * Update src/WireMock.Net.Minimal/Serialization/PactMapper.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * post --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-07-18 08:41:04 +02:00
Stef Heyenrath	aeb15725e4	1.8.14	2025-07-13 08:53:53 +02:00
Stef Heyenrath	a06ee6b158	Fix HandlebarsContext.ParseAndEvaluate (#1329 )	2025-07-12 11:05:02 +02:00
Stef Heyenrath	b0076b4e81	Implement IMimeMessageData (#1326 ) * Implement IMimeMessageData * 1 * Update src/WireMock.Net.MimePart/Util/MimeKitUtils.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * v1 * v2 * e * ? * fix * if (Array.TrueForAll(_funcs, func => func(value).IsPerfect())) * Update src/WireMock.Net.Shared/Util/IMimeKitUtils.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMultiPartMatcher.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/WireMock.Net.MimePart/Models/MimeEntityDataWrapper.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Models.Mime.IMimeMessageData? BodyAsMimeMessage { get; } * Update src/WireMock.Net.MimePart/Util/MimeKitUtils.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/WireMock.Net.MimePart/Models/MimePartDataWrapper.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/WireMock.Net.MimePart/Models/MimeMessageDataWrapper.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/WireMock.Net.Shared/Util/IMimeKitUtils.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * . --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-07-12 09:54:18 +02:00
Stef Heyenrath	6c61f87ef3	Add method CreateHttpClientFactory (#1325 ) * Add method CreateHttpClientFactory * rev	2025-07-08 10:50:30 +02:00
Stef Heyenrath	35cd06b47b	Update README.md	2025-06-24 09:31:22 +02:00
Stef Heyenrath	b925c537c7	1.8.13	2025-06-23 08:07:30 +02:00
Stef Heyenrath	f80925c1fb	Add Scenario set State method (#1322 ) * Add SetScenarioState * add tests * summary * . * 1.8.13-preview-01 * fix * fix name	2025-06-23 08:03:11 +02:00
Stef Heyenrath	43cff52b69	1.8.12	2025-06-15 11:50:31 +02:00
Stef Heyenrath	7b93b2668d	Fix TypeLoader (#1320 ) * no ilmerge * . * . * nullable * .UsingNuGet * fix * . * directoriesToSearch * .	2025-06-15 11:44:09 +02:00
Dom Light	70a9180af4	Set description when converting MappingModel to IRespondWithAProvider (#1317 ) Adding a mapping with a description to `WireMockServer.WithMapping` did not include the description to the resulting `IRespondWithAProvider`, which means that calling `WireMockServer.SavePact` does not populate the description in the contract file. This PR includes the description when mapping from `MappingModel` to `IRespondWithAProvider`.	2025-06-14 11:13:04 +02:00
Stef Heyenrath	acd6592562	remove some old console projects	2025-06-13 13:07:48 +02:00
Sébastien Crocquesel	2a010dcd42	Use default resource cleaning behavior in test (#1316 )	2025-06-12 22:06:58 +02:00
Stef Heyenrath	8151119cca	1.8.11	2025-06-11 12:04:21 +02:00
Stef Heyenrath	77000372c6	Fix for WithTransformer and JsonBody as list (#1315 ) * Fix for WithTransformer and JsonBody as list * Fix WithTransformer when the response BodyAsJson is a List	2025-06-11 11:51:29 +02:00
Stef Heyenrath	ec248a9a78	Fix TestcontainersTests to ignore exception when stopping (#1314 )	2025-06-11 11:12:58 +02:00
Stef Heyenrath	2f7e3a3178	Update TestcontainersTests to ignore exception when stopping	2025-06-11 10:21:42 +02:00
Stef Heyenrath	ac9c51e34e	Update RandomDataGenerator.Net to 1.0.19 (#1313 ) * Update RandomDataGenerator.Net to 1.0.19 * Handlebars.Net.Helpers	2025-06-11 09:00:23 +02:00
Sébastien Crocquesel	8ba243ddcd	Bump Testcontainers version to 4.5.0 (#1311 ) * Bump Testcontainers version to 4.5.0 The Testcontainers dependency Docker.DotNet was bumped to 3.128.1 and is not binary compatible with previous version. When a user has a direct dependency on Testcontainers 4.5.0, WireMock.Net.Testcontainers fails with : System.MissingMethodException : Method not found: 'Docker.DotNet.DockerClient Docker.DotNet.DockerClientConfiguration.CreateClient(System.Version)' * Bump System.Net.Http.Json version to 8.0.1 Minimum required version for Testcontainers 4.5.0 * Do not dispose null container	2025-06-10 22:23:56 +02:00
Stef Heyenrath	d4b95e73ea	Remove unit test which uses postman-echo	2025-06-10 13:16:24 +02:00
Stef Heyenrath	f9ae045847	Images/Icons	2025-06-10 12:23:07 +02:00
Stef Heyenrath	05b5876b5c	1.8.10	2025-06-10 08:15:22 +02:00
Stef Heyenrath	c1bd2d315f	Update AwesomeAssertions to version 9 (#1309 )	2025-06-06 21:06:38 +02:00
Stef Heyenrath	8917a6eaaa	For some projects, change dependency to WireMock.Net.Minimal (#1308 )	2025-06-06 11:22:34 +02:00
Stef Heyenrath	3cc9040f51	Update RequestModelBuilder (add WithHeader) (#1306 ) * Update RequestModelBuilder (add WithHeader) * rejectOnMatch * fix	2025-06-05 12:24:40 +02:00
Stef Heyenrath	6136bc177c	1.8.9	2025-05-28 07:18:51 +02:00
Stef Heyenrath	86d4717216	Add option to provide X509Certificate (#1303 ) * Add option to provide X509CertificateRawData * X509Certificate * remove X509CertificateRawData	2025-05-28 07:15:46 +02:00
Stef Heyenrath	3438539138	1.8.8	2025-05-24 12:34:30 +02:00
Stef Heyenrath	96eca4262a	Create WireMock.Net.MimePart project (#1300 ) * Create WireMock.Net.MimePart project * . * REFACTOR * ILRepack * -- * ... * x * x * . * fix * public class MimePartMatcher * shared * min * . * <!--<DelaySign>true</DelaySign>--> * Update README.md Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-05-24 12:17:42 +02:00
Stef Heyenrath	c15206ecd8	Update README.md [codecov]	2025-05-22 15:30:01 +02:00
Stef Heyenrath	ec15c544c4	Update README.md (fix codefactor link)	2025-05-22 08:46:11 +02:00
Stef Heyenrath	339d3ab3a8	Fix CSharpFormatterTests	2025-05-22 08:42:23 +02:00
Stef Heyenrath	001ba03ee9	1.8.7	2025-05-22 08:22:48 +02:00
Stef Heyenrath	17545da2c3	Add extra unit test test to CSharpFormatterTests	2025-05-22 08:14:45 +02:00
Asaf Agami	b4279be3cb	Fix exception when converting json array to C# code (#1301 )	2025-05-22 07:54:58 +02:00
Stef Heyenrath	d628ce2270	Fix BodyParser to correctly check for json (#1297 ) * Fix BodyParser to correctly check for json * JsonUtils	2025-05-21 17:28:29 +02:00
Stef Heyenrath	1e23c58bf2	Use TinyMapper.Signed (#1299 ) * Use TinyMapper.Signed * <PackageReference Include="TinyMapper.Signed" Version="4.0.0" />	2025-05-17 18:29:03 +02:00