1.8.2

Update ProtoBufJsonConverter to fix conflict for 'MessageOptions' (#1291 )
* Update ProtoBufJsonConverter to fix conflict for 'MessageOptions' * <PackageReference Include="ProtoBufJsonConverter" Version="0.8.0" />
2026-01-12 13:30:32 +01:00 · 2025-05-05 10:23:14 +02:00 · 2025-05-05 10:21:15 +02:00 · 2025-05-02 09:15:59 +02:00 · 2025-05-02 08:50:32 +02:00 · 2025-05-02 08:41:51 +02:00
161 changed files with 7268 additions and 1339 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,39 @@
+# 1.8.2 (05 May 2025)
+- [#1291](https://github.com/WireMock-Net/WireMock.Net/pull/1291) - Update ProtoBufJsonConverter to fix conflict for 'MessageOptions' [bug] contributed by [StefH](https://github.com/StefH)
+- [#1083](https://github.com/WireMock-Net/WireMock.Net/issues/1083) - Compilation Error due to 'MessageOptions' Type Conflict between 'Google.Protobuf' and 'WireMock.Net' [bug]
+- [#1287](https://github.com/WireMock-Net/WireMock.Net/issues/1287) - 1.8.0 - issues with dependency on Microsoft.OpenApi version 2.0.0-preview.xx [bug]
+
+# 1.8.1 (02 May 2025)
+- [#1289](https://github.com/WireMock-Net/WireMock.Net/pull/1289) - Revert changes to WireMock.Net.OpenApiParser [bug] contributed by [StefH](https://github.com/StefH)
+
+# 1.8.0 (28 April 2025)
+- [#1268](https://github.com/WireMock-Net/WireMock.Net/pull/1268) - 1.7.x [bug] contributed by [StefH](https://github.com/StefH)
+- [#1271](https://github.com/WireMock-Net/WireMock.Net/pull/1271) - Add HandlebarsSettings [feature] contributed by [StefH](https://github.com/StefH)
+- [#1273](https://github.com/WireMock-Net/WireMock.Net/pull/1273) - feat(awesome-assertions): Added new project WireMock.Net.AwesomeAssertions [feature] contributed by [Crowbar90](https://github.com/Crowbar90)
+- [#1278](https://github.com/WireMock-Net/WireMock.Net/pull/1278) - changed null check in JSONPathMatcher and JmesPathMatcher to ensure t&#8230; [bug] contributed by [jollyjoyce1995](https://github.com/jollyjoyce1995)
+- [#1283](https://github.com/WireMock-Net/WireMock.Net/pull/1283) - Add an launch inspector command to Aspire Dashboard [feature] contributed by [jmezach](https://github.com/jmezach)
+- [#1285](https://github.com/WireMock-Net/WireMock.Net/pull/1285) - Enable support for WireMock Middleware in Hosted Services [bug] contributed by [etkr](https://github.com/etkr)
+- [#1243](https://github.com/WireMock-Net/WireMock.Net/issues/1243) - Support for AwesomeAssertions [feature]
+- [#1264](https://github.com/WireMock-Net/WireMock.Net/issues/1264) - OpenApiParser - Construction of path possibly incorrect [bug]
+- [#1276](https://github.com/WireMock-Net/WireMock.Net/issues/1276) - Add WireMock Inspector command to Aspire integration [feature]
+- [#1277](https://github.com/WireMock-Net/WireMock.Net/issues/1277) - Newtonsoft.Json.JsonReaderException: 'Unable to read the JSON string.' when using IStringMatcher with an empty body [bug]
+- [#1284](https://github.com/WireMock-Net/WireMock.Net/issues/1284) - WireMock.Net.AspNetCore.Middleware does not work in hosted services [bug]
+
+# 1.7.4 (27 February 2025)
+- [#1256](https://github.com/WireMock-Net/WireMock.Net/pull/1256) - Add ToArray() to ConcurrentObservableCollection [bug] contributed by [StefH](https://github.com/StefH)
+- [#1254](https://github.com/WireMock-Net/WireMock.Net/issues/1254) - FindLogEntries exception 'Destination array was not long enough' [bug]
+
+# 1.7.3 (24 February 2025)
+- [#1253](https://github.com/WireMock-Net/WireMock.Net/pull/1253) - Update QueryStringParser to support param with equal but no value [bug] contributed by [StefH](https://github.com/StefH)
+- [#1247](https://github.com/WireMock-Net/WireMock.Net/issues/1247) - API call isn't matched when using an empty query string parameter [bug]
+
+# 1.7.2 (12 February 2025)
+- [#1246](https://github.com/WireMock-Net/WireMock.Net/pull/1246) - Add &quot;AddUrl&quot; to WireMockContainerBuilder to support grpc [feature] contributed by [StefH](https://github.com/StefH)
+- [#1248](https://github.com/WireMock-Net/WireMock.Net/pull/1248) - Add exception message to logging when mapping fails due to an exception. [feature] contributed by [JvE-iO](https://github.com/JvE-iO)
+- [#1250](https://github.com/WireMock-Net/WireMock.Net/pull/1250) - Add ProtoDefinition to WireMockContainer [feature] contributed by [StefH](https://github.com/StefH)
+- [#1239](https://github.com/WireMock-Net/WireMock.Net/issues/1239) - How to use WiremockContainerBuilder for grpc using http2 [feature]
+- [#1249](https://github.com/WireMock-Net/WireMock.Net/issues/1249) - Add protodefinition and refer it from mapping [feature]
+
 # 1.7.1 (26 January 2025)
 - [#1236](https://github.com/WireMock-Net/WireMock.Net/pull/1236) - Fix ProtoBuf mapping.json [bug] contributed by [StefH](https://github.com/StefH)
 - [#1245](https://github.com/WireMock-Net/WireMock.Net/pull/1245) - Use Handlebars.Net.Helpers to version 2.4.10 [feature] contributed by [StefH](https://github.com/StefH)
@@ -976,8 +1012,7 @@
 - [#263](https://github.com/WireMock-Net/WireMock.Net/issues/263) - Content-Type multipart/form-data is not serialized in proxy and recording mode [bug]

 # 1.0.11.0 (30 March 2019)
- [#261](https://github.com/WireMock-Net/WireMock.Net/pull/261) - Fix BodyAsJson transform bug in ResponseMessageTransformer contributed by [ghost](https://github.com/ghost)
- [#262](https://github.com/WireMock-Net/WireMock.Net/pull/262) - Add ProvideResponse_WithJsonBodyAndTransform test contributed by [ghost](https://github.com/ghost)
+- [#261](https://github.com/WireMock-Net/WireMock.Net/pull/261) - Fix BodyAsJson transform bug in ResponseMessageTransformer [bug] contributed by [ghost](https://github.com/ghost)

 # 1.0.10.0 (27 March 2019)
 - [#260](https://github.com/WireMock-Net/WireMock.Net/pull/260) - Fix Response.Delay property serialization [bug] contributed by [StefH](https://github.com/StefH)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

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

-SET version=1.7.1
+SET version=1.8.2

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

 GitHubReleaseNotes --output PackageReleaseNotes.txt --skip-empty-releases --exclude-labels test question invalid doc duplicate example environment --template PackageReleaseNotes.template --version %version% --token %GH_TOKEN%
--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,6 +1,7 @@
-# 1.7.1 (26 January 2025)
- #1236 Fix ProtoBuf mapping.json [bug]
- #1245 Use Handlebars.Net.Helpers to version 2.4.10 [feature]
- #1233 GRPC mappings are not created correctly when created through Admin API [bug]
+# 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]

 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -45,6 +45,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &nbsp;&nbsp;**WireMock.Net.Aspire** | [![NuGet Badge WireMock.Net.Aspire](https://img.shields.io/nuget/v/WireMock.Net.Aspire)](https://www.nuget.org/packages/WireMock.Net.Aspire) | [![MyGet Badge WireMock.Net.Aspire](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Aspire?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Aspire)
 | &nbsp;&nbsp;**WireMock.Net.AspNetCore.Middleware** | [![NuGet Badge WireMock.Net.AspNetCore.Middleware](https://img.shields.io/nuget/v/WireMock.Net.AspNetCore.Middleware)](https://www.nuget.org/packages/WireMock.Net.AspNetCore.Middleware) | [![MyGet Badge WireMock.Net.AspNetCore.Middleware](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.AspNetCore.Middleware?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.AspNetCore.Middleware)
 | | | |
+| &nbsp;&nbsp;**WireMock.Net.AwesomeAssertions** | [![NuGet Badge WireMock.Net.AwesomeAssertions](https://img.shields.io/nuget/v/WireMock.Net.AwesomeAssertions)](https://www.nuget.org/packages/WireMock.Net.AwesomeAssertions) | [![MyGet Badge WireMock.Net.AwesomeAssertions](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.AwesomeAssertions?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.AwesomeAssertions)
 | &nbsp;&nbsp;**WireMock.Net.FluentAssertions** | [![NuGet Badge WireMock.Net.FluentAssertions](https://img.shields.io/nuget/v/WireMock.Net.FluentAssertions)](https://www.nuget.org/packages/WireMock.Net.FluentAssertions) | [![MyGet Badge WireMock.Net.FluentAssertions](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.FluentAssertions?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.FluentAssertions)
 | &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
 | &nbsp;&nbsp;**WireMock.Net.TUnit** | [![NuGet Badge WireMock.Net.TUnit](https://img.shields.io/nuget/v/WireMock.Net.TUnit)](https://www.nuget.org/packages/WireMock.Net.TUnit) | [![MyGet Badge WireMock.Net.TUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.TUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.TUnit)
@@ -64,6 +65,17 @@ 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:
+
+#### Handlebars.Net `File`-helper
+By default, the internal Handlebars.Net `File`-helper is not allowed anymore because of potential security issues.
+To still enable this feature, you need to set the `AllowedCustomHandlebarHelpers` property to `File` in the `HandlebarsSettings` property in `WireMockServerSettings`.
+
+#### Handlebars.Net `Environment`-helper
+By default, the Handlebars.Net `Environment`-helper is not automatically allowed anymore because of potential security issues.
+To still enable this feature, you need to add the `Environment` category to the `AllowedHandlebarsHelpers` list-property in the `HandlebarsSettings` property in `WireMockServerSettings`.
+
 ---

 ## :memo: Development
--- a/Solution.sln
+++ b/Solution.sln
@@ -46,8 +46,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net452
 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", "src\WireMock.Net.OpenApiParser\WireMock.Net.OpenApiParser.csproj", "{D3804228-91F4-4502-9595-39584E5AADAD}"
-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}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.FluentAssertions", "src\WireMock.Net.FluentAssertions\WireMock.Net.FluentAssertions.csproj", "{B6269AAC-170A-4346-8B9A-579DED3D9A95}"
@@ -128,6 +126,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.TestWebApplica
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Middleware.Tests", "test\WireMock.Net.Middleware.Tests\WireMock.Net.Middleware.Tests.csproj", "{A5FEF4F7-7DA2-4962-89A8-16BA942886E5}"
 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}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -174,10 +176,6 @@ Global
 		{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
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.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
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -302,6 +300,14 @@ Global
 		{A5FEF4F7-7DA2-4962-89A8-16BA942886E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A5FEF4F7-7DA2-4962-89A8-16BA942886E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A5FEF4F7-7DA2-4962-89A8-16BA942886E5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7753670F-7C7F-44BF-8BC7-08325588E60C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -317,7 +323,6 @@ Global
 		{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}
-		{D3804228-91F4-4502-9595-39584E5AADAD} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{B6269AAC-170A-4346-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{40BF24B5-12E6-4610-9489-138798632E28} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
@@ -351,6 +356,8 @@ Global
 		{B6269AAC-170A-4346-8B9A-579DED3D9A13} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/Solution.sln.DotSettings
+++ b/Solution.sln.DotSettings
@@ -35,6 +35,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Levenstein/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=openapi/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=opentelemetry/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pacticipant/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=protobuf/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Raml/@EntryIndexedValue">True</s:Boolean>
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -1,181 +1,176 @@
-variables:
-  Prerelease: 'ci'
-  buildId: "1$(Build.BuildId)"
-  buildProjects: '**/src/**/*.csproj'
-
-jobs:
- job: Linux_Build_Test_SonarCloud
-
-  pool:
-    vmImage: 'Ubuntu-latest'
-
-  steps:
-  - script: |
-      echo "BuildId = $(buildId)"
-    displayName: 'Print buildId'
-
-  - task: CmdLine@2
-    displayName: 'Install .NET Aspire workload'
-    inputs:
-      script: 'dotnet workload install aspire'
-
-  - script: |
-      dotnet tool install --global dotnet-sonarscanner
-      dotnet tool install --global dotnet-coverage
-    displayName: 'Install dotnet tools'
-
-  - task: PowerShell@2
-    displayName: "Use JDK17 by default"
-    inputs:
-      targetType: 'inline'
-      script: |
-        $jdkPath = $env:JAVA_HOME_17_X64
-        Write-Host "##vso[task.setvariable variable=JAVA_HOME]$jdkPath"
-
-  - script: |
-      dotnet dev-certs https --trust || true
-    displayName: 'dotnet dev-certs https'
-  
-  # See: https://docs.sonarsource.com/sonarcloud/enriching/test-coverage/dotnet-test-coverage
-  - script: |
-      dotnet sonarscanner begin /k:"WireMock-Net_WireMock.Net" /o:"wiremock-net" /d:sonar.branch.name=$(Build.SourceBranchName) /d:sonar.host.url="https://sonarcloud.io" /d:sonar.token="$(SONAR_TOKEN)" /d:sonar.pullrequest.provider=github /d:sonar.cs.vscoveragexml.reportsPaths=**/wiremock-coverage-*.xml /d:sonar.verbose=true
-    displayName: 'Begin analysis on SonarCloud'
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-  
-  - task: DotNetCoreCLI@2
-    displayName: 'Build Unit tests'
-    inputs:
-      command: 'build'
-      projects: '**/test/**/*.csproj'
-      arguments: '--configuration Debug --framework net8.0'
-
-  - task: CmdLine@2
-    inputs:
-      script: |
-          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-xunit.xml"
-    displayName: 'WireMock.Net.Tests with Coverage'
-
-  - task: CmdLine@2
-    inputs:
-      script: |
-          dotnet-coverage collect "dotnet test ./test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-tunit.xml"
-    displayName: 'WireMock.Net.TUnitTests with Coverage'
-
-  - task: CmdLine@2
-    inputs:
-      script: |
-          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-middleware.xml"
-    displayName: 'WireMock.Net.Middleware.Tests with Coverage'
-
-  - task: CmdLine@2
-    inputs:
-      script: |
-          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj --configuration Debug --no-build" -f xml -o "wiremock-coverage-aspire.xml"
-    displayName: 'WireMock.Net.Aspire.Tests with Coverage'
-
-  - task: CmdLine@2
-    displayName: 'Merge coverage files'
-    inputs:
-      script: 'dotnet coverage merge **/wiremock-coverage-*.xml --output ./test/wiremock-coverage.xml --output-format xml'
-
-  - script: |
-      dotnet sonarscanner end /d:sonar.token="$(SONAR_TOKEN)"
-    displayName: 'End analysis on SonarCloud'
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-  
-  - task: whitesource.ws-bolt.bolt.wss.WhiteSource Bolt@19
-    displayName: 'WhiteSource Bolt'
-    condition: and(succeeded(), eq(variables['RUN_WHITESOURCE'], 'yes'))
- 
-  - script: |
-      bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) -f ./test/wiremock-coverage.xml
-    displayName: 'Upload coverage results to codecov'
-  
-  - task: PublishTestResults@2
-    condition: and(succeeded(), eq(variables['PUBLISH_TESTRESULTS'], 'yes'))
-    inputs:
-      testRunner: VSTest
-      testResultsFiles: '**/*.trx'
-  
-  - task: PublishBuildArtifacts@1
-    displayName: Publish coverage files
-    inputs:
-      PathtoPublish: './test/WireMock.Net.Tests/coverage.net8.0.opencover.xml'
-
- job: Windows_Build_Test
-
-  pool:
-    vmImage: 'windows-2022'
-
-  steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 8.0
-    inputs:
-      packageType: 'sdk'
-      version: '8.0.x'
-
-  - task: DotNetCoreCLI@2
-    displayName: 'WireMock.Net.Tests with Coverage'
-    inputs:
-      command: 'test'
-      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--configuration Debug --framework net8.0 --collect:"XPlat Code Coverage" --logger trx'
-
-  - task: DotNetCoreCLI@2
-    displayName: 'WireMock.Net.TUnitTests with Coverage'
-    inputs:
-      command: 'test'
-      projects: './test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj'
-      arguments: '--configuration Debug --framework net8.0 --collect:"XPlat Code Coverage" --logger trx'
-
-  - task: DotNetCoreCLI@2
-    displayName: 'WireMock.Net.Middleware.Tests with Coverage'
-    inputs:
-      command: 'test'
-      projects: './test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj'
-      arguments: '--configuration Debug --framework net8.0 --collect:"XPlat Code Coverage" --logger trx'
-  
- job: Windows_Release_to_MyGet
-  dependsOn: Windows_Build_Test
-
-  pool:
-    vmImage: 'windows-2022'
-
-  steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 8.0
-    inputs:
-      packageType: 'sdk'
-      version: '8.0.x'
-
-  - task: DotNetCoreCLI@2
-    displayName: Build Release
-    inputs:
-      command: 'build'
-      arguments: /p:Configuration=Release
-      projects: $(buildProjects)
-
-  - task: DotNetCoreCLI@2
-    displayName: Pack
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-    inputs:
-      command: pack
-      configuration: 'Release'
-      packagesToPack: $(buildProjects)
-      nobuild: true
-      packDirectory: '$(Build.ArtifactStagingDirectory)/packages'
-      verbosityPack: 'normal'
-  
-  - task: PublishBuildArtifacts@1
-    displayName: Publish Artifacts
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-    inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-  
-  - task: DotNetCoreCLI@2
-    displayName: Push to MyGet
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-    inputs:
-      command: custom
-      custom: nuget
+variables:
+  Prerelease: 'ci'
+  buildId: "1$(Build.BuildId)"
+  buildProjects: '**/src/**/*.csproj'
+
+jobs:
+- job: Linux_Build_Test_SonarCloud
+
+  pool:
+    vmImage: 'ubuntu-22.04'
+
+  steps:
+  - script: |
+      echo "BuildId = $(buildId)"
+    displayName: 'Print buildId'
+
+  - script: |
+      dotnet tool install --global dotnet-sonarscanner
+      dotnet tool install --global dotnet-coverage
+    displayName: 'Install dotnet tools'
+
+  - task: PowerShell@2
+    displayName: "Use JDK17 by default"
+    inputs:
+      targetType: 'inline'
+      script: |
+        $jdkPath = $env:JAVA_HOME_17_X64
+        Write-Host "##vso[task.setvariable variable=JAVA_HOME]$jdkPath"
+
+  - script: |
+      dotnet dev-certs https --trust || true
+    displayName: 'dotnet dev-certs https'
+
+  # See: https://docs.sonarsource.com/sonarcloud/enriching/test-coverage/dotnet-test-coverage
+  - script: |
+      dotnet sonarscanner begin /k:"WireMock-Net_WireMock.Net" /o:"wiremock-net" /d:sonar.branch.name=$(Build.SourceBranchName) /d:sonar.host.url="https://sonarcloud.io" /d:sonar.token="$(SONAR_TOKEN)" /d:sonar.pullrequest.provider=github /d:sonar.cs.vscoveragexml.reportsPaths=**/wiremock-coverage-*.xml /d:sonar.verbose=true
+    displayName: 'Begin analysis on SonarCloud'
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+
+  - task: DotNetCoreCLI@2
+    displayName: 'Build Unit tests'
+    inputs:
+      command: 'build'
+      projects: '**/test/**/*.csproj'
+      arguments: '--configuration Debug --framework net8.0'
+
+  - task: CmdLine@2
+    inputs:
+      script: |
+          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-xunit.xml"
+    displayName: 'WireMock.Net.Tests with Coverage'
+
+  - task: CmdLine@2
+    inputs:
+      script: |
+          dotnet-coverage collect "dotnet test ./test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-tunit.xml"
+    displayName: 'WireMock.Net.TUnitTests with Coverage'
+
+  - task: CmdLine@2
+    inputs:
+      script: |
+          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-middleware.xml"
+    displayName: 'WireMock.Net.Middleware.Tests with Coverage'
+
+  - task: CmdLine@2
+    inputs:
+      script: |
+          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj --configuration Debug --no-build" -f xml -o "wiremock-coverage-aspire.xml"
+    displayName: 'WireMock.Net.Aspire.Tests with Coverage'
+
+  - task: CmdLine@2
+    displayName: 'Merge coverage files'
+    inputs:
+      script: 'dotnet coverage merge **/wiremock-coverage-*.xml --output ./test/wiremock-coverage.xml --output-format xml'
+
+  - script: |
+      dotnet sonarscanner end /d:sonar.token="$(SONAR_TOKEN)"
+    displayName: 'End analysis on SonarCloud'
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+
+  - task: whitesource.ws-bolt.bolt.wss.WhiteSource Bolt@19
+    displayName: 'WhiteSource Bolt'
+    condition: and(succeeded(), eq(variables['RUN_WHITESOURCE'], 'yes'))
+
+  - script: |
+      bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) -f ./test/wiremock-coverage.xml
+    displayName: 'Upload coverage results to codecov'
+
+  - task: PublishTestResults@2
+    condition: and(succeeded(), eq(variables['PUBLISH_TESTRESULTS'], 'yes'))
+    inputs:
+      testRunner: VSTest
+      testResultsFiles: '**/*.trx'
+
+  - task: PublishBuildArtifacts@1
+    displayName: Publish coverage files
+    inputs:
+      PathtoPublish: './test/WireMock.Net.Tests/coverage.net8.0.opencover.xml'
+
+- job: Windows_Build_Test
+
+  pool:
+    vmImage: 'windows-2022'
+
+  steps:
+  - task: UseDotNet@2
+    displayName: Use .NET 8.0
+    inputs:
+      packageType: 'sdk'
+      version: '8.0.x'
+
+  - task: DotNetCoreCLI@2
+    displayName: 'WireMock.Net.Tests with Coverage'
+    inputs:
+      command: 'test'
+      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
+      arguments: '--configuration Debug --framework net8.0 --collect:"XPlat Code Coverage" --logger trx'
+
+  - task: DotNetCoreCLI@2
+    displayName: 'WireMock.Net.TUnitTests with Coverage'
+    inputs:
+      command: 'test'
+      projects: './test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj'
+      arguments: '--configuration Debug --framework net8.0 --collect:"XPlat Code Coverage" --logger trx'
+
+  - task: DotNetCoreCLI@2
+    displayName: 'WireMock.Net.Middleware.Tests with Coverage'
+    inputs:
+      command: 'test'
+      projects: './test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj'
+      arguments: '--configuration Debug --framework net8.0 --collect:"XPlat Code Coverage" --logger trx'
+
+- job: Windows_Release_to_MyGet
+  dependsOn: Windows_Build_Test
+
+  pool:
+    vmImage: 'windows-2022'
+
+  steps:
+  - task: UseDotNet@2
+    displayName: Use .NET 8.0
+    inputs:
+      packageType: 'sdk'
+      version: '8.0.x'
+
+  - task: DotNetCoreCLI@2
+    displayName: Build Release
+    inputs:
+      command: 'build'
+      arguments: /p:Configuration=Release
+      projects: $(buildProjects)
+
+  - task: DotNetCoreCLI@2
+    displayName: Pack
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+    inputs:
+      command: pack
+      configuration: 'Release'
+      packagesToPack: $(buildProjects)
+      nobuild: true
+      packDirectory: '$(Build.ArtifactStagingDirectory)/packages'
+      verbosityPack: 'normal'
+
+  - task: PublishBuildArtifacts@1
+    displayName: Publish Artifacts
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+    inputs:
+      PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+
+  - task: DotNetCoreCLI@2
+    displayName: Push to MyGet
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+    inputs:
+      command: custom
+      custom: nuget
      arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg -n -s https://www.myget.org/F/wiremock-net/api/v3/index.json -k $(MyGetKey)
--- a/examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
+++ b/examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
@@ -1,23 +1,24 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <IsAspireHost>true</IsAspireHost>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\AspireApp1.ApiService\AspireApp1.ApiService.csproj" />
-        <ProjectReference Include="..\AspireApp1.Web\AspireApp1.Web.csproj" />
-
-        <!-- https://learn.microsoft.com/en-us/dotnet/aspire/extensibility/custom-resources?tabs=windows#create-library-for-resource-extension -->
-        <ProjectReference Include="..\..\src\WireMock.Net.Aspire\WireMock.Net.Aspire.csproj" IsAspireProjectResource="false" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="8.2.0" />
-    </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Sdk Name="Aspire.AppHost.Sdk" Version="9.2.0" />
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\AspireApp1.ApiService\AspireApp1.ApiService.csproj" />
+        <ProjectReference Include="..\AspireApp1.Web\AspireApp1.Web.csproj" />
+
+        <!-- https://learn.microsoft.com/en-us/dotnet/aspire/extensibility/custom-resources?tabs=windows#create-library-for-resource-extension -->
+        <ProjectReference Include="..\..\src\WireMock.Net.Aspire\WireMock.Net.Aspire.csproj" IsAspireProjectResource="false" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="9.2.0" />
+    </ItemGroup>
+
+</Project>
--- a/examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj
+++ b/examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj
@@ -1,20 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <IsAspireHost>true</IsAspireHost>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\AspireApp1.ApiService\AspireApp1.ApiService.csproj" />
-        <ProjectReference Include="..\AspireApp1.Web\AspireApp1.Web.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="8.2.0" />
-    </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <Sdk Name="Aspire.AppHost.Sdk" Version="9.2.0" />
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\AspireApp1.ApiService\AspireApp1.ApiService.csproj" />
+        <ProjectReference Include="..\AspireApp1.Web\AspireApp1.Web.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Aspire.Hosting.AppHost" Version="9.2.0" />
+    </ItemGroup>
+
+</Project>
--- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
@@ -97,6 +97,46 @@ message HelloReply {
   fullName:String 
  }";

+        private static void RunSse()
+        {
+            var server = WireMockServer.Start(new WireMockServerSettings
+            {
+                Port = 9091,
+                StartAdminInterface = true,
+                Logger = new WireMockConsoleLogger()
+            });
+            server
+                .WhenRequest(r => r
+                    .UsingGet()
+                    .WithPath("/sse")
+                )
+                .ThenRespondWith(r => r
+                    .WithHeader("Content-Type", "text/event-stream")
+                    .WithHeader("Cache-Control", "no-cache")
+                    .WithHeader("Connection", "keep-alive")
+                    .WithSseBody(async (_, q) =>
+                    {
+                        for (var i = 0; i < 5; i++)
+                        {
+                            q.Write("test " + i + "\r\n");
+                            await Task.Delay(5000);
+                        }
+
+                        q.Close();
+                    })
+                );
+
+            server
+                .WhenRequest(r => r
+                    .UsingGet()
+                )
+                .ThenRespondWith(r => r
+                    .WithBody("normal")
+                );
+
+            System.Console.ReadKey();
+        }
+
        private static void RunOnLocal()
        {
            try
@@ -136,6 +176,7 @@ message HelloReply {

        public static void Run()
        {
+            RunSse();
            RunOnLocal();

            var mappingBuilder = new MappingBuilder();
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj
@@ -2,7 +2,7 @@

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

    <ItemGroup>
--- a/examples/WireMock.Net.TestcontainersExample/Program.cs
+++ b/examples/WireMock.Net.TestcontainersExample/Program.cs
@@ -198,7 +198,7 @@ internal class Program
        var dummyNetwork = new NetworkBuilder()
            .WithName($"Dummy Network for {image ?? "null"}")
            .WithReuse(true)
-            .WithCleanUp(true)
+            // .WithCleanUp(true)
            .Build();

        var builder = new WireMockContainerBuilder()
--- a/examples/WireMock.Net.WebApplication.NET6/WireMockService.cs
+++ b/examples/WireMock.Net.WebApplication.NET6/WireMockService.cs
@@ -52,9 +52,9 @@ public class WireMockService : IWireMockService
            _logger.LogDebug("Admin[{0}] {1}", isAdminrequest, message);
        }

-        public void Error(string formatString, Exception exception)
+        public void Error(string message, Exception exception)
        {
-            _logger.LogError(formatString, exception.Message);
+            _logger.LogError(exception, message);
        }
    }

--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Extensions/DictionaryExtensions.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Extensions/DictionaryExtensions.cs
@@ -0,0 +1,22 @@
+// 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
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Extensions/OpenApiSchemaExtensions.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Extensions/OpenApiSchemaExtensions.cs
@@ -0,0 +1,85 @@
+// 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;
+        }
+    }
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Extensions/WireMockServerExtensions.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Extensions/WireMockServerExtensions.cs
@@ -0,0 +1,96 @@
+// 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());
+    }
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/IWireMockOpenApiParser.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/IWireMockOpenApiParser.cs
@@ -0,0 +1,75 @@
+// 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);
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Mappers/OpenApiPathsMapper.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Mappers/OpenApiPathsMapper.cs
@@ -0,0 +1,347 @@
+// 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;
+    }
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Properties/AssemblyInfo.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Properties/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+// Copyright © WireMock.Net
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Settings/IWireMockOpenApiParserExampleValues.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Settings/IWireMockOpenApiParserExampleValues.cs
@@ -0,0 +1,62 @@
+// 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; }
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Settings/WireMockOpenApiParserDynamicExampleValues.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Settings/WireMockOpenApiParserDynamicExampleValues.cs
@@ -0,0 +1,59 @@
+// 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
+        };
+    }
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Settings/WireMockOpenApiParserExampleValues.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Settings/WireMockOpenApiParserExampleValues.cs
@@ -0,0 +1,43 @@
+// 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();
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Settings/WireMockOpenApiParserSettings.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Settings/WireMockOpenApiParserSettings.cs
@@ -0,0 +1,73 @@
+// 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; }
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Types/ExampleValueType.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Types/ExampleValueType.cs
@@ -0,0 +1,21 @@
+// 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
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Types/SchemaFormat.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Types/SchemaFormat.cs
@@ -0,0 +1,26 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Net.OpenApiParser.Types;
+
+internal enum SchemaFormat
+{
+    Float,
+
+    Double,
+
+    Int32,
+
+    Int64,
+
+    Date,
+
+    DateTime,
+
+    Password,
+
+    Byte,
+
+    Binary,
+
+    Undefined
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Utils/DateTimeUtils.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Utils/DateTimeUtils.cs
@@ -0,0 +1,22 @@
+// 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);
+    }
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Utils/ExampleValueGenerator.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Utils/ExampleValueGenerator.cs
@@ -0,0 +1,105 @@
+// 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;
+                }
+        }
+    }
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/Utils/PathUtils.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/Utils/PathUtils.cs
@@ -0,0 +1,27 @@
+// 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;
+    }
+}
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/WireMock.Net.OpenApiParser.Preview.csproj
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/WireMock.Net.OpenApiParser.Preview.csproj
@@ -0,0 +1,38 @@
+<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>
--- a/src-preview/WireMock.Net.OpenApiParser.Preview/WireMockOpenApiParser.cs
+++ b/src-preview/WireMock.Net.OpenApiParser.Preview/WireMockOpenApiParser.cs
@@ -0,0 +1,107 @@
+// 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;
+    }
+}
--- a/src/WireMock.Net.Abstractions/Models/IBlockingQueue.cs
+++ b/src/WireMock.Net.Abstractions/Models/IBlockingQueue.cs
@@ -0,0 +1,30 @@
+// Copyright © WireMock.Net
+
+using System.Diagnostics.CodeAnalysis;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A simple implementation for a Blocking Queue.
+/// </summary>
+/// <typeparam name="T">Specifies the type of elements in the queue.</typeparam>
+public interface IBlockingQueue<T>
+{
+    /// <summary>
+    /// Writes an item to the queue and signals that an item is available.
+    /// </summary>
+    /// <param name="item">The item to be added to the queue.</param>
+    void Write(T item);
+
+    /// <summary>
+    /// Tries to read an item from the queue. Waits until an item is available or the timeout occurs.
+    /// </summary>
+    /// <param name="item">The item read from the queue, or default if the timeout occurs.</param>
+    /// <returns>True if an item was successfully read; otherwise, false.</returns>
+    bool TryRead([NotNullWhen(true)] out T? item);
+
+    /// <summary>
+    /// Closes the queue and signals all waiting threads.
+    /// </summary>
+    public void Close();
+}
--- a/src/WireMock.Net.Abstractions/Models/IBodyData.cs
+++ b/src/WireMock.Net.Abstractions/Models/IBodyData.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Threading.Tasks;
 using WireMock.Models;
 using WireMock.Types;

@@ -71,7 +72,7 @@ public interface IBodyData
    Encoding? Encoding { get; set; }

    /// <summary>
-    /// Defines if this BodyData is the result of a dynamically created response-string. (
+    /// Defines if this BodyData is the result of a dynamically created response-string.
    /// </summary>
    public string? IsFuncUsed { get; set; }

@@ -86,4 +87,14 @@ public interface IBodyData
    /// </summary>
    public string? ProtoBufMessageType { get; set; }
    #endregion
+
+    /// <summary>
+    /// Defines the queue to use for Server-Sent Events (string).
+    /// </summary>
+    public IBlockingQueue<string?>? SseStringQueue { get; set; }
+
+    /// <summary>
+    /// Defines if the body is using Server-Sent Events (string).
+    /// </summary>
+    public Task? BodyAsSseStringTask { get; set; }
 }
--- a/src/WireMock.Net.Abstractions/Models/IdOrTexts.cs
+++ b/src/WireMock.Net.Abstractions/Models/IdOrTexts.cs
@@ -16,7 +16,7 @@ public readonly struct IdOrTexts
    public string? Id { get; }

    /// <summary>
-    /// The Text.
+    /// The Texts.
    /// </summary>
    public IReadOnlyList<string> Texts { get; }

@@ -41,7 +41,7 @@ public readonly struct IdOrTexts
    }

    /// <summary>
-    /// When Id is defined, return process the Id, else process the Texts.
+    /// When Id is defined, process the Id, else process the Texts.
    /// </summary>
    /// <param name="id">Callback to process the id.</param>
    /// <param name="texts">Callback to process the texts.</param>
--- a/src/WireMock.Net.Abstractions/Types/BodyType.cs
+++ b/src/WireMock.Net.Abstractions/Types/BodyType.cs
@@ -45,5 +45,10 @@ public enum BodyType
    /// <summary>
    /// Body is a ProtoBuf Byte array
    /// </summary>
-    ProtoBuf
+    ProtoBuf,
+
+    /// <summary>
+    /// Use Server-Sent Events (string)
+    /// </summary>
+    SseString
 }
--- a/src/WireMock.Net.Abstractions/Types/CustomHandlebarsHelpers.cs
+++ b/src/WireMock.Net.Abstractions/Types/CustomHandlebarsHelpers.cs
@@ -0,0 +1,16 @@
+using System;
+
+namespace WireMock.Types;
+
+/// <summary>
+/// A enum defining the supported Handlebar helpers.
+/// </summary>
+[Flags]
+public enum CustomHandlebarsHelpers
+{
+    None = 0,
+
+    File = 1,
+
+    All = File
+}
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -61,4 +61,11 @@
        </PackageReference>
    </ItemGroup>

+    <ItemGroup>
+        <PackageReference Include="Nullable" Version="1.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
 </Project>
--- a/src/WireMock.Net.AspNetCore.Middleware/HttpDelegatingHandler/WireMockDelegationHandler.cs
+++ b/src/WireMock.Net.AspNetCore.Middleware/HttpDelegatingHandler/WireMockDelegationHandler.cs
@@ -36,7 +36,6 @@ internal class WireMockDelegationHandler : DelegatingHandler
    protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
    {
        Guard.NotNull(request);
-        Guard.NotNull(_httpContextAccessor.HttpContext);

        if (_settings.AlwaysRedirect || IsWireMockRedirectHeaderSetToTrue())
        {
@@ -57,16 +56,30 @@ internal class WireMockDelegationHandler : DelegatingHandler

    private bool IsWireMockRedirectHeaderSetToTrue()
    {
+        var httpContext = _httpContextAccessor.HttpContext;
+        if (httpContext is null)
+        {
+            _logger.LogDebug("HttpContext is not available in current runtime environment");
+            return false;
+        }
+
        return
-            _httpContextAccessor.HttpContext!.Request.Headers.TryGetValue(AppConstants.HEADER_REDIRECT, out var values) &&
+            httpContext.Request.Headers.TryGetValue(AppConstants.HEADER_REDIRECT, out var values) &&
            bool.TryParse(values.ToString(), out var shouldRedirectToWireMock) && shouldRedirectToWireMock;
    }

    private bool TryGetDelayHeaderValue(out int delayInMs)
    {
        delayInMs = 0;
+        var httpContext = _httpContextAccessor.HttpContext;
+        if (httpContext is null)
+        {
+            _logger.LogDebug("HttpContext is not available in current runtime environment");
+            return false;
+        }
+
        return
-            _httpContextAccessor.HttpContext!.Request.Headers.TryGetValue(AppConstants.HEADER_RESPONSE_DELAY, out var values) &&
+            httpContext.Request.Headers.TryGetValue(AppConstants.HEADER_RESPONSE_DELAY, out var values) &&
            int.TryParse(values.ToString(), out delayInMs);
    }
 }
--- a/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
+++ b/src/WireMock.Net.Aspire/WireMock.Net.Aspire.csproj
@@ -1,49 +1,49 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Description>Aspire extension to start a WireMock.Net server to stub an api.</Description>
-        <AssemblyTitle>WireMock.Net.Aspire</AssemblyTitle>
-        <Authors>Stef Heyenrath</Authors>
-        <TargetFramework>net8.0</TargetFramework>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <AssemblyName>WireMock.Net.Aspire</AssemblyName>
-        <PackageId>WireMock.Net.Aspire</PackageId>
-        <PackageTags>dotnet;aspire;wiremock;extension</PackageTags>
-        <ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A12}</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>
-        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>WireMock.Net-LogoAspire.png</PackageIcon>
-        <ApplicationIcon>../../resources/WireMock.Net-LogoAspire.ico</ApplicationIcon>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <None Remove="../../resources/WireMock.Net-Logo.png" />
-        <None Include="../../resources/WireMock.Net-LogoAspire.png" Pack="true" PackagePath="" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <Compile Include="..\WireMock.Net\Util\EnhancedFileSystemWatcher.cs" Link="Utils\EnhancedFileSystemWatcher.cs" />
-    </ItemGroup>
-
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting" Version="8.2.2" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
-    </ItemGroup>
-
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Description>Aspire extension to start a WireMock.Net server to stub an api.</Description>
+        <AssemblyTitle>WireMock.Net.Aspire</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFramework>net8.0</TargetFramework>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AssemblyName>WireMock.Net.Aspire</AssemblyName>
+        <PackageId>WireMock.Net.Aspire</PackageId>
+        <PackageTags>dotnet;aspire;wiremock;extension</PackageTags>
+        <ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A12}</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>
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+        <PackageIcon>WireMock.Net-LogoAspire.png</PackageIcon>
+        <ApplicationIcon>../../resources/WireMock.Net-LogoAspire.ico</ApplicationIcon>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <None Remove="../../resources/WireMock.Net-Logo.png" />
+        <None Include="../../resources/WireMock.Net-LogoAspire.png" Pack="true" PackagePath="" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\WireMock.Net\Util\EnhancedFileSystemWatcher.cs" Link="Utils\EnhancedFileSystemWatcher.cs" />
+    </ItemGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Aspire.Hosting" Version="9.2.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
+    </ItemGroup>
+
 </Project>
--- a/src/WireMock.Net.Aspire/WireMockInspector.cs
+++ b/src/WireMock.Net.Aspire/WireMockInspector.cs
@@ -0,0 +1,43 @@
+using System.Diagnostics;
+using System.Runtime.CompilerServices;
+
+namespace Aspire.Hosting.WireMock;
+
+internal static class WireMockInspector
+{
+    /// <summary>
+    /// Opens the WireMockInspector tool to inspect the WireMock server.
+    /// </summary>
+    /// <param name="wireMockUrl"></param>
+    /// <param name="title"></param>
+    /// <exception cref="InvalidOperationException"></exception>
+    /// <remarks>
+    /// Copy of <see href="https://github.com/WireMock-Net/WireMockInspector/blob/main/src/WireMock.Net.Extensions.WireMockInspector/WireMockServerExtensions.cs" />
+    /// without requestFilters and no call to WaitForExit() method in the process so it doesn't block the caller.
+    /// </remarks>
+    public static void Inspect(string wireMockUrl, [CallerMemberName] string title = "")
+    {
+        try
+        {
+            var arguments = $"attach --adminUrl {wireMockUrl} --autoLoad --instanceName \"{title}\"";
+
+            Process.Start(new ProcessStartInfo
+            {
+                FileName = "wiremockinspector",
+                Arguments = arguments,
+                UseShellExecute = false
+            });
+        }
+        catch (Exception e)
+        {
+            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",
+                innerException: e
+            );
+        }
+    }
+}
--- a/src/WireMock.Net.Aspire/WireMockServerBuilderExtensions.cs
+++ b/src/WireMock.Net.Aspire/WireMockServerBuilderExtensions.cs
@@ -1,175 +1,222 @@
-// Copyright © WireMock.Net
-
-using Aspire.Hosting.ApplicationModel;
-using Aspire.Hosting.Lifecycle;
-using Stef.Validation;
-using WireMock.Client.Builders;
-using WireMock.Net.Aspire;
-
-// ReSharper disable once CheckNamespace
-namespace Aspire.Hosting;
-
-/// <summary>
-/// Provides extension methods for adding WireMock.Net Server resources to the application model.
-/// </summary>
-public static class WireMockServerBuilderExtensions
-{
-    // Linux only (https://github.com/dotnet/aspire/issues/854)
-    private const string DefaultLinuxImage = "sheyenrath/wiremock.net-alpine";
-    private const string DefaultLinuxMappingsPath = "/app/__admin/mappings";
-
-    /// <summary>
-    /// Adds a WireMock.Net Server resource to the application model.
-    /// </summary>
-    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
-    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
-    /// <param name="port">The HTTP port for the WireMock Server.</param>
-    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
-    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, int? port = null)
-    {
-        Guard.NotNull(builder);
-        Guard.NotNullOrWhiteSpace(name);
-        Guard.Condition(port, p => p is null or > 0 and <= ushort.MaxValue);
-
-        return builder.AddWireMock(name, callback =>
-        {
-            callback.HttpPort = port;
-        });
-    }
-
-    /// <summary>
-    /// Adds a WireMock.Net Server resource to the application model.
-    /// </summary>
-    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
-    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
-    /// <param name="arguments">The arguments to start the WireMock.Net Server.</param>
-    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
-    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, WireMockServerArguments arguments)
-    {
-        Guard.NotNull(builder);
-        Guard.NotNullOrWhiteSpace(name);
-        Guard.NotNull(arguments);
-
-        var wireMockContainerResource = new WireMockServerResource(name, arguments);
-        var resourceBuilder = builder
-            .AddResource(wireMockContainerResource)
-            .WithImage(DefaultLinuxImage)
-            .WithEnvironment(ctx => ctx.EnvironmentVariables.Add("DOTNET_USE_POLLING_FILE_WATCHER", "1")) // https://khalidabuhakmeh.com/aspnet-docker-gotchas-and-workarounds#configuration-reloads-and-filesystemwatcher
-            .WithHttpEndpoint(port: arguments.HttpPort, targetPort: WireMockServerArguments.HttpContainerPort);
-
-        if (!string.IsNullOrEmpty(arguments.MappingsPath))
-        {
-            resourceBuilder = resourceBuilder.WithBindMount(arguments.MappingsPath, DefaultLinuxMappingsPath);
-        }
-
-        resourceBuilder = resourceBuilder.WithArgs(ctx =>
-        {
-            foreach (var arg in arguments.GetArgs())
-            {
-                ctx.Args.Add(arg);
-            }
-        });
-
-        return resourceBuilder;
-    }
-
-    /// <summary>
-    /// Adds a WireMock.Net Server resource to the application model.
-    /// </summary>
-    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
-    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
-    /// <param name="callback">A callback that allows for setting the <see cref="WireMockServerArguments"/>.</param>
-    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
-    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, Action<WireMockServerArguments> callback)
-    {
-        Guard.NotNull(builder);
-        Guard.NotNullOrWhiteSpace(name);
-        Guard.NotNull(callback);
-
-        var arguments = new WireMockServerArguments();
-        callback(arguments);
-
-        return builder.AddWireMock(name, arguments);
-    }
-
-    /// <summary>
-    /// Defines if the static mappings should be read at startup.
-    ///
-    /// Default set to <c>false</c>.
-    /// </summary>
-    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
-    public static IResourceBuilder<WireMockServerResource> WithReadStaticMappings(this IResourceBuilder<WireMockServerResource> wiremock)
-    {
-        Guard.NotNull(wiremock).Resource.Arguments.ReadStaticMappings = true;
-        return wiremock;
-    }
-
-    /// <summary>
-    /// Watch the static mapping files + folder for changes when running.
-    ///
-    /// Default set to <c>false</c>.
-    /// </summary>
-    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
-    public static IResourceBuilder<WireMockServerResource> WithWatchStaticMappings(this IResourceBuilder<WireMockServerResource> wiremock)
-    {
-        Guard.NotNull(wiremock).Resource.Arguments.WatchStaticMappings = true;
-        return wiremock;
-    }
-
-    /// <summary>
-    /// Specifies the path for the (static) mapping json files.
-    /// </summary>
-    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
-    /// <param name="mappingsPath">The local path.</param>
-    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
-    public static IResourceBuilder<WireMockServerResource> WithMappingsPath(this IResourceBuilder<WireMockServerResource> wiremock, string mappingsPath)
-    {
-        Guard.NotNullOrWhiteSpace(mappingsPath);
-        Guard.NotNull(wiremock).Resource.Arguments.MappingsPath = mappingsPath;
-
-        return wiremock.WithBindMount(mappingsPath, DefaultLinuxMappingsPath);
-    }
-
-    /// <summary>
-    /// Set the admin username and password for accessing the admin interface from WireMock.Net via HTTP.
-    /// </summary>
-    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
-    /// <param name="username">The admin username.</param>
-    /// <param name="password">The admin password.</param>
-    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
-    public static IResourceBuilder<WireMockServerResource> WithAdminUserNameAndPassword(this IResourceBuilder<WireMockServerResource> wiremock, string username, string password)
-    {
-        Guard.NotNull(wiremock);
-
-        wiremock.Resource.Arguments.AdminUsername = Guard.NotNull(username);
-        wiremock.Resource.Arguments.AdminPassword = Guard.NotNull(password);
-        return wiremock;
-    }
-
-    /// <summary>
-    /// Use WireMock Client's AdminApiMappingBuilder to configure the WireMock.Net resource.
-    /// </summary>
-    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
-    /// <param name="configure">Delegate that will be invoked to configure the WireMock.Net resource.</param>
-    /// <returns></returns>
-    public static IResourceBuilder<WireMockServerResource> WithApiMappingBuilder(this IResourceBuilder<WireMockServerResource> wiremock, Func<AdminApiMappingBuilder, Task> configure)
-    {
-        return wiremock.WithApiMappingBuilder((adminApiMappingBuilder, _) => configure.Invoke(adminApiMappingBuilder));
-    }
-
-    /// <summary>
-    /// Use WireMock Client's AdminApiMappingBuilder to configure the WireMock.Net resource.
-    /// </summary>
-    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
-    /// <param name="configure">Delegate that will be invoked to configure the WireMock.Net resource.</param>
-    /// <returns></returns>
-    public static IResourceBuilder<WireMockServerResource> WithApiMappingBuilder(this IResourceBuilder<WireMockServerResource> wiremock, Func<AdminApiMappingBuilder, CancellationToken, Task> configure)
-    {
-        Guard.NotNull(wiremock);
-
-        wiremock.ApplicationBuilder.Services.TryAddLifecycleHook<WireMockServerLifecycleHook>();
-        wiremock.Resource.Arguments.ApiMappingBuilder = configure;
-
-        return wiremock;
-    }
+// Copyright © WireMock.Net
+
+using Aspire.Hosting.ApplicationModel;
+using Aspire.Hosting.Lifecycle;
+using Aspire.Hosting.WireMock;
+using Microsoft.Extensions.Diagnostics.HealthChecks;
+using Stef.Validation;
+using WireMock.Client.Builders;
+using WireMock.Net.Aspire;
+
+// ReSharper disable once CheckNamespace
+namespace Aspire.Hosting;
+
+/// <summary>
+/// Provides extension methods for adding WireMock.Net Server resources to the application model.
+/// </summary>
+public static class WireMockServerBuilderExtensions
+{
+    // Linux only (https://github.com/dotnet/aspire/issues/854)
+    private const string DefaultLinuxImage = "sheyenrath/wiremock.net-alpine";
+    private const string DefaultLinuxMappingsPath = "/app/__admin/mappings";
+
+    /// <summary>
+    /// Adds a WireMock.Net Server resource to the application model.
+    /// </summary>
+    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
+    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
+    /// <param name="port">The HTTP port for the WireMock Server.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, int? port = null)
+    {
+        Guard.NotNull(builder);
+        Guard.NotNullOrWhiteSpace(name);
+        Guard.Condition(port, p => p is null or > 0 and <= ushort.MaxValue);
+
+        return builder.AddWireMock(name, callback =>
+        {
+            callback.HttpPort = port;
+        });
+    }
+
+    /// <summary>
+    /// Adds a WireMock.Net Server resource to the application model.
+    /// </summary>
+    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
+    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
+    /// <param name="arguments">The arguments to start the WireMock.Net Server.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, WireMockServerArguments arguments)
+    {
+        Guard.NotNull(builder);
+        Guard.NotNullOrWhiteSpace(name);
+        Guard.NotNull(arguments);
+
+        var wireMockContainerResource = new WireMockServerResource(name, arguments);
+        var resourceBuilder = builder
+            .AddResource(wireMockContainerResource)
+            .WithImage(DefaultLinuxImage)
+            .WithEnvironment(ctx => ctx.EnvironmentVariables.Add("DOTNET_USE_POLLING_FILE_WATCHER", "1")) // https://khalidabuhakmeh.com/aspnet-docker-gotchas-and-workarounds#configuration-reloads-and-filesystemwatcher
+            .WithHttpEndpoint(port: arguments.HttpPort, targetPort: WireMockServerArguments.HttpContainerPort)
+            .WithWireMockInspectorCommand();
+
+        if (!string.IsNullOrEmpty(arguments.MappingsPath))
+        {
+            resourceBuilder = resourceBuilder.WithBindMount(arguments.MappingsPath, DefaultLinuxMappingsPath);
+        }
+
+        resourceBuilder = resourceBuilder.WithArgs(ctx =>
+        {
+            foreach (var arg in arguments.GetArgs())
+            {
+                ctx.Args.Add(arg);
+            }
+        });
+
+        return resourceBuilder;
+    }
+
+    /// <summary>
+    /// Adds a WireMock.Net Server resource to the application model.
+    /// </summary>
+    /// <param name="builder">The <see cref="IDistributedApplicationBuilder"/>.</param>
+    /// <param name="name">The name of the resource. This name will be used as the connection string name when referenced in a dependency.</param>
+    /// <param name="callback">A callback that allows for setting the <see cref="WireMockServerArguments"/>.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> AddWireMock(this IDistributedApplicationBuilder builder, string name, Action<WireMockServerArguments> callback)
+    {
+        Guard.NotNull(builder);
+        Guard.NotNullOrWhiteSpace(name);
+        Guard.NotNull(callback);
+
+        var arguments = new WireMockServerArguments();
+        callback(arguments);
+
+        return builder.AddWireMock(name, arguments);
+    }
+
+    /// <summary>
+    /// Defines if the static mappings should be read at startup.
+    ///
+    /// Default set to <c>false</c>.
+    /// </summary>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> WithReadStaticMappings(this IResourceBuilder<WireMockServerResource> wiremock)
+    {
+        Guard.NotNull(wiremock).Resource.Arguments.ReadStaticMappings = true;
+        return wiremock;
+    }
+
+    /// <summary>
+    /// Watch the static mapping files + folder for changes when running.
+    ///
+    /// Default set to <c>false</c>.
+    /// </summary>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> WithWatchStaticMappings(this IResourceBuilder<WireMockServerResource> wiremock)
+    {
+        Guard.NotNull(wiremock).Resource.Arguments.WatchStaticMappings = true;
+        return wiremock;
+    }
+
+    /// <summary>
+    /// Specifies the path for the (static) mapping json files.
+    /// </summary>
+    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
+    /// <param name="mappingsPath">The local path.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> WithMappingsPath(this IResourceBuilder<WireMockServerResource> wiremock, string mappingsPath)
+    {
+        Guard.NotNullOrWhiteSpace(mappingsPath);
+        Guard.NotNull(wiremock).Resource.Arguments.MappingsPath = mappingsPath;
+
+        return wiremock.WithBindMount(mappingsPath, DefaultLinuxMappingsPath);
+    }
+
+    /// <summary>
+    /// Set the admin username and password for accessing the admin interface from WireMock.Net via HTTP.
+    /// </summary>
+    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
+    /// <param name="username">The admin username.</param>
+    /// <param name="password">The admin password.</param>
+    /// <returns>A reference to the <see cref="IResourceBuilder{WireMockServerResource}"/>.</returns>
+    public static IResourceBuilder<WireMockServerResource> WithAdminUserNameAndPassword(this IResourceBuilder<WireMockServerResource> wiremock, string username, string password)
+    {
+        Guard.NotNull(wiremock);
+
+        wiremock.Resource.Arguments.AdminUsername = Guard.NotNull(username);
+        wiremock.Resource.Arguments.AdminPassword = Guard.NotNull(password);
+        return wiremock;
+    }
+
+    /// <summary>
+    /// Use WireMock Client's AdminApiMappingBuilder to configure the WireMock.Net resource.
+    /// </summary>
+    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
+    /// <param name="configure">Delegate that will be invoked to configure the WireMock.Net resource.</param>
+    /// <returns></returns>
+    public static IResourceBuilder<WireMockServerResource> WithApiMappingBuilder(this IResourceBuilder<WireMockServerResource> wiremock, Func<AdminApiMappingBuilder, Task> configure)
+    {
+        return wiremock.WithApiMappingBuilder((adminApiMappingBuilder, _) => configure.Invoke(adminApiMappingBuilder));
+    }
+
+    /// <summary>
+    /// Use WireMock Client's AdminApiMappingBuilder to configure the WireMock.Net resource.
+    /// </summary>
+    /// <param name="wiremock">The <see cref="IResourceBuilder{WireMockServerResource}"/>.</param>
+    /// <param name="configure">Delegate that will be invoked to configure the WireMock.Net resource.</param>
+    /// <returns></returns>
+    public static IResourceBuilder<WireMockServerResource> WithApiMappingBuilder(this IResourceBuilder<WireMockServerResource> wiremock, Func<AdminApiMappingBuilder, CancellationToken, Task> configure)
+    {
+        Guard.NotNull(wiremock);
+
+        wiremock.ApplicationBuilder.Services.TryAddLifecycleHook<WireMockServerLifecycleHook>();
+        wiremock.Resource.Arguments.ApiMappingBuilder = configure;
+
+        return wiremock;
+    }
+
+    /// <summary>
+    /// Enables the WireMockInspect, a cross-platform UI app that facilitates WireMock troubleshooting.
+    /// This requires installation of the WireMockInspector tool.
+    /// <code>
+    /// dotnet tool install WireMockInspector --global --no-cache --ignore-failed-sources
+    /// </code>
+    /// </summary>
+    /// <param name="builder">The <see cref="IResourceBuilder{WireMockNetResource}"/>.</param>
+    /// <returns></returns>
+    public static IResourceBuilder<WireMockServerResource> WithWireMockInspectorCommand(this IResourceBuilder<WireMockServerResource> builder)
+    {
+        Guard.NotNull(builder);
+
+        CommandOptions commandOptions = new()
+        {
+            Description = "Requires installation of the WireMockInspector (https://github.com/WireMock-Net/WireMockInspector) tool:\ndotnet tool install WireMockInspector --global --no-cache --ignore-failed-sources",
+            UpdateState = OnUpdateResourceState,
+            IconName = "BoxSearch",
+            IconVariant = IconVariant.Filled
+        };
+
+        builder.WithCommand(
+            name: "wiremock-inspector",
+            displayName: "WireMock Inspector",
+            executeCommand: context => OnRunOpenInspectorCommandAsync(builder),
+            commandOptions: commandOptions);
+
+        return builder;
+    }
+
+    private static Task<ExecuteCommandResult> OnRunOpenInspectorCommandAsync(IResourceBuilder<WireMockServerResource> builder)
+    {
+        WireMockInspector.Inspect(builder.Resource.GetEndpoint().Url);
+
+        return Task.FromResult(CommandResults.Success());
+    }
+
+    private static ResourceCommandState OnUpdateResourceState(UpdateCommandStateContext context)
+    {
+        return context.ResourceSnapshot.HealthStatus is HealthStatus.Healthy
+            ? ResourceCommandState.Enabled
+            : ResourceCommandState.Disabled;
+    }
 }
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockANumberOfCallsAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockANumberOfCallsAssertions.cs
@@ -0,0 +1,40 @@
+// Copyright © WireMock.Net
+
+using Stef.Validation;
+using WireMock.Server;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+/// <summary>
+/// Provides assertion methods to verify the number of calls made to a WireMock server.
+/// This class is used in the context of FluentAssertions.
+/// </summary>
+public class WireMockANumberOfCallsAssertions
+{
+    private readonly IWireMockServer _server;
+    private readonly int _callsCount;
+    private readonly AssertionChain _chain;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockANumberOfCallsAssertions"/> class.
+    /// </summary>
+    /// <param name="server">The WireMock server to assert against.</param>
+    /// <param name="callsCount">The expected number of calls to assert.</param>
+    /// <param name="chain">The assertion chain</param>
+    public WireMockANumberOfCallsAssertions(IWireMockServer server, int callsCount, AssertionChain chain)
+    {
+        _server = Guard.NotNull(server);
+        _callsCount = callsCount;
+        _chain = chain;
+    }
+
+    /// <summary>
+    /// Returns an instance of <see cref="WireMockAssertions"/> which can be used to assert the expected number of calls.
+    /// </summary>
+    /// <returns>A <see cref="WireMockAssertions"/> instance for asserting the number of calls to the server.</returns>
+    public WireMockAssertions Calls()
+    {
+        return new WireMockAssertions(_server, _callsCount, _chain);
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.AtUrl.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.AtUrl.cs
@@ -0,0 +1,83 @@
+// Copyright © WireMock.Net
+
+using WireMock.Extensions;
+using WireMock.Matchers;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+#pragma warning disable CS1591
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
+    {
+        _ = AtAbsoluteUrl(new ExactMatcher(true, absoluteUrl), because, becauseArgs);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, absoluteUrl);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, IStringMatcher> AtAbsoluteUrl(IStringMatcher absoluteUrlMatcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => absoluteUrlMatcher.IsPerfectMatch(request.AbsoluteUrl));
+
+        var absoluteUrl = absoluteUrlMatcher.GetPatterns().FirstOrDefault().GetPattern();
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but no calls were made.",
+                absoluteUrl
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => absoluteUrl,
+                requests => requests.Select(request => request.AbsoluteUrl)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, IStringMatcher>(this, absoluteUrlMatcher);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtUrl(string url, string because = "", params object[] becauseArgs)
+    {
+        _ = AtUrl(new ExactMatcher(true, url), because, becauseArgs);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, url);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, IStringMatcher> AtUrl(IStringMatcher urlMatcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => urlMatcher.IsPerfectMatch(request.Url));
+
+        var url = urlMatcher.GetPatterns().FirstOrDefault().GetPattern();
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but no calls were made.",
+                url
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => url,
+                requests => requests.Select(request => request.Url)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, IStringMatcher>(this, urlMatcher);
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.FromClientIP.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.FromClientIP.cs
@@ -0,0 +1,35 @@
+// Copyright © WireMock.Net
+
+#pragma warning disable CS1591
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ClientIP, clientIP, StringComparison.OrdinalIgnoreCase));
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but no calls were made.",
+                clientIP
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but didn't find it among the calls from IP(s) {1}.",
+                _ => clientIP, requests => requests.Select(request => request.ClientIP)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, clientIP);
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.UsingMethod.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.UsingMethod.cs
@@ -0,0 +1,81 @@
+// Copyright © WireMock.Net
+
+#pragma warning disable CS1591
+using System;
+using WireMock.Constants;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingConnect(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.CONNECT, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingDelete(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.DELETE, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingGet(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.GET, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingHead(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.HEAD, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingOptions(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.OPTIONS, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingPost(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.POST, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingPatch(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.PATCH, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingPut(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.PUT, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingTrace(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.TRACE, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingAnyMethod(string because = "", params object[] becauseArgs)
+        => UsingMethod(Any, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingMethod(string method, string because = "", params object[] becauseArgs)
+    {
+        var any = method == Any;
+        Func<IRequestMessage, bool> predicate = request => (any && !string.IsNullOrEmpty(request.Method)) ||
+                                                           string.Equals(request.Method, method, StringComparison.OrdinalIgnoreCase);
+
+        var (filter, condition) = BuildFilterAndCondition(predicate);
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called using method {0}{reason}, but no calls were made.",
+                method
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called using method {0}{reason}, but didn't find it among the methods {1}.",
+                _ => method,
+                requests => requests.Select(request => request.Method)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs
@@ -0,0 +1,147 @@
+// Copyright © WireMock.Net
+
+#pragma warning disable CS1591
+using System;
+using System.Collections.Generic;
+using AnyOfTypes;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using WireMock.Extensions;
+using WireMock.Matchers;
+using WireMock.Models;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    private const string MessageFormatNoCalls = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but no calls were made.";
+    private const string MessageFormat = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but didn't find it among the body/bodies {1}.";
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithBody(string body, string because = "", params object[] becauseArgs)
+    {
+        return WithBody(new WildcardMatcher(body), because, becauseArgs);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithBody(IStringMatcher matcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(r => r.Body, matcher);
+
+        return ExecuteAssertionWithBodyStringMatcher(matcher, because, becauseArgs, condition, filter, r => r.Body);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(object body, string because = "", params object[] becauseArgs)
+    {
+        return WithBodyAsJson(new JsonMatcher(body), because, becauseArgs);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(string body, string because = "", params object[] becauseArgs)
+    {
+        return WithBodyAsJson(new JsonMatcher(body), because, becauseArgs);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(IObjectMatcher matcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsJson, matcher);
+
+        return ExecuteAssertionWithBodyAsIObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsJson);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithBodyAsBytes(byte[] body, string because = "", params object[] becauseArgs)
+    {
+        return WithBodyAsBytes(new ExactObjectMatcher(body), because, becauseArgs);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithBodyAsBytes(ExactObjectMatcher matcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsBytes, matcher);
+
+        return ExecuteAssertionWithBodyAsIObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsBytes);
+    }
+
+    private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyStringMatcher(
+        IStringMatcher matcher,
+        string because,
+        object[] becauseArgs,
+        Func<IReadOnlyList<IRequestMessage>, bool> condition,
+        Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter,
+        Func<IRequestMessage, object?> expression
+    )
+    {
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                MessageFormatNoCalls,
+                FormatBody(matcher.GetPatterns())
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                MessageFormat,
+                _ => FormatBody(matcher.GetPatterns()),
+                requests => FormatBodies(requests.Select(expression))
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyAsIObjectMatcher(
+        IObjectMatcher matcher,
+        string because,
+        object[] becauseArgs,
+        Func<IReadOnlyList<IRequestMessage>, bool> condition,
+        Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter,
+        Func<IRequestMessage, object?> expression
+    )
+    {
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                MessageFormatNoCalls,
+                FormatBody(matcher.Value)
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                MessageFormat,
+                _ => FormatBody(matcher.Value),
+                requests => FormatBodies(requests.Select(expression))
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    private static string? FormatBody(object? body)
+    {
+        return body switch
+        {
+            null => null,
+            string str => str,
+            AnyOf<string, StringPattern>[] stringPatterns => FormatBodies(stringPatterns.Select(p => p.GetPattern())),
+            byte[] bytes => $"byte[{bytes.Length}] {{...}}",
+            JToken jToken => jToken.ToString(Formatting.None),
+            _ => JToken.FromObject(body).ToString(Formatting.None)
+        };
+    }
+
+    private static string? FormatBodies(IEnumerable<object?> bodies)
+    {
+        var valueAsArray = bodies as object[] ?? bodies.ToArray();
+        return valueAsArray.Length == 1 ? FormatBody(valueAsArray[0]) : $"[ {string.Join(", ", valueAsArray.Select(FormatBody))} ]";
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithHeader.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithHeader.cs
@@ -0,0 +1,157 @@
+// Copyright © WireMock.Net
+
+#pragma warning disable CS1591
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> WitHeaderKey(string expectedKey, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            return request.Headers?.Any(h => h.Key == expectedKey) == true;
+        });
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0}{reason}.",
+                expectedKey
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0}{reason}, but didn't find it among the calls with Header(s) {1}.",
+                _ => expectedKey,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, expectedKey);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string value, string because = "", params object[] becauseArgs)
+        => WithHeader(expectedKey, new[] { value }, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            var headers = request.Headers?.ToArray() ?? [];
+
+            var matchingHeaderValues = headers.Where(h => h.Key == expectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
+
+            if (expectedValues.Length == 1 && matchingHeaderValues.Length == 1)
+            {
+                return matchingHeaderValues[0] == expectedValues[0];
+            }
+
+            var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToArray();
+            return expectedValues.Any(trimmedHeaderValues.Contains);
+        });
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0} and Values {1}{reason}.",
+                expectedKey,
+                expectedValues
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0} and Values {1}{reason}, but didn't find it among the calls with Header(s) {2}.",
+                _ => expectedKey,
+                _ => expectedValues,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeaderKey(string unexpectedKey, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            return request.Headers?.Any(h => h.Key == unexpectedKey) != true;
+        });
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0}{reason}.",
+                unexpectedKey
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0}{reason}, but found it among the calls with Header(s) {1}.",
+                _ => unexpectedKey,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string value, string because = "", params object[] becauseArgs)
+        => WithoutHeader(unexpectedKey, new[] { value }, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            var headers = request.Headers?.ToArray() ?? [];
+
+            var matchingHeaderValues = headers.Where(h => h.Key == unexpectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
+
+            if (expectedValues.Length == 1 && matchingHeaderValues.Length == 1)
+            {
+                return matchingHeaderValues[0] != expectedValues[0];
+            }
+
+            var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToArray();
+            return !expectedValues.Any(trimmedHeaderValues.Contains);
+        });
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0} and Values {1}{reason}.",
+                unexpectedKey,
+                expectedValues
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0} and Values {1}{reason}, but found it among the calls with Header(s) {2}.",
+                _ => unexpectedKey,
+                _ => expectedValues,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithProxy.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithProxy.cs
@@ -0,0 +1,36 @@
+// Copyright © WireMock.Net
+
+#pragma warning disable CS1591
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> WithProxyUrl(string proxyUrl, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ProxyUrl, proxyUrl, StringComparison.OrdinalIgnoreCase));
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but no calls were made.",
+                proxyUrl
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but didn't find it among the calls with {1}.",
+                _ => proxyUrl,
+                requests => requests.Select(request => request.ProxyUrl)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, proxyUrl);
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.cs
@@ -0,0 +1,48 @@
+// Copyright © WireMock.Net
+
+#pragma warning disable CS1591
+using System;
+using System.Collections.Generic;
+using WireMock.Matchers;
+using WireMock.Server;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    public const string Any = "*";
+
+    public int? CallsCount { get; }
+    public IReadOnlyList<IRequestMessage> RequestMessages { get; private set; }
+    private readonly AssertionChain _chain;
+
+    public WireMockAssertions(IWireMockServer subject, int? callsCount, AssertionChain chain)
+    {
+        CallsCount = callsCount;
+        RequestMessages = subject.LogEntries.Select(logEntry => logEntry.RequestMessage).ToList();
+        _chain = chain;
+    }
+
+    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, bool> predicate)
+    {
+        Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter = requests => requests.Where(predicate).ToList();
+
+        return (filter, requests => (CallsCount is null && filter(requests).Any()) || CallsCount == filter(requests).Count);
+    }
+
+    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, string?> expression, IStringMatcher matcher)
+    {
+        return BuildFilterAndCondition(r => matcher.IsMatch(expression(r)).IsPerfect());
+    }
+
+    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, object?> expression, IObjectMatcher matcher)
+    {
+        return BuildFilterAndCondition(r => matcher.IsMatch(expression(r)).IsPerfect());
+    }
+
+    public void FilterRequestMessages(Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter)
+    {
+        RequestMessages = filter(RequestMessages).ToList();
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockReceivedAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockReceivedAssertions.cs
@@ -0,0 +1,56 @@
+// Copyright © WireMock.Net
+
+using FluentAssertions.Primitives;
+using WireMock.Server;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+/// <summary>
+/// Contains a number of methods to assert that the <see cref="IWireMockServer"/> is in the expected state.
+/// </summary>
+public class WireMockReceivedAssertions : ReferenceTypeAssertions<IWireMockServer, WireMockReceivedAssertions>
+{
+    private readonly AssertionChain _chain;
+
+    /// <summary>
+    /// Create a WireMockReceivedAssertions.
+    /// </summary>
+    /// <param name="server">The <see cref="IWireMockServer"/>.</param>
+    /// <param name="chain">The assertion chain</param>
+    public WireMockReceivedAssertions(IWireMockServer server, AssertionChain chain) : base(server, chain)
+    {
+        _chain = chain;
+    }
+
+    /// <summary>
+    /// Asserts if <see cref="IWireMockServer"/> has received no calls.
+    /// </summary>
+    /// <returns><see cref="WireMockAssertions"/></returns>
+    public WireMockAssertions HaveReceivedNoCalls()
+    {
+        return new WireMockAssertions(Subject, 0, _chain);
+    }
+
+    /// <summary>
+    /// Asserts if <see cref="IWireMockServer"/> has received a call.
+    /// </summary>
+    /// <returns><see cref="WireMockAssertions"/></returns>
+    public WireMockAssertions HaveReceivedACall()
+    {
+        return new WireMockAssertions(Subject, null, _chain);
+    }
+
+    /// <summary>
+    /// Asserts if <see cref="IWireMockServer"/> has received n-calls.
+    /// </summary>
+    /// <param name="callsCount"></param>
+    /// <returns><see cref="WireMockANumberOfCallsAssertions"/></returns>
+    public WireMockANumberOfCallsAssertions HaveReceived(int callsCount)
+    {
+        return new WireMockANumberOfCallsAssertions(Subject, callsCount, _chain);
+    }
+
+    /// <inheritdoc />
+    protected override string Identifier => "wiremockserver";
+}
--- a/src/WireMock.Net.AwesomeAssertions/Extensions/WireMockExtensions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Extensions/WireMockExtensions.cs
@@ -0,0 +1,23 @@
+// Copyright © WireMock.Net
+
+using WireMock.Server;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions
+{
+    /// <summary>
+    /// Contains extension methods for custom assertions in unit tests.
+    /// </summary>
+    public static class WireMockExtensions
+    {
+        /// <summary>
+        /// Returns a <see cref="WireMockReceivedAssertions"/> object that can be used to assert the current <see cref="IWireMockServer"/>.
+        /// </summary>
+        /// <param name="instance">The WireMockServer</param>
+        /// <returns><see cref="WireMockReceivedAssertions"/></returns>
+        public static WireMockReceivedAssertions Should(this IWireMockServer instance)
+        {
+            return new WireMockReceivedAssertions(instance, AssertionChain.GetOrCreate());
+        }
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Usings.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Usings.cs
@@ -0,0 +1,5 @@
+// Copyright © WireMock.Net
+
+global using System.Linq;
+global using FluentAssertions;
+global using FluentAssertions.Execution;
--- a/src/WireMock.Net.AwesomeAssertions/WireMock.Net.AwesomeAssertions.csproj
+++ b/src/WireMock.Net.AwesomeAssertions/WireMock.Net.AwesomeAssertions.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>AwesomeAssertions extensions for WireMock.Net</Description>
+        <AssemblyTitle>WireMock.Net.AwesomeAssertions</AssemblyTitle>
+        <Authors>Francesco Venturoli;Mahmoud Ali;Stef Heyenrath</Authors>
+        <TargetFrameworks>net47;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AssemblyName>WireMock.Net.AwesomeAssertions</AssemblyName>
+        <PackageId>WireMock.Net.AwesomeAssertions</PackageId>
+        <PackageTags>wiremock;AwesomeAssertions;UnitTest;Assert;Assertions</PackageTags>
+        <RootNamespace>WireMock.AwesomeAssertions</RootNamespace>
+        <ProjectGuid>{9565C395-FC5D-4CB1-8381-EC3D9DA74779}</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 Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="AwesomeAssertions" Version="8.1.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
+    </ItemGroup>
+
+</Project>
--- a/src/WireMock.Net.OpenApiParser/Extensions/WireMockServerExtensions.cs
+++ b/src/WireMock.Net.OpenApiParser/Extensions/WireMockServerExtensions.cs
@@ -1,96 +1,96 @@
-// Copyright © WireMock.Net
-
-using System.IO;
-using System.Linq;
-using JetBrains.Annotations;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers;
-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 or V3 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 or V3 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 or V3 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 or V3 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 or V3 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());
-    }
+// Copyright © WireMock.Net
+
+using System.IO;
+using System.Linq;
+using JetBrains.Annotations;
+using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Readers;
+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 or V3 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 or V3 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 or V3 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 or V3 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 or V3 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());
+    }
 }
--- a/src/WireMock.Net.OpenApiParser/IWireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/IWireMockOpenApiParser.cs
@@ -1,75 +1,75 @@
-// Copyright © WireMock.Net
-
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers;
-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 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 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);
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Readers;
+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 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 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);
 }
--- a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
+++ b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
@@ -102,8 +102,8 @@ internal class OpenApiPathsMapper
            Guid = Guid.NewGuid(),
            Request = new RequestModel
            {
-                Methods = new[] { httpMethod },
-                Path = MapBasePath(servers) + MapPathWithParameters(path, pathParameters),
+                Methods = [httpMethod],
+                Path = PathUtils.Combine(MapBasePath(servers), MapPathWithParameters(path, pathParameters)),
                Params = MapQueryParameters(queryParameters),
                Headers = MapRequestHeaders(headers),
                Body = requestBodyModel
--- a/src/WireMock.Net.OpenApiParser/Properties/AssemblyInfo.cs
+++ b/src/WireMock.Net.OpenApiParser/Properties/AssemblyInfo.cs
@@ -0,0 +1,5 @@
+// Copyright © WireMock.Net
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
--- a/src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs
@@ -1,62 +1,62 @@
-// Copyright © WireMock.Net
-
-using System;
-using Microsoft.OpenApi.Models;
-
-namespace WireMock.Net.OpenApiParser.Settings;
-
-/// <summary>
-/// A 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 Double.
-    /// </summary>
-    double Double { 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>
-    OpenApiSchema? Schema { get; set; }
+// Copyright © WireMock.Net
+
+using System;
+using Microsoft.OpenApi.Models;
+
+namespace WireMock.Net.OpenApiParser.Settings;
+
+/// <summary>
+/// A 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 Double.
+    /// </summary>
+    double Double { 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>
+    OpenApiSchema? Schema { get; set; }
 }
--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs
@@ -1,44 +1,44 @@
-// Copyright © WireMock.Net
-
-using System;
-using Microsoft.OpenApi.Models;
-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 double Double => RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d;
-
-    /// <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 OpenApiSchema? Schema { get; set; }
+// Copyright © WireMock.Net
+
+using System;
+using Microsoft.OpenApi.Models;
+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 double Double => RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d;
+
+    /// <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 OpenApiSchema? Schema { get; set; }
 }
--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
@@ -1,42 +1,42 @@
-// Copyright © WireMock.Net
-
-using System;
-using Microsoft.OpenApi.Models;
-
-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 double Double => 4.2d;
-
-    /// <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 OpenApiSchema? Schema { get; set; } = new();
+// Copyright © WireMock.Net
+
+using System;
+using Microsoft.OpenApi.Models;
+
+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 double Double => 4.2d;
+
+    /// <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 OpenApiSchema? Schema { get; set; } = new();
 }
--- a/src/WireMock.Net.OpenApiParser/Utils/PathUtils.cs
+++ b/src/WireMock.Net.OpenApiParser/Utils/PathUtils.cs
@@ -0,0 +1,27 @@
+// 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;
+    }
+}
--- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
+++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
@@ -1,37 +1,37 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <Description>An OpenApi (swagger) parser to generate MappingModel or mapping.json file.</Description>
-        <TargetFrameworks>net46;netstandard2.0;netstandard2.1</TargetFrameworks>
-        <GenerateDocumentationFile>true</GenerateDocumentationFile>
-        <PackageTags>wiremock;openapi;OAS;raml;converter;parser;openapiparser</PackageTags>
-        <ProjectGuid>{D3804228-91F4-4502-9595-39584E5AADAD}</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="Microsoft.OpenApi.Readers" Version="1.2.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.6.1" />
-        <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 Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>An OpenApi (swagger) parser to generate MappingModel or mapping.json file.</Description>
+        <TargetFrameworks>net46;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>wiremock;openapi;OAS;raml;converter;parser;openapiparser</PackageTags>
+        <ProjectGuid>{D3804228-91F4-4502-9595-39584E5AADAD}</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="Microsoft.OpenApi.Readers" Version="1.2.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.6.1" />
+        <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>
--- a/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
@@ -1,84 +1,84 @@
-// 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.Readers;
-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 readonly OpenApiStreamReader _reader = 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
-        {
-            var reader = new OpenApiStreamReader();
-            document = reader.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(_reader.Read(stream, out diagnostic));
-    }
-
-    /// <inheritdoc />
-    [PublicAPI]
-    public IReadOnlyList<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
-    {
-        return FromDocument(_reader.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);
-    }
+// 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.Readers;
+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 readonly OpenApiStreamReader _reader = 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
+        {
+            var reader = new OpenApiStreamReader();
+            document = reader.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(_reader.Read(stream, out diagnostic));
+    }
+
+    /// <inheritdoc />
+    [PublicAPI]
+    public IReadOnlyList<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+    {
+        return FromDocument(_reader.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);
+    }
 }
--- a/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
+++ b/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
@@ -311,6 +311,15 @@ public interface IWireMockAdminApi
    [Delete("files/{filename}")]
    Task<StatusModel> DeleteFileAsync([Path] string filename, CancellationToken cancellationToken = default);

+    /// <summary>
+    /// Add a Grpc ProtoDefinition at server-level.
+    /// </summary>
+    /// <param name="id">Unique identifier for the ProtoDefinition.</param>
+    /// <param name="protoDefinition">The ProtoDefinition as text.</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
+    [Post("protodefinitions/{id}")]
+    Task<StatusModel> AddProtoDefinitionAsync([Path] string id, [Body] string body, CancellationToken cancellationToken = default);
+
    /// <summary>
    /// Check if a file exists
    /// </summary>
--- a/src/WireMock.Net.TUnit/TUnitWireMockLogger.cs
+++ b/src/WireMock.Net.TUnit/TUnitWireMockLogger.cs
@@ -51,9 +51,9 @@ public sealed class TUnitWireMockLogger : IWireMockLogger
    }

    /// <inheritdoc />
-    public void Error(string formatString, Exception exception)
+    public void Error(string message, Exception exception)
    {
-        _tUnitLogger.LogError(Format("Error", formatString, exception.Message), exception);
+        _tUnitLogger.LogError(Format("Error", $"{message} {{0}}", exception));

        if (exception is AggregateException ae)
        {
--- a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
+++ b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
@@ -21,6 +21,8 @@
    <ItemGroup>
      <Compile Include="..\WireMock.Net\Http\HttpClientFactory2.cs" Link="Http\HttpClientFactory2.cs" />
      <Compile Include="..\WireMock.Net\Util\EnhancedFileSystemWatcher.cs" Link="Utils\EnhancedFileSystemWatcher.cs" />
+      <Compile Include="..\WireMock.Net\Util\PortUtils.cs" Link="Util\PortUtils.cs" />
+      <Compile Include="..\WireMock.Net\Constants\WireMockConstants.cs" Link="Constants\WireMockConstants.cs" />
    </ItemGroup>

    <ItemGroup>
@@ -28,6 +30,10 @@
          <PrivateAssets>all</PrivateAssets>
          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
+        <PackageReference Include="Nullable" Version="1.3.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
        <PackageReference Include="Stef.Validation" Version="0.1.1" />
        <PackageReference Include="Testcontainers" Version="4.0.0" />
    </ItemGroup>
--- a/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockConfiguration.cs
@@ -1,9 +1,12 @@
 // Copyright © WireMock.Net

+using System.Collections.Generic;
+using System.Linq;
 using Docker.DotNet.Models;
 using DotNet.Testcontainers.Builders;
 using DotNet.Testcontainers.Configurations;
 using JetBrains.Annotations;
+using Stef.Validation;

 namespace WireMock.Net.Testcontainers;

@@ -24,6 +27,10 @@ public sealed class WireMockConfiguration : ContainerConfiguration

    public bool HasBasicAuthentication => !string.IsNullOrEmpty(Username) && !string.IsNullOrEmpty(Password);

+    public List<string> AdditionalUrls { get; private set; } = [];
+
+    public Dictionary<string, string[]> ProtoDefinitions { get; set; } = new();
+
    public WireMockConfiguration(string? username = null, string? password = null)
    {
        Username = username;
@@ -70,6 +77,8 @@ public sealed class WireMockConfiguration : ContainerConfiguration
        StaticMappingsPath = BuildConfiguration.Combine(oldValue.StaticMappingsPath, newValue.StaticMappingsPath);
        WatchStaticMappings = BuildConfiguration.Combine(oldValue.WatchStaticMappings, newValue.WatchStaticMappings);
        WatchStaticMappingsInSubdirectories = BuildConfiguration.Combine(oldValue.WatchStaticMappingsInSubdirectories, newValue.WatchStaticMappingsInSubdirectories);
+        AdditionalUrls = Combine(oldValue.AdditionalUrls, newValue.AdditionalUrls);
+        ProtoDefinitions = Combine(oldValue.ProtoDefinitions, newValue.ProtoDefinitions);
    }

    /// <summary>
@@ -94,4 +103,43 @@ public sealed class WireMockConfiguration : ContainerConfiguration
        WatchStaticMappingsInSubdirectories = includeSubDirectories;
        return this;
    }
+
+    /// <summary>
+    /// An additional Url on which WireMock listens.
+    /// </summary>
+    /// <param name="url">The url to add.</param>
+    /// <returns><see cref="WireMockConfiguration"/></returns>
+    public WireMockConfiguration WithAdditionalUrl(string url)
+    {
+        AdditionalUrls.Add(Guard.NotNullOrWhiteSpace(url));
+        return this;
+    }
+
+    /// <summary>
+    /// Add a Grpc ProtoDefinition at server-level.
+    /// </summary>
+    /// <param name="id">Unique identifier for the ProtoDefinition.</param>
+    /// <param name="protoDefinition">The ProtoDefinition as text.</param>
+    /// <returns><see cref="WireMockConfiguration"/></returns>
+    public WireMockConfiguration AddProtoDefinition(string id, params string[] protoDefinition)
+    {
+        Guard.NotNullOrWhiteSpace(id);
+        Guard.NotNullOrEmpty(protoDefinition);
+
+        ProtoDefinitions[id] = protoDefinition;
+
+        return this;
+    }
+
+    private static List<T> Combine<T>(List<T> oldValue, List<T> newValue)
+    {
+        return oldValue.Concat(newValue).ToList();
+    }
+
+    private static Dictionary<TKey, TValue> Combine<TKey, TValue>(Dictionary<TKey, TValue> oldValue, Dictionary<TKey, TValue> newValue)
+    {
+        return newValue
+            .Concat(oldValue.Where(item => !newValue.Keys.Contains(item.Key)))
+            .ToDictionary(item => item.Key, item => item.Value);
+    }
 }
--- a/src/WireMock.Net.Testcontainers/WireMockContainer.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockContainer.cs
@@ -1,7 +1,9 @@
 // Copyright © WireMock.Net

 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
@@ -10,6 +12,7 @@ using DotNet.Testcontainers.Containers;
 using JetBrains.Annotations;
 using Microsoft.Extensions.Logging;
 using RestEase;
+using Stef.Validation;
 using WireMock.Client;
 using WireMock.Client.Extensions;
 using WireMock.Http;
@@ -30,6 +33,7 @@ public sealed class WireMockContainer : DockerContainer

    private IWireMockAdminApi? _adminApi;
    private EnhancedFileSystemWatcher? _enhancedFileSystemWatcher;
+    private IDictionary<int, Uri>? _publicUris;

    /// <summary>
    /// Initializes a new instance of the <see cref="WireMockContainer" /> class.
@@ -37,9 +41,9 @@ public sealed class WireMockContainer : DockerContainer
    /// <param name="configuration">The container configuration.</param>
    public WireMockContainer(WireMockConfiguration configuration) : base(configuration)
    {
-        _configuration = Stef.Validation.Guard.NotNull(configuration);
+        _configuration = Guard.NotNull(configuration);

-        Started += WireMockContainer_Started;
+        Started += async (sender, eventArgs) => await WireMockContainerStartedAsync(sender, eventArgs);
    }

    /// <summary>
@@ -48,6 +52,21 @@ public sealed class WireMockContainer : DockerContainer
    [PublicAPI]
    public string GetPublicUrl() => GetPublicUri().ToString();

+    /// <summary>
+    /// Gets the public Urls as a dictionary with the internal port as the key.
+    /// </summary>
+    [PublicAPI]
+    public IDictionary<int, string> GetPublicUrls() => GetPublicUris().ToDictionary(kvp => kvp.Key, kvp => kvp.Value.ToString());
+
+    /// <summary>
+    /// Gets the mapped public port for the given container port.
+    /// </summary>
+    [PublicAPI]
+    public string GetMappedPublicUrl(int containerPort)
+    {
+        return GetPublicUris()[containerPort].ToString();
+    }
+
    /// <summary>
    /// Create a RestEase Admin client which can be used to call the admin REST endpoint.
    /// </summary>
@@ -121,7 +140,7 @@ public sealed class WireMockContainer : DockerContainer
            await ReloadStaticMappingsAsync(target, ct);
        }
    }
-    
+
    /// <summary>
    /// Reload the static mappings.
    /// </summary>
@@ -157,8 +176,6 @@ public sealed class WireMockContainer : DockerContainer
            _enhancedFileSystemWatcher = null;
        }

-        Started -= WireMockContainer_Started;
-
        return base.DisposeAsyncCore();
    }

@@ -177,10 +194,17 @@ public sealed class WireMockContainer : DockerContainer
        }
    }

-    private void WireMockContainer_Started(object sender, EventArgs e)
+    private async Task WireMockContainerStartedAsync(object sender, EventArgs e)
    {
        _adminApi = CreateWireMockAdminClient();

+        RegisterEnhancedFileSystemWatcher();
+
+        await CallAdditionalActionsAfterStartedAsync();
+    }
+
+    private void RegisterEnhancedFileSystemWatcher()
+    {
        if (!_configuration.WatchStaticMappings || string.IsNullOrEmpty(_configuration.StaticMappingsPath))
        {
            return;
@@ -196,9 +220,35 @@ public sealed class WireMockContainer : DockerContainer
        _enhancedFileSystemWatcher.EnableRaisingEvents = true;
    }

+    private async Task CallAdditionalActionsAfterStartedAsync()
+    {
+        foreach (var kvp in _configuration.ProtoDefinitions)
+        {
+            Logger.LogInformation("Adding ProtoDefinition {Id}", kvp.Key);
+            foreach (var protoDefinition in kvp.Value)
+            {
+                try
+                {
+                    await _adminApi!.AddProtoDefinitionAsync(kvp.Key, protoDefinition);
+                }
+                catch (Exception ex)
+                {
+                    Logger.LogWarning(ex, "Error adding ProtoDefinition '{Id}'.", kvp.Key);
+                }
+            }
+        }
+    }
+
    private async void FileCreatedChangedOrDeleted(object sender, FileSystemEventArgs args)
    {
-        await ReloadStaticMappingsAsync(args.FullPath);
+        try
+        {
+            await ReloadStaticMappingsAsync(args.FullPath);
+        }
+        catch (Exception ex)
+        {
+            Logger.LogWarning(ex, "Error reloading static mappings from '{FullPath}'.", args.FullPath);
+        }
    }

    private async Task ReloadStaticMappingsAsync(string path, CancellationToken cancellationToken = default)
@@ -207,5 +257,27 @@ public sealed class WireMockContainer : DockerContainer
        await ReloadStaticMappingsAsync(cancellationToken);
    }

-    private Uri GetPublicUri() => new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(ContainerPort)).Uri;
+    private Uri GetPublicUri() => GetPublicUris()[ContainerPort];
+
+    private IDictionary<int, Uri> GetPublicUris()
+    {
+        if (_publicUris != null)
+        {
+            return _publicUris;
+        }
+
+        _publicUris = _configuration.ExposedPorts.Keys
+            .Select(int.Parse)
+            .ToDictionary(port => port, port => new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(port)).Uri);
+
+        foreach (var url in _configuration.AdditionalUrls)
+        {
+            if (PortUtils.TryExtract(url, out _, out _, out _, out _, out var port))
+            {
+                _publicUris[port] = new UriBuilder(Uri.UriSchemeHttp, Hostname, GetMappedPublicPort(port)).Uri;
+            }
+        }
+
+        return _publicUris;
+    }
 }
--- a/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
+++ b/src/WireMock.Net.Testcontainers/WireMockContainerBuilder.cs
@@ -1,6 +1,7 @@
 // Copyright © WireMock.Net

 using System;
+using System.Linq;
 using System.Runtime.InteropServices;
 using Docker.DotNet.Models;
 using DotNet.Testcontainers.Builders;
@@ -8,6 +9,7 @@ using DotNet.Testcontainers.Configurations;
 using JetBrains.Annotations;
 using Stef.Validation;
 using WireMock.Net.Testcontainers.Utils;
+using WireMock.Util;

 namespace WireMock.Net.Testcontainers;

@@ -132,6 +134,53 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
            WithCommand("--WatchStaticMappingsInSubdirectories", includeSubDirectories);
    }

