1.9.0

* Create new project for GraphQL

* ...

* .

* ok?

* Update src/WireMock.Net.Shared/Extensions/AnyOfExtensions.cs

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

* --

* ...

---------

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

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

.github/ISSUE_TEMPLATE/feature_request.md

@@ -8,7 +8,7 @@ assignees: ''
 ---
 
 **Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+A clear and concise description of what the problem is.
 
 **Describe the solution you'd like**
 A clear and concise description of what you want to happen.
@@ -17,7 +17,7 @@ A clear and concise description of what you want to happen.
 A clear and concise description of any alternative solutions or features you've considered.
 
 **Is your feature request supported by [WireMock (java version)](https://www.wiremock.org)? Please provide details.**
-Provide relevant information if requested feature is supported in [Handlebarsjs](https://handlebarsjs.com/) but is missing in our implementation.
+Provide relevant information if requested feature is supported but is missing in this implementation.
 
 **Additional context**
 Add any other context or screenshots about the feature request here.

.github/workflows/CreateRelease.yml

@@ -1,5 +1,8 @@
 name: CreateRelease
 
+permissions:
+  contents: write
+
 on:
   push:
     tags:
@@ -10,6 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
       - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true

.github/workflows/ci.yml

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

.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.9.0</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.9.0
 
 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,4 @@
-# 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.9.0 (10 August 2025)
+- #1334 Create GraphQL project [feature]
 
-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,16 @@ 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.GraphQL** | [![NuGet Badge WireMock.Net.GraphQL](https://img.shields.io/nuget/v/WireMock.Net.GraphQL)](https://www.nuget.org/packages/WireMock.Net.GraphQL) | [![MyGet Badge WireMock.Net.GraphQL](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.GraphQL?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.GraphQL)
 | | | |
 |   **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* and *WireMock.Net.GraphQL*.
+
 ---
 
 ## :exclamation: Breaking changes
@@ -65,6 +72,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 +87,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 +110,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 +122,19 @@ 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))
+
+---
+
+## Powered by
+[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://jb.gg/OpenSource)

WireMock.Net Solution.sln

@@ -38,12 +38,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Client", "examples\WireMock.Net.Client\WireMock.Net.Client.csproj", "{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Proxy.Net452", "examples\WireMock.Net.Console.Proxy.Net452\WireMock.Net.Console.Proxy.Net452.csproj", "{26433A8F-BF01-4962-97EB-81BFFBB61096}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Service", "examples\Wiremock.Net.Service\WireMock.Net.Service.csproj", "{7F0B2446-0363-4720-AF46-F47F83B557DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net452.Classic", "examples\WireMock.Net.Console.Net452.Classic\WireMock.Net.Console.Net452.Classic.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.RequestLogTest", "examples\WireMock.Net.Console.RequestLogTest\WireMock.Net.Console.RequestLogTest.csproj", "{A9D039B9-7509-4CF1-9EFD-87EB82998575}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.OpenApiParser.ConsoleApp", "examples\WireMock.Net.OpenApiParser.ConsoleApp\WireMock.Net.OpenApiParser.ConsoleApp.csproj", "{5C09FB93-1535-4F92-AF26-21E8A061EE4A}"
@@ -128,7 +124,19 @@ 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
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ConsoleApp.UsingNuGet", "examples\WireMock.Net.ConsoleApp.UsingNuGet\WireMock.Net.ConsoleApp.UsingNuGet.csproj", "{1F80A6E6-D146-4E40-9EA8-49DB8494239F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Tests.UsingNuGet", "test\WireMock.Net.Tests.UsingNuGet\WireMock.Net.Tests.UsingNuGet.csproj", "{BBA332C6-28A9-42E7-9C4D-A0816E52A198}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.GraphQL", "src\WireMock.Net.GraphQL\WireMock.Net.GraphQL.csproj", "{B6269AAC-170A-4346-8B9A-444DED3D9A45}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -160,18 +168,10 @@ Global
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -304,10 +304,34 @@ 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
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A45}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A45}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A45}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-444DED3D9A45}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -319,9 +343,7 @@ Global
 		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{26433A8F-BF01-4962-97EB-81BFFBB61096} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{668F689E-57B4-422E-8846-C0FF643CA268} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{B6269AAC-170A-4346-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
@@ -357,7 +379,13 @@ 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}
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198} = {0BB8B634-407A-4610-A91F-11586990767A}
+		{B6269AAC-170A-4346-8B9A-444DED3D9A45} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

azure-pipelines-ci.yml

@@ -109,6 +109,13 @@ jobs:
       packageType: 'sdk'
       version: '8.0.x'
 
+  - task: DotNetCoreCLI@2
+    displayName: 'WireMock.Net.Tests.UsingNuGet'
+    inputs:
+      command: 'test'
+      projects: './test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj'
+      arguments: '--configuration Release'
+
   - task: DotNetCoreCLI@2
     displayName: 'WireMock.Net.Tests with Coverage'
     inputs:

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.NET8/WireMock.Net.Console.NET8.csproj

@@ -6,11 +6,6 @@
       <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs" Link="MainApp.cs" />
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs" Link="CustomFileSystemFileHandler.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="__admin\mappings\*.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

examples/WireMock.Net.Console.Net452.Classic/App.config

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-    </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="HandlebarsDotNet.Helpers.Core" publicKeyToken="00d131fae0c250bc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.3.3.0" newVersion="2.3.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Handlebars" publicKeyToken="22225d0bf33cd661" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>

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

@@ -1,16 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.IO;
-using log4net.Config;
-
-namespace WireMock.Net.ConsoleApplication;
-
-static class Program
-{
-    static void Main(params string[] args)
-    {
-        XmlConfigurator.Configure(new FileInfo("log4net.config"));
-
-        MainApp.Run();
-    }
-}

examples/WireMock.Net.Console.Net452.Classic/Properties/AssemblyInfo.cs

@@ -1,37 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("WireMock.Net.Console.Net452.Classic")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WireMock.Net.Console.Net452.Classic")]
-[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("668f689e-57b4-422e-8846-c0ff643ca268")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{668F689E-57B4-422E-8846-C0FF643CA268}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WireMock.Net.ConsoleApplication</RootNamespace>
-    <AssemblyName>WireMock.Net.ConsoleApplication</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>..\..\resources\WireMock.Net-Logo.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
-    </Reference>
-    <Reference Include="Handlebars, Version=2.1.6.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.6\lib\net451\Handlebars.dll</HintPath>
-    </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.3\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.3\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.17.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.17\lib\net45\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="Stef.Validation, Version=0.1.1.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Stef.Validation.0.1.1\lib\net40\Stef.Validation.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomFileSystemFileHandler.cs" />
-    <Compile Include="MainApp.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-    <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="__admin\mappings\873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
-      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
-      <Name>WireMock.Net.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="log4net">
-      <Version>2.0.17</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>

examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json

@@ -1,21 +0,0 @@
-{
-    "Request": {
-        "Path": {
-            "Matchers": [
-                {
-                    "Name": "WildcardMatcher",
-                    "Pattern": "/static/mapping"
-                }
-            ]
-        },
-        "Methods": [
-            "get"
-        ]
-    },
-    "Response": {
-        "BodyAsJson": { "body": "static mapping" },
-        "Headers": {
-            "Content-Type": "application/json"
-        }
-    }
-}

examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json

@@ -1,19 +0,0 @@
-{
-  "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
-  "Priority": 4,
-  "Request": {
-    "Path": {},
-    "Methods": [
-      "get"
-    ]
-  },
-  "Response": {
-    "StatusCode": 200,
-    "BodyDestination": "SameAsSource",
-    "Body": "NO PATH OR URL",
-    "UseTransformer": false,
-    "Headers": {
-      "Content-Type": "application/json"
-    }
-  }
-}

examples/WireMock.Net.Console.Net452.Classic/log4net.config

@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
-  </configSections>
-  <appSettings>
-    <add key="log4net.Internal.Debug" value="true"/>
-  </appSettings>
-  <log4net>
-    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="ConsoleAppender" />
-    </root>
-  </log4net>
-</configuration>

examples/WireMock.Net.Console.Net452.Classic/packages.config

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AnyOf" version="0.3.0" targetFramework="net452" />
-  <package id="Handlebars.Net" version="2.1.6" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers" version="2.4.3" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.4.3" targetFramework="net452" />
-  <package id="log4net" version="2.0.17" targetFramework="net452" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
-  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
-  <package id="Stef.Validation" version="0.1.1" targetFramework="net452" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
-</packages>

examples/WireMock.Net.Console.Proxy.Net452/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
-    </startup>
-</configuration>

examples/WireMock.Net.Console.Proxy.Net452/Program.cs

@@ -1,60 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Collections.Specialized;
-using System.Net.Http;
-using WireMock.Server;
-using WireMock.Settings;
-
-namespace WireMock.Net.Console.Proxy.Net452
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            string[] urls = { "http://localhost:9091/", "https://localhost:9443/" };
-            var server = WireMockServer.Start(new WireMockServerSettings
-            {
-                Urls = urls,
-                StartAdminInterface = true,
-                ReadStaticMappings = false,
-                ProxyAndRecordSettings = new ProxyAndRecordSettings
-                {
-                    Url = "http://postman-echo.com/post",
-                    //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
-                    SaveMapping = true,
-                    SaveMappingToFile = false,
-                    ExcludedHeaders = new[] { "dnt", "Content-Length" }
-                }
-            });
-
-            System.Console.WriteLine("Subscribing to LogEntriesChanged");
-            server.LogEntriesChanged += Server_LogEntriesChanged;
-
-            var uri = new Uri(urls[0]);
-            var form = new MultipartFormDataContent
-            {
-                { new StringContent("data"), "test", "test.txt" }
-            };
-            new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
-
-            System.Console.WriteLine("Unsubscribing to LogEntriesChanged");
-            server.LogEntriesChanged -= Server_LogEntriesChanged;
-
-            form = new MultipartFormDataContent
-            {
-                { new StringContent("data2"), "test2", "test2.txt" }
-            };
-            new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
-
-            System.Console.WriteLine("Press any key to stop the server");
-            System.Console.ReadKey();
-            server.Stop();
-        }
-
-        private static void Server_LogEntriesChanged(object sender, NotifyCollectionChangedEventArgs eventRecordArgs)
-        {
-            System.Console.WriteLine("Server_LogEntriesChanged : {0}", eventRecordArgs.NewItems.Count);
-        }
-    }
-}

