1.8.11

* Fix for WithTransformer and JsonBody as list

* Fix WithTransformer when the response BodyAsJson is a List

.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
-}

.vscode/launch.json

@@ -1,11 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
-        }
-    ]
-}

.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"
-        }
-    ]
-}

Directory.Build.props

@@ -4,13 +4,13 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.8.2</VersionPrefix>
+        <VersionPrefix>1.8.11</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
-        <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
+        <PackageProjectUrl>https://github.com/wiremock/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
         <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../../PackageReleaseNotes.txt"))</PackageReleaseNotes>
         <RepositoryType>git</RepositoryType>
-        <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
+        <RepositoryUrl>https://github.com/wiremock/WireMock.Net</RepositoryUrl>
         <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
         <PackageReadmeFile>PackageReadme.md</PackageReadmeFile>
         <LangVersion>12.0</LangVersion>

Generate-ReleaseNotes.cmd

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

PackageReadme.md

@@ -15,13 +15,13 @@ Lightweight Http Mocking Server for .NET, inspired by WireMock.org (from the Jav
 
 ### :star: Stubbing
 A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
-See [Wiki : Stubbing](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing).
+See [Wiki : Stubbing](https://github.com/wiremock/WireMock.Net/wiki/Stubbing).
 
 ### :star: Request Matching
-WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Request-Matching).
+WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/wiremock/WireMock.Net/wiki/Request-Matching).
 
 ### :star: Response Templating
-The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/WireMock-Net/WireMock.Net/wiki/Response-Templating).
+The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/wiremock/WireMock.Net/wiki/Response-Templating).
 
 ### :star: Admin API Reference
 The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
@@ -34,10 +34,10 @@ You can use your favorite test framework and use WireMock within your tests, see
 [Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
 
 ### Unit/Integration Testing using Testcontainers.DotNet
-See [Wiki : WireMock.Net.Testcontainers](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
+See [Wiki : WireMock.Net.Testcontainers](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
 
 ### Unit/Integration Testing using an an Aspire Distributed Application
-See [Wiki : WireMock.Net.Aspire](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-WireMock.Net.Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.
+See [Wiki : WireMock.Net.Aspire](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.
 
 #### As a dotnet tool
 It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).
@@ -46,17 +46,17 @@ It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet
 This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
 
 #### As a Windows Service
-You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
+You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
 
 #### As a Web Job in Azure or application in IIS
-See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
+See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
 
 #### In a docker container
 There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
-For more details see also [Docker](https://github.com/WireMock-Net/WireMock.Net-docker).
+For more details see also [Docker](https://github.com/wiremock/WireMock.Net-docker).
 
 #### HTTPS / SSL
-More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-HTTPS-(SSL))
+More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/wiremock/WireMock.Net/wiki/Using-HTTPS-(SSL))
 
 ## :books: Documentation
-For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/WireMock-Net/WireMock.Net/wiki/What-Is-WireMock.Net).
+For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/wiremock/WireMock.Net/wiki/What-Is-WireMock.Net).

PackageReleaseNotes.template

@@ -3,4 +3,4 @@
 - #{{Number}} {{Title}}{{#if Labels}} [{{join Labels ", "}}]{{/if}}
 {{/each}}
 
-The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
+The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md

PackageReleaseNotes.txt

@@ -1,7 +1,8 @@
-# 1.8.2 (05 May 2025)
-- #1291 Update ProtoBufJsonConverter to fix conflict for 'MessageOptions' [bug]
-- #1083 Compilation Error due to 'MessageOptions' Type Conflict between 'Google.Protobuf' and 'WireMock.Net' [bug]
-- #1097 Encoded url path parameter decoded via proxy [wontfix]
-- #1287 1.8.0 - issues with dependency on Microsoft.OpenApi version 2.0.0-preview.xx [bug]
+# 1.8.11 (11 June 2025)
+- #1311 Bump Testcontainers version to 4.5.0 [feature]
+- #1313 Update RandomDataGenerator.Net to 1.0.19 [feature]
+- #1315 Fix for WithTransformer and JsonBody as list [bug]
+- #1310 Binary compat issue with testcontainers 4.5.0 [bug]
+- #1312 WithTransformer breaks when the response BodyAsJson is a List [bug]
 
-The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
+The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md

README.md

@@ -1,7 +1,7 @@
-# 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).
+# ![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-Net/WireMock.Net/wiki/What-Is-WireMock.Net).
+For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/wiremock/WireMock.Net/wiki/What-Is-WireMock.Net).
 
 ## :star: Key Features
 * HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
@@ -26,20 +26,21 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | --- | --- |
 | ***Project*** |   |
 |   **Chat** | [![Slack](https://badgen.net/badge/icon/slack?icon=slack&label)](https://slack.wiremock.org/) [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
-|   **Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues) |
+|   **Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/wiremock/WireMock.Net/issues) |
 | | |
 | ***Quality*** |   |
 |   **Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=7) |
-|   **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) |
+|   **Quality** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=alert_status)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net) [![CodeFactor](https://www.codefactor.io/repository/github/wiremock/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock/wiremock.net) |
 |   **Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=bugs)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=BUG) [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=code_smells)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=CODE_SMELL) |
-|   **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)|
+|   **Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=coverage)](https://sonarcloud.io/component_measures?id=WireMock-Net_WireMock.Net&metric=coverage) [![codecov](https://codecov.io/gh/wiremock/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/wiremock/WireMock.Net)|
 |   **TIOBE** | [TIOBE Quality Indicator](https://ticsdemo.tiobe.com/tiobeweb/DEMO/TqiDashboard.html#axes=Project(WireMock.Net),Sub()&metric=tqi)
 
 ### :package: NuGet packages
 
-| | Official | Preview [:information_source:](https://github.com/WireMock-Net/WireMock.Net/wiki/MyGet-preview-versions) |
+| | Official | Preview [:information_source:](https://github.com/wiremock/WireMock.Net/wiki/MyGet-preview-versions) |
 | - | - | - |
 |   **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)
+|   **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)
 |   **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)
 |   **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)
 |   **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
 | | | |
 |   **WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/nuget/v/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Matchers.CSharpCode?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
 |   **WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/nuget/v/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.OpenApiParser?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
+|   **WireMock.Net.MimePart** | [![NuGet Badge WireMock.Net.MimePart](https://img.shields.io/nuget/v/WireMock.Net.MimePart)](https://www.nuget.org/packages/WireMock.Net.MimePart) | [![MyGet Badge WireMock.Net.MimePart](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.MimePart?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.MimePart)
 | | | |
 |   **WireMock.Net.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)
 |   **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:
 
@@ -79,17 +86,17 @@ To still enable this feature, you need to add the `Environment` category to the
 ---
 
 ## :memo: Development
-For the supported frameworks and build information, see [this](https://github.com/WireMock-Net/WireMock.Net/wiki/Development-Information) page.
+For the supported frameworks and build information, see [this](https://github.com/wiremock/WireMock.Net/wiki/Development-Information) page.
 
 ## :star: Stubbing
 A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
-See [Wiki : Stubbing](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing).
+See [Wiki : Stubbing](https://github.com/wiremock/WireMock.Net/wiki/Stubbing).
 
 ## :star: Request Matching
-WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Request-Matching).
+WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/wiremock/WireMock.Net/wiki/Request-Matching).
 
 ## :star: Response Templating
-The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/WireMock-Net/WireMock.Net/wiki/Response-Templating).
+The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/wiremock/WireMock.Net/wiki/Response-Templating).
 
 ## :star: Admin API Reference
 The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