+    /// <summary>
+    /// Use Http version 2.
+    /// </summary>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder WithHttp2()
+    {
+        return WithCommand("--UseHttp2 true");
+    }
+
+    /// <summary>
+    /// Adds another URL to the WireMock container. By default, the WireMock container will listen on <c>http://*:80</c>.
+    ///
+    /// This method can be used to also host the WireMock container on another port or protocol (like grpc).
+    /// </summary>
+    /// <example>grpc://*:9090</example>
+    /// <returns>A configured instance of <see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder AddUrl(string url)
+    {
+        if (!PortUtils.TryExtract(Guard.NotNullOrEmpty(url), out _, out _, out _, out _, out var port))
+        {
+            throw new ArgumentException("The URL is not valid.", nameof(url));
+        }
+
+        DockerResourceConfiguration.WithAdditionalUrl(url);
+
+        return WithPortBinding(port, true);
+    }
+
+    /// <summary>
+    /// Add a Grpc ProtoDefinition at server-level.
+    /// </summary>
+    /// <param name="id">Unique identifier for the ProtoDefinition.</param>
+    /// <param name="protoDefinition">The ProtoDefinition as text.</param>
+    /// <returns><see cref="WireMockContainerBuilder"/></returns>
+    [PublicAPI]
+    public WireMockContainerBuilder AddProtoDefinition(string id, params string[] protoDefinition)
+    {
+        Guard.NotNullOrWhiteSpace(id);
+        Guard.NotNullOrEmpty(protoDefinition);
+
+        DockerResourceConfiguration.AddProtoDefinition(id, protoDefinition);
+
+        return this;
+    }
+
    private WireMockContainerBuilder WithCommand(string param, bool value)
    {
        return !value ? this : WithCommand($"{param} true");
@@ -172,6 +221,11 @@ public sealed class WireMockContainerBuilder : ContainerBuilder<WireMockContaine
            builder = builder.WithBindMount(builder.DockerResourceConfiguration.StaticMappingsPath, ContainerInfoProvider.Info[_imageOS.Value].MappingsPath);
        }