examples/WireMock.Net.Console.Proxy.Net452/Properties/AssemblyInfo.cs

@@ -1,37 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("WireMock.Net.Console.Proxy.Net452")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WireMock.Net.Console.Proxy.Net452")]
-[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("26433a8f-bf01-4962-97eb-81bffbb61096")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj

@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{26433A8F-BF01-4962-97EB-81BFFBB61096}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>WireMock.Net.Console.Proxy.Net452</RootNamespace>
-    <AssemblyName>WireMock.Net.Console.Proxy.Net452</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>WireMock.Net.Console.Proxy.Net452.Program</StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Condition="'$(Platform)' == 'x64'" Include="..\packages\Libuv.1.10.0\runtimes\win7-x64\native\libuv.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-      <Link>libuv.dll</Link>
-    </None>
-    <None Condition="'$(Platform)' == 'x86'" Include="..\packages\Libuv.1.10.0\runtimes\win7-x86\native\libuv.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-      <Link>libuv.dll</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

examples/WireMock.Net.Console.Proxy.Net452/packages.config

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
-</packages>

examples/WireMock.Net.ConsoleApp.UsingNuGet/Program.cs

@@ -0,0 +1,88 @@
+// Copyright © WireMock.Net
+
+using System.Net.Http.Headers;
+using System.Text;
+using WireMock.Matchers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+
+Directory.SetCurrentDirectory(Path.GetTempPath());
+
+using var server = WireMockServer.Start();
+
+var textPlainContent = "This is some plain text";
+var textPlainContentType = "text/plain";
+var textPlainContentTypeMatcher = new ContentTypeMatcher(textPlainContentType);
+var textPlainContentMatcher = new ExactMatcher(textPlainContent);
+var textPlainMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textPlainContentTypeMatcher, null, null, textPlainContentMatcher);
+
+var textJson = "{ \"Key\" : \"Value\" }";
+var textJsonContentType = "text/json";
+var textJsonContentTypeMatcher = new ContentTypeMatcher(textJsonContentType);
+var textJsonContentMatcher = new JsonMatcher(new { Key = "Value" }, true);
+var jsonMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textJsonContentTypeMatcher, null, null, textJsonContentMatcher);
+
+var imagePngBytes = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC");
+var imagePngContentMatcher = new ExactObjectMatcher(imagePngBytes);
+var imagePngMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, null, null, null, imagePngContentMatcher);
+
+var matchers = new IMatcher[]
+{
+    textPlainMatcher,
+    jsonMatcher,
+    imagePngMatcher
+};
+
+server
+    .Given(Request.Create()
+        .UsingPost()
+        .WithPath("/multipart")
+        .WithMultiPart(matchers)
+    )
+    .RespondWith(Response.Create()
+        .WithBodyAsJson(new
+        {
+            Method = "{{request.Method}}",
+            BodyAsMimeMessage = "{{request.BodyAsMimeMessage.TextBody}}"
+        })
+        .WithTransformer()
+    );
+
+server
+    .Given(Request.Create()
+        .UsingPost()
+        .WithPath("/multipart2")
+        .WithMultiPart(matchers)
+    )
+    .RespondWith(Response.Create()
+        .WithBody(request =>
+        {
+            if (request.BodyAsMimeMessage == null)
+            {
+                throw new InvalidProgramException("Not expected");
+            }
+            return "OK";
+        })
+        .WithTransformer()
+    );
+
+var formDataContent = new MultipartFormDataContent
+{
+    { new StringContent(textPlainContent, Encoding.UTF8, textPlainContentType), "text" },
+    { new StringContent(textJson, Encoding.UTF8, textJsonContentType), "json" }
+};
+
+var fileContent = new ByteArrayContent(imagePngBytes);
+fileContent.Headers.ContentType = new MediaTypeHeaderValue("image/png");
+formDataContent.Add(fileContent, "somefile", "image.png");
+
+var client = server.CreateClient();
+
+var response = await client.PostAsync("/multipart", formDataContent);
+var content = await response.Content.ReadAsStringAsync();
+Console.WriteLine(content);
+
+var response2 = await client.PostAsync("/multipart2", formDataContent);
+var content2 = await response2.Content.ReadAsStringAsync();
+Console.WriteLine(content2);

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

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="SonarAnalyzer.CSharp" Version="10.12.0.118525" />
+  </ItemGroup>
+
+  <!--<ItemGroup>
+    <PackageReference Include="WireMock.Net" Version="1.8.11" />
+  </ItemGroup>-->
+
+</Project>

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