@@ -102,10 +109,10 @@ You can use your favorite test framework and use WireMock within your tests, see
 [Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
 
 ### Unit/Integration Testing using Testcontainers.DotNet
-See [Wiki : WireMock.Net.Testcontainers](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
+See [Wiki : WireMock.Net.Testcontainers](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
 
 ### Unit/Integration Testing using an an Aspire Distributed Application
-See [Wiki : WireMock.Net.Aspire](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-WireMock.Net.Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.
+See [Wiki : WireMock.Net.Aspire](https://github.com/wiremock/WireMock.Net/wiki/Using-WireMock.Net.Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.
 
 ### As a dotnet tool
 It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).
@@ -114,14 +121,14 @@ It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet
 This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
 
 ### As a Windows Service
-You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
+You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
 
 ### As a Web Job in Azure or application in IIS
-See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
+See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/wiremock/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
 
 ### In a docker container
 There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
-For more details see also [Docker](https://github.com/WireMock-Net/WireMock.Net-docker).
+For more details see also [Docker](https://github.com/wiremock/WireMock.Net-docker).
 
 #### HTTPS / SSL
-More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-HTTPS-(SSL))
+More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/wiremock/WireMock.Net/wiki/Using-HTTPS-(SSL))

WireMock.Net Solution.sln

@@ -128,7 +128,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Middleware.Tes
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.AwesomeAssertions", "src\WireMock.Net.AwesomeAssertions\WireMock.Net.AwesomeAssertions.csproj", "{7753670F-7C7F-44BF-8BC7-08325588E60C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.OpenApiParser", "src\WireMock.Net.OpenApiParser\WireMock.Net.OpenApiParser.csproj", "{D3804228-91F4-4502-9595-39584E5AADAD}"
+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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -304,10 +310,22 @@ Global
 		{7753670F-7C7F-44BF-8BC7-08325588E60C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7753670F-7C7F-44BF-8BC7-08325588E60C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7753670F-7C7F-44BF-8BC7-08325588E60C}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D3804228-91F4-4502-9595-39584E5AADAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3804228-91F4-4502-9595-39584E5AADAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3804228-91F4-4502-9595-39584E5AADAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D3804228-91F4-4502-9595-39584E5AADAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5B03EEF-822C-4295-952B-4479AD30082B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -357,7 +375,10 @@ Global
 		{6B30AA9F-DA04-4EB5-B03C-45A8EF272ECE} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{A5FEF4F7-7DA2-4962-89A8-16BA942886E5} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{7753670F-7C7F-44BF-8BC7-08325588E60C} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
-		{D3804228-91F4-4502-9595-39584E5AADAD} = {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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

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

@@ -2,22 +2,42 @@
 
 using Greet;
 using Grpc.Net.Client;
+using Policy2;
 
-namespace WireMock.Net.Console.GrpcClient;
+await TestPolicyAsync();
+// await TestGreeterAsync();
+return;
 
-internal class Program
+async Task TestGreeterAsync()
 {
-    static async Task Main(string[] args)
+    var channel = GrpcChannel.ForAddress("http://localhost:9093/grpc3", new GrpcChannelOptions
     {
-        var channel = GrpcChannel.ForAddress("http://localhost:9093/grpc3", new GrpcChannelOptions
+        Credentials = Grpc.Core.ChannelCredentials.Insecure
+    });
+
+    var client = new Greeter.GreeterClient(channel);
+
+    var reply = await client.SayHelloAsync(new HelloRequest { Name = "stef" });
+
+    Console.WriteLine("Greeting: " + reply.Message);
+}
+
+async Task TestPolicyAsync()
+{
+    var channel = GrpcChannel.ForAddress("http://localhost:9093/grpc-policy", new GrpcChannelOptions
+    {
+        Credentials = Grpc.Core.ChannelCredentials.Insecure
+    });
+
+    var client = new PolicyService2.PolicyService2Client(channel);
+
+    var reply = await client.GetCancellationDetailAsync(new GetCancellationDetailRequest
+    {
+        Client = new Client
         {
-            Credentials = Grpc.Core.ChannelCredentials.Insecure
-        });
+            CorrelationId = "abc"
+        }
+    });
 
-        var client = new Greeter.GreeterClient(channel);
-
-        var reply = await client.SayHelloAsync(new HelloRequest { Name = "stef" });
-
-        System.Console.WriteLine("Greeting: " + reply.Message);
-    }
+    Console.WriteLine("PolicyService2:reply.CancellationName " + reply.CancellationName);
 }

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

@@ -5,6 +5,7 @@
         <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
+        <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>
@@ -18,6 +19,7 @@
 
     <ItemGroup>
         <Protobuf Include="greet.proto" GrpcServices="Client" />
+        <Protobuf Include="policy.proto" GrpcServices="Client" />
     </ItemGroup>
 
-</Project>
+</Project>

examples/WireMock.Net.Console.GrpcClient/policy.proto

@@ -0,0 +1,64 @@
+
+syntax = "proto3";
+
+import "google/protobuf/timestamp.proto";
+
+// option csharp_namespace = "NarrowIntegrationTest.Lookup";
+
+package Policy2;
+
+service PolicyService2 {	
+	rpc GetCancellationDetail (GetCancellationDetailRequest) returns (GetCancellationDetailResponse);
+}
+
+message GetCancellationDetailRequest {
+	Client Client = 1;
+	LegacyPolicyKey LegacyPolicyKey = 2;
+}
+
+message GetCancellationDetailResponse {
+	ResponseStatus Status = 1;
+	string CancellationCode = 2;
+	string CancellationName = 3;
+	string CancellationDescription = 4;
+	google.protobuf.Timestamp CancellationEffDate = 5;
+	string NonRenewalCode = 6;
+	string NonRenewalName = 7;
+	string NonRenewalDescription = 8;
+	google.protobuf.Timestamp NonRenewalEffDate = 9;
+	google.protobuf.Timestamp LastReinstatementDate = 10;
+}
+
+message LegacyPolicyKey {
+	string Group = 1;
+	int32 UnitNumber = 2;
+	int32 Year = 3;
+	string Suffix = 4;
+}
+
+message ResponseStatus {
+	bool HasErrors = 1;
+	bool HasWarnings = 2;
+	repeated string Errors = 3;
+	repeated string Warnings = 4;
+	string CorrelationId = 5;
+}
+
+message Client {
+	string CorrelationId = 1;
+	enum Clients {
+		Unknown = 0;
+        QMS = 1;
+        BillingCenter = 2;
+        PAS = 3;
+        Payroll = 4;
+        Portal = 5;
+        SFO = 6;
+        QuoteAndBind = 7;
+        LegacyConversion = 8;
+        BindNow = 9;
+		PaymentPortal = 10 ;
+		PricingEngine = 11;
+	}
+	Clients ClientName = 2;
+}

examples/WireMock.Net.Console.Net452.Classic/MainApp.cs

@@ -6,7 +6,6 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Net.Sockets;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using WireMock.Logging;
@@ -45,57 +44,129 @@ namespace WireMock.Net.ConsoleApplication
 
     public static class MainApp
     {
-        private const string ProtoDefinition = @"
-syntax = ""proto3"";
+        private const string ProtoDefinitionGreeter =
+            """
+            syntax = "proto3";
 
-package greet;
+            package greet;
 
-service Greeter {
-  rpc SayHello (HelloRequest) returns (HelloReply);
-}
+            service Greeter {
+              rpc SayHello (HelloRequest) returns (HelloReply);
+            }
 
-message HelloRequest {
-  string name = 1;
-}
+            message HelloRequest {
+              string name = 1;
+            }
 
-message HelloReply {
-  string message = 1;
-}
-";
+            message HelloReply {
+              string message = 1;
+            }
 
-        private const string TestSchema = @"
-  scalar DateTime
-  scalar MyCustomScalar
+            """;
 
-  input MessageInput {
-    content: String
-    author: String
-  }
+        private const string ProtoDefinitionPolicy =
+            """
+            syntax = "proto3";
 
-  type Message {
-    id: ID!
-    content: String
-    author: String
-  }
+            import "google/protobuf/timestamp.proto";
 
-  type Mutation {
-    createMessage(input: MessageInput): Message
-    createAnotherMessage(x: MyCustomScalar, dt: DateTime): Message
-    updateMessage(id: ID!, input: MessageInput): Message
-  }
+            // option csharp_namespace = "NarrowIntegrationTest.Lookup";
 
-  type Query {
-   greeting:String
-   students:[Student]
-   studentById(id:ID!):Student
-  }
+            package Policy2;
 
-  type Student {
-   id:ID!
-   firstName:String
-   lastName:String
-   fullName:String 
-  }";
+            service PolicyService2 {	
+            	rpc GetCancellationDetail (GetCancellationDetailRequest) returns (GetCancellationDetailResponse);
+            }
+
+            message GetCancellationDetailRequest {
+            	Client Client = 1;
+            	LegacyPolicyKey LegacyPolicyKey = 2;
+            }
+
+            message GetCancellationDetailResponse {
+            	ResponseStatus Status = 1;
+            	string CancellationCode = 2;
+            	string CancellationName = 3;
+            	string CancellationDescription = 4;
+            	google.protobuf.Timestamp CancellationEffDate = 5;
+            	string NonRenewalCode = 6;
+            	string NonRenewalName = 7;
+            	string NonRenewalDescription = 8;
+            	google.protobuf.Timestamp NonRenewalEffDate = 9;
+            	google.protobuf.Timestamp LastReinstatementDate = 10; // Always send the last reinstatement date if present on the policy term.
+            }
+
+            message LegacyPolicyKey {
+            	string Group = 1;
+            	int32 UnitNumber = 2;
+            	int32 Year = 3;
+            	string Suffix = 4;
+            }
+
+
+            message ResponseStatus {
+            	bool HasErrors = 1;
+            	bool HasWarnings = 2;
+            	repeated string Errors = 3;
+            	repeated string Warnings = 4;
+            	string CorrelationId = 5;
+            }
+
+            message Client {
+            	string CorrelationId = 1;
+            	enum Clients {
+            		Unknown = 0;
+                    QMS = 1;
+                    BillingCenter = 2;
+                    PAS = 3;
+                    Payroll = 4;
+                    Portal = 5;
+                    SFO = 6;
+                    QuoteAndBind = 7;
+                    LegacyConversion = 8;
+                    BindNow = 9;
+            		PaymentPortal = 10 ;
+            		PricingEngine = 11;
+            	}
+            	Clients ClientName = 2;
+            }
+            """;
+
+        private const string TestSchema =
+            """
+            scalar DateTime
+            scalar MyCustomScalar
+
+            input MessageInput {
+                content: String
+                author: String
+            }
+
+            type Message {
+                id: ID!
+                content: String
+                author: String
+            }
+
+            type Mutation {
+                createMessage(input: MessageInput): Message
+                createAnotherMessage(x: MyCustomScalar, dt: DateTime): Message
+                updateMessage(id: ID!, input: MessageInput): Message
+            }
+
+            type Query {
+                greeting:String
+                students:[Student]
+                studentById(id:ID!):Student
+            }
+
+            type Student {
+                id:ID!
+                firstName:String
+                lastName:String
+                fullName:String 
+            }
+            """;
 
         private static void RunSse()
         {
@@ -176,8 +247,8 @@ message HelloReply {
 
         public static void Run()
         {
-            RunSse();
-            RunOnLocal();
+            //RunSse();
+            //RunOnLocal();
 
             var mappingBuilder = new MappingBuilder();
             mappingBuilder
@@ -269,7 +340,7 @@ message HelloReply {
             System.Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
 
             server.SetBasicAuthentication("a", "b");
-            //server.SetAzureADAuthentication("6c2a4722-f3b9-4970-b8fc-fac41e29stef", "8587fde1-7824-42c7-8592-faf92b04stef");
+            //server.SetAzureADAuthentication(Environment.GetEnvironmentVariable("WIREMOCK_AAD_TENANT")!, "api://e083d51a-01a6-446c-8ad5-0c5c7f002208");
 
             //var http = new HttpClient();
             //var response = await http.GetAsync($"{_wireMockServer.Url}/pricing");
@@ -282,11 +353,11 @@ message HelloReply {
                     .UsingPost()
                     .WithHttpVersion("2")
                     .WithPath("/grpc/greet.Greeter/SayHello")
-                    .WithBodyAsProtoBuf(ProtoDefinition, "greet.HelloRequest", protoBufJsonMatcher)
+                    .WithBodyAsProtoBuf(ProtoDefinitionGreeter, "greet.HelloRequest", protoBufJsonMatcher)
                 )
                 .RespondWith(Response.Create()
                     .WithHeader("Content-Type", "application/grpc")
-                    .WithBodyAsProtoBuf(ProtoDefinition, "greet.HelloReply",
+                    .WithBodyAsProtoBuf(ProtoDefinitionGreeter, "greet.HelloReply",
                         new
                         {
                             message = "hello {{request.BodyAsJson.name}}"
@@ -303,7 +374,7 @@ message HelloReply {
                     .WithPath("/grpc2/greet.Greeter/SayHello")
                     .WithBodyAsProtoBuf("greet.HelloRequest", protoBufJsonMatcher)
                 )
-                .WithProtoDefinition(ProtoDefinition)
+                .WithProtoDefinition(ProtoDefinitionGreeter)
                 .RespondWith(Response.Create()
                     .WithHeader("Content-Type", "application/grpc")
                     .WithBodyAsProtoBuf("greet.HelloReply",
@@ -317,7 +388,7 @@ message HelloReply {
                 );
 
             server
-                .AddProtoDefinition("my-greeter", ProtoDefinition)
+                .AddProtoDefinition("my-greeter", ProtoDefinitionGreeter)
                 .Given(Request.Create()
                     .UsingPost()
                     .WithPath("/grpc3/greet.Greeter/SayHello")
@@ -335,6 +406,25 @@ message HelloReply {
                     .WithTrailingHeader("grpc-status", "0")
                     .WithTransformer()
                 );
+
+            var protoBufJsonMatcherForGetCancellationDetailRequest = new JsonPartialWildcardMatcher("{\"Client\":{\"CorrelationId\":\"*\"}}", false, true);
+            var getCancellationDetailResponseAsJsonObject = JsonConvert.DeserializeObject(
+                """{"Status":{"HasErrors":false,"HasWarnings":false,"Errors":[],"Warnings":[],"CorrelationId":"b8ad0d04-ed2f-42e1-ac85-339d91dc9855"},"CancellationCode":"cc123","CancellationName":"cn123","CancellationDescription":"","CancellationEffDate":null,"NonRenewalCode":"","NonRenewalName":"","NonRenewalDescription":"","NonRenewalEffDate":null,"LastReinstatementDate":null}"""
+            )!;
+            server
+                .AddProtoDefinition("grpc-policy", ProtoDefinitionPolicy)
+                .Given(Request.Create()
+                    .UsingPost()
+                    .WithPath("/Policy2.PolicyService2/GetCancellationDetail")
+                    .WithBodyAsProtoBuf("Policy2.GetCancellationDetailRequest", protoBufJsonMatcherForGetCancellationDetailRequest)
+                )
+                .WithProtoDefinition("grpc-policy")
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/grpc")
+                    .WithBodyAsProtoBuf("Policy2.GetCancellationDetailResponse", getCancellationDetailResponseAsJsonObject)
+                    .WithTrailingHeader("grpc-status", "0")
+                    .WithTransformer()
+                );
 #endif
 
 #if GRAPHQL
@@ -596,9 +686,9 @@ message HelloReply {
                     .WithHeader("Content-Type", "application/json")
                     .WithBodyAsJson(new { result = "data:headers posted with 201" }));
 
-            if (!System.IO.File.Exists(@"c:\temp\x.json"))
+            if (!File.Exists(@"c:\temp\x.json"))
             {
-                System.IO.File.WriteAllText(@"c:\temp\x.json", "{ \"hello\": \"world\", \"answer\": 42 }");
+                File.WriteAllText(@"c:\temp\x.json", "{ \"hello\": \"world\", \"answer\": 42 }");
             }
 
             server
@@ -925,7 +1015,7 @@ message HelloReply {
                         BodyData = new BodyData
                         {
                             BodyAsString = "random200or505:" + code + ", HeadersFromRequest = " + string.Join(",", request.Headers),
-                            DetectedBodyType = Types.BodyType.String,
+                            DetectedBodyType = BodyType.String,
                         },
                         StatusCode = code
                     };
@@ -941,7 +1031,7 @@ message HelloReply {
 
                     return new ResponseMessage
                     {
-                        BodyData = new BodyData { BodyAsString = "random200or505async:" + code, DetectedBodyType = Types.BodyType.String },
+                        BodyData = new BodyData { BodyAsString = "random200or505async:" + code, DetectedBodyType = BodyType.String },
                         StatusCode = code
                     };
                 }));

src-preview/WireMock.Net.OpenApiParser.Preview/Extensions/DictionaryExtensions.cs

@@ -1,22 +0,0 @@
-// Copyright © WireMock.Net
-
-#if NET46 || NET47 || NETSTANDARD2_0
-using System.Collections.Generic;
-
-namespace WireMock.Net.OpenApiParser.Extensions;
-
-internal static class DictionaryExtensions
-{
-    public static bool TryAdd<TKey, TValue>(this Dictionary<TKey, TValue>? dictionary, TKey key, TValue value)
-    {
-        if (dictionary is null || dictionary.ContainsKey(key))
-        {
-            return false;
-        }
-
-        dictionary[key] = value;
-
-        return true;
-    }
-}
-#endif

src-preview/WireMock.Net.OpenApiParser.Preview/Extensions/OpenApiSchemaExtensions.cs

@@ -1,85 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Linq;
-using System.Text.Json;
-using Microsoft.OpenApi.Any;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
-using WireMock.Net.OpenApiParser.Types;
-
-namespace WireMock.Net.OpenApiParser.Extensions;
-
-internal static class OpenApiSchemaExtensions
-{
-    public static bool TryGetXNullable(this IOpenApiSchema schema, out bool value)
-    {
-        value = false;
-
-        if (schema.Extensions != null && schema.Extensions.TryGetValue(OpenApiConstants.NullableExtension, out var nullExtRawValue) && nullExtRawValue is OpenApiAny { Node: { } jsonNode })
-        {
-            value = jsonNode.GetValueKind() == JsonValueKind.True;
-            return true;
-        }
-
-        return false;
-    }
-
-    public static JsonSchemaType? GetSchemaType(this IOpenApiSchema? schema, out bool isNullable)
-    {
-        isNullable = false;
-
-        if (schema == null)
-        {
-            return null;
-        }
-
-        if (schema.Type == null)
-        {
-            if (schema.AllOf?.Any() == true || schema.AnyOf?.Any() == true)
-            {
-                return JsonSchemaType.Object;
-            }
-        }
-
-        isNullable = (schema.Type | JsonSchemaType.Null) == JsonSchemaType.Null || (schema.TryGetXNullable(out var xNullable) && xNullable);
-
-        // Removes the Null flag from the schema.Type, ensuring the returned value represents a non-nullable type.
-        return schema.Type & ~JsonSchemaType.Null;
-    }
-
-    public static SchemaFormat GetSchemaFormat(this IOpenApiSchema? schema)
-    {
-        switch (schema?.Format)
-        {
-            case "float":
-                return SchemaFormat.Float;
-
-            case "double":
-                return SchemaFormat.Double;
-
-            case "int32":
-                return SchemaFormat.Int32;
-
-            case "int64":
-                return SchemaFormat.Int64;
-
-            case "date":
-                return SchemaFormat.Date;
-
-            case "date-time":
-                return SchemaFormat.DateTime;
-
-            case "password":
-                return SchemaFormat.Password;
-
-            case "byte":
-                return SchemaFormat.Byte;
-
-            case "binary":
-                return SchemaFormat.Binary;
-
-            default:
-                return SchemaFormat.Undefined;
-        }
-    }
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Extensions/WireMockServerExtensions.cs

@@ -1,96 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.IO;
-using System.Linq;
-using JetBrains.Annotations;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Reader;
-using Stef.Validation;
-using WireMock.Net.OpenApiParser.Settings;
-using WireMock.Server;
-
-namespace WireMock.Net.OpenApiParser.Extensions;
-
-/// <summary>
-/// Some extension methods for <see cref="IWireMockServer"/>.
-/// </summary>
-public static class WireMockServerExtensions
-{
-    /// <summary>
-    /// Register the mappings via an OpenAPI (swagger) V2/V3/V3.1 file.
-    /// </summary>
-    /// <param name="server">The WireMockServer instance</param>
-    /// <param name="path">Path containing OpenAPI file to parse and use the mappings.</param>
-    /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
-    [PublicAPI]
-    public static IWireMockServer WithMappingFromOpenApiFile(this IWireMockServer server, string path, out OpenApiDiagnostic diagnostic)
-    {
-        return WithMappingFromOpenApiFile(server, path, new WireMockOpenApiParserSettings(), out diagnostic);
-    }
-
-    /// <summary>
-    /// Register the mappings via an OpenAPI (swagger) V2/V3/V3.1 file.
-    /// </summary>
-    /// <param name="server">The WireMockServer instance</param>
-    /// <param name="path">Path containing OpenAPI file to parse and use the mappings.</param>
-    /// <param name="settings">Additional settings</param>
-    /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
-    [PublicAPI]
-    public static IWireMockServer WithMappingFromOpenApiFile(this IWireMockServer server, string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
-    {
-        Guard.NotNull(server);
-        Guard.NotNullOrEmpty(path);
-
-        var mappings = new WireMockOpenApiParser().FromFile(path, settings, out diagnostic);
-
-        return server.WithMapping(mappings.ToArray());
-    }
-
-    /// <summary>
-    /// Register the mappings via an OpenAPI (swagger) V2/V3/V3.1 stream.
-    /// </summary>
-    /// <param name="server">The WireMockServer instance</param>
-    /// <param name="stream">Stream containing OpenAPI description to parse and use the mappings.</param>
-    /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
-    [PublicAPI]
-    public static IWireMockServer WithMappingFromOpenApiStream(this IWireMockServer server, Stream stream, out OpenApiDiagnostic diagnostic)
-    {
-        return WithMappingFromOpenApiStream(server, stream, new WireMockOpenApiParserSettings(), out diagnostic);
-    }
-
-    /// <summary>
-    /// Register the mappings via an OpenAPI (swagger) V2/V3/V3.1 stream.
-    /// </summary>
-    /// <param name="server">The WireMockServer instance</param>
-    /// <param name="stream">Stream containing OpenAPI description to parse and use the mappings.</param>
-    /// <param name="settings">Additional settings</param>
-    /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
-    [PublicAPI]
-    public static IWireMockServer WithMappingFromOpenApiStream(this IWireMockServer server, Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
-    {
-        Guard.NotNull(server);
-        Guard.NotNull(stream);
-        Guard.NotNull(settings);
-
-        var mappings = new WireMockOpenApiParser().FromStream(stream, settings, out diagnostic);
-
-        return server.WithMapping(mappings.ToArray());
-    }
-
-    /// <summary>
-    /// Register the mappings via an OpenAPI (swagger) V2/V3/V3.1 document.
-    /// </summary>
-    /// <param name="server">The WireMockServer instance</param>
-    /// <param name="document">The OpenAPI document to use as mappings.</param>
-    /// <param name="settings">Additional settings [optional].</param>
-    [PublicAPI]
-    public static IWireMockServer WithMappingFromOpenApiDocument(this IWireMockServer server, OpenApiDocument document, WireMockOpenApiParserSettings? settings = null)
-    {
-        Guard.NotNull(server);
-        Guard.NotNull(document);
-
-        var mappings = new WireMockOpenApiParser().FromDocument(document, settings);
-
-        return server.WithMapping(mappings.ToArray());
-    }
-}

src-preview/WireMock.Net.OpenApiParser.Preview/IWireMockOpenApiParser.cs

@@ -1,75 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Reader;
-using WireMock.Admin.Mappings;
-using WireMock.Net.OpenApiParser.Settings;
-
-namespace WireMock.Net.OpenApiParser;
-
-/// <summary>
-/// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock MappingModels.
-/// </summary>
-public interface IWireMockOpenApiParser
-{
-    /// <summary>
-    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a file-path.
-    /// </summary>
-    /// <param name="path">The path to read the OpenApi/Swagger/V2/V3/V31 or Raml file.</param>
-    /// <param name="diagnostic">OpenApiDiagnostic output</param>
-    /// <returns>MappingModel</returns>
-    IReadOnlyList<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic);
-
-    /// <summary>
-    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a file-path.
-    /// </summary>
-    /// <param name="path">The path to read the OpenApi/Swagger/V2/V3/V31 or Raml file.</param>
-    /// <param name="settings">Additional settings</param>
-    /// <param name="diagnostic">OpenApiDiagnostic output</param>
-    /// <returns>MappingModel</returns>
-    IReadOnlyList<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
-
-    /// <summary>
-    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from an <seealso cref="OpenApiDocument"/>.
-    /// </summary>
-    /// <param name="document">The source OpenApiDocument</param>
-    /// <param name="settings">Additional settings [optional]</param>
-    /// <returns>MappingModel</returns>
-    IReadOnlyList<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null);
-
-    /// <summary>
-    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="Stream"/>.
-    /// </summary>
-    /// <param name="stream">The source stream</param>
-    /// <param name="diagnostic">OpenApiDiagnostic output</param>
-    /// <returns>MappingModel</returns>
-    IReadOnlyList<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic);
-
-    /// <summary>
-    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="Stream"/>.
-    /// </summary>
-    /// <param name="stream">The source stream</param>
-    /// <param name="settings">Additional settings</param>
-    /// <param name="diagnostic">OpenApiDiagnostic output</param>
-    /// <returns>MappingModel</returns>
-    IReadOnlyList<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
-
-    /// <summary>
-    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="string"/>.
-    /// </summary>
-    /// <param name="text">The source text</param>
-    /// <param name="diagnostic">OpenApiDiagnostic output</param>
-    /// <returns>MappingModel</returns>
-    IReadOnlyList<MappingModel> FromText(string text, out OpenApiDiagnostic diagnostic);
-
-    /// <summary>
-    /// Generate <see cref="IReadOnlyList{MappingModel}"/> from a <seealso cref="string"/>.
-    /// </summary>
-    /// <param name="text">The source text</param>
-    /// <param name="settings">Additional settings</param>
-    /// <param name="diagnostic">OpenApiDiagnostic output</param>
-    /// <returns>MappingModel</returns>
-    IReadOnlyList<MappingModel> FromText(string text, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Mappers/OpenApiPathsMapper.cs

@@ -1,347 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
-using Newtonsoft.Json;
-using Stef.Validation;
-using WireMock.Admin.Mappings;
-using WireMock.Net.OpenApiParser.Extensions;
-using WireMock.Net.OpenApiParser.Settings;
-using WireMock.Net.OpenApiParser.Types;
-using WireMock.Net.OpenApiParser.Utils;
-using SystemTextJsonSerializer = System.Text.Json.JsonSerializer;
-
-namespace WireMock.Net.OpenApiParser.Mappers;
-
-internal class OpenApiPathsMapper
-{
-    private const string HeaderContentType = "Content-Type";
-
-    private readonly WireMockOpenApiParserSettings _settings;
-    private readonly ExampleValueGenerator _exampleValueGenerator;
-
-    public OpenApiPathsMapper(WireMockOpenApiParserSettings settings)
-    {
-        _settings = Guard.NotNull(settings);
-        _exampleValueGenerator = new ExampleValueGenerator(settings);
-    }
-
-    public IReadOnlyList<MappingModel> ToMappingModels(OpenApiPaths? paths, IList<OpenApiServer> servers)
-    {
-        return paths?
-            .OrderBy(p => p.Key)
-            .Select(p => MapPath(p.Key, p.Value, servers))
-            .SelectMany(x => x)
-            .ToArray() ?? [];
-    }
-
-    private IReadOnlyList<MappingModel> MapPath(string path, IOpenApiPathItem pathItem, IList<OpenApiServer> servers)
-    {
-        return pathItem.Operations?.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers)).ToArray() ?? [];
-    }
-
-    private MappingModel MapOperationToMappingModel(string path, string httpMethod, OpenApiOperation operation, IList<OpenApiServer> servers)
-    {
-        var queryParameters = operation.Parameters?.Where(p => p.In == ParameterLocation.Query) ?? [];
-        var pathParameters = operation.Parameters?.Where(p => p.In == ParameterLocation.Path) ?? [];
-        var headers = operation.Parameters?.Where(p => p.In == ParameterLocation.Header) ?? [];
-
-        var response = operation?.Responses?.FirstOrDefault() ?? new KeyValuePair<string, IOpenApiResponse>();
-
-        TryGetContent(response.Value?.Content, out OpenApiMediaType? responseContent, out var responseContentType);
-        var responseSchema = response.Value?.Content?.FirstOrDefault().Value?.Schema;
-        var responseExample = responseContent?.Example;
-        var responseSchemaExample = responseContent?.Schema?.Example;
-
-        var responseBody = responseExample ?? responseSchemaExample ?? MapSchemaToObject(responseSchema);
-
-        var requestBodyModel = new BodyModel();
-        if (operation.RequestBody != null && operation.RequestBody.Content != null && operation.RequestBody.Required)
-        {
-            var request = operation.RequestBody.Content;
-            TryGetContent(request, out var requestContent, out _);
-
-            var requestBodySchema = operation.RequestBody.Content.First().Value?.Schema;
-            var requestBodyExample = requestContent!.Example;
-            var requestBodySchemaExample = requestContent.Schema?.Example;
-
-            var requestBodyMapped = requestBodyExample ?? requestBodySchemaExample ?? MapSchemaToObject(requestBodySchema);
-            requestBodyModel = MapRequestBody(requestBodyMapped);
-        }
-
-        if (!int.TryParse(response.Key, out var httpStatusCode))
-        {
-            httpStatusCode = 200;
-        }
-
-        return new MappingModel
-        {
-            Guid = Guid.NewGuid(),
-            Request = new RequestModel
-            {
-                Methods = [httpMethod],
-                Path = PathUtils.Combine(MapBasePath(servers), MapPathWithParameters(path, pathParameters)),
-                Params = MapQueryParameters(queryParameters),
-                Headers = MapRequestHeaders(headers),
-                Body = requestBodyModel
-            },
-            Response = new ResponseModel
-            {
-                StatusCode = httpStatusCode,
-                Headers = MapHeaders(responseContentType, response.Value?.Headers),
-                BodyAsJson = responseBody != null ? JsonConvert.DeserializeObject(SystemTextJsonSerializer.Serialize(responseBody)) : null
-            }
-        };
-    }
-
-    private BodyModel? MapRequestBody(JsonNode? requestBody)
-    {
-        if (requestBody == null)
-        {
-            return null;
-        }
-
-        return new BodyModel
-        {
-            Matcher = new MatcherModel
-            {
-                Name = "JsonMatcher",
-                Pattern = SystemTextJsonSerializer.Serialize(requestBody, new JsonSerializerOptions { WriteIndented = true }),
-                IgnoreCase = _settings.RequestBodyIgnoreCase
-            }
-        };
-    }
-
-    private static bool TryGetContent(IDictionary<string, OpenApiMediaType>? contents, [NotNullWhen(true)] out OpenApiMediaType? openApiMediaType, [NotNullWhen(true)] out string? contentType)
-    {
-        openApiMediaType = null;
-        contentType = null;
-
-        if (contents == null || contents.Values.Count == 0)
-        {
-            return false;
-        }
-
-        if (contents.TryGetValue("application/json", out var content))
-        {
-            openApiMediaType = content;
-            contentType = "application/json";
-        }
-        else
-        {
-            var first = contents.FirstOrDefault();
-            openApiMediaType = first.Value;
-            contentType = first.Key;
-        }
-
-        return true;
-    }
-
-    private JsonNode? MapSchemaToObject(IOpenApiSchema? schema)
-    {
-        if (schema == null)
-        {
-            return null;
-        }
-
-        switch (schema.GetSchemaType(out _))
-        {
-            case JsonSchemaType.Array:
-                var array = new JsonArray();
-                for (var i = 0; i < _settings.NumberOfArrayItems; i++)
-                {
-                    if (schema.Items?.Properties?.Count > 0)
-                    {
-                        var item = new JsonObject();
-                        foreach (var property in schema.Items.Properties)
-                        {
-                            item[property.Key] = MapSchemaToObject(property.Value);
-                        }
-
-                        array.Add(item);
-                    }
-                    else
-                    {
-                        var arrayItem = MapSchemaToObject(schema.Items);
-                        array.Add(arrayItem);
-                    }
-                }
-
-                if (schema.AllOf?.Count > 0)
-                {
-                    array.Add(MapSchemaAllOfToObject(schema));
-                }
-
-                return array;
-
-            case JsonSchemaType.Boolean:
-            case JsonSchemaType.Integer:
-            case JsonSchemaType.Number:
-            case JsonSchemaType.String:
-                return _exampleValueGenerator.GetExampleValue(schema);
-
-            case JsonSchemaType.Object:
-                var propertyAsJsonObject = new JsonObject();
-                foreach (var schemaProperty in schema.Properties ?? new Dictionary<string, IOpenApiSchema>())
-                {
-                    propertyAsJsonObject[schemaProperty.Key] = MapPropertyAsJsonNode(schemaProperty.Value);
-                }
-
-                if (schema.AllOf?.Count > 0)
-                {
-                    foreach (var group in schema.AllOf.SelectMany(p => p.Properties ?? new Dictionary<string, IOpenApiSchema>()).GroupBy(x => x.Key))
-                    {
-                        propertyAsJsonObject[group.Key] = MapPropertyAsJsonNode(group.First().Value);
-                    }
-                }
-
-                return propertyAsJsonObject;
-
-            default:
-                return null;
-        }
-    }
-
-    private JsonObject MapSchemaAllOfToObject(IOpenApiSchema schema)
-    {
-        var arrayItem = new JsonObject();
-        foreach (var property in schema.AllOf ?? [])
-        {
-            foreach (var item in property.Properties ?? new Dictionary<string, IOpenApiSchema>())
-            {
-                arrayItem[item.Key] = MapPropertyAsJsonNode(item.Value);
-            }
-        }
-        return arrayItem;
-    }
-
-    private JsonNode? MapPropertyAsJsonNode(IOpenApiSchema openApiSchema)
-    {
-        var schemaType = openApiSchema.GetSchemaType(out _);
-        if (schemaType is JsonSchemaType.Object or JsonSchemaType.Array)
-        {
-            return MapSchemaToObject(openApiSchema);
-        }
-
-        return _exampleValueGenerator.GetExampleValue(openApiSchema);
-    }
-
-    private string MapPathWithParameters(string path, IEnumerable<IOpenApiParameter>? parameters)
-    {
-        if (parameters == null)
-        {
-            return path;
-        }
-
-        var newPath = path;
-        foreach (var parameter in parameters)
-        {
-            var exampleMatcherModel = GetExampleMatcherModel(parameter.Schema, _settings.PathPatternToUse);
-            newPath = newPath.Replace($"{{{parameter.Name}}}", exampleMatcherModel.Pattern as string);
-        }
-
-        return newPath;
-    }
-
-    private IDictionary<string, object>? MapHeaders(string? responseContentType, IDictionary<string, IOpenApiHeader>? headers)
-    {
-        var mappedHeaders = headers?
-            .ToDictionary(item => item.Key, _ => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern!) ?? new Dictionary<string, object>();
-
-        if (!string.IsNullOrEmpty(responseContentType))
-        {
-            mappedHeaders.TryAdd(HeaderContentType, responseContentType);
-        }
-
-        return mappedHeaders.Keys.Any() ? mappedHeaders : null;
-    }
-
-    private IList<ParamModel>? MapQueryParameters(IEnumerable<IOpenApiParameter> queryParameters)
-    {
-        var list = queryParameters
-            .Where(req => req.Required)
-            .Select(qp => new ParamModel
-            {
-                Name = qp.Name ?? string.Empty,
-                IgnoreCase = _settings.QueryParameterPatternIgnoreCase,
-                Matchers =
-                [
-                    GetExampleMatcherModel(qp.Schema, _settings.QueryParameterPatternToUse)
-                ]
-            })
-            .ToList();
-
-        return list.Any() ? list : null;
-    }
-
-    private IList<HeaderModel>? MapRequestHeaders(IEnumerable<IOpenApiParameter> headers)
-    {
-        var list = headers
-            .Where(req => req.Required)
-            .Select(qp => new HeaderModel
-            {
-                Name = qp.Name ?? string.Empty,
-                IgnoreCase = _settings.HeaderPatternIgnoreCase,
-                Matchers =
-                [
-                    GetExampleMatcherModel(qp.Schema, _settings.HeaderPatternToUse)
-                ]
-            })
-            .ToList();
-
-        return list.Any() ? list : null;
-    }
-
-    private MatcherModel GetExampleMatcherModel(IOpenApiSchema? schema, ExampleValueType type)
-    {
-        return type switch
-        {
-            ExampleValueType.Value => new MatcherModel
-            {
-                Name = "ExactMatcher",
-                Pattern = GetExampleValueAsStringForSchemaType(schema),
-                IgnoreCase = _settings.IgnoreCaseExampleValues
-            },
-
-            _ => new MatcherModel
-            {
-                Name = "WildcardMatcher",
-                Pattern = "*"
-            }
-        };
-    }
-
-    private string GetExampleValueAsStringForSchemaType(IOpenApiSchema? schema)
-    {
-        var value = _exampleValueGenerator.GetExampleValue(schema);
-
-        if (value.GetValueKind() == JsonValueKind.String)
-        {
-            return value.GetValue<string>();
-        }
-
-        return value.ToString();
-    }
-
-    private static string MapBasePath(IList<OpenApiServer>? servers)
-    {
-        var server = servers?.FirstOrDefault();
-        if (server == null)
-        {
-            return string.Empty;
-        }
-
-        if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out var uriResult))
-        {
-            return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString();
-        }
-
-        return string.Empty;
-    }
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Settings/IWireMockOpenApiParserExampleValues.cs

@@ -1,62 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using Microsoft.OpenApi.Models.Interfaces;
-
-namespace WireMock.Net.OpenApiParser.Settings;
-
-/// <summary>
-/// An interface defining the example values to use for the different types.
-/// </summary>
-public interface IWireMockOpenApiParserExampleValues
-{
-    /// <summary>
-    /// An example value for a Boolean.
-    /// </summary>
-    bool Boolean { get; }
-
-    /// <summary>
-    /// An example value for an Integer.
-    /// </summary>
-    int Integer { get; }
-
-    /// <summary>
-    /// An example value for a Float.
-    /// </summary>
-    float Float { get; }
-
-    /// <summary>
-    /// An example value for a Decimal.
-    /// </summary>
-    decimal Decimal { get; }
-
-    /// <summary>
-    /// An example value for a Date.
-    /// </summary>
-    Func<DateTime> Date { get; }
-
-    /// <summary>
-    /// An example value for a DateTime.
-    /// </summary>
-    Func<DateTime> DateTime { get; }
-
-    /// <summary>
-    /// An example value for Bytes.
-    /// </summary>
-    byte[] Bytes { get; }
-
-    /// <summary>
-    /// An example value for a Object.
-    /// </summary>
-    object Object { get; }
-
-    /// <summary>
-    /// An example value for a String.
-    /// </summary>
-    string String { get; }
-
-    /// <summary>
-    /// OpenApi Schema to generate dynamic examples more accurate
-    /// </summary>
-    IOpenApiSchema? Schema { get; set; }
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Settings/WireMockOpenApiParserDynamicExampleValues.cs

@@ -1,59 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using Microsoft.OpenApi.Models.Interfaces;
-using RandomDataGenerator.FieldOptions;
-using RandomDataGenerator.Randomizers;
-
-namespace WireMock.Net.OpenApiParser.Settings;
-
-/// <summary>
-/// A class defining the random example values to use for the different types.
-/// </summary>
-public class WireMockOpenApiParserDynamicExampleValues : IWireMockOpenApiParserExampleValues
-{
-    /// <inheritdoc />
-    public virtual bool Boolean => RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true;
-
-    /// <inheritdoc />
-    public virtual int Integer => RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42;
-
-    /// <inheritdoc />
-    public virtual float Float => RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f;
-
-    /// <inheritdoc />
-    public virtual decimal Decimal => SafeConvertFloatToDecimal(RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f);
-
-    /// <inheritdoc />
-    public virtual Func<DateTime> Date => () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow.Date;
-
-    /// <inheritdoc />
-    public virtual Func<DateTime> DateTime => () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow;
-
-    /// <inheritdoc />
-    public virtual byte[] Bytes => RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate();
-
-    /// <inheritdoc />
-    public virtual object Object => "example-object";
-
-    /// <inheritdoc />
-    public virtual string String => RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string";
-
-    /// <inheritdoc />
-    public virtual IOpenApiSchema? Schema { get; set; }
-
-    /// <summary>
-    /// Safely converts a float to a decimal, ensuring the value stays within the bounds of a decimal.
-    /// </summary>
-    /// <param name="value">The float value to convert.</param>
-    /// <returns>A decimal value within the valid range of a decimal.</returns>
-    private static decimal SafeConvertFloatToDecimal(float value)
-    {
-        return value switch
-        {
-            < (float)decimal.MinValue => decimal.MinValue,
-            > (float)decimal.MaxValue => decimal.MaxValue,
-            _ => (decimal)value
-        };
-    }
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Settings/WireMockOpenApiParserExampleValues.cs

@@ -1,43 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
-
-namespace WireMock.Net.OpenApiParser.Settings;
-
-/// <summary>
-/// A class defining the example values to use for the different types.
-/// </summary>
-public class WireMockOpenApiParserExampleValues : IWireMockOpenApiParserExampleValues
-{
-    /// <inheritdoc />
-    public virtual bool Boolean => true;
-
-    /// <inheritdoc />
-    public virtual int Integer => 42;
-
-    /// <inheritdoc />
-    public virtual float Float => 4.2f;
-
-    /// <inheritdoc />
-    public virtual decimal Decimal => 4.2m;
-
-    /// <inheritdoc />
-    public virtual Func<DateTime> Date { get; } = () => System.DateTime.UtcNow.Date;
-
-    /// <inheritdoc />
-    public virtual Func<DateTime> DateTime { get; } = () => System.DateTime.UtcNow;
-
-    /// <inheritdoc />
-    public virtual byte[] Bytes { get; } = [48, 49, 50];
-
-    /// <inheritdoc />
-    public virtual object Object => "example-object";
-
-    /// <inheritdoc />
-    public virtual string String => "example-string";
-
-    /// <inheritdoc />
-    public virtual IOpenApiSchema? Schema { get; set; } = new OpenApiSchema();
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Settings/WireMockOpenApiParserSettings.cs

@@ -1,73 +0,0 @@
-// Copyright © WireMock.Net
-
-using WireMock.Net.OpenApiParser.Types;
-
-namespace WireMock.Net.OpenApiParser.Settings;
-
-/// <summary>
-/// The WireMockOpenApiParser Settings
-/// </summary>
-public class WireMockOpenApiParserSettings
-{
-    /// <summary>
-    /// The number of array items to generate (default is 3).
-    /// </summary>
-    public int NumberOfArrayItems { get; set; } = 3;
-
-    /// <summary>
-    /// The example value type to use when generating a Path
-    /// </summary>
-    public ExampleValueType PathPatternToUse { get; set; } = ExampleValueType.Value;
-
-    /// <summary>
-    /// The example value type to use when generating a Header
-    /// </summary>
-    public ExampleValueType HeaderPatternToUse { get; set; } = ExampleValueType.Value;
-
-    /// <summary>
-    /// The example value type to use when generating a Query Parameter
-    /// </summary>
-    public ExampleValueType QueryParameterPatternToUse { get; set; } = ExampleValueType.Value;
-
-    /// <summary>
-    /// The example values to use.
-    ///
-    /// Default implementations are:
-    /// - <see cref="WireMockOpenApiParserExampleValues"/>
-    /// - <see cref="WireMockOpenApiParserDynamicExampleValues"/>
-    /// </summary>
-    public IWireMockOpenApiParserExampleValues? ExampleValues { get; set; }
-
-    /// <summary>
-    /// Is a Header match case-insensitive?
-    /// 
-    /// Default is <c>true</c>.
-    /// </summary>
-    public bool HeaderPatternIgnoreCase { get; set; } = true;
-
-    /// <summary>
-    /// Is a Query Parameter match case-insensitive?
-    ///
-    /// Default is <c>true</c>.
-    /// </summary>
-    public bool QueryParameterPatternIgnoreCase { get; set; } = true;
-
-    /// <summary>
-    /// Is a Request Body match case-insensitive?
-    ///
-    /// Default is <c>true</c>.
-    /// </summary>
-    public bool RequestBodyIgnoreCase { get; set; } = true;
-
-    /// <summary>
-    /// Is a ExampleValue match case-insensitive?
-    ///
-    /// Default is <c>true</c>.
-    /// </summary>
-    public bool IgnoreCaseExampleValues { get; set; } = true;
-
-    /// <summary>
-    /// Are examples generated dynamically?
-    /// </summary>
-    public bool DynamicExamples { get; set; }
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Types/ExampleValueType.cs

@@ -1,21 +0,0 @@
-// Copyright © WireMock.Net
-
-namespace WireMock.Net.OpenApiParser.Types;
-
-/// <summary>
-/// The example value to use
-/// </summary>
-public enum ExampleValueType
-{
-    /// <summary>
-    /// 1. Use a generated example value based on the SchemaType (default).
-    /// 2. If there is no example value defined in the schema,
-    ///    then the <see cref="Settings.IWireMockOpenApiParserExampleValues"/> will be used (custom, fixed or dynamic).
-    /// </summary>
-    Value,
-
-    /// <summary>
-    /// Just use a Wildcard (*) character.
-    /// </summary>
-    Wildcard
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Types/SchemaFormat.cs

@@ -1,26 +0,0 @@
-// Copyright © WireMock.Net
-
-namespace WireMock.Net.OpenApiParser.Types;
-
-internal enum SchemaFormat
-{
-    Float,
-
-    Double,
-
-    Int32,
-
-    Int64,
-
-    Date,
-
-    DateTime,
-
-    Password,
-
-    Byte,
-
-    Binary,
-
-    Undefined
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Utils/DateTimeUtils.cs

@@ -1,22 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Globalization;
-
-namespace WireMock.Net.OpenApiParser.Utils;
-
-internal static class DateTimeUtils
-{
-    private const string DateFormat = "yyyy-MM-dd";
-    private const string DateTimeFormat = "yyyy-MM-dd'T'HH:mm:ss.fffzzz";
-
-    public static string ToRfc3339DateTime(DateTime dateTime)
-    {
-        return dateTime.ToString(DateTimeFormat, DateTimeFormatInfo.InvariantInfo);
-    }
-
-    public static string ToRfc3339Date(DateTime dateTime)
-    {
-        return dateTime.ToString(DateFormat, DateTimeFormatInfo.InvariantInfo);
-    }
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Utils/ExampleValueGenerator.cs

@@ -1,105 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Linq;
-using System.Text.Json.Nodes;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Models.Interfaces;
-using Stef.Validation;
-using WireMock.Net.OpenApiParser.Extensions;
-using WireMock.Net.OpenApiParser.Settings;
-using WireMock.Net.OpenApiParser.Types;
-
-namespace WireMock.Net.OpenApiParser.Utils;
-
-internal class ExampleValueGenerator
-{
-    private readonly IWireMockOpenApiParserExampleValues _exampleValues;
-
-    public ExampleValueGenerator(WireMockOpenApiParserSettings settings)
-    {
-        Guard.NotNull(settings);
-
-        // Check if user provided an own implementation
-        if (settings.ExampleValues is null)
-        {
-            if (settings.DynamicExamples)
-            {
-                _exampleValues = new WireMockOpenApiParserDynamicExampleValues();
-            }
-            else
-            {
-                _exampleValues = new WireMockOpenApiParserExampleValues();
-            }
-        }
-        else
-        {
-            _exampleValues = settings.ExampleValues;
-        }
-    }
-
-    public JsonNode GetExampleValue(IOpenApiSchema? schema)
-    {
-        var schemaExample = schema?.Example;
-        var schemaEnum = schema?.Enum?.FirstOrDefault();
-
-        _exampleValues.Schema = schema;
-
-        switch (schema?.GetSchemaType(out _))
-        {
-            case JsonSchemaType.Boolean:
-                var exampleBoolean = schemaExample?.GetValue<bool>();
-                return exampleBoolean ?? _exampleValues.Boolean;
-
-            case JsonSchemaType.Integer:
-                var exampleInteger = schemaExample?.GetValue<decimal>();
-                var enumInteger = schemaEnum?.GetValue<decimal>();
-                var valueIntegerEnumOrExample = enumInteger ?? exampleInteger;
-                return valueIntegerEnumOrExample ?? _exampleValues.Integer;
-
-            case JsonSchemaType.Number:
-                switch (schema.GetSchemaFormat())
-                {
-                    case SchemaFormat.Float:
-                        var exampleFloat = schemaExample?.GetValue<float>();
-                        var enumFloat = schemaEnum?.GetValue<float>();
-                        var valueFloatEnumOrExample = enumFloat ?? exampleFloat;
-                        return valueFloatEnumOrExample ?? _exampleValues.Float;
-
-                    default:
-                        var exampleDecimal = schemaExample?.GetValue<decimal>();
-                        var enumDecimal = schemaEnum?.GetValue<decimal>();
-                        var valueDecimalEnumOrExample = enumDecimal ?? exampleDecimal;
-                        return valueDecimalEnumOrExample ?? _exampleValues.Decimal;
-                }
-
-            default:
-                switch (schema?.GetSchemaFormat())
-                {
-                    case SchemaFormat.Date:
-                        var exampleDate = schemaExample?.GetValue<string>();
-                        var enumDate = schemaEnum?.GetValue<string>();
-                        var valueDateEnumOrExample = enumDate ?? exampleDate;
-                        return valueDateEnumOrExample ?? DateTimeUtils.ToRfc3339Date(_exampleValues.Date());
-
-                    case SchemaFormat.DateTime:
-                        var exampleDateTime = schemaExample?.GetValue<string>();
-                        var enumDateTime = schemaEnum?.GetValue<string>();
-                        var valueDateTimeEnumOrExample = enumDateTime ?? exampleDateTime;
-                        return valueDateTimeEnumOrExample ?? DateTimeUtils.ToRfc3339DateTime(_exampleValues.DateTime());
-
-                    case SchemaFormat.Byte:
-                        var exampleByte = schemaExample?.GetValue<byte[]>();
-                        var enumByte = schemaEnum?.GetValue<byte[]>();
-                        var valueByteEnumOrExample = enumByte ?? exampleByte;
-                        return Convert.ToBase64String(valueByteEnumOrExample ?? _exampleValues.Bytes);
-
-                    default:
-                        var exampleString = schemaExample?.GetValue<string>();
-                        var enumString = schemaEnum?.GetValue<string>();
-                        var valueStringEnumOrExample = enumString ?? exampleString;
-                        return valueStringEnumOrExample ?? _exampleValues.String;
-                }
-        }
-    }
-}

src-preview/WireMock.Net.OpenApiParser.Preview/Utils/PathUtils.cs

@@ -1,27 +0,0 @@
-// Copyright © WireMock.Net
-
-namespace WireMock.Net.OpenApiParser.Utils;
-
-internal static class PathUtils
-{
-    internal static string Combine(params string[] paths)
-    {
-        if (paths.Length == 0)
-        {
-            return string.Empty;
-        }
-
-        var result = paths[0].Trim().TrimEnd('/');
-
-        for (int i = 1; i < paths.Length; i++)
-        {
-            var nextPath = paths[i].Trim().TrimStart('/').TrimEnd('/');
-            if (!string.IsNullOrEmpty(nextPath))
-            {
-                result += '/' + nextPath;
-            }
-        }
-
-        return result;
-    }
-}

src-preview/WireMock.Net.OpenApiParser.Preview/WireMock.Net.OpenApiParser.Preview.csproj

@@ -1,38 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <Description>An OpenApi (swagger) parser to generate MappingModel or mapping.json file.</Description>
-        <TargetFrameworks>net47;netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageTags>wiremock;openapi;OAS;raml;converter;parser;openapiparser</PackageTags>
-        <ProjectGuid>{E5B03EEF-822C-4295-952B-4479AD30082B}</ProjectGuid>
-        <PublishRepositoryUrl>true</PublishRepositoryUrl>
-        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
-        <SignAssembly>true</SignAssembly>
-        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
-        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    </PropertyGroup>
-
-    <!--
-    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    </PropertyGroup>
-    -->
-
-    <ItemGroup>
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Nullable" Version="1.3.1">
-          <PrivateAssets>all</PrivateAssets>
-          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-        <PackageReference Include="RamlToOpenApiConverter" Version="0.7.0" />
-        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.18" />
-        <PackageReference Include="Stef.Validation" Version="0.1.1" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-    </ItemGroup>
-
-</Project>

src-preview/WireMock.Net.OpenApiParser.Preview/WireMockOpenApiParser.cs

@@ -1,107 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using JetBrains.Annotations;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Reader;
-using Microsoft.OpenApi.YamlReader;
-using RamlToOpenApiConverter;
-using WireMock.Admin.Mappings;
-using WireMock.Net.OpenApiParser.Mappers;
-using WireMock.Net.OpenApiParser.Settings;
-
-namespace WireMock.Net.OpenApiParser;
-
-/// <summary>
-/// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock.Net MappingModels.
-/// </summary>
-public class WireMockOpenApiParser : IWireMockOpenApiParser
-{
-    private static readonly OpenApiReaderSettings ReaderSettings = new();
-
-    /// <inheritdoc />
-    [PublicAPI]
-    public IReadOnlyList<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
-    {
-        return FromFile(path, new WireMockOpenApiParserSettings(), out diagnostic);
-    }
-
-    /// <inheritdoc />
-    [PublicAPI]
-    public IReadOnlyList<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
-    {
-        OpenApiDocument document;
-        if (Path.GetExtension(path).EndsWith("raml", StringComparison.OrdinalIgnoreCase))
-        {
-            diagnostic = new OpenApiDiagnostic();
-            document = new RamlConverter().ConvertToOpenApiDocument(path);
-        }
-        else
-        {
-            document = Read(File.OpenRead(path), out diagnostic);
-        }
-
-        return FromDocument(document, settings);
-    }
-
-    /// <inheritdoc />
-    [PublicAPI]
-    public IReadOnlyList<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null)
-    {
-        return new OpenApiPathsMapper(settings ?? new WireMockOpenApiParserSettings()).ToMappingModels(document.Paths, document.Servers ?? []);
-    }
-
-    /// <inheritdoc  />
-    [PublicAPI]
-    public IReadOnlyList<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic)
-    {
-        return FromDocument(Read(stream, out diagnostic));
-    }
-
-    /// <inheritdoc />
-    [PublicAPI]
-    public IReadOnlyList<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
-    {
-        return FromDocument(Read(stream, out diagnostic), settings);
-    }
-
-    /// <inheritdoc  />
-    [PublicAPI]
-    public IReadOnlyList<MappingModel> FromText(string text, out OpenApiDiagnostic diagnostic)
-    {
-        return FromStream(new MemoryStream(Encoding.UTF8.GetBytes(text)), out diagnostic);
-    }
-
-    /// <inheritdoc />
-    [PublicAPI]
-    public IReadOnlyList<MappingModel> FromText(string text, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
-    {
-        return FromStream(new MemoryStream(Encoding.UTF8.GetBytes(text)), settings, out diagnostic);
-    }
-
-    private static OpenApiDocument Read(Stream stream, out OpenApiDiagnostic diagnostic)
-    {
-        var reader = new OpenApiYamlReader();
-
-        if (stream is not MemoryStream memoryStream)
-        {
-            memoryStream = ReadStreamIntoMemoryStream(stream);
-        }
-
-        var result = reader.Read(memoryStream, ReaderSettings);
-
-        diagnostic = result.Diagnostic ?? new OpenApiDiagnostic();
-        return result.Document ?? throw new InvalidOperationException("The document is null.");
-    }
-
-    private static MemoryStream ReadStreamIntoMemoryStream(Stream stream)
-    {
-        var memoryStream = new MemoryStream();
-        stream.CopyTo(memoryStream);
-        memoryStream.Position = 0;
-        return memoryStream;
-    }
-}

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)
+                    )
+                )
+            )
+        );
+    }
 }

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;
     }
 }

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")] 

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>

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>

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>

src/WireMock.Net.Aspire/WireMockInspector.cs

@@ -1,6 +1,9 @@
+// Copyright © WireMock.Net
+
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
+// ReSharper disable once CheckNamespace
 namespace Aspire.Hosting.WireMock;
 
 internal static class WireMockInspector
@@ -32,10 +35,13 @@ internal static class WireMockInspector
         {
             throw new InvalidOperationException
             (
-                message: @"Cannot find installation of WireMockInspector.
-Execute the following command to install WireMockInspector dotnet tool:
-> dotnet tool install WireMockInspector --global --no-cache --ignore-failed-sources
-To get more info please visit https://github.com/WireMock-Net/WireMockInspector",
+                message:
+                """
+                Cannot find installation of WireMockInspector.
+                Execute the following command to install WireMockInspector dotnet tool:
+                > dotnet tool install WireMockInspector --global --no-cache --ignore-failed-sources
+                To get more info please visit https://github.com/WireMock-Net/WireMockInspector
+                """,
                 innerException: e
             );
         }

src/WireMock.Net.Aspire/WireMockServerBuilderExtensions.cs

@@ -200,7 +200,7 @@ public static class WireMockServerBuilderExtensions
         builder.WithCommand(
             name: "wiremock-inspector",
             displayName: "WireMock Inspector",
-            executeCommand: context => OnRunOpenInspectorCommandAsync(builder),
+            executeCommand: _ => OnRunOpenInspectorCommandAsync(builder),
             commandOptions: commandOptions);
 
         return builder;

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

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;

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>

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>

src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs

@@ -25,13 +25,13 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
     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; }

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>

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>

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.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;
 
     /// <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 />
@@ -70,19 +58,15 @@ public class MimePartMatcher : IMatcher
         ];
     }
 
-    /// <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(object value)
     {
         var score = MatchScores.Mismatch;
         Exception? exception = null;
 
         try
         {
-            if (Array.TrueForAll(_funcs, func => func(mimePart).IsPerfect()))
+            if (value is MimePart mimePart && Array.TrueForAll(_funcs, func => func(mimePart).IsPerfect()))
             {
                 score = MatchScores.Perfect;
             }
@@ -125,5 +109,4 @@ public class MimePartMatcher : IMatcher
     {
         return contentType?.ToString().Replace("Content-Type: ", string.Empty);
     }
-}
-#endif
+}

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;
@@ -13,9 +13,16 @@ 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 object LoadFromStream(Stream stream)
+    {
+        return MimeMessage.Load(Guard.NotNull(stream));
+    }
+
+    /// <inheritdoc />
+    public bool TryGetMimeMessage(IRequestMessage requestMessage, [NotNullWhen(true)] out object? mimeMessage)
     {
         Guard.NotNull(requestMessage);
 
@@ -37,7 +44,7 @@ internal static class MimeKitUtils
 
             var fixedBytes = FixBytes(bytes, contentTypeHeader[0]);
 
-            mimeMessage = MimeMessage.Load(new MemoryStream(fixedBytes));
+            mimeMessage = LoadFromStream(new MemoryStream(fixedBytes));
             return true;
         }
 
@@ -45,6 +52,19 @@ internal static class MimeKitUtils
         return false;
     }
 
+    /// <inheritdoc />
+    public IReadOnlyList<object> GetBodyParts(object mimeMessage)
+    {
+        if (mimeMessage is not MimeMessage mm)
+        {
+            throw new ArgumentException($"The mimeMessage must be of type {nameof(MimeMessage)}", nameof(mimeMessage));
+        }
+
+        return mm.BodyParts
+            .OfType<MimePart>()
+            .ToArray();
+    }
+
     private static bool StartsWithMultiPart(WireMockList<string> contentTypeHeader)
     {
         return contentTypeHeader.Any(ct => ct.TrimStart().StartsWith("multipart/", StringComparison.OrdinalIgnoreCase));
@@ -61,5 +81,4 @@ internal static class MimeKitUtils
 
         return result;
     }
-}
-#endif
+}

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="PolySharp" Version="1.15.0">
+            <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>

src/WireMock.Net.Minimal/Authentication/AzureADAuthenticationMatcher.cs

@@ -0,0 +1,115 @@
+// Copyright © WireMock.Net
+
+#if !NETSTANDARD1_3
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.IdentityModel.Tokens.Jwt;
+using System.Text.RegularExpressions;
+using AnyOfTypes;
+using Microsoft.IdentityModel.Protocols;
+using Microsoft.IdentityModel.Protocols.OpenIdConnect;
+using Microsoft.IdentityModel.Tokens;
+using Stef.Validation;
+using WireMock.Constants;
+using WireMock.Matchers;
+using WireMock.Models;
+
+namespace WireMock.Authentication;
+
+/// <summary>
+/// https://www.c-sharpcorner.com/article/how-to-validate-azure-ad-token-using-console-application/
+/// https://stackoverflow.com/questions/38684865/validation-of-an-azure-ad-bearer-token-in-a-console-application
+/// https://github.com/AzureAD/microsoft-identity-web/blob/36fb5f555638787823a89e89c67f17d6a10006ed/tools/CrossPlatformValidator/CrossPlatformValidation/CrossPlatformValidation/RequestValidator.cs#L42
+/// </summary>
+internal class AzureADAuthenticationMatcher : IStringMatcher
+{
+    private const string BearerPrefix = "Bearer ";
+    private static readonly Regex ExtractTenantIdRegex = new(@"https:\/\/(?:sts\.windows\.net|login\.microsoftonline\.com)\/([a-z0-9-]{36}|[a-zA-Z0-9\.]+)/", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
+    private readonly JwtSecurityTokenHandler _jwtSecurityTokenHandler;
+    private readonly IConfigurationManager<OpenIdConnectConfiguration> _configurationManager;
+    private readonly string _tenant;
+    private readonly string _audience;
+
+    public AzureADAuthenticationMatcher(JwtSecurityTokenHandler jwtSecurityTokenHandler, IConfigurationManager<OpenIdConnectConfiguration> configurationManager, string tenant, string audience)
+    {
+        _jwtSecurityTokenHandler = Guard.NotNull(jwtSecurityTokenHandler);
+        _configurationManager = Guard.NotNull(configurationManager);
+        _audience = Guard.NotNullOrEmpty(audience);
+        _tenant = Guard.NotNullOrEmpty(tenant);
+    }
+
+    public string Name => nameof(AzureADAuthenticationMatcher);
+
+    public MatchBehaviour MatchBehaviour => MatchBehaviour.AcceptOnMatch;
+
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return [];
+    }
+
+    public MatchOperator MatchOperator => MatchOperator.Or;
+
+    public MatchResult IsMatch(string? input)
+    {
+        if (string.IsNullOrEmpty(input))
+        {
+            return MatchScores.Mismatch;
+        }
+
+        var token = Regex.Replace(input, BearerPrefix, string.Empty, RegexOptions.IgnoreCase, RegexConstants.DefaultTimeout);
+
+        try
+        {
+            var config = _configurationManager.GetConfigurationAsync(default).ConfigureAwait(false).GetAwaiter().GetResult();
+
+            var validationParameters = new TokenValidationParameters
+            {
+                ValidAudience = _audience,
+                ValidIssuer = config.Issuer,
+                IssuerValidator = (issuer, _, _) =>
+                {
+                    if (TryExtractTenantId(issuer, out var extractedTenant) && string.Equals(extractedTenant, _tenant, StringComparison.OrdinalIgnoreCase))
+                    {
+                        return issuer;
+                    }
+
+                    throw new SecurityTokenInvalidIssuerException($"tenant {extractedTenant} does not match {_tenant}.");
+                },
+                IssuerSigningKeys = config.SigningKeys,
+                ValidateLifetime = true
+            };
+
+            // Throws an Exception as the token is invalid (expired, invalid-formatted, tenant mismatch, etc.)
+            _jwtSecurityTokenHandler.ValidateToken(token, validationParameters, out _);
+
+            return MatchScores.Perfect;
+        }
+        catch (Exception ex)
+        {
+            return new MatchResult(MatchScores.Mismatch, ex);
+        }
+    }
+
+    /// <inheritdoc />
+    public virtual string GetCSharpCodeArguments()
+    {
+        throw new NotImplementedException();
+    }
+
+    // Handles: https://sts.windows.net/{tenant}/, https://login.microsoftonline.com/{tenant}/ or /v2.0
+    private static bool TryExtractTenantId(string issuer, [NotNullWhen(true)] out string? tenant)
+    {
+        var match = ExtractTenantIdRegex.Match(issuer);
+
+        if (match is { Success: true, Groups.Count: > 1 })
+        {
+            tenant = match.Groups[1].Value;
+            return !string.IsNullOrEmpty(tenant);
+        }
+
+        tenant = null;
+        return false;
+    }
+}
+#endif

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

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;

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

@@ -2,7 +2,6 @@
 
 using System.Net.Http;
 using System.Net.Http.Headers;
-using Stef.Validation;
 
 namespace WireMock.Http;
 
@@ -16,8 +15,6 @@ internal static class ByteArrayContentHelper
     /// <returns>ByteArrayContent</returns>
     internal static ByteArrayContent Create(byte[] content, MediaTypeHeaderValue? contentType)
     {
-        Guard.NotNull(content);
-
         var byteContent = new ByteArrayContent(content);
         if (contentType != null)
         {

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

@@ -35,12 +35,13 @@ 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),
-            BodyType.String => StringContentHelper.Create(bodyData!.BodyAsString!, contentType),
-            BodyType.FormUrlEncoded => StringContentHelper.Create(bodyData!.BodyAsString!, contentType),
+            BodyType.Bytes => ByteArrayContentHelper.Create(bodyData.BodyAsBytes!, contentType),
+            BodyType.Json => StringContentHelper.Create(JsonConvert.SerializeObject(bodyData.BodyAsJson), contentType),
+            BodyType.String => StringContentHelper.Create(bodyData.BodyAsString!, contentType),
+            BodyType.FormUrlEncoded => StringContentHelper.Create(bodyData.BodyAsString!, contentType),
+            BodyType.MultiPart => StringContentHelper.Create(bodyData.BodyAsString!, contentType),
 
             _ => httpRequestMessage.Content
         };
@@ -60,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
         {

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

@@ -2,7 +2,6 @@
 
 using System.Net.Http;
 using System.Net.Http.Headers;
-using Stef.Validation;
 
 namespace WireMock.Http;
 
@@ -16,8 +15,6 @@ internal static class StringContentHelper
     /// <returns>StringContent</returns>
     internal static StringContent Create(string content, MediaTypeHeaderValue? contentType)
     {
-        Guard.NotNull(content);
-
         var stringContent = new StringContent(content);
         stringContent.Headers.ContentType = contentType;
         return stringContent;

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;
+    }
 }

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>

src/WireMock.Net.Minimal/Json/FloatBehavior.cs

@@ -5,7 +5,7 @@
 namespace WireMock.Json;
 
 /// <summary>
-/// Enum to define how to convert an Float in the Json Object.
+/// Enum to define how to convert a Float in the Json Object.
 /// </summary>
 internal enum FloatBehavior
 {

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!;
 }

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;
+    }
 }

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

@@ -1,90 +1,90 @@
-// Copyright © WireMock.Net
-
-using System.Net.Http.Headers;
-using AnyOfTypes;
-using Stef.Validation;
-using WireMock.Extensions;
-using WireMock.Models;
-using WireMock.Util;
-
-namespace WireMock.Matchers;
-
-/// <summary>
-/// ContentTypeMatcher which accepts also all charsets
-/// </summary>
-/// <seealso cref="RegexMatcher" />
-public class ContentTypeMatcher : WildcardMatcher
-{
-    private readonly AnyOf<string, StringPattern>[] _patterns;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
-    /// </summary>
-    /// <param name="pattern">The pattern.</param>
-    /// <param name="ignoreCase">IgnoreCase (default false)</param>
-    public ContentTypeMatcher(AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this([pattern], ignoreCase)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="pattern">The pattern.</param>
-    /// <param name="ignoreCase">IgnoreCase (default false)</param>
-    public ContentTypeMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour,
-        [pattern], ignoreCase)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
-    /// </summary>
-    /// <param name="patterns">The patterns.</param>
-    /// <param name="ignoreCase">IgnoreCase (default false)</param>
-    public ContentTypeMatcher(AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="patterns">The patterns.</param>
-    /// <param name="ignoreCase">IgnoreCase (default false)</param>
-    public ContentTypeMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : base(matchBehaviour, patterns, ignoreCase)
-    {
-        _patterns = Guard.NotNull(patterns);
-    }
-
-    /// <inheritdoc />
-    public override MatchResult IsMatch(string? input)
-    {
-        if (string.IsNullOrEmpty(input) || !MediaTypeHeaderValue.TryParse(input, out var contentType))
-        {
-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.Mismatch);
-        }
-
-        return base.IsMatch(contentType.MediaType);
-    }
-
-    /// <inheritdoc />
-    public override AnyOf<string, StringPattern>[] GetPatterns()
-    {
-        return _patterns;
-    }
-
-    /// <inheritdoc />
-    public override string Name => nameof(ContentTypeMatcher);
-
-    /// <inheritdoc />
-    public override string GetCSharpCodeArguments()
-    {
-        return $"new {Name}" +
-               $"(" +
-               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
-               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}" +
-               $")";
-    }
+// Copyright © WireMock.Net
+
+using System.Net.Http.Headers;
+using AnyOfTypes;
+using Stef.Validation;
+using WireMock.Extensions;
+using WireMock.Models;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// ContentTypeMatcher which accepts also all charsets
+/// </summary>
+/// <seealso cref="RegexMatcher" />
+public class ContentTypeMatcher : WildcardMatcher
+{
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+    /// </summary>
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="ignoreCase">IgnoreCase (default false)</param>
+    public ContentTypeMatcher(AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this([pattern], ignoreCase)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="ignoreCase">IgnoreCase (default false)</param>
+    public ContentTypeMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour,
+        [pattern], ignoreCase)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="ignoreCase">IgnoreCase (default false)</param>
+    public ContentTypeMatcher(AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="ignoreCase">IgnoreCase (default false)</param>
+    public ContentTypeMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : base(matchBehaviour, patterns, ignoreCase)
+    {
+        _patterns = Guard.NotNull(patterns);
+    }
+
+    /// <inheritdoc />
+    public override MatchResult IsMatch(string? input)
+    {
+        if (string.IsNullOrEmpty(input) || !MediaTypeHeaderValue.TryParse(input, out var contentType))
+        {
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.Mismatch);
+        }
+
+        return base.IsMatch(contentType.MediaType);
+    }
+
+    /// <inheritdoc />
+    public override AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc />
+    public override string Name => nameof(ContentTypeMatcher);
+
+    /// <inheritdoc />
+    public override string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}" +
+               $")";
+    }
 }

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