+        if (builder.DockerResourceConfiguration.AdditionalUrls.Any())
+        {
+            builder = builder.WithCommand($"--Urls http://*:80 {string.Join(" ", builder.DockerResourceConfiguration.AdditionalUrls)}");
+        }
+
        builder.Validate();

        return new WireMockContainer(builder.DockerResourceConfiguration);
--- a/src/WireMock.Net.xUnit/TestOutputHelperWireMockLogger.cs
+++ b/src/WireMock.Net.xUnit/TestOutputHelperWireMockLogger.cs
@@ -50,15 +50,15 @@ public sealed class TestOutputHelperWireMockLogger : IWireMockLogger
    }

    /// <inheritdoc />
-    public void Error(string formatString, Exception exception)
+    public void Error(string message, Exception exception)
    {
-        _testOutputHelper.WriteLine(Format("Error", formatString, exception.Message));
+        _testOutputHelper.WriteLine(Format("Error", $"{message} {{0}}", exception));

        if (exception is AggregateException ae)
        {
            ae.Handle(ex =>
            {
-                _testOutputHelper.WriteLine(Format("Error", "Exception {0}", ex.Message));
+                _testOutputHelper.WriteLine(Format("Error", "Exception {0}", ex));
                return true;
            });
        }
--- a/src/WireMock.Net/Extensions/StringExtensions.cs
+++ b/src/WireMock.Net/Extensions/StringExtensions.cs
@@ -0,0 +1,31 @@
+using System.Globalization;
+
+namespace WireMock.Extensions;
+
+internal static class StringExtensions
+{
+    // See https://andrewlock.net/why-is-string-gethashcode-different-each-time-i-run-my-program-in-net-core/
+    public static string GetDeterministicHashCodeAsString(this string str)
+    {
+        unchecked
+        {
+            int hash1 = (5381 << 16) + 5381;
+            int hash2 = hash1;
+
+            for (int i = 0; i < str.Length; i += 2)
+            {
+                hash1 = ((hash1 << 5) + hash1) ^ str[i];
+                if (i == str.Length - 1)
+                {
+                    break;
+                }
+
+                hash2 = ((hash2 << 5) + hash2) ^ str[i + 1];
+            }
+
+            int result = hash1 + hash2 * 1566083941;
+
+            return result.ToString(CultureInfo.InvariantCulture).Replace('-', '_');
+        }
+    }
+}
--- a/src/WireMock.Net/Handlers/LocalFileSystemHandler.cs
+++ b/src/WireMock.Net/Handlers/LocalFileSystemHandler.cs
@@ -84,20 +84,20 @@ public class LocalFileSystemHandler : IFileSystemHandler
    public virtual byte[] ReadResponseBodyAsFile(string path)
    {
        Guard.NotNullOrEmpty(path);
-        path = PathUtils.CleanPath(path)!;
+        path = FilePathUtils.CleanPath(path)!;
        // If the file exists at the given path relative to the MappingsFolder, then return that.
        // Else the path will just be as-is.
-        return File.ReadAllBytes(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
+        return File.ReadAllBytes(File.Exists(FilePathUtils.Combine(GetMappingFolder(), path)) ? FilePathUtils.Combine(GetMappingFolder(), path) : path);
    }

    /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsString"/>
    public virtual string ReadResponseBodyAsString(string path)
    {
        Guard.NotNullOrEmpty(path);
-        path = PathUtils.CleanPath(path)!;
+        path = FilePathUtils.CleanPath(path)!;
        // In case the path is a filename, the path will be adjusted to the MappingFolder.
        // Else the path will just be as-is.
-        return File.ReadAllText(File.Exists(PathUtils.Combine(GetMappingFolder(), path)) ? PathUtils.Combine(GetMappingFolder(), path) : path);
+        return File.ReadAllText(File.Exists(FilePathUtils.Combine(GetMappingFolder(), path)) ? FilePathUtils.Combine(GetMappingFolder(), path) : path);
    }

    /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
@@ -124,7 +124,7 @@ public class LocalFileSystemHandler : IFileSystemHandler
        Guard.NotNullOrEmpty(filename);
        Guard.NotNull(bytes);

-        File.WriteAllBytes(PathUtils.Combine(folder, filename), bytes);
+        File.WriteAllBytes(FilePathUtils.Combine(folder, filename), bytes);
    }

    /// <inheritdoc cref="IFileSystemHandler.DeleteFile"/>
--- a/src/WireMock.Net/Matchers/JSONPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/JSONPathMatcher.cs
@@ -67,7 +67,7 @@ public class JsonPathMatcher : IStringMatcher, IObjectMatcher
        var score = MatchScores.Mismatch;
        Exception? exception = null;

-        if (input != null)
+        if (!string.IsNullOrWhiteSpace(input))
        {
            try
            {
--- a/src/WireMock.Net/Matchers/JmesPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/JmesPathMatcher.cs
@@ -74,7 +74,7 @@ public class JmesPathMatcher : IStringMatcher, IObjectMatcher
        var score = MatchScores.Mismatch;
        Exception? exception = null;

-        if (input != null)
+        if (!string.IsNullOrWhiteSpace(input))
        {
            try
            {
--- a/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
@@ -142,6 +142,6 @@ public class RequestMessageParamMatcher : IRequestMatcher
            }
        }

-        return total.Any() ? MatchScores.ToScore(total, MatchOperator.Average) : default;
+        return total.Any() ? MatchScores.ToScore(total, MatchOperator.Average) : 0;
    }
 }
--- a/src/WireMock.Net/Models/BlockingQueue.cs
+++ b/src/WireMock.Net/Models/BlockingQueue.cs
@@ -0,0 +1,85 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading;
+
+namespace WireMock.Models;
+
+/// <inheritdoc />
+internal class BlockingQueue<T>(TimeSpan? readTimeout = null) : IBlockingQueue<T>
+{
+    private readonly TimeSpan _readTimeout = readTimeout ?? TimeSpan.FromHours(1);
+    private readonly Queue<T?> _queue = new();
+    private readonly object _lockObject = new();
+
+    private bool _isClosed;
+
+    /// <summary>
+    /// Writes an item to the queue and signals that an item is available.
+    /// </summary>
+    /// <param name="item">The item to be added to the queue.</param>
+    public void Write(T item)
+    {
+        lock (_lockObject)
+        {
+            if (_isClosed)
+            {
+                throw new InvalidOperationException("Cannot write to a closed queue.");
+            }
+
+            _queue.Enqueue(item);
+
+            // Signal that an item is available
+            Monitor.Pulse(_lockObject);
+        }
+    }
+
+    /// <summary>
+    /// Tries to read an item from the queue.
+    /// - waits until an item is available
+    /// - or the timeout occurs
+    /// - or queue is closed
+    /// </summary>
+    /// <param name="item">The item read from the queue, or default if the timeout occurs.</param>
+    /// <returns>True if an item was successfully read; otherwise, false.</returns>
+    public bool TryRead([NotNullWhen(true)] out T? item)
+    {
+        lock (_lockObject)
+        {
+            // Wait until an item is available or timeout occurs
+            while (_queue.Count == 0 && !_isClosed)
+            {
+                // Wait with timeout
+                if (!Monitor.Wait(_lockObject, _readTimeout))
+                {
+                    item = default;
+                    return false;
+                }
+            }
+
+            // After waiting, check if we have items
+            if (_queue.Count == 0)
+            {
+                item = default;
+                return false;
+            }
+
+            item = _queue.Dequeue();
+            return item != null;
+        }
+    }
+
+    /// <summary>
+    /// Closes the queue and signals all waiting threads.
+    /// </summary>
+    public void Close()
+    {
+        lock (_lockObject)
+        {
+            _isClosed = true;
+            Monitor.PulseAll(_lockObject);
+        }
+    }
+}
--- a/src/WireMock.Net/Models/BodyData.cs
+++ b/src/WireMock.Net/Models/BodyData.cs
@@ -3,6 +3,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using System.Threading.Tasks;
 using WireMock.Models;
 using WireMock.Types;

@@ -57,4 +58,10 @@ public class BodyData : IBodyData
    /// <inheritdoc />
    public string? ProtoBufMessageType { get; set; }
    #endregion
+
+    /// <inheritdoc />
+    public IBlockingQueue<string?>? SseStringQueue { get; set; }
+
+    /// <inheritdoc />
+    public Task? BodyAsSseStringTask { get; set; }
 }