@@ -113,20 +113,13 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
-      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
-      <Name>WireMock.Net.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="log4net">
       <Version>3.0.3</Version>
     </PackageReference>
+    <PackageReference Include="WireMock.Net">
+      <Version>1.8.11</Version>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

examples/WireMock.Net.TestcontainersExample/Program.cs

@@ -159,9 +159,7 @@ internal class Program
     private static async Task TestWindowsCopyAsync()
     {
         var builder = new WireMockContainerBuilder()
-            .WithWatchStaticMappings(true)
-            .WithAutoRemove(true)
-            .WithCleanUp(true);
+            .WithWatchStaticMappings(true);
 
         var container = builder.Build();
 
@@ -186,8 +184,6 @@ internal class Program
         var mappings = await adminClient.GetMappingsAsync();
         Console.WriteLine("mappings = " + JsonConvert.SerializeObject(mappings, Formatting.Indented));
 
-        await Task.Delay(1_000);
-
         await container.StopAsync();
     }
 
@@ -205,9 +201,7 @@ internal class Program
             .WithNetwork(dummyNetwork)
             .WithAdminUserNameAndPassword("x", "y")
             .WithMappings(mappingsPath)
-            .WithWatchStaticMappings(true)
-            // .WithAutoRemove(true)
-            .WithCleanUp(true);
+            .WithWatchStaticMappings(true);
 
         if (image != null)
         {

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/Admin/Scenarios/ScenarioStateUpdateModel.cs

@@ -0,0 +1,15 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Admin.Scenarios;
+
+/// <summary>
+/// ScenarioStateModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class ScenarioStateUpdateModel
+{
+    /// <summary>
+    /// Gets or sets the NextState.
+    /// </summary>
+    public string? State { get; set; }
+}

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/IRequestMessage.cs

@@ -123,7 +123,7 @@ public interface IRequestMessage
     /// The original body as MimeMessage.
     /// Convenience getter for Handlebars and WireMockAssertions.
     /// </summary>
-    object? BodyAsMimeMessage { get; }
+    Models.Mime.IMimeMessageData? BodyAsMimeMessage { get; }
 #endif
 
     /// <summary>

src/WireMock.Net.Abstractions/Models/GraphQL/ISchemaData.cs

@@ -0,0 +1,5 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Models.GraphQL;
+
+public interface ISchemaData;

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/Models/Mime/IContentDispositionData.cs

@@ -0,0 +1,60 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// An interface exposing the public, readable properties of a ContentDisposition.
+/// </summary>
+public interface IContentDispositionData
+{
+    /// <summary>
+    /// Get the disposition.
+    /// </summary>
+    /// <value>The disposition.</value>
+    string Disposition { get; }
+
+    /// <summary>
+    /// Get a value indicating whether the <see cref="IMimeEntityData"/> is an attachment.
+    /// </summary>
+    /// <value><see langword="true" /> if the <see cref="IMimeEntityData"/> is an attachment; otherwise, <see langword="false" />.</value>
+    bool IsAttachment { get; }
+
+    /// <summary>
+    /// Get the list of parameters on the ContentDisposition.
+    /// </summary>
+    /// <value>The parameters.</value>
+    public IList<string> Parameters { get; }
+
+    /// <summary>
+    /// Get the name of the file.
+    /// </summary>
+    /// <value>The name of the file.</value>
+    string FileName { get; }
+
+    /// <summary>
+    /// Get the creation-date parameter.
+    /// </summary>
+    /// <value>The creation date.</value>
+    DateTimeOffset? CreationDate { get; }
+
+    /// <summary>
+    /// Get the modification-date parameter.
+    /// </summary>
+    /// <value>The modification date.</value>
+    DateTimeOffset? ModificationDate { get; }
+
+    /// <summary>
+    /// Get the read-date parameter.
+    /// </summary>
+    /// <value>The read date.</value>
+    DateTimeOffset? ReadDate { get; }
+
+    /// <summary>
+    /// Get the size parameter.
+    /// </summary>
+    /// <value>The size.</value>
+    long? Size { get; }
+}

src/WireMock.Net.Abstractions/Models/Mime/IContentTypeData.cs

@@ -0,0 +1,67 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Text;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// An interface exposing the public, readable properties of a ContentType
+/// with complex types simplified to a generic object.
+/// </summary>
+public interface IContentTypeData
+{
+    /// <summary>
+    /// Get the type of the media.
+    /// </summary>
+    /// <value>The type of the media.</value>
+    string MediaType { get; }
+
+    /// <summary>
+    /// Get the media subtype.
+    /// </summary>
+    /// <value>The media subtype.</value>
+    string MediaSubtype { get; }
+
+    /// <summary>
+    /// Get the list of parameters on the ContentType.
+    /// </summary>
+    /// <value>The parameters.</value>
+    IList<string> Parameters { get; }
+
+    /// <summary>
+    /// Get the boundary parameter.
+    /// </summary>
+    /// <value>The boundary.</value>
+    string Boundary { get; }
+
+    /// <summary>
+    /// Get the charset parameter.
+    /// </summary>
+    /// <value>The charset.</value>
+    string Charset { get; }
+
+    /// <summary>
+    /// Get the charset parameter as an Encoding.
+    /// </summary>
+    /// <value>The charset encoding.</value>
+    Encoding CharsetEncoding { get; }
+
+    /// <summary>
+    /// Get the format parameter.
+    /// </summary>
+    /// <value>The format.</value>
+    string Format { get; }
+
+    /// <summary>
+    /// Get the simple mime-type.
+    /// </summary>
+    /// <value>The mime-type.</value>
+    string MimeType { get; }
+
+    /// <summary>
+    /// Get the name parameter.
+    /// </summary>
+    /// <value>The name.</value>
+    string Name { get; }
+}

src/WireMock.Net.Abstractions/Models/Mime/IMimeEntityData.cs

@@ -0,0 +1,54 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// A simplified interface exposing the public, readable properties of MimeEntity.
+/// </summary>
+public interface IMimeEntityData
+{
+    /// <summary>
+    /// Get the list of headers.
+    /// </summary>
+    /// <value>The list of headers.</value>
+    IList<string> Headers { get; }
+
+    /// <summary>
+    /// Get the content disposition.
+    /// </summary>
+    /// <value>The content disposition.</value>
+    IContentDispositionData? ContentDisposition { get; }
+
+    /// <summary>
+    /// Get the type of the content.
+    /// </summary>
+    /// <value>The type of the content.</value>
+    IContentTypeData? ContentType { get; }
+
+    /// <summary>
+    /// Get the base content URI.
+    /// </summary>
+    /// <value>The base content URI or <see langword="null"/>.</value>
+    Uri ContentBase { get; }
+
+    /// <summary>
+    /// Get the content location.
+    /// </summary>
+    /// <value>The content location or <see langword="null"/>.</value>
+    Uri ContentLocation { get; }
+
+    /// <summary>
+    /// Get the Content-Id.
+    /// </summary>
+    /// <value>The content identifier.</value>
+    string ContentId { get; }
+
+    /// <summary>
+    /// Get a value indicating whether this <see cref="IMimeEntityData"/> is an attachment.
+    /// </summary>
+    /// <value><see langword="true" /> if this <see cref="IMimeEntityData"/> is an attachment; otherwise, <see langword="false" />.</value>
+    bool IsAttachment { get; }
+}

src/WireMock.Net.Abstractions/Models/Mime/IMimeMessageData.cs

@@ -0,0 +1,186 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// A simplified interface exposing the public, readable properties of a MIME message.
+/// </summary>
+public interface IMimeMessageData
+{
+    /// <summary>
+    /// Get the list of headers.
+    /// </summary>
+    /// <value>The list of headers.</value>
+    IList<string> Headers { get; }
+
+    /// <summary>
+    /// Get the value of the Importance header.
+    /// </summary>
+    /// <value>The importance, as an integer.</value>
+    int Importance { get; }
+
+    /// <summary>
+    /// Get the value of the Priority header.
+    /// </summary>
+    /// <value>The priority, as an integer.</value>
+    int Priority { get; }
+
+    /// <summary>
+    /// Get the value of the X-Priority header.
+    /// </summary>
+    /// <value>The X-priority, as an integer.</value>
+    int XPriority { get; }
+
+    /// <summary>
+    /// Get the address in the Sender header.
+    /// </summary>
+    /// <value>The address in the Sender header.</value>
+    string Sender { get; }
+
+    /// <summary>
+    /// Get the address in the Resent-Sender header.
+    /// </summary>
+    /// <value>The address in the Resent-Sender header.</value>
+    string ResentSender { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the From header.
+    /// </summary>
+    /// <value>The list of addresses in the From header.</value>
+    IList<string> From { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-From header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-From header.</value>
+    IList<string> ResentFrom { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Reply-To header.
+    /// </summary>
+    /// <value>The list of addresses in the Reply-To header.</value>
+    IList<string> ReplyTo { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-Reply-To header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-Reply-To header.</value>
+    IList<string> ResentReplyTo { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the To header.
+    /// </summary>
+    /// <value>The list of addresses in the To header.</value>
+    IList<string> To { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-To header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-To header.</value>
+    IList<string> ResentTo { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Cc header.
+    /// </summary>
+    /// <value>The list of addresses in the Cc header.</value>
+    IList<string> Cc { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-Cc header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-Cc header.</value>
+    IList<string> ResentCc { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Bcc header.
+    /// </summary>
+    /// <value>The list of addresses in the Bcc header.</value>
+    IList<string> Bcc { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-Bcc header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-Bcc header.</value>
+    IList<string> ResentBcc { get; }
+        
+    /// <summary>
+    /// Get the subject of the message.
+    /// </summary>
+    /// <value>The subject of the message.</value>
+    string Subject { get; }
+
+    /// <summary>
+    /// Get the date of the message.
+    /// </summary>
+    /// <value>The date of the message.</value>
+    DateTimeOffset Date { get; }
+
+    /// <summary>
+    /// Get the Resent-Date of the message.
+    /// </summary>
+    /// <value>The Resent-Date of the message.</value>
+    DateTimeOffset ResentDate { get; }
+
+    /// <summary>
+    /// Get the list of references to other messages.
+    /// </summary>
+    /// <value>The references.</value>
+    IList<string> References { get; }
+
+    /// <summary>
+    /// Get the Message-Id that this message is replying to.
+    /// </summary>
+    /// <value>The message id that this message is in reply to.</value>
+    string InReplyTo { get; }
+
+    /// <summary>
+    /// Get the message identifier.
+    /// </summary>
+    /// <value>The message identifier.</value>
+    string MessageId { get; }
+
+    /// <summary>
+    /// Get the Resent-Message-Id header.
+    /// </summary>
+    /// <value>The Resent-Message-Id.</value>
+    string ResentMessageId { get; }
+
+    /// <summary>
+    /// Get the MIME-Version.
+    /// </summary>
+    /// <value>The MIME version.</value>
+    Version MimeVersion { get; }
+
+    /// <summary>
+    /// Get the body of the message.
+    /// </summary>
+    /// <value>The body of the message.</value>
+    IMimeEntityData Body { get; }
+
+    /// <summary>
+    /// Get the text body of the message if it exists.
+    /// </summary>
+    /// <value>The text body if it exists; otherwise, <see langword="null"/>.</value>
+    string TextBody { get; }
+
+    /// <summary>
+    /// Get the html body of the message if it exists.
+    /// </summary>
+    /// <value>The html body if it exists; otherwise, <see langword="null"/>.</value>
+    string HtmlBody { get; }
+
+    /// <summary>
+    /// Get the body parts of the message.
+    /// </summary>
+    /// <value>The body parts.</value>
+    IList<IMimePartData> BodyParts { get; }
+
+    /// <summary>
+    /// Get the attachments.
+    /// </summary>
+    /// <value>The attachments.</value>
+    IList<IMimeEntityData> Attachments { get; }
+}

src/WireMock.Net.Abstractions/Models/Mime/IMimePartData.cs

@@ -0,0 +1,57 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// A simplified interface exposing the public, readable properties of MimePart.
+/// </summary>
+public interface IMimePartData : IMimeEntityData
+{
+    /// <summary>
+    /// Get the description of the content if available.
+    /// </summary>
+    /// <value>The description of the content.</value>
+    string ContentDescription { get; }
+
+    /// <summary>
+    /// Get the duration of the content if available.
+    /// </summary>
+    /// <value>The duration of the content.</value>
+    int? ContentDuration { get; }
+
+    /// <summary>
+    /// Get the md5sum of the content.
+    /// </summary>
+    /// <value>The md5sum of the content.</value>
+    string ContentMd5 { get; }
+
+    /// <summary>
+    /// Get the content transfer encoding.
+    /// </summary>
+    /// <value>The content transfer encoding as a string.</value>
+    string ContentTransferEncoding { get; }
+
+    /// <summary>
+    /// Get the name of the file.
+    /// </summary>
+    /// <value>The name of the file.</value>
+    string FileName { get; }
+
+    /// <summary>
+    /// Get the MIME content.
+    /// </summary>
+    /// <value>The MIME content.</value>
+    IDictionary<string, object?> Content { get; }
+
+    /// <summary>
+    /// Open the decoded content stream.
+    /// </summary>
+    /// <remarks>
+    /// Provides a means of reading the decoded content without having to first write it to another stream.
+    /// </remarks>
+    /// <returns>The decoded content stream.</returns>
+    Stream Open();
+}

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/Server/IWireMockServer.cs

@@ -161,6 +161,11 @@ public interface IWireMockServer : IDisposable
     /// </summary>
     bool ResetScenario(string name);
 
+    /// <summary>
+    /// Sets a scenario to a state.
+    /// </summary>
+    bool SetScenarioState(string name, string? state);
+
     /// <summary>
     /// Resets the LogEntries.
     /// </summary>

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.GraphQL/Matchers/GraphQLMatcher.cs

@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net
 
-#if GRAPHQL
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -14,17 +13,17 @@ using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Exceptions;
 using WireMock.Extensions;
-using WireMock.Matchers.Models;
+using WireMock.GraphQL.Models;
 using WireMock.Models;
-using WireMock.Util;
+using WireMock.Models.GraphQL;
+using WireMock.Utils;
 
 namespace WireMock.Matchers;
 
 /// <summary>
 /// GrapQLMatcher Schema Matcher
 /// </summary>
-/// <inheritdoc cref="IStringMatcher"/>
-public class GraphQLMatcher : IStringMatcher
+public class GraphQLMatcher : IGraphQLMatcher
 {
     private sealed class GraphQLRequest
     {
@@ -54,7 +53,7 @@ public class GraphQLMatcher : IStringMatcher
     /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
     /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
     public GraphQLMatcher(
-        AnyOf<string, StringPattern, ISchema> schema,
+        AnyOf<string, StringPattern, ISchemaData> schema,
         MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch,
         MatchOperator matchOperator = MatchOperator.Or
     ) : this(schema, null, matchBehaviour, matchOperator)
@@ -69,7 +68,7 @@ public class GraphQLMatcher : IStringMatcher
     /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
     /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
     public GraphQLMatcher(
-        AnyOf<string, StringPattern, ISchema> schema,
+        AnyOf<string, StringPattern, ISchemaData> schema,
         IDictionary<string, Type>? customScalars,
         MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch,
         MatchOperator matchOperator = MatchOperator.Or
@@ -94,7 +93,7 @@ public class GraphQLMatcher : IStringMatcher
                 break;
 
             case AnyOfType.Third:
-                _schema = schema.Third;
+                _schema = ((SchemaDataWrapper)schema.Third).Schema;
                 break;
 
             default:
@@ -201,7 +200,7 @@ public class GraphQLMatcher : IStringMatcher
                     throw new WireMockException($"The GraphQL Scalar type '{scalarTypeDefinitionName}' is not defined in the CustomScalars dictionary.");
                 }
 
-                // Create a this custom Scalar GraphType (extending the WireMockCustomScalarGraphType<{clrType}> class)
+                // Create a custom Scalar GraphType (extending the WireMockCustomScalarGraphType<{clrType}> class)
                 var customScalarGraphType = ReflectionUtils.CreateGenericType(customScalarGraphTypeName, typeof(WireMockCustomScalarGraphType<>), clrType);
                 schema.RegisterType(customScalarGraphType);
             }
@@ -209,5 +208,4 @@ public class GraphQLMatcher : IStringMatcher
 
         return schema;
     }
-}
-#endif
+}

src/WireMock.Net.GraphQL/Models/SchemaDataWrapper.cs

@@ -0,0 +1,18 @@
+// Copyright © WireMock.Net
+
+using GraphQL.Types;
+using WireMock.Models.GraphQL;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// Represents a wrapper for schema data, providing access to the associated schema.
+/// </summary>
+/// <param name="schema"></param>
+public class SchemaDataWrapper(ISchema schema) : ISchemaData
+{
+    /// <summary>
+    /// Gets the schema associated with the current instance.
+    /// </summary>
+    public ISchema Schema { get; } = schema;
+}

src/WireMock.Net.GraphQL/Models/WireMockCustomScalarGraphType.cs

@@ -1,10 +1,10 @@
 // Copyright © WireMock.Net
 
-#if GRAPHQL
 using System;
 using GraphQL.Types;
 
-namespace WireMock.Matchers.Models;
+// ReSharper disable once CheckNamespace
+namespace WireMock.GraphQL.Models;
 
 /// <inheritdoc />
 public abstract class WireMockCustomScalarGraphType<T> : ScalarGraphType
@@ -28,5 +28,4 @@ public abstract class WireMockCustomScalarGraphType<T> : ScalarGraphType
 
         return (T)Convert.ChangeType(value, typeof(T));
     }
-}
-#endif
+}

src/WireMock.Net.GraphQL/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.GraphQL/RequestBuilders/IRequestBuilderExtensions.cs

@@ -0,0 +1,94 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using GraphQL.Types;
+using Stef.Validation;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+using WireMock.Models;
+using WireMock.Models.GraphQL;
+
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// IRequestBuilderExtensions extensions for GraphQL.
+/// </summary>
+// ReSharper disable once InconsistentNaming
+public static class IRequestBuilderExtensions
+{
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL body as a string.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
+    }
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a string.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
+    }
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a <see cref="ISchema"/>.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, new SchemaDataWrapper(schema)));
+    }
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a <see cref="ISchema"/>.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, new SchemaDataWrapper(schema), customScalars));
+    }
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a <see cref="ISchemaData"/>.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, ISchemaData schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
+    }
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a <see cref="ISchemaData"/>.
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithGraphQLSchema(this IRequestBuilder requestBuilder, ISchemaData schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Guard.NotNull(requestBuilder).Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
+    }
+}