@@ -1,107 +1,107 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Linq;
-using AnyOfTypes;
-using Stef.Validation;
-using WireMock.Extensions;
-using WireMock.Models;
-using WireMock.Util;
-
-namespace WireMock.Matchers;
-
-/// <summary>
-/// ExactMatcher
-/// </summary>
-/// <seealso cref="IStringMatcher" /> and <seealso cref="IIgnoreCaseMatcher" />
-public class ExactMatcher : IStringMatcher, IIgnoreCaseMatcher
-{
-    private readonly AnyOf<string, StringPattern>[] _values;
-
-    /// <inheritdoc />
-    public MatchBehaviour MatchBehaviour { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param> 
-    /// <param name="value">The string value.</param>
-    public ExactMatcher(MatchBehaviour matchBehaviour, string value) : this(matchBehaviour, true, MatchOperator.Or, new AnyOf<string, StringPattern>(value))
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
-    /// </summary>
-    /// <param name="values">The values.</param>
-    public ExactMatcher(params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, values)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
-    /// </summary>
-    /// <param name="ignoreCase">Ignore the case from the pattern(s).</param>
-    /// <param name="values">The values.</param>
-    public ExactMatcher(bool ignoreCase, params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, ignoreCase, MatchOperator.Or, values)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="ignoreCase">Ignore the case from the pattern(s).</param>
-    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
-    /// <param name="values">The values.</param>
-    public ExactMatcher(
-        MatchBehaviour matchBehaviour,
-        bool ignoreCase = false,
-        MatchOperator matchOperator = MatchOperator.Or,
-        params AnyOf<string, StringPattern>[] values)
-    {
-        _values = Guard.NotNull(values);
-
-        MatchBehaviour = matchBehaviour;
-        IgnoreCase = ignoreCase;
-        MatchOperator = matchOperator;
-    }
-
-    /// <inheritdoc />
-    public MatchResult IsMatch(string? input)
-    {
-        Func<string?, bool> equals = IgnoreCase
-            ? pattern => string.Equals(pattern, input, StringComparison.OrdinalIgnoreCase)
-            : pattern => pattern == input;
-
-        var score = MatchScores.ToScore(_values.Select(v => equals(v)).ToArray(), MatchOperator);
-        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score));
-    }
-
-    /// <inheritdoc />
-    public AnyOf<string, StringPattern>[] GetPatterns()
-    {
-        return _values;
-    }
-
-    /// <inheritdoc />
-    public MatchOperator MatchOperator { get; }
-
-    /// <inheritdoc />
-    public string Name => nameof(ExactMatcher);
-
-    /// <inheritdoc />
-    public bool IgnoreCase { get; }
-
-    /// <inheritdoc />
-    public string GetCSharpCodeArguments()
-    {
-        return $"new {Name}" +
-               $"(" +
-               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
-               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_values)}" +
-               $")";
-    }
+// Copyright © WireMock.Net
+
+using System;
+using System.Linq;
+using AnyOfTypes;
+using Stef.Validation;
+using WireMock.Extensions;
+using WireMock.Models;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// ExactMatcher
+/// </summary>
+/// <seealso cref="IStringMatcher" /> and <seealso cref="IIgnoreCaseMatcher" />
+public class ExactMatcher : IStringMatcher, IIgnoreCaseMatcher
+{
+    private readonly AnyOf<string, StringPattern>[] _values;
+
+    /// <inheritdoc />
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param> 
+    /// <param name="value">The string value.</param>
+    public ExactMatcher(MatchBehaviour matchBehaviour, string value) : this(matchBehaviour, true, MatchOperator.Or, new AnyOf<string, StringPattern>(value))
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+    /// </summary>
+    /// <param name="values">The values.</param>
+    public ExactMatcher(params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, values)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+    /// </summary>
+    /// <param name="ignoreCase">Ignore the case from the pattern(s).</param>
+    /// <param name="values">The values.</param>
+    public ExactMatcher(bool ignoreCase, params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, ignoreCase, MatchOperator.Or, values)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern(s).</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="values">The values.</param>
+    public ExactMatcher(
+        MatchBehaviour matchBehaviour,
+        bool ignoreCase = false,
+        MatchOperator matchOperator = MatchOperator.Or,
+        params AnyOf<string, StringPattern>[] values)
+    {
+        _values = Guard.NotNull(values);
+
+        MatchBehaviour = matchBehaviour;
+        IgnoreCase = ignoreCase;
+        MatchOperator = matchOperator;
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(string? input)
+    {
+        Func<string?, bool> equals = IgnoreCase
+            ? pattern => string.Equals(pattern, input, StringComparison.OrdinalIgnoreCase)
+            : pattern => pattern == input;
+
+        var score = MatchScores.ToScore(_values.Select(v => equals(v)).ToArray(), MatchOperator);
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score));
+    }
+
+    /// <inheritdoc />
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _values;
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc />
+    public string Name => nameof(ExactMatcher);
+
+    /// <inheritdoc />
+    public bool IgnoreCase { get; }
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_values)}" +
+               $")";
+    }
 }

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