--- a/src/WireMock.Net/Models/ProtoDefinitionData.cs
+++ b/src/WireMock.Net/Models/ProtoDefinitionData.cs
@@ -0,0 +1,39 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Linq;
+using Stef.Validation;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A placeholder class for Proto Definitions.
+/// </summary>
+public class ProtoDefinitionData
+{
+    private readonly IDictionary<string, string> _filenameMappedToProtoDefinition;
+
+    internal ProtoDefinitionData(IDictionary<string, string> filenameMappedToProtoDefinition)
+    {
+        _filenameMappedToProtoDefinition = filenameMappedToProtoDefinition;
+    }
+
+    /// <summary>
+    /// Get all the ProtoDefinitions.
+    /// Note: the main ProtoDefinition will be the first one in the list.
+    /// </summary>
+    /// <param name="mainProtoFilename">The main ProtoDefinition filename.</param>
+    public IReadOnlyList<string> ToList(string mainProtoFilename)
+    {
+        Guard.NotNullOrEmpty(mainProtoFilename);
+
+        if (!_filenameMappedToProtoDefinition.TryGetValue(mainProtoFilename, out var mainProtoDefinition))
+        {
+            throw new KeyNotFoundException($"The ProtoDefinition with filename '{mainProtoFilename}' was not found.");
+        }
+
+        var list = new List<string> { mainProtoDefinition };
+        list.AddRange(_filenameMappedToProtoDefinition.Where(kvp => kvp.Key != mainProtoFilename).Select(kvp => kvp.Value));
+        return list;
+    }
+}
--- a/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
@@ -69,6 +69,13 @@ namespace WireMock.Owin.Mappers
                return;
            }