src/WireMock.Net.GraphQL/Utils/ReflectionUtils.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
 
-namespace WireMock.Util;
+namespace WireMock.Utils;
 
 internal static class ReflectionUtils
 {

src/WireMock.Net.GraphQL/WireMock.Net.GraphQL.csproj

@@ -0,0 +1,47 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>GraphQL support for WireMock.Net</Description>
+        <AssemblyTitle>WireMock.Net.Matchers.GraphQL</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>wiremock;matchers;matcher;graphql</PackageTags>
+        <RootNamespace>WireMock</RootNamespace>
+        <ProjectGuid>{B6269AAC-170A-4346-8B9A-444DED3D9A45}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <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 Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="GraphQL.NewtonsoftJson" Version="8.2.1" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+        <PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Shared\WireMock.Net.Shared.csproj" />
+    </ItemGroup>
+
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+        <PackageReference Include="Nullable" Version="1.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+</Project>

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

@@ -18,20 +18,20 @@ namespace WireMock.Matchers;
 /// CSharpCode / CS-Script Matcher
 /// </summary>
 /// <inheritdoc cref="ICSharpCodeMatcher"/>
-internal class CSharpCodeMatcher : ICSharpCodeMatcher
+public class CSharpCodeMatcher : ICSharpCodeMatcher
 {
     private const string TemplateForIsMatchWithString = "public class CodeHelper {{ public bool IsMatch(string it) {{ {0} }} }}";
 
     private const string TemplateForIsMatchWithDynamic = "public class CodeHelper {{ public bool IsMatch(dynamic it) {{ {0} }} }}";
 
     private readonly string[] _usings =
-    {
+    [
         "System",
         "System.Linq",
         "System.Collections.Generic",
         "Microsoft.CSharp",
         "Newtonsoft.Json.Linq"
-    };
+    ];
 
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
@@ -63,17 +63,24 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
         Value = patterns;
     }
 
-    public MatchResult IsMatch(string? input)
+    /// <inheritdoc />
+    public MatchResult IsMatch(string? input) => IsMatchInternal(input);
+
+    /// <inheritdoc />
+    public MatchResult IsMatch(object? input) => IsMatchInternal(input);
+
+    /// <inheritdoc />
+    public string GetCSharpCodeArguments()
     {
-        return IsMatchInternal(input);
+        return $"new {Name}" +
+               $"(" +
+               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
+               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
+               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
+               $")";
     }
 
-    public MatchResult IsMatch(object? input)
-    {
-        return IsMatchInternal(input);
-    }
-
-    public MatchResult IsMatchInternal(object? input)
+    private MatchResult IsMatchInternal(object? input)
     {
         var score = MatchScores.Mismatch;
         Exception? exception = null;
@@ -93,17 +100,6 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
         return new MatchResult(MatchBehaviourHelper.Convert(MatchBehaviour, score), exception);
     }
 
-    /// <inheritdoc />
-    public string GetCSharpCodeArguments()
-    {
-        return $"new {Name}" +
-               $"(" +
-               $"{MatchBehaviour.GetFullyQualifiedEnumValue()}, " +
-               $"{MatchOperator.GetFullyQualifiedEnumValue()}, " +
-               $"{MappingConverterUtils.ToCSharpCodeArguments(_patterns)}" +
-               $")";
-    }
-
     private bool IsMatch(dynamic input, string pattern)
     {
         var isMatchWithString = input is string;

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.Models.Mime;
 using WireMock.Util;
 
 namespace WireMock.Matchers;
@@ -14,31 +10,23 @@ namespace WireMock.Matchers;
 /// <summary>
 /// MimePartMatcher
 /// </summary>
-public class MimePartMatcher : IMatcher
+public class MimePartMatcher : IMimePartMatcher
 {
-    private readonly Func<MimePart, MatchResult>[] _funcs;
+    private readonly Func<IMimePartData, MatchResult>[] _funcs;
 
     /// <inheritdoc />
     public string Name => nameof(MimePartMatcher);
 
-    /// <summary>
-    /// ContentType Matcher (image/png; name=image.png.)
-    /// </summary>
+    /// <inheritdoc />
     public IStringMatcher? ContentTypeMatcher { get; }
 
-    /// <summary>
-    /// ContentDisposition Matcher (attachment; filename=image.png)
-    /// </summary>
+    /// <inheritdoc />
     public IStringMatcher? ContentDispositionMatcher { get; }
 
-    /// <summary>
-    /// ContentTransferEncoding Matcher (base64)
-    /// </summary>
+    /// <inheritdoc />
     public IStringMatcher? ContentTransferEncodingMatcher { get; }
 
-    /// <summary>
-    /// Content Matcher
-    /// </summary>
+    /// <inheritdoc />
     public IMatcher? ContentMatcher { get; }
 
     /// <inheritdoc />
@@ -64,25 +52,21 @@ public class MimePartMatcher : IMatcher
         _funcs =
         [
             mp => ContentTypeMatcher?.IsMatch(GetContentTypeAsString(mp.ContentType)) ?? MatchScores.Perfect,
-            mp => ContentDispositionMatcher?.IsMatch(mp.ContentDisposition.ToString().Replace("Content-Disposition: ", string.Empty)) ?? MatchScores.Perfect,
-            mp => ContentTransferEncodingMatcher?.IsMatch(mp.ContentTransferEncoding.ToString().ToLowerInvariant()) ?? MatchScores.Perfect,
+            mp => ContentDispositionMatcher?.IsMatch(mp.ContentDisposition?.ToString()?.Replace("Content-Disposition: ", string.Empty)) ?? MatchScores.Perfect,
+            mp => ContentTransferEncodingMatcher?.IsMatch(mp.ContentTransferEncoding.ToLowerInvariant()) ?? MatchScores.Perfect,
             MatchOnContent
         ];
     }
 
-    /// <summary>
-    /// Determines whether the specified MimePart is match.
-    /// </summary>
-    /// <param name="mimePart">The MimePart.</param>
-    /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
-    public MatchResult IsMatch(MimePart mimePart)
+    /// <inheritdoc />
+    public MatchResult IsMatch(IMimePartData value)
     {
         var score = MatchScores.Mismatch;
         Exception? exception = null;
 
         try
         {
-            if (Array.TrueForAll(_funcs, func => func(mimePart).IsPerfect()))
+            if (Array.TrueForAll(_funcs, func => func(value).IsPerfect()))
             {
                 score = MatchScores.Perfect;
             }
@@ -101,7 +85,7 @@ public class MimePartMatcher : IMatcher
         return "NotImplemented";
     }
 
-    private MatchResult MatchOnContent(MimePart mimePart)
+    private MatchResult MatchOnContent(IMimePartData mimePart)
     {
         if (ContentMatcher == null)
         {
@@ -110,10 +94,10 @@ public class MimePartMatcher : IMatcher
 
         var bodyParserSettings = new BodyParserSettings
         {
-            Stream = mimePart.Content.Open(),
+            Stream = mimePart.Open(),
             ContentType = GetContentTypeAsString(mimePart.ContentType),
             DeserializeJson = true,
-            ContentEncoding = null, // mimePart.ContentType.CharsetEncoding.ToString(),
+            ContentEncoding = null, // mimePart.ContentType?.CharsetEncoding.ToString(),
             DecompressGZipAndDeflate = true
         };
 
@@ -121,9 +105,8 @@ public class MimePartMatcher : IMatcher
         return BodyDataMatchScoreCalculator.CalculateMatchScore(bodyData, ContentMatcher);
     }
 
-    private static string? GetContentTypeAsString(ContentType? contentType)
+    private static string? GetContentTypeAsString(IContentTypeData? contentType)
     {
-        return contentType?.ToString().Replace("Content-Type: ", string.Empty);
+        return contentType?.ToString()?.Replace("Content-Type: ", string.Empty);
     }
-}
-#endif
+}

src/WireMock.Net.MimePart/Models/ContentDispositionDataWrapper.cs

@@ -0,0 +1,63 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the IContentDispositionData interface
+/// by wrapping a ContentDisposition object.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of a ContentDisposition.
+/// </remarks>
+public class ContentDispositionDataWrapper : IContentDispositionData
+{
+    private readonly ContentDisposition _contentDisposition;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentDispositionDataWrapper"/> class.
+    /// </summary>
+    /// <param name="contentDisposition">The ContentDisposition to wrap.</param>
+    public ContentDispositionDataWrapper(ContentDisposition contentDisposition)
+    {
+        _contentDisposition = Guard.NotNull(contentDisposition);
+
+        Parameters = _contentDisposition.Parameters.Select(p => p.ToString()).ToList();
+    }
+
+    /// <inheritdoc/>
+    public string Disposition => _contentDisposition.Disposition;
+
+    /// <inheritdoc/>
+    public bool IsAttachment => _contentDisposition.IsAttachment;
+
+    /// <inheritdoc/>
+    public IList<string> Parameters { get; private set; }
+
+    /// <inheritdoc/>
+    public string FileName => _contentDisposition.FileName;
+
+    /// <inheritdoc/>
+    public DateTimeOffset? CreationDate => _contentDisposition.CreationDate;
+
+    /// <inheritdoc/>
+    public DateTimeOffset? ModificationDate => _contentDisposition.ModificationDate;
+
+    /// <inheritdoc/>
+    public DateTimeOffset? ReadDate => _contentDisposition.ReadDate;
+
+    /// <inheritdoc/>
+    public long? Size => _contentDisposition.Size;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _contentDisposition.ToString();
+    }
+}

src/WireMock.Net.MimePart/Models/ContentTypeDataWrapper.cs

@@ -0,0 +1,65 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IContentTypeData"/> interface by wrapping a <see cref="ContentType"/> object.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of a <see cref="ContentType"/>.
+/// </remarks>
+public class ContentTypeDataWrapper : IContentTypeData
+{
+    private readonly ContentType _contentType;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentTypeDataWrapper"/> class.
+    /// </summary>
+    /// <param name="contentType">The ContentType to wrap.</param>
+    public ContentTypeDataWrapper(ContentType contentType)
+    {
+        _contentType = Guard.NotNull(contentType);
+
+        Parameters = _contentType.Parameters.Select(p => p.ToString()).ToList();
+    }
+
+    /// <inheritdoc/>
+    public string MediaType => _contentType.MediaType;
+
+    /// <inheritdoc/>
+    public string MediaSubtype => _contentType.MediaSubtype;
+
+    /// <inheritdoc/>
+    public IList<string> Parameters { get; private set; }
+
+    /// <inheritdoc/>
+    public string Boundary => _contentType.Boundary;
+
+    /// <inheritdoc/>
+    public string Charset => _contentType.Charset;
+
+    /// <inheritdoc/>
+    public Encoding CharsetEncoding => _contentType.CharsetEncoding;
+
+    /// <inheritdoc/>
+    public string Format => _contentType.Format;
+
+    /// <inheritdoc/>
+    public string MimeType => _contentType.MimeType;
+
+    /// <inheritdoc/>
+    public string Name => _contentType.Name;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _contentType.ToString();
+    }
+}