@@ -1,179 +1,179 @@
-// Copyright © WireMock.Net
-
-using System.Collections.Generic;
-using System.Linq;
-using AnyOfTypes;
-using Stef.Validation;
-using WireMock.Extensions;
-using WireMock.Models;
-using WireMock.Util;
-
-namespace WireMock.Matchers;
-
-/// <summary>
-/// FormUrl Encoded fields Matcher
-/// </summary>
-/// <inheritdoc cref="IStringMatcher"/>
-/// <inheritdoc cref="IIgnoreCaseMatcher"/>
-public class FormUrlEncodedMatcher : IStringMatcher, IIgnoreCaseMatcher
-{
-    private readonly AnyOf<string, StringPattern>[] _patterns;
-
-    /// <inheritdoc />
-    public MatchBehaviour MatchBehaviour { get; }
-
-    private readonly List<(WildcardMatcher Key, WildcardMatcher? Value)> _pairs = [];
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="FormUrlEncodedMatcher"/> class.
-    /// </summary>
-    /// <param name="pattern">The pattern.</param>
-    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
-    public FormUrlEncodedMatcher(
-        AnyOf<string, StringPattern> pattern,
-        bool ignoreCase = false,
-        MatchOperator matchOperator = MatchOperator.Or) :
-        this(MatchBehaviour.AcceptOnMatch, [pattern], ignoreCase, matchOperator)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="FormUrlEncodedMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="pattern">The pattern.</param>
-    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
-    public FormUrlEncodedMatcher(
-        MatchBehaviour matchBehaviour,
-        AnyOf<string, StringPattern> pattern,
-        bool ignoreCase = false,
-        MatchOperator matchOperator = MatchOperator.Or) :
-        this(matchBehaviour, [pattern], ignoreCase, matchOperator)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="FormUrlEncodedMatcher"/> class.
-    /// </summary>
-    /// <param name="patterns">The patterns.</param>
-    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
-    public FormUrlEncodedMatcher(
-        AnyOf<string, StringPattern>[] patterns,
-        bool ignoreCase = false,
-        MatchOperator matchOperator = MatchOperator.Or) :
-        this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase, matchOperator)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="FormUrlEncodedMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="patterns">The patterns.</param>
-    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
-    public FormUrlEncodedMatcher(
-        MatchBehaviour matchBehaviour,
-        AnyOf<string, StringPattern>[] patterns,
-        bool ignoreCase = false,
-        MatchOperator matchOperator = MatchOperator.Or)
-    {
-        _patterns = Guard.NotNull(patterns);
-        IgnoreCase = ignoreCase;
-        MatchBehaviour = matchBehaviour;
-        MatchOperator = matchOperator;
-
-        foreach (var pattern in _patterns)
-        {
-            if (QueryStringParser.TryParse(pattern, IgnoreCase, out var nameValueCollection))
-            {
-                foreach (var nameValue in nameValueCollection)
-                {
-                    var keyMatcher = new WildcardMatcher(MatchBehaviour.AcceptOnMatch, [nameValue.Key], ignoreCase, MatchOperator);
-                    var valueMatcher = new WildcardMatcher(MatchBehaviour.AcceptOnMatch, [nameValue.Value], ignoreCase, MatchOperator);
-                    _pairs.Add((keyMatcher, valueMatcher));
-                }
-            }
-        }
-    }
-
-    /// <inheritdoc />
-    public MatchResult IsMatch(string? input)
-    {
-        // Input is null or empty and if no patterns defined, return Perfect match.
-        if (string.IsNullOrEmpty(input) && _patterns.Length == 0)
-        {
-            return new MatchResult(MatchScores.Perfect);
-        }
-
-        if (!QueryStringParser.TryParse(input, IgnoreCase, out var inputNameValueCollection))
-        {
-            return new MatchResult(MatchScores.Mismatch);
-        }
-
-        var matches = GetMatches(inputNameValueCollection);
-
-        var score = MatchScores.ToScore(matches, MatchOperator);
-        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score));
-    }
-
-    private bool[] GetMatches(IDictionary<string, string> inputNameValueCollection)
-    {
-        var matches = new List<bool>();
-        if (_pairs.Count > inputNameValueCollection.Count)
-        {
-            matches.AddRange(Enumerable.Repeat(false, _pairs.Count - inputNameValueCollection.Count));
-        }
-
-        foreach (var inputKeyValuePair in inputNameValueCollection)
-        {
-            var match = false;
-            foreach (var pair in _pairs)
-            {
-                var keyMatchResult = pair.Key.IsMatch(inputKeyValuePair.Key).IsPerfect();
-                if (keyMatchResult)
-                {
-                    match = pair.Value?.IsMatch(inputKeyValuePair.Value).IsPerfect() ?? false;
-                    if (match)
-                    {
-                        break;
-                    }
-                }
-            }
-
-            matches.Add(match);
-        }
-
-        return matches.ToArray();
-    }
-
-    /// <inheritdoc />
-    public virtual AnyOf<string, StringPattern>[] GetPatterns()
-    {
-        return _patterns;
-    }
-
-    /// <inheritdoc />
-    public virtual string Name => nameof(FormUrlEncodedMatcher);
-
-    /// <inheritdoc />
-    public bool IgnoreCase { get; }
-
-    /// <inheritdoc />
-    public MatchOperator MatchOperator { get; }
-
-    /// <inheritdoc />
-    public string GetCSharpCodeArguments()
-    {
-        return $"new {Name}" +
-               $"(" +
-               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
-               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
-               $"{MatchOperator.GetFullyQualifiedEnumValue()}" +
-               $")";
-    }
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Linq;
+using AnyOfTypes;
+using Stef.Validation;
+using WireMock.Extensions;
+using WireMock.Models;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// FormUrl Encoded fields Matcher
+/// </summary>
+/// <inheritdoc cref="IStringMatcher"/>
+/// <inheritdoc cref="IIgnoreCaseMatcher"/>
+public class FormUrlEncodedMatcher : IStringMatcher, IIgnoreCaseMatcher
+{
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
+    /// <inheritdoc />
+    public MatchBehaviour MatchBehaviour { get; }
+
+    private readonly List<(WildcardMatcher Key, WildcardMatcher? Value)> _pairs = [];
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FormUrlEncodedMatcher"/> class.
+    /// </summary>
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
+    public FormUrlEncodedMatcher(
+        AnyOf<string, StringPattern> pattern,
+        bool ignoreCase = false,
+        MatchOperator matchOperator = MatchOperator.Or) :
+        this(MatchBehaviour.AcceptOnMatch, [pattern], ignoreCase, matchOperator)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FormUrlEncodedMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="pattern">The pattern.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
+    public FormUrlEncodedMatcher(
+        MatchBehaviour matchBehaviour,
+        AnyOf<string, StringPattern> pattern,
+        bool ignoreCase = false,
+        MatchOperator matchOperator = MatchOperator.Or) :
+        this(matchBehaviour, [pattern], ignoreCase, matchOperator)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FormUrlEncodedMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
+    public FormUrlEncodedMatcher(
+        AnyOf<string, StringPattern>[] patterns,
+        bool ignoreCase = false,
+        MatchOperator matchOperator = MatchOperator.Or) :
+        this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase, matchOperator)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="FormUrlEncodedMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="patterns">The patterns.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern.</param>
+    /// <param name="matchOperator">The <see cref="MatchOperator"/> to use. (default = "Or")</param>
+    public FormUrlEncodedMatcher(
+        MatchBehaviour matchBehaviour,
+        AnyOf<string, StringPattern>[] patterns,
+        bool ignoreCase = false,
+        MatchOperator matchOperator = MatchOperator.Or)
+    {
+        _patterns = Guard.NotNull(patterns);
+        IgnoreCase = ignoreCase;
+        MatchBehaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+
+        foreach (var pattern in _patterns)
+        {
+            if (QueryStringParser.TryParse(pattern, IgnoreCase, out var nameValueCollection))
+            {
+                foreach (var nameValue in nameValueCollection)
+                {
+                    var keyMatcher = new WildcardMatcher(MatchBehaviour.AcceptOnMatch, [nameValue.Key], ignoreCase, MatchOperator);
+                    var valueMatcher = new WildcardMatcher(MatchBehaviour.AcceptOnMatch, [nameValue.Value], ignoreCase, MatchOperator);
+                    _pairs.Add((keyMatcher, valueMatcher));
+                }
+            }
+        }
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(string? input)
+    {
+        // Input is null or empty and if no patterns defined, return Perfect match.
+        if (string.IsNullOrEmpty(input) && _patterns.Length == 0)
+        {
+            return new MatchResult(MatchScores.Perfect);
+        }
+
+        if (!QueryStringParser.TryParse(input, IgnoreCase, out var inputNameValueCollection))
+        {
+            return new MatchResult(MatchScores.Mismatch);
+        }
+
+        var matches = GetMatches(inputNameValueCollection);
+
+        var score = MatchScores.ToScore(matches, MatchOperator);
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score));
+    }
+
+    private bool[] GetMatches(IDictionary<string, string> inputNameValueCollection)
+    {
+        var matches = new List<bool>();
+        if (_pairs.Count > inputNameValueCollection.Count)
+        {
+            matches.AddRange(Enumerable.Repeat(false, _pairs.Count - inputNameValueCollection.Count));
+        }
+
+        foreach (var inputKeyValuePair in inputNameValueCollection)
+        {
+            var match = false;
+            foreach (var pair in _pairs)
+            {
+                var keyMatchResult = pair.Key.IsMatch(inputKeyValuePair.Key).IsPerfect();
+                if (keyMatchResult)
+                {
+                    match = pair.Value?.IsMatch(inputKeyValuePair.Value).IsPerfect() ?? false;
+                    if (match)
+                    {
+                        break;
+                    }
+                }
+            }
+
+            matches.Add(match);
+        }
+
+        return matches.ToArray();
+    }
+
+    /// <inheritdoc />
+    public virtual AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc />
+    public virtual string Name => nameof(FormUrlEncodedMatcher);
+
+    /// <inheritdoc />
+    public bool IgnoreCase { get; }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}" +
+               $")";
+    }
 }

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