+            var bodyData = responseMessage.BodyData;
+            if (bodyData?.GetBodyType() == BodyType.SseString)
+            {
+                await HandleSseStringAsync(responseMessage, response, bodyData);
+                return;
+            }
+
            byte[]? bytes;
            switch (responseMessage.FaultType)
            {
@@ -104,7 +111,7 @@ namespace WireMock.Owin.Mappers
                }
            }

-            SetResponseHeaders(responseMessage, bytes, response);
+            SetResponseHeaders(responseMessage, bytes != null, response);

            if (bytes != null)
            {
@@ -121,6 +128,26 @@ namespace WireMock.Owin.Mappers
            SetResponseTrailingHeaders(responseMessage, response);
        }

+        private static async Task HandleSseStringAsync(IResponseMessage responseMessage, IResponse response, IBodyData bodyData)
+        {
+            if (bodyData.SseStringQueue == null)
+            {
+                return;
+            }
+
+            SetResponseHeaders(responseMessage, true, response);
+
+            string? text;
+            do
+            {
+                if (bodyData.SseStringQueue.TryRead(out text))
+                {
+                    await response.WriteAsync(text);
+                    await response.Body.FlushAsync();
+                }
+            } while (text != null);
+        }
+
        private int MapStatusCode(int code)
        {
            if (_options.AllowOnlyDefinedHttpStatusCodeInResponse == true && !Enum.IsDefined(typeof(HttpStatusCode), code))
@@ -136,7 +163,8 @@ namespace WireMock.Owin.Mappers
            return responseMessage.FaultPercentage == null || _randomizerDouble.Generate() <= responseMessage.FaultPercentage;
        }