src/WireMock.Net.MimePart/Models/MimeEntityDataWrapper.cs

@@ -0,0 +1,61 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IMimeEntityData" /> interface by wrapping an <see cref="IMimeEntity" /> interface.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of an <see cref="IMimeEntity"/>.
+/// </remarks>
+public class MimeEntityDataWrapper : IMimeEntityData
+{
+    private readonly IMimeEntity _entity;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MimeEntityDataWrapper"/> class.
+    /// </summary>
+    /// <param name="entity">The MIME entity to wrap.</param>
+    public MimeEntityDataWrapper(IMimeEntity entity)
+    {
+        _entity = Guard.NotNull(entity);
+
+        ContentDisposition = _entity.ContentDisposition != null ? new ContentDispositionDataWrapper(_entity.ContentDisposition) : null;
+        ContentType = _entity.ContentType != null ? new ContentTypeDataWrapper(_entity.ContentType) : null;
+        Headers = _entity.Headers.Select(h => h.ToString()).ToList();
+    }
+
+    /// <inheritdoc/>
+    public IList<string> Headers { get; private set; }
+
+    /// <inheritdoc/>
+    public IContentDispositionData? ContentDisposition { get; private set; }
+
+    /// <inheritdoc/>
+    public IContentTypeData? ContentType { get; private set; }
+
+    /// <inheritdoc/>
+    public Uri ContentBase => _entity.ContentBase;
+
+    /// <inheritdoc/>
+    public Uri ContentLocation => _entity.ContentLocation;
+
+    /// <inheritdoc/>
+    public string ContentId => _entity.ContentId;
+
+    /// <inheritdoc/>
+    public bool IsAttachment => _entity.IsAttachment;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _entity.ToString()!;
+    }
+}