@@ -1,167 +1,167 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Linq;
-using AnyOfTypes;
-using Newtonsoft.Json.Linq;
-using Stef.Validation;
-using WireMock.Extensions;
-using WireMock.Models;
-using WireMock.Util;
-
-namespace WireMock.Matchers;
-
-/// <summary>
-/// JsonPathMatcher
-/// </summary>
-/// <seealso cref="IStringMatcher" />
-/// <seealso cref="IObjectMatcher" />
-public class JsonPathMatcher : IStringMatcher, IObjectMatcher
-{
-    private readonly AnyOf<string, StringPattern>[] _patterns;
-
-    /// <inheritdoc />
-    public MatchBehaviour MatchBehaviour { get; }
-
-    /// <inheritdoc />
-    public object Value { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
-    /// </summary>
-    /// <param name="patterns">The patterns.</param>
-    public JsonPathMatcher(params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or,
-        patterns.ToAnyOfPatterns())
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
-    /// </summary>
-    /// <param name="patterns">The patterns.</param>
-    public JsonPathMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch,
-        MatchOperator.Or, patterns)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
-    /// <param name="patterns">The patterns.</param>
-    public JsonPathMatcher(
-        MatchBehaviour matchBehaviour,
-        MatchOperator matchOperator = MatchOperator.Or,
-        params AnyOf<string, StringPattern>[] patterns)
-    {
-        _patterns = Guard.NotNull(patterns);
-        MatchBehaviour = matchBehaviour;
-        MatchOperator = matchOperator;
-        Value = patterns;
-    }
-
-    /// <inheritdoc />
-    public MatchResult IsMatch(string? input)
-    {
-        var score = MatchScores.Mismatch;
-        Exception? exception = null;
-
-        if (!string.IsNullOrWhiteSpace(input))
-        {
-            try
-            {
-                var jToken = JToken.Parse(input);
-                score = IsMatch(jToken);
-            }
-            catch (Exception ex)
-            {
-                exception = ex;
-            }
-        }
-
-        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
-    }
-
-    /// <inheritdoc />
-    public MatchResult IsMatch(object? input)
-    {
-        var score = MatchScores.Mismatch;
-        Exception? exception = null;
-
-        // When input is null or byte[], return Mismatch.
-        if (input != null && input is not byte[])
-        {
-            try
-            {
-                // Check if JToken or object
-                JToken jToken = input as JToken ?? JObject.FromObject(input);
-                score = IsMatch(jToken);
-            }
-            catch (Exception ex)
-            {
-                exception = ex;
-            }
-        }
-
-        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
-    }
-
-    /// <inheritdoc />
-    public AnyOf<string, StringPattern>[] GetPatterns()
-    {
-        return _patterns;
-    }
-
-    /// <inheritdoc />
-    public MatchOperator MatchOperator { get; }
-
-    /// <inheritdoc />
-    public string Name => nameof(JsonPathMatcher);
-
-    /// <inheritdoc />
-    public string GetCSharpCodeArguments()
-    {
-        return $"new {Name}" +
-               $"(" +
-               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
-               $")";
-    }
-
-    private double IsMatch(JToken jToken)
-    {
-        var array = ConvertJTokenToJArrayIfNeeded(jToken);
-
-        // The SelectToken method can accept a string path to a child token ( i.e. "Manufacturers[0].Products[0].Price").
-        // In that case it will return a JValue (some type) which does not implement the IEnumerable interface.
-        var values = _patterns.Select(pattern => array.SelectToken(pattern.GetPattern()) != null).ToArray();
-
-        return MatchScores.ToScore(values, MatchOperator);
-    }
-
-    // https://github.com/WireMock-Net/WireMock.Net/issues/965
-    // https://stackoverflow.com/questions/66922188/newtonsoft-jsonpath-with-c-sharp-syntax
-    // Filtering using SelectToken() isn't guaranteed to work for objects inside objects -- only objects inside arrays.
-    // So this code checks if it's an JArray, if it's not an array, construct a new JArray.
-    private static JToken ConvertJTokenToJArrayIfNeeded(JToken jToken)
-    {
-        if (jToken.Count() == 1)
-        {
-            var property = jToken.First();
-            var item = property.First();
-            if (item is JArray)
-            {
-                return jToken;
-            }
-
-            return new JObject
-            {
-                [property.Path] = new JArray(item)
-            };
-        }
-
-        return jToken;
-    }
+// Copyright © WireMock.Net
+
+using System;
+using System.Linq;
+using AnyOfTypes;
+using Newtonsoft.Json.Linq;
+using Stef.Validation;
+using WireMock.Extensions;
+using WireMock.Models;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// JsonPathMatcher
+/// </summary>
+/// <seealso cref="IStringMatcher" />
+/// <seealso cref="IObjectMatcher" />
+public class JsonPathMatcher : IStringMatcher, IObjectMatcher
+{
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
+    /// <inheritdoc />
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc />
+    public object Value { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public JsonPathMatcher(params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or,
+        patterns.ToAnyOfPatterns())
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public JsonPathMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch,
+        MatchOperator.Or, patterns)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="patterns">The patterns.</param>
+    public JsonPathMatcher(
+        MatchBehaviour matchBehaviour,
+        MatchOperator matchOperator = MatchOperator.Or,
+        params AnyOf<string, StringPattern>[] patterns)
+    {
+        _patterns = Guard.NotNull(patterns);
+        MatchBehaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+        Value = patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(string? input)
+    {
+        var score = MatchScores.Mismatch;
+        Exception? exception = null;
+
+        if (!string.IsNullOrWhiteSpace(input))
+        {
+            try
+            {
+                var jToken = JToken.Parse(input);
+                score = IsMatch(jToken);
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+            }
+        }
+
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(object? input)
+    {
+        var score = MatchScores.Mismatch;
+        Exception? exception = null;
+
+        // When input is null or byte[], return Mismatch.
+        if (input != null && input is not byte[])
+        {
+            try
+            {
+                // Check if JToken or object
+                JToken jToken = input as JToken ?? JObject.FromObject(input);
+                score = IsMatch(jToken);
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+            }
+        }
+
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
+    }
+
+    /// <inheritdoc />
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc />
+    public string Name => nameof(JsonPathMatcher);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
+    }
+
+    private double IsMatch(JToken jToken)
+    {
+        var array = ConvertJTokenToJArrayIfNeeded(jToken);
+
+        // The SelectToken method can accept a string path to a child token ( i.e. "Manufacturers[0].Products[0].Price").
+        // In that case it will return a JValue (some type) which does not implement the IEnumerable interface.
+        var values = _patterns.Select(pattern => array.SelectToken(pattern.GetPattern()) != null).ToArray();
+
+        return MatchScores.ToScore(values, MatchOperator);
+    }
+
+    // https://github.com/wiremock/WireMock.Net/issues/965
+    // https://stackoverflow.com/questions/66922188/newtonsoft-jsonpath-with-c-sharp-syntax
+    // Filtering using SelectToken() isn't guaranteed to work for objects inside objects -- only objects inside arrays.
+    // So this code checks if it's an JArray, if it's not an array, construct a new JArray.
+    private static JToken ConvertJTokenToJArrayIfNeeded(JToken jToken)
+    {
+        if (jToken.Count() == 1)
+        {
+            var property = jToken.First();
+            var item = property.First();
+            if (item is JArray)
+            {
+                return jToken;
+            }
+
+            return new JObject
+            {
+                [property.Path] = new JArray(item)
+            };
+        }
+
+        return jToken;
+    }
 }

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

@@ -1,130 +1,130 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Linq;
-using AnyOfTypes;
-using DevLab.JmesPath;
-using Newtonsoft.Json;
-using Stef.Validation;
-using WireMock.Extensions;
-using WireMock.Models;
-using WireMock.Util;
-
-namespace WireMock.Matchers;
-
-/// <summary>
-/// http://jmespath.org/
-/// </summary>
-public class JmesPathMatcher : IStringMatcher, IObjectMatcher
-{
-    private readonly AnyOf<string, StringPattern>[] _patterns;
-
-    /// <inheritdoc />
-    public object Value { get; }
-
-    /// <inheritdoc />
-    public MatchBehaviour MatchBehaviour { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
-    /// </summary>
-    /// <param name="patterns">The patterns.</param>
-    public JmesPathMatcher(params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, patterns.ToAnyOfPatterns())
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
-    /// </summary>
-    /// <param name="patterns">The patterns.</param>
-    public JmesPathMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, patterns)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
-    /// </summary>
-    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
-    /// <param name="patterns">The patterns.</param>
-    public JmesPathMatcher(MatchOperator matchOperator = MatchOperator.Or, params AnyOf<string, StringPattern>[] patterns) :
-        this(MatchBehaviour.AcceptOnMatch, matchOperator, patterns)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
-    /// <param name="patterns">The patterns.</param>
-    public JmesPathMatcher(
-        MatchBehaviour matchBehaviour,
-        MatchOperator matchOperator = MatchOperator.Or,
-        params AnyOf<string, StringPattern>[] patterns)
-    {
-        _patterns = Guard.NotNull(patterns);
-        MatchBehaviour = matchBehaviour;
-        MatchOperator = matchOperator;
-        Value = patterns;
-    }
-
-    /// <inheritdoc />
-    public MatchResult IsMatch(string? input)
-    {
-        var score = MatchScores.Mismatch;
-        Exception? exception = null;
-
-        if (!string.IsNullOrWhiteSpace(input))
-        {
-            try
-            {
-                var results = _patterns.Select(pattern => bool.Parse(new JmesPath().Transform(input, pattern.GetPattern()))).ToArray();
-                score = MatchScores.ToScore(results, MatchOperator);
-            }
-            catch (Exception ex)
-            {
-                exception = ex;
-            }
-        }
-
-        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
-    }
-
-    /// <inheritdoc />
-    public MatchResult IsMatch(object? input)
-    {
-        var score = MatchScores.Mismatch;
-
-        // When input is null or byte[], return Mismatch.
-        if (input != null && !(input is byte[]))
-        {
-            var inputAsString = JsonConvert.SerializeObject(input);
-            return IsMatch(inputAsString);
-        }
-
-        return MatchBehaviourHelper.Convert(MatchBehaviour, score);
-    }
-
-    /// <inheritdoc />
-    public AnyOf<string, StringPattern>[] GetPatterns()
-    {
-        return _patterns;
-    }
-
-    /// <inheritdoc />
-    public MatchOperator MatchOperator { get; }
-
-    /// <inheritdoc />
-    public string Name => nameof(JmesPathMatcher);
-
-    /// <inheritdoc />
-    public string GetCSharpCodeArguments()
-    {
-        return $"new {Name}" +
-               $"(" +
-               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
-               $")";
-    }
+// Copyright © WireMock.Net
+
+using System;
+using System.Linq;
+using AnyOfTypes;
+using DevLab.JmesPath;
+using Newtonsoft.Json;
+using Stef.Validation;
+using WireMock.Extensions;
+using WireMock.Models;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// http://jmespath.org/
+/// </summary>
+public class JmesPathMatcher : IStringMatcher, IObjectMatcher
+{
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
+    /// <inheritdoc />
+    public object Value { get; }
+
+    /// <inheritdoc />
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public JmesPathMatcher(params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, patterns.ToAnyOfPatterns())
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public JmesPathMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, patterns)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
+    /// </summary>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
+    /// <param name="patterns">The patterns.</param>
+    public JmesPathMatcher(MatchOperator matchOperator = MatchOperator.Or, params AnyOf<string, StringPattern>[] patterns) :
+        this(MatchBehaviour.AcceptOnMatch, matchOperator, patterns)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
+    /// <param name="patterns">The patterns.</param>
+    public JmesPathMatcher(
+        MatchBehaviour matchBehaviour,
+        MatchOperator matchOperator = MatchOperator.Or,
+        params AnyOf<string, StringPattern>[] patterns)
+    {
+        _patterns = Guard.NotNull(patterns);
+        MatchBehaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+        Value = patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(string? input)
+    {
+        var score = MatchScores.Mismatch;
+        Exception? exception = null;
+
+        if (!string.IsNullOrWhiteSpace(input))
+        {
+            try
+            {
+                var results = _patterns.Select(pattern => bool.Parse(new JmesPath().Transform(input, pattern.GetPattern()))).ToArray();
+                score = MatchScores.ToScore(results, MatchOperator);
+            }
+            catch (Exception ex)
+            {
+                exception = ex;
+            }
+        }
+
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(object? input)
+    {
+        var score = MatchScores.Mismatch;
+
+        // When input is null or byte[], return Mismatch.
+        if (input != null && !(input is byte[]))
+        {
+            var inputAsString = JsonConvert.SerializeObject(input);
+            return IsMatch(inputAsString);
+        }
+
+        return MatchBehaviourHelper.Convert(MatchBehaviour, score);
+    }
+
+    /// <inheritdoc />
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc />
+    public string Name => nameof(JmesPathMatcher);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
+    }
 }

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

@@ -1,250 +1,250 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Newtonsoft.Json.Linq;
-using Stef.Validation;
-using WireMock.Extensions;
-using WireMock.Util;
-using JsonUtils = WireMock.Util.JsonUtils;
-
-namespace WireMock.Matchers;
-
-/// <summary>
-/// JsonMatcher
-/// </summary>
-public class JsonMatcher : IJsonMatcher
-{
-    /// <inheritdoc />
-    public virtual string Name => nameof(JsonMatcher);
-
-    /// <inheritdoc />
-    public object Value { get; }
-
-    /// <inheritdoc />
-    public MatchBehaviour MatchBehaviour { get; }
-
-    /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
-    public bool IgnoreCase { get; }
-
-    /// <summary>
-    /// Support Regex
-    /// </summary>
-    public bool Regex { get; }
-
-    private readonly JToken _valueAsJToken;
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
-    /// </summary>
-    /// <param name="value">The string value to check for equality.</param>
-    /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    /// <param name="regex">Support Regex.</param>
-    public JsonMatcher(string value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
-    /// </summary>
-    /// <param name="value">The object value to check for equality.</param>
-    /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    /// <param name="regex">Support Regex.</param>
-    public JsonMatcher(object value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="value">The value to check for equality.</param>
-    /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    /// <param name="regex">Support Regex.</param>
-    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false)
-    {
-        Guard.NotNull(value);
-
-        MatchBehaviour = matchBehaviour;
-        IgnoreCase = ignoreCase;
-        Regex = regex;
-
-        Value = value;
-        _valueAsJToken = JsonUtils.ConvertValueToJToken(value);
-    }
-
-    /// <inheritdoc />
-    public MatchResult IsMatch(object? input)
-    {
-        var score = MatchScores.Mismatch;
-        Exception? error = null;
-
-        // When input is null or byte[], return Mismatch.
-        if (input != null && input is not byte[])
-        {
-            try
-            {
-                var inputAsJToken = JsonUtils.ConvertValueToJToken(input);
-
-                var match = IsMatch(RenameJToken(_valueAsJToken), RenameJToken(inputAsJToken));
-                score = MatchScores.ToScore(match);
-            }
-            catch (Exception ex)
-            {
-                error = ex;
-            }
-        }
-
-        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), error);
-    }
-
-    /// <inheritdoc />
-    public virtual string GetCSharpCodeArguments()
-    {
-        return $"new {Name}" +
-               $"(" +
-               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " + 
-               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
-               $"{CSharpFormatter.ToCSharpBooleanLiteral(Regex)}" +
-               $")";
-    }
-
-    /// <summary>
-    /// Compares the input against the matcher value
-    /// </summary>
-    /// <param name="value">Matcher value</param>
-    /// <param name="input">Input value</param>
-    /// <returns></returns>
-    protected virtual bool IsMatch(JToken value, JToken? input)
-    {
-        // If equal, return true.
-        if (input == value)
-        {
-            return true;
-        }
-
-        // If input is null, return false.
-        if (input == null)
-        {
-            return false;
-        }
-
-        // If using Regex and the value is a string, use the MatchRegex method.
-        if (Regex && value.Type == JTokenType.String)
-        {
-            var valueAsString = value.ToString();
-
-            var (valid, result) = RegexUtils.MatchRegex(valueAsString, input.ToString());
-            if (valid)
-            {
-                return result;
-            }
-        }
-
-        // If the value is a Guid and the input is a string, or vice versa, convert them to strings and compare the string values.
-        if ((value.Type == JTokenType.Guid && input.Type == JTokenType.String) || (value.Type == JTokenType.String && input.Type == JTokenType.Guid))
-        {
-            return JToken.DeepEquals(value.ToString().ToUpperInvariant(), input.ToString().ToUpperInvariant());
-        }
-
-        switch (value.Type)
-        {
-            // If the value is an object, compare all properties.
-            case JTokenType.Object:
-                var valueProperties = value.ToObject<Dictionary<string, JToken>>() ?? new Dictionary<string, JToken>();
-                var inputProperties = input.ToObject<Dictionary<string, JToken>>() ?? new Dictionary<string, JToken>();
-
-                // If the number of properties is different, return false.
-                if (valueProperties.Count != inputProperties.Count)
-                {
-                    return false;
-                }
-
-                // Compare all properties. The input must match all properties of the value.
-                foreach (var pair in valueProperties)
-                {
-                    if (!IsMatch(pair.Value, inputProperties[pair.Key]))
-                    {
-                        return false;
-                    }
-                }
-
-                return true;
-
-            // If the value is an array, compare all elements.
-            case JTokenType.Array:
-                var valueArray = value.ToObject<JToken[]>() ?? EmptyArray<JToken>.Value;
-                var inputArray = input.ToObject<JToken[]>() ?? EmptyArray<JToken>.Value;
-
-                // If the number of elements is different, return false.
-                if (valueArray.Length != inputArray.Length)
-                {
-                    return false;
-                }
-
-                return !valueArray.Where((valueToken, index) => !IsMatch(valueToken, inputArray[index])).Any();
-
-            default:
-                // Use JToken.DeepEquals() for all other types.
-                return JToken.DeepEquals(value, input);
-        }
-    }
-
-    // https://stackoverflow.com/questions/11679804/json-net-rename-properties
-    private JToken RenameJToken(JToken input)
-    {
-        if (!IgnoreCase)
-        {
-            return input;
-        }
-
-        return input switch
-        {
-            JProperty property => RenameJProperty(property),
-            JArray array => RenameJArray(array),
-            JObject obj => RenameJObject(obj),
-            _ => input
-        };
-    }
-
-    private JProperty RenameJProperty(JProperty property)
-    {
-        if (!IgnoreCase)
-        {
-            return property;
-        }
-
-        var propertyValue = property.Value;
-        if (propertyValue.Type == JTokenType.String && !Regex)
-        {
-            var stringValue = propertyValue.Value<string>()!;
-            propertyValue = ToUpper(stringValue);
-        }
-
-        return new JProperty(ToUpper(property.Name)!, RenameJToken(propertyValue));
-    }
-
-    private JArray RenameJArray(JArray array)
-    {
-        if (Regex)
-        {
-            return array;
-        }
-
-        var renamedValues = array.Select(RenameJToken);
-        return new JArray(renamedValues);
-    }
-
-    private JObject RenameJObject(JObject obj)
-    {
-        var renamedProperties = obj.Properties().Select(RenameJProperty);
-        return new JObject(renamedProperties);
-    }
-
-    private static string? ToUpper(string? input)
-    {
-        return input?.ToUpperInvariant();
-    }
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Newtonsoft.Json.Linq;
+using Stef.Validation;
+using WireMock.Extensions;
+using WireMock.Util;
+using JsonUtils = WireMock.Util.JsonUtils;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// JsonMatcher
+/// </summary>
+public class JsonMatcher : IJsonMatcher
+{
+    /// <inheritdoc />
+    public virtual string Name => nameof(JsonMatcher);
+
+    /// <inheritdoc />
+    public object Value { get; }
+
+    /// <inheritdoc />
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
+    public bool IgnoreCase { get; }
+
+    /// <summary>
+    /// Support Regex
+    /// </summary>
+    public bool Regex { get; }
+
+    private readonly JToken _valueAsJToken;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+    /// </summary>
+    /// <param name="value">The string value to check for equality.</param>
+    /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+    /// <param name="regex">Support Regex.</param>
+    public JsonMatcher(string value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+    /// </summary>
+    /// <param name="value">The object value to check for equality.</param>
+    /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+    /// <param name="regex">Support Regex.</param>
+    public JsonMatcher(object value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="value">The value to check for equality.</param>
+    /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
+    /// <param name="regex">Support Regex.</param>
+    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false)
+    {
+        Guard.NotNull(value);
+
+        MatchBehaviour = matchBehaviour;
+        IgnoreCase = ignoreCase;
+        Regex = regex;
+
+        Value = value;
+        _valueAsJToken = JsonUtils.ConvertValueToJToken(value);
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(object? input)
+    {
+        var score = MatchScores.Mismatch;
+        Exception? error = null;
+
+        // When input is null or byte[], return Mismatch.
+        if (input != null && input is not byte[])
+        {
+            try
+            {
+                var inputAsJToken = JsonUtils.ConvertValueToJToken(input);
+
+                var match = IsMatch(RenameJToken(_valueAsJToken), RenameJToken(inputAsJToken));
+                score = MatchScores.ToScore(match);
+            }
+            catch (Exception ex)
+            {
+                error = ex;
+            }
+        }
+
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), error);
+    }
+
+    /// <inheritdoc />
+    public virtual string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{CSharpFormatter.ConvertToAnonymousObjectDefinition(Value, 3)}, " + 
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(IgnoreCase)}, " +
+               $"{CSharpFormatter.ToCSharpBooleanLiteral(Regex)}" +
+               $")";
+    }
+
+    /// <summary>
+    /// Compares the input against the matcher value
+    /// </summary>
+    /// <param name="value">Matcher value</param>
+    /// <param name="input">Input value</param>
+    /// <returns></returns>
+    protected virtual bool IsMatch(JToken value, JToken? input)
+    {
+        // If equal, return true.
+        if (input == value)
+        {
+            return true;
+        }
+
+        // If input is null, return false.
+        if (input == null)
+        {
+            return false;
+        }
+
+        // If using Regex and the value is a string, use the MatchRegex method.
+        if (Regex && value.Type == JTokenType.String)
+        {
+            var valueAsString = value.ToString();
+
+            var (valid, result) = RegexUtils.MatchRegex(valueAsString, input.ToString());
+            if (valid)
+            {
+                return result;
+            }
+        }
+
+        // If the value is a Guid and the input is a string, or vice versa, convert them to strings and compare the string values.
+        if ((value.Type == JTokenType.Guid && input.Type == JTokenType.String) || (value.Type == JTokenType.String && input.Type == JTokenType.Guid))
+        {
+            return JToken.DeepEquals(value.ToString().ToUpperInvariant(), input.ToString().ToUpperInvariant());
+        }
+
+        switch (value.Type)
+        {
+            // If the value is an object, compare all properties.
+            case JTokenType.Object:
+                var valueProperties = value.ToObject<Dictionary<string, JToken>>() ?? new Dictionary<string, JToken>();
+                var inputProperties = input.ToObject<Dictionary<string, JToken>>() ?? new Dictionary<string, JToken>();
+
+                // If the number of properties is different, return false.
+                if (valueProperties.Count != inputProperties.Count)
+                {
+                    return false;
+                }
+
+                // Compare all properties. The input must match all properties of the value.
+                foreach (var pair in valueProperties)
+                {
+                    if (!IsMatch(pair.Value, inputProperties[pair.Key]))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+
+            // If the value is an array, compare all elements.
+            case JTokenType.Array:
+                var valueArray = value.ToObject<JToken[]>() ?? [];
+                var inputArray = input.ToObject<JToken[]>() ?? [];
+
+                // If the number of elements is different, return false.
+                if (valueArray.Length != inputArray.Length)
+                {
+                    return false;
+                }
+
+                return !valueArray.Where((valueToken, index) => !IsMatch(valueToken, inputArray[index])).Any();
+
+            default:
+                // Use JToken.DeepEquals() for all other types.
+                return JToken.DeepEquals(value, input);
+        }
+    }
+
+    // https://stackoverflow.com/questions/11679804/json-net-rename-properties
+    private JToken RenameJToken(JToken input)
+    {
+        if (!IgnoreCase)
+        {
+            return input;
+        }
+
+        return input switch
+        {
+            JProperty property => RenameJProperty(property),
+            JArray array => RenameJArray(array),
+            JObject obj => RenameJObject(obj),
+            _ => input
+        };
+    }
+
+    private JProperty RenameJProperty(JProperty property)
+    {
+        if (!IgnoreCase)
+        {
+            return property;
+        }
+
+        var propertyValue = property.Value;
+        if (propertyValue.Type == JTokenType.String && !Regex)
+        {
+            var stringValue = propertyValue.Value<string>()!;
+            propertyValue = ToUpper(stringValue);
+        }
+
+        return new JProperty(ToUpper(property.Name)!, RenameJToken(propertyValue));
+    }
+
+    private JArray RenameJArray(JArray array)
+    {
+        if (Regex)
+        {
+            return array;
+        }
+
+        var renamedValues = array.Select(RenameJToken);
+        return new JArray(renamedValues);
+    }
+
+    private JObject RenameJObject(JObject obj)
+    {
+        var renamedProperties = obj.Properties().Select(RenameJProperty);
+        return new JObject(renamedProperties);
+    }
+
+    private static string? ToUpper(string? input)
+    {
+        return input?.ToUpperInvariant();
+    }
 }

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

@@ -1,151 +1,151 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Linq;
-using System.Linq.Dynamic.Core;
-using AnyOfTypes;
-using Newtonsoft.Json.Linq;
-using Stef.Validation;
-using WireMock.Extensions;
-using WireMock.Json;
-using WireMock.Models;
-using WireMock.Util;
-
-namespace WireMock.Matchers;
-
-/// <summary>
-/// System.Linq.Dynamic.Core Expression Matcher
-/// </summary>
-/// <inheritdoc cref="IObjectMatcher"/>
-/// <inheritdoc cref="IStringMatcher"/>
-public class LinqMatcher : IObjectMatcher, IStringMatcher
-{
-    private readonly AnyOf<string, StringPattern>[] _patterns;
-
-    /// <inheritdoc />
-    public MatchBehaviour MatchBehaviour { get; }
-
-    /// <inheritdoc />
-    public object Value { get; }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
-    /// </summary>
-    /// <param name="pattern">The pattern.</param>
-    public LinqMatcher(AnyOf<string, StringPattern> pattern) : this(new[] { pattern })
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
-    /// </summary>
-    /// <param name="patterns">The patterns.</param>
-    public LinqMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, patterns)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="pattern">The pattern.</param>
-    public LinqMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> pattern) : this(matchBehaviour, MatchOperator.Or, pattern)
-    {
-    }
-
-    /// <summary>
-    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
-    /// </summary>
-    /// <param name="matchBehaviour">The match behaviour.</param>
-    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
-    /// <param name="patterns">The patterns.</param>
-    public LinqMatcher(
-        MatchBehaviour matchBehaviour,
-        MatchOperator matchOperator = MatchOperator.Or,
-        params AnyOf<string, StringPattern>[] patterns)
-    {
-        _patterns = Guard.NotNull(patterns);
-        MatchBehaviour = matchBehaviour;
-        MatchOperator = matchOperator;
-        Value = patterns;
-    }
-
-    /// <inheritdoc />
-    public MatchResult IsMatch(string? input)
-    {
-        var score = MatchScores.Mismatch;
-        Exception? error = null;
-
-        // Convert a single input string to a Queryable string-list with 1 entry.
-        IQueryable queryable = new[] { input }.AsQueryable();
-
-        try
-        {
-            // Use the Any(...) method to check if the result matches
-            score = MatchScores.ToScore(_patterns.Select(pattern => queryable.Any(pattern.GetPattern())).ToArray(), MatchOperator);
-        }
-        catch (Exception e)
-        {
-            error = e;
-        }
-
-        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), error);
-    }
-
-    /// <inheritdoc />
-    public MatchResult IsMatch(object? input)
-    {
-        var score = MatchScores.Mismatch;
-        Exception? error = null;
-
-        JArray jArray;
-        try
-        {
-            jArray = new JArray { input };
-        }
-        catch
-        {
-            jArray = input == null ? new JArray() : new JArray { JToken.FromObject(input) };
-        }
-
-        // Convert a single object to a Queryable JObject-list with 1 entry.
-        var queryable = jArray.ToDynamicClassArray().AsQueryable();
-
-        try
-        {
-            var patternsAsStringArray = _patterns.Select(p => p.GetPattern()).ToArray();
-            var scores = patternsAsStringArray.Select(p => queryable.Any(p)).ToArray();
-
-            score = MatchScores.ToScore(scores, MatchOperator);
-        }
-        catch (Exception e)
-        {
-            error = e;
-        }
-
-        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), error);
-    }
-
-    /// <inheritdoc />
-    public AnyOf<string, StringPattern>[] GetPatterns()
-    {
-        return _patterns;
-    }
-
-    /// <inheritdoc />
-    public MatchOperator MatchOperator { get; }
-
-    /// <inheritdoc />
-    public string Name => nameof(LinqMatcher);
-
-    /// <inheritdoc />
-    public string GetCSharpCodeArguments()
-    {
-        return $"new {Name}" +
-               $"(" +
-               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
-               $")";
-    }
+// Copyright © WireMock.Net
+
+using System;
+using System.Linq;
+using System.Linq.Dynamic.Core;
+using AnyOfTypes;
+using Newtonsoft.Json.Linq;
+using Stef.Validation;
+using WireMock.Extensions;
+using WireMock.Json;
+using WireMock.Models;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// System.Linq.Dynamic.Core Expression Matcher
+/// </summary>
+/// <inheritdoc cref="IObjectMatcher"/>
+/// <inheritdoc cref="IStringMatcher"/>
+public class LinqMatcher : IObjectMatcher, IStringMatcher
+{
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
+    /// <inheritdoc />
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc />
+    public object Value { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+    /// </summary>
+    /// <param name="pattern">The pattern.</param>
+    public LinqMatcher(AnyOf<string, StringPattern> pattern) : this(new[] { pattern })
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public LinqMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, patterns)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="pattern">The pattern.</param>
+    public LinqMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> pattern) : this(matchBehaviour, MatchOperator.Or, pattern)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
+    /// <param name="patterns">The patterns.</param>
+    public LinqMatcher(
+        MatchBehaviour matchBehaviour,
+        MatchOperator matchOperator = MatchOperator.Or,
+        params AnyOf<string, StringPattern>[] patterns)
+    {
+        _patterns = Guard.NotNull(patterns);
+        MatchBehaviour = matchBehaviour;
+        MatchOperator = matchOperator;
+        Value = patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(string? input)
+    {
+        var score = MatchScores.Mismatch;
+        Exception? error = null;
+
+        // Convert a single input string to a Queryable string-list with 1 entry.
+        IQueryable queryable = new[] { input }.AsQueryable();
+
+        try
+        {
+            // Use the Any(...) method to check if the result matches
+            score = MatchScores.ToScore(_patterns.Select(pattern => queryable.Any(pattern.GetPattern())).ToArray(), MatchOperator);
+        }
+        catch (Exception e)
+        {
+            error = e;
+        }
+
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), error);
+    }
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(object? input)
+    {
+        var score = MatchScores.Mismatch;
+        Exception? error = null;
+
+        JArray jArray;
+        try
+        {
+            jArray = new JArray { input };
+        }
+        catch
+        {
+            jArray = input == null ? new JArray() : new JArray { JToken.FromObject(input) };
+        }
+
+        // Convert a single object to a Queryable JObject-list with 1 entry.
+        var queryable = jArray.ToDynamicClassArray().AsQueryable();
+
+        try
+        {
+            var patternsAsStringArray = _patterns.Select(p => p.GetPattern()).ToArray();
+            var scores = patternsAsStringArray.Select(p => queryable.Any(p)).ToArray();
+
+            score = MatchScores.ToScore(scores, MatchOperator);
+        }
+        catch (Exception e)
+        {
+            error = e;
+        }
+
+        return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), error);
+    }
+
+    /// <inheritdoc />
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc />
+    public string Name => nameof(LinqMatcher);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
+    {
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
+    }
 }