-        private async Task<byte[]?> GetNormalBodyAsync(IResponseMessage responseMessage) {
+        private async Task<byte[]?> GetNormalBodyAsync(IResponseMessage responseMessage)
+        {
            var bodyData = responseMessage.BodyData;
            switch (bodyData?.GetBodyType())
            {
@@ -172,13 +200,13 @@ namespace WireMock.Owin.Mappers
            return null;
        }

-        private static void SetResponseHeaders(IResponseMessage responseMessage, byte[]? bytes, IResponse response)
+        private static void SetResponseHeaders(IResponseMessage responseMessage, bool hasBody, IResponse response)
        {
            // Force setting the Date header (#577)
            AppendResponseHeader(
                response,
                HttpKnownHeaderNames.Date,
-                [ DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture) ]
+                [DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture)]
            );

            // Set other headers
@@ -188,7 +216,7 @@ namespace WireMock.Owin.Mappers
                var value = item.Value;
                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
                {
-                    action?.Invoke(response, bytes != null, value);
+                    action?.Invoke(response, hasBody, value);
                }
                else
                {
--- a/src/WireMock.Net/RequestBuilders/Request.WithBody.cs
+++ b/src/WireMock.Net/RequestBuilders/Request.WithBody.cs
@@ -37,13 +37,14 @@ public partial class Request
    /// <inheritdoc />
    public IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
    {
-        return WithBody(new IMatcher[] { new JsonMatcher(matchBehaviour, body) });
+        var matcher = body as IMatcher ?? new JsonMatcher(matchBehaviour, body);
+        return WithBody([matcher]);
    }

    /// <inheritdoc />
    public IRequestBuilder WithBody(IMatcher matcher)
    {
-        return WithBody(new[] { matcher });
+        return WithBody([matcher]);
    }

    /// <inheritdoc />
--- a/src/WireMock.Net/RequestBuilders/Request.WithBodyAsProtoBuf.cs
+++ b/src/WireMock.Net/RequestBuilders/Request.WithBodyAsProtoBuf.cs
@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net

+using System;
 using System.Collections.Generic;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
@@ -12,7 +13,7 @@ public partial class Request
    /// <inheritdoc />
    public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
    {
-        return WithBodyAsProtoBuf([ protoDefinition ], messageType, matchBehaviour);
+        return WithBodyAsProtoBuf([protoDefinition], messageType, matchBehaviour);
    }

    /// <inheritdoc />
@@ -36,12 +37,25 @@ public partial class Request
    /// <inheritdoc />
    public IRequestBuilder WithBodyAsProtoBuf(string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => Mapping.ProtoDefinition!.Value, messageType));
+        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, ProtoDefinitionFunc(), messageType));
    }

    /// <inheritdoc />
    public IRequestBuilder WithBodyAsProtoBuf(string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => Mapping.ProtoDefinition!.Value, messageType, matcher));