src/WireMock.Net.MimePart/Models/MimeMessageDataWrapper.cs

@@ -0,0 +1,140 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IMimeMessageData" /> interface by wrapping an <see cref="IMimeMessage" /> interface.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of an <see cref="IMimeMessage"/>.
+/// </remarks>
+internal class MimeMessageDataWrapper : IMimeMessageData
+{
+    private readonly IMimeMessage _message;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MimeMessageDataWrapper"/> class.
+    /// </summary>
+    /// <param name="message">The MIME message to wrap.</param>
+    public MimeMessageDataWrapper(IMimeMessage message)
+    {
+        _message = Guard.NotNull(message);
+
+        Bcc = _message.Bcc.Select(h => h.ToString()).ToList();
+        Cc = _message.Cc.Select(h => h.ToString()).ToList();
+        From = _message.From.Select(h => h.ToString()).ToList();
+        Headers = _message.Headers.Select(h => h.ToString()).ToList();
+        References = _message.References.ToList();
+        ReplyTo = _message.ReplyTo.Select(h => h.ToString()).ToList();
+        ResentBcc = _message.ResentBcc.Select(h => h.ToString()).ToList();
+        ResentCc = _message.ResentCc.Select(h => h.ToString()).ToList();
+        ResentFrom = _message.ResentFrom.Select(h => h.ToString()).ToList();
+        ResentReplyTo = _message.ResentReplyTo.Select(h => h.ToString()).ToList();
+        ResentTo = _message.ResentTo.Select(h => h.ToString()).ToList();
+        To = _message.To.Select(h => h.ToString()).ToList();
+
+        Body = new MimeEntityDataWrapper(_message.Body);
+        BodyParts = _message.BodyParts.OfType<MimePart>().Select(mp => new MimePartDataWrapper(mp)).ToList<IMimePartData>();
+        Attachments = _message.Attachments.Select(me => new MimeEntityDataWrapper(me)).ToList<IMimeEntityData>();
+    }
+
+    /// <inheritdoc/>
+    public IList<string> Headers { get; private set; }
+
+    /// <inheritdoc/>
+    public int Importance => (int)_message.Importance;
+
+    /// <inheritdoc/>
+    public int Priority => (int)_message.Priority;
+
+    /// <inheritdoc/>
+    public int XPriority => (int)_message.XPriority;
+
+    /// <inheritdoc/>
+    public string Sender => _message.Sender.Address;
+
+    /// <inheritdoc/>
+    public string ResentSender => _message.ResentSender.ToString();
+
+    /// <inheritdoc/>
+    public IList<string> From { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentFrom { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ReplyTo { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentReplyTo { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> To { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentTo { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> Cc { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentCc { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> Bcc { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentBcc { get; private set; }
+
+    /// <inheritdoc/>
+    public string Subject => _message.Subject;
+
+    /// <inheritdoc/>
+    public DateTimeOffset Date => _message.Date;
+
+    /// <inheritdoc/>
+    public DateTimeOffset ResentDate => _message.ResentDate;
+
+    /// <inheritdoc/>
+    public IList<string> References { get; private set; }
+
+    /// <inheritdoc/>
+    public string InReplyTo => _message.InReplyTo;
+
+    /// <inheritdoc/>
+    public string MessageId => _message.MessageId;
+
+    /// <inheritdoc/>
+    public string ResentMessageId => _message.ResentMessageId;
+
+    /// <inheritdoc/>
+    public Version MimeVersion => _message.MimeVersion;
+
+    /// <inheritdoc/>
+    public IMimeEntityData Body { get; private set; }
+
+    /// <inheritdoc/>
+    public string TextBody => _message.TextBody;
+
+    /// <inheritdoc/>
+    public string HtmlBody => _message.HtmlBody;
+
+    /// <inheritdoc/>
+    public IList<IMimePartData> BodyParts { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<IMimeEntityData> Attachments { get; private set; }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _message.ToString();
+    }
+}

src/WireMock.Net.MimePart/Models/MimePartDataWrapper.cs

@@ -0,0 +1,64 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.IO;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IMimePartData" /> interface by wrapping an <see cref="IMimePart"/> interface.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of an <see cref="IMimePart"/>.
+/// </remarks>
+public class MimePartDataWrapper : MimeEntityDataWrapper, IMimePartData
+{
+    private readonly IMimePart _part;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MimePartDataWrapper"/> class.
+    /// </summary>
+    /// <param name="part">The MIME part to wrap.</param>
+    /// <exception cref="System.ArgumentNullException">
+    /// <paramref name="part"/> is <see langword="null"/>.
+    /// </exception>
+    public MimePartDataWrapper(IMimePart part) : base(part)
+    {
+        _part = Guard.NotNull(part);
+    }
+
+    /// <inheritdoc/>
+    public string ContentDescription => _part.ContentDescription;
+
+    /// <inheritdoc/>
+    public int? ContentDuration => _part.ContentDuration;
+
+    /// <inheritdoc/>
+    public string ContentMd5 => _part.ContentMd5;
+
+    /// <inheritdoc/>
+    public string ContentTransferEncoding => _part.ContentTransferEncoding.ToString();
+
+    /// <inheritdoc/>
+    public string FileName => _part.FileName;
+
+    /// <inheritdoc/>
+    public IDictionary<string, object?> Content => new Dictionary<string, object?>()
+    {
+        { nameof(MimePart.Content.Encoding),  _part.Content.Encoding },
+        { nameof(MimePart.Content.NewLineFormat),  _part.Content.NewLineFormat },
+        { nameof(MimePart.Content.Stream),  _part.Content.Stream }
+    };
+
+    /// <inheritdoc/>
+    public Stream Open() => _part.Content.Open();
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _part.ToString()!;
+    }
+}

src/WireMock.Net.MimePart/Util/MimeKitUtils.cs

@@ -1,7 +1,7 @@
 // Copyright © WireMock.Net
 
-#if MIMEKIT
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
@@ -9,19 +9,28 @@ using System.Text;
 using MimeKit;
 using Stef.Validation;
 using WireMock.Http;
+using WireMock.Models;
+using WireMock.Models.Mime;
 using WireMock.Types;
 
 namespace WireMock.Util;
 
-internal static class MimeKitUtils
+internal class MimeKitUtils : IMimeKitUtils
 {
-    public static bool TryGetMimeMessage(IRequestMessage requestMessage, [NotNullWhen(true)] out MimeMessage? mimeMessage)
+    /// <inheritdoc />
+    public IMimeMessageData LoadFromStream(Stream stream)
+    {
+        return new MimeMessageDataWrapper(MimeMessage.Load(Guard.NotNull(stream)));
+    }
+
+    /// <inheritdoc />
+    public bool TryGetMimeMessage(IRequestMessage requestMessage, [NotNullWhen(true)] out IMimeMessageData? mimeMessageData)
     {
         Guard.NotNull(requestMessage);
 
         if (requestMessage.BodyData != null &&
             requestMessage.Headers?.TryGetValue(HttpKnownHeaderNames.ContentType, out var contentTypeHeader) == true &&
-            StartsWithMultiPart(contentTypeHeader) // Only parse when "multipart/mixed"
+            StartsWithMultiPart(contentTypeHeader)
         )
         {
             var bytes = requestMessage.BodyData?.DetectedBodyType switch
@@ -37,14 +46,15 @@ internal static class MimeKitUtils
 
             var fixedBytes = FixBytes(bytes, contentTypeHeader[0]);
 
-            mimeMessage = MimeMessage.Load(new MemoryStream(fixedBytes));
+            mimeMessageData = LoadFromStream(new MemoryStream(fixedBytes));
             return true;
         }
 
-        mimeMessage = null;
+        mimeMessageData = null;
         return false;
     }
 
+
     private static bool StartsWithMultiPart(WireMockList<string> contentTypeHeader)
     {
         return contentTypeHeader.Any(ct => ct.TrimStart().StartsWith("multipart/", StringComparison.OrdinalIgnoreCase));
@@ -61,5 +71,4 @@ internal static class MimeKitUtils
 
         return result;
     }
-}
-#endif
+}

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

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