+        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, ProtoDefinitionFunc(), messageType, matcher));
+    }
+
+    private Func<IdOrTexts> ProtoDefinitionFunc()
+    {
+        return () =>
+        {
+            if (Mapping.ProtoDefinition == null)
+            {
+                throw new InvalidOperationException($"No ProtoDefinition defined on mapping '{Mapping.Guid}'. Please use the WireMockServerSettings to define ProtoDefinitions.");
+            }
+
+            return Mapping.ProtoDefinition.Value;
+        };
    }
 }
--- a/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
+++ b/src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using JsonConverter.Abstractions;
+using WireMock.Models;

 namespace WireMock.ResponseBuilders;

@@ -32,7 +33,7 @@ public interface IBodyResponseBuilder : IFaultResponseBuilder
    IResponseBuilder WithBody(Func<IRequestMessage, string> bodyFactory, string? destination = BodyDestinationFormat.SameAsSource, Encoding? encoding = null);

    /// <summary>
-    /// WithBody : Create a ... response based on a async callback function.
+    /// WithBody : Create a ... response based on an async callback function.
    /// </summary>
    /// <param name="bodyFactory">The async delegate to build the body.</param>
    /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
@@ -40,6 +41,14 @@ public interface IBodyResponseBuilder : IFaultResponseBuilder
    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
    IResponseBuilder WithBody(Func<IRequestMessage, Task<string>> bodyFactory, string? destination = BodyDestinationFormat.SameAsSource, Encoding? encoding = null);

+    /// <summary>
+    /// WithBody : Create a ... response based on an async callback function.
+    /// </summary>
+    /// <param name="bodyFactory">The async delegate to build the body.</param>
+    /// <param name="timeout">The timeout to wait on new items in the queue. Default value is <c>1</c> hour.</param>
+    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+    IResponseBuilder WithSseBody(Func<IRequestMessage, IBlockingQueue<string?>, Task> bodyFactory, TimeSpan? timeout = null);
+
    /// <summary>
    /// WithBody : Create a ... response based on a bytearray.
    /// </summary>
--- a/src/WireMock.Net/ResponseBuilders/Response.WithBody.cs
+++ b/src/WireMock.Net/ResponseBuilders/Response.WithBody.cs
@@ -51,6 +51,26 @@ public partial class Response
        });
    }

+    /// <inheritdoc />
+    public IResponseBuilder WithSseBody(Func<IRequestMessage, IBlockingQueue<string?>, Task> bodyFactory, TimeSpan? timeout = null)
+    {
+        Guard.NotNull(bodyFactory);
+
+        var queue = new BlockingQueue<string?>(timeout);
+
+        return WithCallbackInternal(true, req => new ResponseMessage
+        {
+            BodyData = new BodyData
+            {
+                DetectedBodyType = BodyType.SseString,
+                SseStringQueue = queue,
+                BodyAsSseStringTask = bodyFactory(req, queue),
+                Encoding = Encoding.UTF8,
+                IsFuncUsed = "Func<IRequestMessage, BlockingQueue<string?>, Task>"
+            }
+        });
+    }
+
    /// <inheritdoc />
    public IResponseBuilder WithBody(byte[] body, string? destination = BodyDestinationFormat.SameAsSource, Encoding? encoding = null)
    {
--- a/src/WireMock.Net/Server/RespondWithAProvider.cs
+++ b/src/WireMock.Net/Server/RespondWithAProvider.cs
@@ -356,9 +356,12 @@ internal class RespondWithAProvider : IRespondWithAProvider
    {
        Guard.NotNull(protoDefinitionOrId);

+#if PROTOBUF
        ProtoDefinition = ProtoDefinitionHelper.GetIdOrTexts(_settings, protoDefinitionOrId);
-
        return this;
+#else
+        throw new NotSupportedException("The WithProtoDefinition method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
+#endif
    }

    /// <inheritdoc />
--- a/src/WireMock.Net/Server/WireMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/WireMockServer.Admin.cs
@@ -68,6 +68,7 @@ public partial class WireMockServer
        public RegexMatcher ScenariosNameMatcher => new($"^{_prefixEscaped}\\/scenarios\\/.+$");
        public RegexMatcher ScenariosNameWithResetMatcher => new($"^{_prefixEscaped}\\/scenarios\\/.+\\/reset$");
        public RegexMatcher FilesFilenamePathMatcher => new($"^{_prefixEscaped}\\/files\\/.+$");
+        public RegexMatcher ProtoDefinitionsIdPathMatcher => new($"^{_prefixEscaped}\\/protodefinitions\\/.+$");
    }

    #region InitAdmin
@@ -147,6 +148,9 @@ public partial class WireMockServer
        // __admin/openapi
        Given(Request.Create().WithPath($"{_adminPaths.OpenApi}/convert").UsingPost()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(OpenApiConvertToMappings));
        Given(Request.Create().WithPath($"{_adminPaths.OpenApi}/save").UsingPost()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(OpenApiSaveToMappings));
+
+        // __admin/protodefinitions/{id}
+        Given(Request.Create().WithPath(_adminPaths.ProtoDefinitionsIdPathMatcher).UsingPost()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(ProtoDefinitionAdd));
    }
    #endregion

@@ -369,7 +373,7 @@ public partial class WireMockServer
    {
        if (TryParseGuidFromRequestMessage(requestMessage, out var guid))
        {
-            var code = _mappingBuilder.ToCSharpCode(guid, GetMappingConverterType(requestMessage));
+            var code = _mappingBuilder.ToCSharpCode(guid, GetEnumFromQuery(requestMessage, MappingConverterType.Server));
            if (code is null)
            {
                _settings.Logger.Warn("HttpStatusCode set to 404 : Mapping not found");
@@ -383,15 +387,16 @@ public partial class WireMockServer
        return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "GUID is missing");
    }

-    private static MappingConverterType GetMappingConverterType(IRequestMessage requestMessage)
+    private static TEnum GetEnumFromQuery<TEnum>(IRequestMessage requestMessage, TEnum defaultValue)
+        where TEnum : struct
    {
-        if (requestMessage.QueryIgnoreCase?.TryGetValue(nameof(MappingConverterType), out var values) == true &&
-            Enum.TryParse(values.FirstOrDefault(), true, out MappingConverterType parsed))
+        if (requestMessage.QueryIgnoreCase?.TryGetValue(typeof(TEnum).Name, out var values) == true &&
+            Enum.TryParse<TEnum>(values.FirstOrDefault(), true, out var parsed))
        {
            return parsed;
        }

-        return MappingConverterType.Server;
+        return defaultValue;
    }

    private IMapping? FindMappingByGuid(IRequestMessage requestMessage)
@@ -465,7 +470,7 @@ public partial class WireMockServer

    private IResponseMessage MappingsCodeGet(IRequestMessage requestMessage)
    {
-        var converterType = GetMappingConverterType(requestMessage);
+        var converterType = GetEnumFromQuery(requestMessage, MappingConverterType.Server);

        var code = _mappingBuilder.ToCSharpCode(converterType);

--- a/src/WireMock.Net/Server/WireMockServer.AdminFiles.cs
+++ b/src/WireMock.Net/Server/WireMockServer.AdminFiles.cs
@@ -13,6 +13,22 @@ public partial class WireMockServer
 {
    private static readonly Encoding[] FileBodyIsString = [Encoding.UTF8, Encoding.ASCII];

+    #region ProtoDefinitions/{id}
+    private IResponseMessage ProtoDefinitionAdd(IRequestMessage requestMessage)
+    {
+        if (requestMessage.Body is null)
+        {
+            return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Body is null");
+        }
+
+        var id = requestMessage.Path.Split('/').Last();
+
+        AddProtoDefinition(id, requestMessage.Body);
+
+        return ResponseMessageBuilder.Create(HttpStatusCode.OK, "ProtoDefinition added");
+    }
+    #endregion
+
    #region Files/{filename}
    private IResponseMessage FilePost(IRequestMessage requestMessage)
    {
--- a/src/WireMock.Net/Server/WireMockServer.LogEntries.cs
+++ b/src/WireMock.Net/Server/WireMockServer.LogEntries.cs
@@ -26,7 +26,6 @@ public partial class WireMockServer
    [PublicAPI]
    public IReadOnlyList<ILogEntry> LogEntries => _options.LogEntries.ToArray();

-
    /// <inheritdoc />
    [PublicAPI]
    public IReadOnlyList<ILogEntry> FindLogEntries(params IRequestMatcher[] matchers)
--- a/src/WireMock.Net/Server/WireMockServer.OpenApiParser.cs
+++ b/src/WireMock.Net/Server/WireMockServer.OpenApiParser.cs
@@ -25,7 +25,7 @@ public partial class WireMockServer
            return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, e.Message);
        }
 #else
-        return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Not supported for .NETStandard 1.3 and .NET 4.5.2 or lower.");
+        return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Not supported for .NETStandard 1.3 and .NET 4.6.x or lower.");
 #endif
    }

@@ -50,7 +50,7 @@ public partial class WireMockServer
            return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, e.Message);
        }
 #else
-        return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Not supported for .NETStandard 1.3 and .NET 4.5.2 or lower.");
+        return ResponseMessageBuilder.Create(HttpStatusCode.BadRequest, "Not supported for .NETStandard 1.3 and .NET 4.6.x or lower.");
 #endif
    }
 }
--- a/src/WireMock.Net/Server/WireMockServer.cs
+++ b/src/WireMock.Net/Server/WireMockServer.cs
@@ -602,7 +602,14 @@ public partial class WireMockServer : IWireMockServer

        _settings.ProtoDefinitions ??= new Dictionary<string, string[]>();

-        _settings.ProtoDefinitions[id] = protoDefinition;
+        if (_settings.ProtoDefinitions.TryGetValue(id, out var existingProtoDefinitions))
+        {
+            _settings.ProtoDefinitions[id] = existingProtoDefinitions.Union(protoDefinition).ToArray();
+        }
+        else
+        {
+            _settings.ProtoDefinitions[id] = protoDefinition;
+        }

        return this;
    }
--- a/src/WireMock.Net/Settings/HandlebarsSettings.cs
+++ b/src/WireMock.Net/Settings/HandlebarsSettings.cs
@@ -0,0 +1,50 @@
+// Copyright © WireMock.Net
+
+using HandlebarsDotNet.Helpers.Enums;
+using JetBrains.Annotations;
+using WireMock.Types;
+
+namespace WireMock.Settings;
+
+/// <summary>
+/// HandlebarsSettings
+/// </summary>
+[PublicAPI]
+public class HandlebarsSettings
+{
+    internal static readonly Category[] DefaultAllowedHandlebarsHelpers =
+    [
+        Category.Boolean,
+        Category.Constants,
+        Category.DateTime,
+        Category.Enumerable,
+        Category.Humanizer,
+        Category.JsonPath,
+        Category.Math,
+        Category.Object,
+        Category.Random,
+        Category.Regex,
+        Category.String,
+        Category.Url,
+        Category.Xeger,
+        Category.XPath,
+        Category.Xslt
+    ];
+
+    /// <summary>
+    /// Defines the allowed custom HandlebarsHelpers which can be used. Possible values are:
+    /// - <see cref="CustomHandlebarsHelpers.None"/> (Default)
+    /// - <see cref="CustomHandlebarsHelpers.File"/>
+    /// - <see cref="CustomHandlebarsHelpers.All"/>
+    /// </summary>
+    [PublicAPI]
+    public CustomHandlebarsHelpers AllowedCustomHandlebarsHelpers { get; set; } = CustomHandlebarsHelpers.None;
+
+    /// <summary>
+    /// Defines the allowed HandlebarHelpers which can be used.
+    ///
+    /// By default, all categories except <see cref="Category.DynamicLinq"/> and <see cref="Category.Environment"/> are registered.
+    /// </summary>
+    [PublicAPI]
+    public Category[] AllowedHandlebarsHelpers { get; set; } = DefaultAllowedHandlebarsHelpers;
+}
--- a/src/WireMock.Net/Settings/ProxyAndRecordSettings.cs
+++ b/src/WireMock.Net/Settings/ProxyAndRecordSettings.cs
@@ -98,7 +98,7 @@ public class ProxyAndRecordSettings : HttpClientSettings
    public bool UseDefinedRequestMatchers { get; set; }

    /// <summary>
-    /// Append an unique GUID to the filename from the saved mapping file.
+    /// Append a unique GUID to the filename from the saved mapping file.
    /// </summary>
    public bool AppendGuidToSavedMappingFile { get; set; }

--- a/src/WireMock.Net/Settings/ProxyUrlReplaceSettings.cs
+++ b/src/WireMock.Net/Settings/ProxyUrlReplaceSettings.cs
@@ -18,7 +18,7 @@ public class ProxyUrlReplaceSettings
    public string NewValue { get; set; } = null!;

    /// <summary>
-    /// Defines if the case should be ignore when replacing.
+    /// Defines if the case should be ignored when replacing.
    /// </summary>
    public bool IgnoreCase { get; set; }
 }
--- a/src/WireMock.Net/Settings/SimpleSettingsParser.cs
+++ b/src/WireMock.Net/Settings/SimpleSettingsParser.cs
@@ -70,6 +70,11 @@ internal class SimpleSettingsParser
        return Arguments.ContainsKey(name);
    }

+    public bool ContainsAny(params string[] names)
+    {
+        return names.Any(Arguments.ContainsKey);
+    }
+
    public string[] GetValues(string name, string[] defaultValue)
    {
        return Contains(name) ? Arguments[name] : defaultValue;
@@ -142,6 +147,28 @@ internal class SimpleSettingsParser
        }, defaultValue);
    }

+    public TEnum[] GetEnumValues<TEnum>(string name, TEnum[] defaultValues)
+        where TEnum : struct
+    {
+        var values = GetValues(name);
+        if (values == null)
+        {
+            return defaultValues;
+        }
+
+        var enums = new List<TEnum>();
+
+        foreach (var value in values)
+        {
+            if (Enum.TryParse<TEnum>(value, true, out var enumValue))
+            {
+                enums.Add(enumValue);
+            }
+        }
+
+        return enums.ToArray();
+    }
+
    public string GetStringValue(string name, string defaultValue)
    {
        return GetValue(name, values => values.FirstOrDefault() ?? defaultValue, defaultValue);
--- a/src/WireMock.Net/Settings/WebProxySettings.cs
+++ b/src/WireMock.Net/Settings/WebProxySettings.cs
@@ -16,13 +16,13 @@ public class WebProxySettings
    public string Address { get; set; } = null!;

    /// <summary>
-    /// The user name associated with the credentials.
+    /// The username associated with the credentials.
    /// </summary>
    [PublicAPI]
    public string? UserName { get; set; }

    /// <summary>
-    /// The password for the user name associated with the credentials.
+    /// The password for the username associated with the credentials.
    /// </summary>
    [PublicAPI]
    public string? Password { get; set; }
--- a/src/WireMock.Net/Settings/WireMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/WireMockServerSettings.cs
@@ -329,4 +329,10 @@ public class WireMockServerSettings
    /// </summary>
    [PublicAPI]
    public string? AdminPath { get; set; }
+
+    /// <summary>
+    /// Defines the additional Handlebars Settings.
+    /// </summary>
+    [PublicAPI]
+    public HandlebarsSettings? HandlebarsSettings { get; set; }
 }
--- a/src/WireMock.Net/Settings/WireMockServerSettingsParser.cs
+++ b/src/WireMock.Net/Settings/WireMockServerSettingsParser.cs
@@ -84,6 +84,7 @@ public static class WireMockServerSettingsParser
        ParsePortSettings(settings, parser);
        ParseProxyAndRecordSettings(settings, parser);
        ParseCertificateSettings(settings, parser);
+        ParseHandlebarsSettings(settings, parser);

        return true;
    }
@@ -152,7 +153,7 @@ public static class WireMockServerSettingsParser
        }
        else if (settings.HostingScheme is null)
        {
-            settings.Urls = parser.GetValues("Urls", new[] { "http://*:9091/" });
+            settings.Urls = parser.GetValues("Urls", ["http://*:9091/"]);
        }
    }

@@ -166,12 +167,25 @@ public static class WireMockServerSettingsParser
            X509CertificateFilePath = parser.GetStringValue("X509CertificateFilePath"),
            X509CertificatePassword = parser.GetStringValue("X509CertificatePassword")
        };
+
        if (certificateSettings.IsDefined)
        {
            settings.CertificateSettings = certificateSettings;
        }
    }

+    private static void ParseHandlebarsSettings(WireMockServerSettings settings, SimpleSettingsParser parser)
+    {
+        if (parser.ContainsAny(nameof(HandlebarsSettings.AllowedCustomHandlebarsHelpers), nameof(HandlebarsSettings.AllowedHandlebarsHelpers)))
+        {
+            settings.HandlebarsSettings = new HandlebarsSettings
+            {
+                AllowedCustomHandlebarsHelpers = parser.GetEnumValue(nameof(HandlebarsSettings.AllowedCustomHandlebarsHelpers), CustomHandlebarsHelpers.None),
+                AllowedHandlebarsHelpers = parser.GetEnumValues(nameof(HandlebarsSettings.AllowedHandlebarsHelpers), HandlebarsSettings.DefaultAllowedHandlebarsHelpers)
+            };
+        }
+    }
+
    private static void ParseWebProxyAddressSettings(ProxyAndRecordSettings settings, SimpleSettingsParser parser)
    {
        string? proxyAddress = parser.GetStringValue("WebProxyAddress");
--- a/src/WireMock.Net/Transformers/Handlebars/FileHelpers.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/FileHelpers.cs
@@ -4,26 +4,30 @@ using HandlebarsDotNet;
 using HandlebarsDotNet.Helpers.Attributes;
 using HandlebarsDotNet.Helpers.Enums;
 using HandlebarsDotNet.Helpers.Helpers;
+using HandlebarsDotNet.Helpers.Options;
 using Stef.Validation;
 using WireMock.Handlers;
+using WireMock.Settings;

 namespace WireMock.Transformers.Handlebars;

 internal class FileHelpers : BaseHelpers, IHelpers
 {
+    internal const string Name = "File";
+
    private readonly IFileSystemHandler _fileSystemHandler;

-    public FileHelpers(IHandlebars context, IFileSystemHandler fileSystemHandler) : base(context)
+    public FileHelpers(IHandlebars context, WireMockServerSettings settings) : base(context, new HandlebarsHelpersOptions())
    {
-        _fileSystemHandler = Guard.NotNull(fileSystemHandler);
+        _fileSystemHandler = Guard.NotNull(settings.FileSystemHandler);
    }

-    [HandlebarsWriter(WriterType.String, usage: HelperUsage.Both, passContext: true, name: "File")]
+    [HandlebarsWriter(WriterType.String, usage: HelperUsage.Both, passContext: true, name: Name)]
    public string Read(Context context, string path)
    {
        var templateFunc = Context.Compile(path);
-        var transformed = templateFunc(context.Value);
-        return _fileSystemHandler.ReadResponseBodyAsString(transformed);
+        var transformedPath = templateFunc(context.Value);
+        return _fileSystemHandler.ReadResponseBodyAsString(transformedPath);
    }

    public Category Category => Category.Custom;
--- a/src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/HandlebarsContextFactory.cs
@@ -23,7 +23,7 @@ internal class HandlebarsContextFactory : ITransformerContextFactory
        };
        var handlebars = HandlebarsDotNet.Handlebars.Create(config);

-        WireMockHandlebarsHelpers.Register(handlebars, _settings.FileSystemHandler);
+        WireMockHandlebarsHelpers.Register(handlebars, _settings);

        _settings.HandlebarsRegistrationCallback?.Invoke(handlebars, _settings.FileSystemHandler);

--- a/src/WireMock.Net/Transformers/Handlebars/WireMockHandlebarsHelpers.cs
+++ b/src/WireMock.Net/Transformers/Handlebars/WireMockHandlebarsHelpers.cs
@@ -2,21 +2,20 @@

 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
-using System.Reflection;
 using HandlebarsDotNet;
 using HandlebarsDotNet.Helpers;
 using HandlebarsDotNet.Helpers.Helpers;
-using WireMock.Handlers;
+using WireMock.Settings;
+using WireMock.Types;

 namespace WireMock.Transformers.Handlebars;

 internal static class WireMockHandlebarsHelpers
 {
-    public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
+    internal static void Register(IHandlebars handlebarsContext, WireMockServerSettings settings)
    {
-        // Register https://github.com/StefH/Handlebars.Net.Helpers
+        // Register https://github.com/Handlebars.Net/Handlebars.Net.Helpers
        HandlebarsHelpers.Register(handlebarsContext, o =>
        {
            var paths = new List<string>
@@ -33,17 +32,18 @@ internal static class WireMockHandlebarsHelpers
                    customHelperPaths.Add(path!);
                }
            }
-            Add(Path.GetDirectoryName(Assembly.GetEntryAssembly()?.Location), paths);
-            Add(Path.GetDirectoryName(Assembly.GetCallingAssembly().Location), paths);
-            Add(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), paths);
-            Add(Path.GetDirectoryName(Process.GetCurrentProcess().MainModule?.FileName), paths);
+            Add(Path.GetDirectoryName(System.Reflection.Assembly.GetEntryAssembly()?.Location), paths);
+            Add(Path.GetDirectoryName(System.Reflection.Assembly.GetCallingAssembly().Location), paths);
+            Add(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), paths);
+            Add(Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName), paths);
 #endif
            o.CustomHelperPaths = paths;

-            o.CustomHelpers = new Dictionary<string, IHelpers>
+            o.CustomHelpers = new Dictionary<string, IHelpers>();
+            if (settings.HandlebarsSettings?.AllowedCustomHandlebarsHelpers.HasFlag(CustomHandlebarsHelpers.File) == true)
            {
-                { "File", new FileHelpers(handlebarsContext, fileSystemHandler) }
-            };
+                o.CustomHelpers.Add(FileHelpers.Name, new FileHelpers(handlebarsContext, settings));
+            }
        });
    }

--- a/src/WireMock.Net/Util/ConcurrentObservableCollection.cs
+++ b/src/WireMock.Net/Util/ConcurrentObservableCollection.cs
@@ -84,4 +84,12 @@ internal class ConcurrentObservableCollection<T> : ObservableCollection<T>
            return Items.ToList();
        }
    }
+
+    public T[] ToArray()
+    {
+        lock (_lockObject)
+        {
+            return Items.ToArray();
+        }
+    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef	cfc13b2449	1.8.2	2025-05-05 10:23:14 +02:00
Stef Heyenrath	4303706530	Update ProtoBufJsonConverter to fix conflict for 'MessageOptions' (#1291 ) * Update ProtoBufJsonConverter to fix conflict for 'MessageOptions' * <PackageReference Include="ProtoBufJsonConverter" Version="0.8.0" />	2025-05-05 10:21:15 +02:00
Stef Heyenrath	5c8105b50d	move 'WireMock.Net.OpenApiParser.Preview' to ''src-preview' folder	2025-05-02 09:15:59 +02:00
Stef Heyenrath	630ffab56e	Do not generate NuGet for WireMock.Net.OpenApiParser.Preview	2025-05-02 08:50:32 +02:00
Stef Heyenrath	c181d0286a	Do not generate NuGet for WireMock.Net.OpenApiParser.Preview	2025-05-02 08:41:51 +02:00
Stef Heyenrath	16dab99175	1.8.1	2025-05-02 07:29:11 +02:00
Stef Heyenrath	cf0dcf5855	Revert changes to WireMock.Net.OpenApiParser (#1289 ) * Revert changes to WireMock.Net.OpenApiParser * revert	2025-05-02 07:18:35 +02:00
Stef	e7310fbc7b	1.8.0	2025-04-28 19:35:48 +02:00
Jonathan Mezach	8a07286b89	Add an launch inspector command to Aspire Dashboard (#1283 ) * Upgrade to Aspire 9.2.0 Signed-off-by: Jonathan Mezach <jonathan.mezach@rr-wfm.com> * Remove workload installs from CI pipeline Signed-off-by: Jonathan Mezach <jonathan.mezach@rr-wfm.com> * Missed package upgrade Signed-off-by: Jonathan Mezach <jonathan.mezach@rr-wfm.com> * Fix usings Signed-off-by: Jonathan Mezach <jonathan.mezach@rr-wfm.com> * Add Open Inspector command Signed-off-by: Jonathan Mezach <jonathan.mezach@rr-wfm.com> * Fix broken test Signed-off-by: Jonathan Mezach <jonathan.mezach@rr-wfm.com> * PR comments Signed-off-by: Jonathan Mezach <jonathan.mezach@rr-wfm.com> * More PR comments Signed-off-by: Jonathan Mezach <jonathan.mezach@rr-wfm.com> --------- Signed-off-by: Jonathan Mezach <jonathan.mezach@rr-wfm.com>	2025-04-25 20:23:19 +02:00
Emil Tang Kristensen	9392069f8a	Enable support for WireMock Middleware in Hosted Services (#1285 )	2025-04-25 16:35:55 +02:00
Stef Heyenrath	0fd190b5a3	Fix Changelog	2025-04-24 20:17:15 +02:00
Stef Heyenrath	4368e3cde6	1.7.x (#1268 ) * Fix construction of path in OpenApiParser (#1265) * Server-Sent Events (#1269) * Server Side Events * fixes * await HandleSseStringAsync(responseMessage, response, bodyData); * 1.7.5-preview-01 * IBlockingQueue * 1.7.5-preview-02 (03 April 2025) * IBlockingQueue * ... * Support OpenApi V31 (#1279) * Support OpenApi V31 * Update src/WireMock.Net.OpenApiParser/Extensions/OpenApiSchemaExtensions.cs Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * fx --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Add ProtoDefinitionHelper.FromDirectory (#1263) * Add ProtoDefinitionHelper.FromDirectory * . * unix-windows * move test * imports in the proto files indeed should use a forward slash * updates * . * private Func<IdOrTexts> ProtoDefinitionFunc() * OpenTelemetry * . * fix path utils --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-04-23 11:51:44 +02:00
Stef Heyenrath	fc0f82db33	Add HandlebarsSettings (#1271 ) * Add HandlebarsSettings class * DefaultAllowedHandlebarsHelpers * HB - 2.5.0-preview-01 * readme * fix * readme * Handlebars.Net.Helpers Version="2.5.0"	2025-04-23 07:47:37 +02:00
Stef Heyenrath	beabba4064	Add extra unit tests for PR #1278	2025-04-23 07:47:07 +02:00
jollyjoyce1995	d9a7e80360	changed null check in JSONPathMatcher and JmesPathMatcher to ensure that the body is not an empty string (the json parse would throw an exception at this point) (#1278 )	2025-04-23 07:30:52 +02:00
Stef Heyenrath	66a048a487	update readme for WireMock.Net.AwesomeAssertions	2025-04-23 07:30:21 +02:00
Francesco Venturoli	04d53f3a9e	feat(awesome-assertions): Added new project WireMock.Net.AwesomeAssertions (#1273 ) * feat(awesome-assertions): Added new project WireMock.Net.AwesomeAssertions * feat(awesome-assertions): Applied dotnet naming convention for private readonly fields --------- Co-authored-by: Francesco Venturoli <f.venturoli@crif.com>	2025-04-22 22:51:40 +02:00
Stef Heyenrath	a8562fda32	Use vmImage ubuntu-22.04 and install aspire workload in Azure DevOps CI-CD pipeline (#1282 ) * Install aspire workload in Azure DevOps CI-CD pipeline * vmImage: 'ubuntu-22.04'	2025-04-22 22:47:43 +02:00
Stef Heyenrath	5abb424d3c	Add extra JsonPartialWildcardMatcher Tests (#1267 ) * Add extra JsonPartialWildcardMatcher Tests * responseText.Should().Contain	2025-04-02 08:57:44 +02:00
Stef Heyenrath	db158bcc7e	Update readme	2025-03-04 18:17:09 +01:00
Stef Heyenrath	0effda3cfa	1.8.0-prview-01 (Update the usage from the custom Handlebars.Net File helper)	2025-03-04 18:11:13 +01:00
Stef Heyenrath	ff36c1ee6f	Merge commit from fork	2025-03-04 17:58:38 +01:00
Stef Heyenrath	be55022a2a	1.7.4	2025-02-27 07:15:02 +01:00
Stef Heyenrath	7c68fc1d94	Add ToArray() to ConcurrentObservableCollection (#1256 ) * Add ToArray() to ConcurrentObservableCollection * ---	2025-02-27 07:12:05 +01:00
Stef Heyenrath	e7d442e5ac	1.7.3	2025-02-24 23:14:50 +01:00
Stef Heyenrath	f977b3eb86	Update QueryStringParser to support param with equal but no value (#1253 ) * RequestMessageParamMatcher * ? * . * .	2025-02-13 18:09:18 +01:00
Stef	84e5ba6dce	1.7.2	2025-02-12 06:15:52 +01:00
Stef	e0d693c515	1.7.2	2025-02-12 06:14:39 +01:00
Stef Heyenrath	e8de5aa73c	Add ProtoDefinition to WireMockContainer (#1250 ) * AddProtoDefinitionAsync * ... * Body * " * . * . * . * [Fact(Skip = "new docker is needed")] * x	2025-02-12 06:08:55 +01:00
Stef Heyenrath	a02ff47db6	Update WireMockProtoFileResolver and add tests for ProtoBufUtils (#1252 ) * Update WireMockProtoFileResolver and add tests for ProtoBufUtils * .	2025-02-01 22:27:32 +01:00
JvE-iO	29bf9b42f8	Add exception message to logging when mapping fails due to an exception. (#1248 ) * Add exception message to logging when mapping fails due to an exception. * Revert "Add exception message to logging when mapping fails due to an exception." This reverts commit `eb7cf46c95`. * Fix loggers with improved exception logging.	2025-01-30 10:59:22 +01:00
Stef Heyenrath	52b00d74a9	Add "AddUrl" to WireMockContainerBuilder to support grpc (#1246 ) * Add "AddUrl" to WireMockContainerBuilder to support grpc * fix * fix for windows * wip * fix ! * change some example code	2025-01-29 22:09:17 +01:00