1.5.12

Update some dependencies (#857 )
* fb * . * linq * ,,, * anno * log * rd
2026-01-14 07:33:33 +01:00 · 2022-12-03 14:12:15 +01:00 · 2022-12-03 11:45:44 +01:00 · 2022-12-03 11:03:57 +01:00 · 2022-12-03 11:03:45 +01:00 · 2022-11-25 18:13:02 +01:00
149 changed files with 3880 additions and 2370 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,6 +1,6 @@
 # These are supported funding model platforms

-github: # [StefH]
+github: [StefH]
 patreon: # Replace with a single Patreon username
 open_collective: # wiremocknet
 ko_fi: # Replace with a single Ko-fi username
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: https://www.paypal.me/stefheyenrath
+custom: https://www.paypal.me/stefheyenrath
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,26 @@
+# 1.5.12 (03 December 2022)
+- [#851](https://github.com/WireMock-Net/WireMock.Net/pull/851) - Fix Linux CI build + Fix opencover [feature] contributed by [StefH](https://github.com/StefH)
+- [#853](https://github.com/WireMock-Net/WireMock.Net/pull/853) - Add .Net 7 [feature] contributed by [StefH](https://github.com/StefH)
+- [#854](https://github.com/WireMock-Net/WireMock.Net/pull/854) - Fix logic for QueryParameterMultipleValueSupport [bug] contributed by [StefH](https://github.com/StefH)
+- [#857](https://github.com/WireMock-Net/WireMock.Net/pull/857) - Update some dependencies [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.11 (24 November 2022)
+- [#836](https://github.com/WireMock-Net/WireMock.Net/pull/836) - Add Settings.QueryParameterMultipleValueSupport [feature] contributed by [StefH](https://github.com/StefH)
+- [#848](https://github.com/WireMock-Net/WireMock.Net/pull/848) - Use try-catch when adding or removing logEntry [bug] contributed by [StefH](https://github.com/StefH)
+- [#846](https://github.com/WireMock-Net/WireMock.Net/issues/846) - Exception ArgumentOutOfRangeException [bug]
+
+# 1.5.10 (06 November 2022)
+- [#843](https://github.com/WireMock-Net/WireMock.Net/pull/843) - Webhook Templating: Use the transformed URL to create the HttpRequestMessage contributed by [ggradnig](https://github.com/ggradnig)
+- [#845](https://github.com/WireMock-Net/WireMock.Net/pull/845) - Add WireMockNullLogger as valid commandline logger option [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.9 (29 October 2022)
+- [#828](https://github.com/WireMock-Net/WireMock.Net/pull/828) - Add setting to skip saving the string-response in the logging when using WithBody(Func...) [feature] contributed by [StefH](https://github.com/StefH)
+- [#832](https://github.com/WireMock-Net/WireMock.Net/pull/832) - Fixes for WireMock.Net.FluentAssertions (callcount behaviour) [feature] contributed by [StefH](https://github.com/StefH)
+- [#834](https://github.com/WireMock-Net/WireMock.Net/pull/834) - Support deleting / resetting a single scenario [feature] contributed by [StefH](https://github.com/StefH)
+- [#837](https://github.com/WireMock-Net/WireMock.Net/pull/837) - Bump Microsoft.AspNetCore.Server.Kestrel.Core from 2.1.7 to 2.1.25 in /examples/WireMock.Net.StandAlone.Net461 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#838](https://github.com/WireMock-Net/WireMock.Net/pull/838) - Add option to ProxySettings to append guid to mapping file contributed by [StefH](https://github.com/StefH)
+- [#826](https://github.com/WireMock-Net/WireMock.Net/issues/826) - Dynamic Body not to be cached when a Func is used to created the body [feature]
+
 # 1.5.8 (16 October 2022)
 - [#816](https://github.com/WireMock-Net/WireMock.Net/pull/816) - Some fixes to WireMock.Net.Assertions [feature] contributed by [StefH](https://github.com/StefH)
 - [#817](https://github.com/WireMock-Net/WireMock.Net/pull/817) - ExactMatcher : IgnoreCase [feature] contributed by [StefH](https://github.com/StefH)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <VersionPrefix>1.5.8</VersionPrefix>
+        <VersionPrefix>1.5.12</VersionPrefix>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -20,6 +20,13 @@
        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
    </PropertyGroup>

+    <!-- https://github.com/coverlet-coverage/coverlet/issues/1391 -->
+    <PropertyGroup Condition="$(MSBuildProjectName.Contains('.Tests'))">
+        <CollectCoverage>true</CollectCoverage>
+        <ExcludeByAttribute>GeneratedCodeAttribute</ExcludeByAttribute>
+        <CoverletOutputFormat>opencover</CoverletOutputFormat>
+    </PropertyGroup>
+
    <ItemGroup>
        <None Include="../../resources/WireMock.Net-Logo.png" Pack="true" PackagePath="" />
        <!--<None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>-->
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes

-SET version=1.5.8
+SET version=1.5.12

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

--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,9 +1,7 @@
-# 1.5.8 (16 October 2022)
- #816 Some fixes to WireMock.Net.Assertions [feature]
- #817 ExactMatcher : IgnoreCase [feature]
- #824 WebHook - Transform Url [feature]
- #814 WithHeader cannot handle multiple requests with the same header key values [bug]
- #815 Why does UsingMethod check _callscount? [bug]
- #822 Webhook with generic url, body and custom header values [feature]
+# 1.5.12 (03 December 2022)
+- #851 Fix Linux CI build + Fix opencover [feature]
+- #853 Add .Net 7 [feature]
+- #854 Fix logic for QueryParameterMultipleValueSupport [bug]
+- #857 Update some dependencies [feature]

 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
--- a/Solution.sln
+++ b/Solution.sln
@@ -25,6 +25,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		CHANGELOG.md = CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
+		.github\FUNDING.yml = .github\FUNDING.yml
 		Generate-ReleaseNotes.cmd = Generate-ReleaseNotes.cmd
 		nuget.config = nuget.config
 		PackageReleaseNotes.template = PackageReleaseNotes.template
@@ -105,6 +106,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.xUnit", "src\W
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NET6.WithCertificate", "examples\WireMock.Net.Console.NET6.WithCertificate\WireMock.Net.Console.NET6.WithCertificate.csproj", "{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueExample", "examples\WireMockAzureQueueExample\WireMockAzureQueueExample.csproj", "{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueProxy", "examples\WireMockAzureQueueProxy\WireMockAzureQueueProxy.csproj", "{ADB557D8-D66B-4387-912B-3F73E290B478}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -251,6 +256,14 @@ Global
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADB557D8-D66B-4387-912B-3F73E290B478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADB557D8-D66B-4387-912B-3F73E290B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -293,6 +306,8 @@ Global
 		{670C7562-C154-442E-A249-7D26849BCD13} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{ADB557D8-D66B-4387-912B-3F73E290B478} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/Solution.sln.DotSettings
+++ b/Solution.sln.DotSettings
@@ -1,10 +1,18 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AD/@EntryIndexedValue">AD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CONNECT/@EntryIndexedValue">CONNECT</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CS/@EntryIndexedValue">CS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DELETE/@EntryIndexedValue">DELETE</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EC/@EntryIndexedValue">EC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GET/@EntryIndexedValue">GET</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HEAD/@EntryIndexedValue">HEAD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OPTIONS/@EntryIndexedValue">OPTIONS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PATCH/@EntryIndexedValue">PATCH</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=POST/@EntryIndexedValue">POST</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PUT/@EntryIndexedValue">PUT</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RSA/@EntryIndexedValue">RSA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSL/@EntryIndexedValue">SSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TE/@EntryIndexedValue">TE</s:String>
--- a/azure-pipelines-ci-linux.yml
+++ b/azure-pipelines-ci-linux.yml
@@ -5,8 +5,16 @@ variables:
  buildConfiguration: 'Release'

 steps:
+- task: UseDotNet@2
+  displayName: 'Use .NET 7'
+  inputs:
+    packageType: sdk
+    version: 7.0.x
+
 - script: |
-    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework net6.0 --logger trx
+    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework net7.0 --logger trx
+  displayName: 'Test'
+
 - task: PublishTestResults@2
  inputs:
    testRunner: VSTest
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -14,6 +14,12 @@ jobs:
      echo "BuildId = $(buildId)"
    displayName: 'Print buildId'

+  - task: UseDotNet@2
+    displayName: Use .NET 7.0
+    inputs:
+      packageType: 'sdk'
+      version: '7.0.x'    
+
  - task: PowerShell@2
    displayName: "Use JDK11 by default"
    inputs:
@@ -35,22 +41,20 @@ jobs:
      projectKey: 'WireMock-Net_WireMock.Net'
      projectName: 'WireMock.Net'
      extraProperties: |
-        sonar.cs.opencover.reportsPaths=**/coverage.net6.0.opencover.xml
+        sonar.cs.opencover.reportsPaths=**/coverage.net7.0.opencover.xml
  
  - task: DotNetCoreCLI@2
    displayName: 'Build Unit tests'
    inputs:
      command: 'build'
      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--configuration Debug --framework net6.0'
-  
-  - task: DotNetCoreCLI@2
-    displayName: 'Execute Unit tests'
+      arguments: '--configuration Debug --framework net7.0'
+
+  - task: CmdLine@2
    inputs:
-      command: 'test'
-      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--no-build --configuration Debug --framework net6.0 --collect:"XPlat Code Coverage" --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
-  
+      script: 'dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --no-build --configuration Debug --framework net7.0'
+    displayName: 'Execute Unit Tests with Coverage'
+   
  - task: SonarCloudAnalyze@1
    displayName: 'SonarCloud: Run Code Analysis'
    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
@@ -64,7 +68,7 @@ jobs:
    condition: and(succeeded(), eq(variables['RUN_WHITESOURCE'], 'yes'))
 
  - script: |
-      bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) -f ./test/WireMock.Net.Tests/coverage.net6.0.opencover.xml
+      bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) -f ./test/WireMock.Net.Tests/coverage.7.0.opencover.xml
    displayName: 'codecov'
  
  - task: PublishTestResults@2
@@ -76,7 +80,7 @@ jobs:
  - task: PublishBuildArtifacts@1
    displayName: Publish coverage file
    inputs:
-      PathtoPublish: '/home/vsts/work/1/s/test/WireMock.Net.Tests/coverage.net6.0.opencover.xml'
+      PathtoPublish: './test/WireMock.Net.Tests/coverage.net7.0.opencover.xml'

 - job: Windows_Build_Test

@@ -85,24 +89,24 @@ jobs:

  steps:
  - task: UseDotNet@2
-    displayName: Use .NET 6.0
+    displayName: Use .NET 7.0
    inputs:
      packageType: 'sdk'
-      version: '6.0.x'
+      version: '7.0.x'

  - task: DotNetCoreCLI@2
    displayName: 'Build Unit tests'
    inputs:
      command: 'build'
      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--configuration Debug --framework net6.0'
+      arguments: '--configuration Debug --framework net7.0'
  
  - task: DotNetCoreCLI@2
-    displayName: 'Execute Unit tests'
+    displayName: 'Execute Unit Tests with Coverage'
    inputs:
      command: 'test'
      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--no-build --configuration Debug --framework net6.0 --collect:"XPlat Code Coverage" --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
+      arguments: '--no-build --configuration Debug --framework net7.0 --collect:"XPlat Code Coverage" --logger trx'
  
 - job: Windows_Release_to_MyGet
  dependsOn: Windows_Build_Test
@@ -112,10 +116,10 @@ jobs:

  steps:
  - task: UseDotNet@2
-    displayName: Use .NET 6.0
+    displayName: Use .NET 7.0
    inputs:
      packageType: 'sdk'
-      version: '6.0.x'
+      version: '7.0.x'

  - task: DotNetCoreCLI@2
    displayName: Build Release
--- a/azure-pipelines-linux.yml
+++ b/azure-pipelines-linux.yml
@@ -9,6 +9,12 @@ variables:
  buildConfiguration: 'Release'

 steps:
+- task: UseDotNet@2
+  displayName: 'Use .NET 7'
+  inputs:
+    packageType: sdk
+    version: 7.0.x
+
 - task: DotNetCoreCLI@2
  displayName: Build Release
  inputs:
--- a/azure-pipelines-nuget.yml
+++ b/azure-pipelines-nuget.yml
@@ -12,6 +12,12 @@ steps:
    echo "BuildId = $(buildId)"
  displayName: 'Print buildId'

+- task: UseDotNet@2
+  displayName: 'Use .NET 7'
+  inputs:
+    packageType: sdk
+    version: 7.0.x
+
 # Based on https://whereslou.com/2018/09/versioning-and-publishing-nuget-packages-automatically-using-azure-devops-pipelines/
 - task: DotNetCoreCLI@2
  displayName: Build Release
--- a/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj
+++ b/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj
@@ -29,7 +29,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="log4net" Version="2.0.15" />
    <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
  </ItemGroup>
--- a/examples/WireMock.Net.Console.NET6/WireMock.Net.Console.NET6.csproj
+++ b/examples/WireMock.Net.Console.NET6/WireMock.Net.Console.NET6.csproj
@@ -28,7 +28,7 @@
  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="log4net" Version="2.0.15" />
    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
  </ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
@@ -21,11 +21,11 @@
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.10" />
    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.10" />
+    <PackageReference Include="log4net" Version="2.0.15" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
  </ItemGroup>

--- a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
@@ -33,11 +33,11 @@
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.10" />
    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.10" />
+    <PackageReference Include="log4net" Version="2.0.15" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
  </ItemGroup>

--- a/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj
@@ -30,11 +30,11 @@
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.*" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.10" />
    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.10" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.10" />
+    <PackageReference Include="log4net" Version="2.0.15" />
    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
  </ItemGroup>

--- a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
@@ -42,14 +42,14 @@
    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net452\Handlebars.dll</HintPath>
    </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.5\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
    </Reference>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -61,6 +61,9 @@
    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
    </Reference>
+    <Reference Include="Stef.Validation, Version=0.1.1.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Stef.Validation.0.1.1\lib\net40\Stef.Validation.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
--- a/examples/WireMock.Net.Console.Net452.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/packages.config
@@ -2,11 +2,12 @@
 <packages>
  <package id="AnyOf" version="0.3.0" targetFramework="net452" />
  <package id="Handlebars.Net" version="2.1.2" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers" version="2.3.5" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.5" targetFramework="net452" />
-  <package id="log4net" version="2.0.14" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers" version="2.3.10" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net452" />
+  <package id="log4net" version="2.0.15" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
+  <package id="Stef.Validation" version="0.1.1" targetFramework="net452" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
 </packages>
--- a/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
@@ -41,14 +41,14 @@
    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
    </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.5\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
    </Reference>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
@@ -59,6 +59,9 @@
    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
    </Reference>
+    <Reference Include="Stef.Validation, Version=0.1.1.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Stef.Validation.0.1.1\lib\net40\Stef.Validation.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
--- a/examples/WireMock.Net.Console.Net461.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net461.Classic/packages.config
@@ -2,11 +2,12 @@
 <packages>
  <package id="AnyOf" version="0.3.0" targetFramework="net461" />
  <package id="Handlebars.Net" version="2.1.2" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers" version="2.3.5" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.5" targetFramework="net461" />
-  <package id="log4net" version="2.0.14" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers" version="2.3.10" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net461" />
+  <package id="log4net" version="2.0.15" targetFramework="net461" />
  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
+  <package id="Stef.Validation" version="0.1.1" targetFramework="net461" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>
--- a/examples/WireMock.Net.Console.Net472.Classic/App.config
+++ b/examples/WireMock.Net.Console.Net472.Classic/App.config
@@ -55,7 +55,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="HandlebarsDotNet.Helpers.Core" publicKeyToken="00d131fae0c250bc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.3.5.0" newVersion="2.3.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.10.0" newVersion="2.3.10.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="XPath2" publicKeyToken="463c6d7fb740c7e5" culture="neutral" />
@@ -67,16 +67,40 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Handlebars.Net.Helpers" publicKeyToken="00d131fae0c250bc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.3.5.0" newVersion="2.3.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.10.0" newVersion="2.3.10.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.18.0" newVersion="1.2.18.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.23.0" newVersion="1.2.23.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Fare" publicKeyToken="ea68d375bf33a7c8" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Stef.Validation" publicKeyToken="8f3400880c321038" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.1.1.0" newVersion="0.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="HandlebarsDotNet.Helpers.Json" publicKeyToken="00d131fae0c250bc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.10.0" newVersion="2.3.10.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.25.0.0" newVersion="6.25.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.25.0.0" newVersion="6.25.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.25.0.0" newVersion="6.25.0.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Nullable.1.3.1\build\Nullable.props" Condition="Exists('..\..\packages\Nullable.1.3.1\build\Nullable.props')" />
  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
@@ -48,29 +49,29 @@
    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
    </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.5\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.10\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.5\lib\net452\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.10\lib\net452\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Json.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Json.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Random.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Random.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.10\lib\net452\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.5\lib\net452\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.10.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.10\lib\net452\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
    </Reference>
    <Reference Include="Humanizer, Version=2.14.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Humanizer.Core.2.14.1\lib\netstandard2.0\Humanizer.dll</HintPath>
@@ -78,8 +79,8 @@
    <Reference Include="JmesPath.Net, Version=1.0.125.0, Culture=neutral, PublicKeyToken=b29d616b7f4faff0, processorArchitecture=MSIL">
      <HintPath>..\..\packages\JmesPath.Net.1.0.125\lib\net45\JmesPath.Net.dll</HintPath>
    </Reference>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.AspNetCore, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNetCore.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.dll</HintPath>
@@ -156,6 +157,9 @@
    <Reference Include="Microsoft.AspNetCore.WebUtilities, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNetCore.WebUtilities.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll</HintPath>
    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.Extensions.Configuration, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.5.0.0\lib\net461\Microsoft.Extensions.Configuration.dll</HintPath>
    </Reference>
@@ -228,11 +232,14 @@
    <Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.JsonWebTokens.6.12.2\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.25.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Abstractions.6.25.0\lib\net472\Microsoft.IdentityModel.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.6.12.2\lib\net472\Microsoft.IdentityModel.Logging.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=6.25.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.IdentityModel.JsonWebTokens.6.25.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Logging, Version=6.25.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.6.25.0\lib\net472\Microsoft.IdentityModel.Logging.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.IdentityModel.Protocols, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.6.12.2\lib\net472\Microsoft.IdentityModel.Protocols.dll</HintPath>
@@ -240,8 +247,8 @@
    <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.6.12.2\lib\net472\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.IdentityModel.Tokens, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.6.12.2\lib\net472\Microsoft.IdentityModel.Tokens.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Tokens, Version=6.25.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.6.25.0\lib\net472\Microsoft.IdentityModel.Tokens.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
@@ -261,8 +268,8 @@
    <Reference Include="NSwag.Core, Version=13.15.10.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
      <HintPath>..\..\packages\NSwag.Core.13.15.10\lib\net45\NSwag.Core.dll</HintPath>
    </Reference>
-    <Reference Include="RandomDataGenerator, Version=1.0.15.0, Culture=neutral, PublicKeyToken=ae5c571d29a3b8d9, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RandomDataGenerator.Net.1.0.16\lib\net45\RandomDataGenerator.dll</HintPath>
+    <Reference Include="RandomDataGenerator, Version=1.0.16.0, Culture=neutral, PublicKeyToken=ae5c571d29a3b8d9, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RandomDataGenerator.Net.1.0.17\lib\net45\RandomDataGenerator.dll</HintPath>
    </Reference>
    <Reference Include="Scriban.Signed, Version=2.1.4.0, Culture=neutral, PublicKeyToken=5675fb69b15f2433, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Scriban.Signed.2.1.4\lib\net45\Scriban.Signed.dll</HintPath>
@@ -270,8 +277,8 @@
    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
    </Reference>
-    <Reference Include="Stef.Validation, Version=0.1.0.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Stef.Validation.0.1.0\lib\net40\Stef.Validation.dll</HintPath>
+    <Reference Include="Stef.Validation, Version=0.1.1.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Stef.Validation.0.1.1\lib\net40\Stef.Validation.dll</HintPath>
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -289,14 +296,14 @@
    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
    </Reference>
-    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.6.12.2\lib\net472\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=6.25.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.6.25.0\lib\net472\System.IdentityModel.Tokens.Jwt.dll</HintPath>
    </Reference>
    <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
    </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.18.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.18\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.23.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.23\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
    </Reference>
    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
@@ -326,8 +333,11 @@
    <Reference Include="System.Text.Encodings.Web, Version=4.0.5.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll</HintPath>
    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Json.4.7.2\lib\net461\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
@@ -398,6 +408,7 @@
    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets'))" />
    <Error Condition="!Exists('..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Nullable.1.3.1\build\Nullable.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nullable.1.3.1\build\Nullable.props'))" />
  </Target>
  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" />
  <Import Project="..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets" Condition="Exists('..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets')" />
--- a/examples/WireMock.Net.Console.Net472.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net472.Classic/packages.config
@@ -3,14 +3,14 @@
  <package id="AnyOf" version="0.3.0" targetFramework="net472" />
  <package id="Fare" version="2.2.1" targetFramework="net472" />
  <package id="Handlebars.Net" version="2.1.2" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Json" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Random" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.XPath" version="2.3.5" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Json" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Random" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.10" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.XPath" version="2.3.10" targetFramework="net472" />
  <package id="Humanizer" version="2.14.1" targetFramework="net472" />
  <package id="Humanizer.Core" version="2.14.1" targetFramework="net472" />
  <package id="Humanizer.Core.af" version="2.14.1" targetFramework="net472" />
@@ -62,7 +62,7 @@
  <package id="Humanizer.Core.zh-Hans" version="2.14.1" targetFramework="net472" />
  <package id="Humanizer.Core.zh-Hant" version="2.14.1" targetFramework="net472" />
  <package id="JmesPath.Net" version="1.0.125" targetFramework="net472" />
-  <package id="log4net" version="2.0.14" targetFramework="net472" />
+  <package id="log4net" version="2.0.15" targetFramework="net472" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.8" targetFramework="net472" />
  <package id="Microsoft.AspNetCore" version="2.2.0" targetFramework="net472" />
  <package id="Microsoft.AspNetCore.Authentication.Abstractions" version="2.2.0" targetFramework="net472" />
@@ -89,6 +89,7 @@
  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" version="2.2.0" targetFramework="net472" />
  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" version="2.2.0" targetFramework="net472" />
  <package id="Microsoft.AspNetCore.WebUtilities" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net472" />
  <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net472" />
  <package id="Microsoft.Extensions.Configuration" version="5.0.0" targetFramework="net472" />
  <package id="Microsoft.Extensions.Configuration.Abstractions" version="5.0.0" targetFramework="net472" />
@@ -114,37 +115,40 @@
  <package id="Microsoft.Extensions.Options" version="2.2.0" targetFramework="net472" />
  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.2.0" targetFramework="net472" />
  <package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net472" />
-  <package id="Microsoft.IdentityModel.JsonWebTokens" version="6.12.2" targetFramework="net472" />
-  <package id="Microsoft.IdentityModel.Logging" version="6.12.2" targetFramework="net472" />
+  <package id="Microsoft.IdentityModel.Abstractions" version="6.25.0" targetFramework="net472" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="6.25.0" targetFramework="net472" />
+  <package id="Microsoft.IdentityModel.Logging" version="6.25.0" targetFramework="net472" />
  <package id="Microsoft.IdentityModel.Protocols" version="6.12.2" targetFramework="net472" />
  <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.12.2" targetFramework="net472" />
-  <package id="Microsoft.IdentityModel.Tokens" version="6.12.2" targetFramework="net472" />
+  <package id="Microsoft.IdentityModel.Tokens" version="6.25.0" targetFramework="net472" />
  <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net472" />
  <package id="Namotion.Reflection" version="2.0.10" targetFramework="net472" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
  <package id="NJsonSchema" version="10.6.10" targetFramework="net472" />
  <package id="NJsonSchema.Extensions" version="0.1.0" targetFramework="net472" />
  <package id="NSwag.Core" version="13.15.10" targetFramework="net472" />
-  <package id="Nullable" version="1.3.0" targetFramework="net472" developmentDependency="true" />
-  <package id="RandomDataGenerator.Net" version="1.0.16" targetFramework="net472" />
+  <package id="Nullable" version="1.3.1" targetFramework="net472" developmentDependency="true" />
+  <package id="RandomDataGenerator.Net" version="1.0.17" targetFramework="net472" />
  <package id="Scriban.Signed" version="2.1.4" targetFramework="net472" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
-  <package id="Stef.Validation" version="0.1.0" targetFramework="net472" />
+  <package id="Stef.Validation" version="0.1.1" targetFramework="net472" />
  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net472" />
  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net472" />
  <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net472" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="6.12.2" targetFramework="net472" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="6.25.0" targetFramework="net472" />
  <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net472" />
-  <package id="System.Linq.Dynamic.Core" version="1.2.18" targetFramework="net472" />
+  <package id="System.Linq.Dynamic.Core" version="1.2.23" targetFramework="net472" />
  <package id="System.Memory" version="4.5.4" targetFramework="net472" />
  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
  <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />
  <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
  <package id="System.Security.Cryptography.Cng" version="4.5.0" targetFramework="net472" />
  <package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net472" />
+  <package id="System.Text.Encoding" version="4.3.0" targetFramework="net472" />
  <package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net472" />
+  <package id="System.Text.Json" version="4.7.2" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
  <package id="TinyMapper" version="3.0.3" targetFramework="net472" />
  <package id="XPath2" version="1.1.3" targetFramework="net472" />
--- a/examples/WireMock.Net.Service/App.config
+++ b/examples/WireMock.Net.Service/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
  </startup>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -11,4 +11,4 @@
      </dependentAssembly>
    </assemblyBinding>
  </runtime>
-</configuration>
+</configuration>
--- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
+++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
@@ -8,9 +8,10 @@
    <OutputType>Exe</OutputType>
    <RootNamespace>WireMock.Net.Service</RootNamespace>
    <AssemblyName>WireMock.Net.Service</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,8 +33,8 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
--- a/examples/WireMock.Net.Service/packages.config
+++ b/examples/WireMock.Net.Service/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net452" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
@@ -11,6 +11,6 @@
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
  <package id="Owin" version="1.0" targetFramework="net452" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" requireReinstallation="true" />
  <package id="XPath2" version="1.1.3" targetFramework="net452" />
 </packages>
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj
@@ -7,7 +7,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="log4net" Version="2.0.15" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
+++ b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
@@ -39,8 +39,8 @@
    <StartupObject>WireMock.Net.StandAlone.Net452.Program</StartupObject>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
    </Reference>
    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
--- a/examples/WireMock.Net.StandAlone.Net452/packages.config
+++ b/examples/WireMock.Net.StandAlone.Net452/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net452" />
+  <package id="log4net" version="2.0.15" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net452" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
--- a/examples/WireMock.Net.StandAlone.Net461/App.config
+++ b/examples/WireMock.Net.StandAlone.Net461/App.config
@@ -11,7 +11,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -20,7 +20,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.1" newVersion="4.0.3.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -40,7 +40,7 @@
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Security.Cryptography.Cng" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.3.1.1" newVersion="4.3.1.1" />
      </dependentAssembly>
      <dependentAssembly>
        <assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
@@ -66,6 +66,50 @@
        <assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
        <bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Binder" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.10.0" newVersion="2.1.10.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Hosting" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.7.0" newVersion="2.2.7.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Http" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.2.0" newVersion="2.2.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Routing" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.2.0" newVersion="2.2.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.1.0" newVersion="2.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Server.IIS" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.6.0" newVersion="2.2.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Server.IISIntegration" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.1.0" newVersion="2.2.1.0" />
+      </dependentAssembly>
    </assemblyBinding>
  </runtime>
 </configuration>
--- a/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj
+++ b/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" />
+  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -42,158 +42,164 @@
    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore, Version=2.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.2.1.4\lib\netstandard2.0\Microsoft.AspNetCore.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Authentication.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Authentication.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Authentication.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Authentication.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Authentication.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Authentication.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Authentication.Core.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Authentication.Core.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Authentication.Core.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Authentication.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Connections.Abstractions, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Connections.Abstractions.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Connections.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Connections.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Connections.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Connections.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Diagnostics, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Diagnostics.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Diagnostics.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Diagnostics, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Diagnostics.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Diagnostics.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Diagnostics.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Diagnostics.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Diagnostics.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Diagnostics.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Diagnostics.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Diagnostics.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.HostFiltering, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.HostFiltering.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.HostFiltering.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.HostFiltering, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.HostFiltering.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.HostFiltering.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Hosting, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Hosting, Version=2.2.7.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.2.2.7\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Server.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Server.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Server.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Server.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Http, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Http.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Http, Version=2.2.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.2.2.2\lib\netstandard2.0\Microsoft.AspNetCore.Http.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Http.Extensions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Extensions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Http.Extensions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Http.Extensions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Extensions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Extensions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Features.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Features.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.HttpOverrides, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.HttpOverrides.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.HttpOverrides.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.HttpOverrides, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.HttpOverrides.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.HttpOverrides.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Routing, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Routing.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Routing.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Routing, Version=2.2.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Routing.2.2.2\lib\netstandard2.0\Microsoft.AspNetCore.Routing.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Routing.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Routing.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Routing.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Routing.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Routing.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Routing.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration, Version=2.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.1.2\lib\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.IIS, Version=2.2.6.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\lib\netstandard2.0\Microsoft.AspNetCore.Server.IIS.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration, Version=2.2.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.1\lib\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Core.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Core.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Https.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Https.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Core.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Core.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Https.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Https.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.AspNetCore.WebUtilities, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.WebUtilities.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets, Version=2.2.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.2.2.1\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.WebUtilities, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.WebUtilities.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Binder.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.CommandLine, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.CommandLine.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.CommandLine.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Binder.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.CommandLine, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.CommandLine.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.CommandLine.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.FileExtensions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.2.2.4\lib\netstandard2.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Json, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Json.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Json.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.FileExtensions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.Json, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Json.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Json.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.2.2.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.FileProviders.Physical, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Physical.2.1.1\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.FileSystemGlobbing, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.FileSystemGlobbing.2.1.1\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.FileProviders.Physical, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Physical.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Hosting.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Hosting.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Hosting.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.FileSystemGlobbing, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.FileSystemGlobbing.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Hosting.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Hosting.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Hosting.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Configuration, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Console, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Console.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Console.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Configuration, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Configuration.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Debug, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Debug.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Debug.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Console, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Console.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Console.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.ObjectPool, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.ObjectPool.2.1.1\lib\netstandard2.0\Microsoft.Extensions.ObjectPool.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Debug, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Debug.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Debug.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Options.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.EventSource, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.EventSource.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.EventSource.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.ObjectPool, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.ObjectPool.2.2.0\lib\netstandard2.0\Microsoft.Extensions.ObjectPool.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Options, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Options.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Net.Http.Headers, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Net.Http.Headers.2.1.1\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    <Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
    </Reference>
-    <Reference Include="Microsoft.Owin.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Hosting.4.0.0\lib\net451\Microsoft.Owin.Hosting.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.2.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Hosting, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.Hosting.4.2.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
    </Reference>
    <Reference Include="MimeKitLite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
      <HintPath>..\..\packages\MimeKitLite.2.0.7\lib\net45\MimeKitLite.dll</HintPath>
@@ -212,28 +218,32 @@
    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
    </Reference>
    <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
    </Reference>
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
    <Reference Include="System.Core" />
    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
    </Reference>
    <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IO.Pipelines.4.5.2\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
+      <HintPath>..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
    </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.18.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.18\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.23.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.23\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
    </Reference>
-    <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
    </Reference>
    <Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
    <Reference Include="System.Net.Http.WebRequest" />
    <Reference Include="System.Numerics" />
@@ -244,14 +254,14 @@
      <HintPath>..\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
    </Reference>
    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
    </Reference>
    <Reference Include="System.Security" />
    <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
    </Reference>
-    <Reference Include="System.Security.Cryptography.Cng, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Security.Cryptography.Cng.4.5.0\lib\net461\System.Security.Cryptography.Cng.dll</HintPath>
+    <Reference Include="System.Security.Cryptography.Cng, Version=4.3.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Cng.4.5.2\lib\net461\System.Security.Cryptography.Cng.dll</HintPath>
    </Reference>
    <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
@@ -268,18 +278,18 @@
    <Reference Include="System.Text.Encodings.Web, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
    </Reference>
    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
    </Reference>
    <Reference Include="System.Web" />
-    <Reference Include="System.Web.Http, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.4\lib\net45\System.Web.Http.dll</HintPath>
+    <Reference Include="System.Web.Http, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll</HintPath>
    </Reference>
-    <Reference Include="System.Web.Http.Owin, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.4\lib\net45\System.Web.Http.Owin.dll</HintPath>
+    <Reference Include="System.Web.Http.Owin, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.9\lib\net45\System.Web.Http.Owin.dll</HintPath>
    </Reference>
    <Reference Include="System.Xml" />
    <Reference Include="System.Xml.Linq" />
@@ -314,8 +324,12 @@
    <PropertyGroup>
      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
    </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.1\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.1\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets'))" />
  </Target>
-  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" />
+  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" />
+  <Import Project="..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets" Condition="Exists('..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets')" />
+  <Import Project="..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.1\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets" Condition="Exists('..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.1\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets')" />
 </Project>
--- a/examples/WireMock.Net.StandAlone.Net461/packages.config
+++ b/examples/WireMock.Net.StandAlone.Net461/packages.config
@@ -1,83 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
  <package id="Handlebars.Net" version="2.1.2" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore" version="2.1.4" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authentication.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authentication.Core" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Connections.Abstractions" version="2.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Diagnostics" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Diagnostics.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.HostFiltering" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http" version="2.1.22" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Extensions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Features" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.HttpOverrides" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Routing" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Routing.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.IISIntegration" version="2.1.2" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel" version="2.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel.Core" version="2.1.7" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel.Https" version="2.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" version="2.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" version="2.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.WebUtilities" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Binder" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.CommandLine" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.EnvironmentVariables" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.FileExtensions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Json" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.UserSecrets" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.FileProviders.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.FileProviders.Physical" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.FileSystemGlobbing" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Hosting.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Configuration" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Console" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Debug" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.ObjectPool" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Net.Http.Headers" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Owin" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Hosting" version="4.0.0" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.9" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.9" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Authentication.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Authentication.Core" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Connections.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Diagnostics" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Diagnostics.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.HostFiltering" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Hosting" version="2.2.7" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http" version="2.2.2" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http.Extensions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http.Features" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.HttpOverrides" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Routing" version="2.2.2" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Routing.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.IIS" version="2.2.6" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.IISIntegration" version="2.2.1" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Core" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Https" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" version="2.2.1" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.WebUtilities" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.CommandLine" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.EnvironmentVariables" version="2.2.4" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.FileExtensions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.Json" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.UserSecrets" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.FileProviders.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.FileProviders.Physical" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.FileSystemGlobbing" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Hosting.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Configuration" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Console" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Debug" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.EventSource" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.ObjectPool" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Owin" version="4.2.2" targetFramework="net461" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="4.2.2" targetFramework="net461" />
+  <package id="Microsoft.Owin.Hosting" version="4.2.2" targetFramework="net461" />
  <package id="MimeKitLite" version="2.0.7" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
  <package id="Owin" version="1.0" targetFramework="net461" />
  <package id="RestEase" version="1.5.7" targetFramework="net461" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
-  <package id="System.Buffers" version="4.5.0" targetFramework="net461" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net461" />
-  <package id="System.IO.Pipelines" version="4.5.2" targetFramework="net461" />
-  <package id="System.Linq.Dynamic.Core" version="1.2.18" targetFramework="net461" />
-  <package id="System.Memory" version="4.5.1" targetFramework="net461" />
+  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.5.1" targetFramework="net461" />
+  <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net461" />
+  <package id="System.Linq.Dynamic.Core" version="1.2.23" targetFramework="net461" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net461" />
  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
  <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net461" />
  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Cng" version="4.5.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Cng" version="4.5.2" targetFramework="net461" />
  <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
  <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net461" />
  <package id="System.Text.Encodings.Web" version="4.5.1" targetFramework="net461" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
  <package id="XPath2" version="1.1.3" targetFramework="net461" />
 </packages>
--- a/examples/WireMock.Net.WebApplication.NET6/Properties/ServiceDependencies/WireMockNetWebApplicationNET6Linux
+++ b/examples/WireMock.Net.WebApplication.NET6/Properties/ServiceDependencies/WireMockNetWebApplicationNET6Linux
@@ -0,0 +1,173 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "metadata": {
+    "_dependencyType": "compute.function.linux.appService"
+  },
+  "parameters": {
+    "resourceGroupName": {
+      "type": "string",
+      "defaultValue": "linux-app-service",
+      "metadata": {
+        "description": "Name of the resource group for the resource. It is recommended to put resources under same resource group for better tracking."
+      }
+    },
+    "resourceGroupLocation": {
+      "type": "string",
+      "defaultValue": "westeurope",
+      "metadata": {
+        "description": "Location of the resource group. Resource groups could have different location than resources, however by default we use API versions from latest hybrid profile which support all locations for resource types we support."
+      }
+    },
+    "resourceName": {
+      "type": "string",
+      "defaultValue": "WireMockNetWebApplicationNET6Linux",
+      "metadata": {
+        "description": "Name of the main resource to be created by this template."
+      }
+    },
+    "resourceLocation": {
+      "type": "string",
+      "defaultValue": "[parameters('resourceGroupLocation')]",
+      "metadata": {
+        "description": "Location of the resource. By default use resource group's location, unless the resource provider is not supported there."
+      }
+    }
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/resourceGroups",
+      "name": "[parameters('resourceGroupName')]",
+      "location": "[parameters('resourceGroupLocation')]",
+      "apiVersion": "2019-10-01"
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId)))]",
+      "resourceGroup": "[parameters('resourceGroupName')]",
+      "apiVersion": "2019-10-01",
+      "dependsOn": [
+        "[parameters('resourceGroupName')]"
+      ],
+      "properties": {
+        "mode": "Incremental",
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "parameters": {
+          "resourceGroupName": {
+            "value": "[parameters('resourceGroupName')]"
+          },
+          "resourceGroupLocation": {
+            "value": "[parameters('resourceGroupLocation')]"
+          },
+          "resourceName": {
+            "value": "[parameters('resourceName')]"
+          },
+          "resourceLocation": {
+            "value": "[parameters('resourceLocation')]"
+          }
+        },
+        "template": {
+          "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "parameters": {
+            "resourceGroupName": {
+              "type": "string"
+            },
+            "resourceGroupLocation": {
+              "type": "string"
+            },
+            "resourceName": {
+              "type": "string"
+            },
+            "resourceLocation": {
+              "type": "string"
+            }
+          },
+          "variables": {
+            "storage_name": "[toLower(concat('storage', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId))))]",
+            "appServicePlan_name": "[concat('Plan', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId)))]",
+            "storage_ResourceId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', parameters('resourceGroupName'), '/providers/Microsoft.Storage/storageAccounts/', variables('storage_name'))]",
+            "appServicePlan_ResourceId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', parameters('resourceGroupName'), '/providers/Microsoft.Web/serverFarms/', variables('appServicePlan_name'))]",
+            "function_ResourceId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', parameters('resourceGroupName'), '/providers/Microsoft.Web/sites/', parameters('resourceName'))]"
+          },
+          "resources": [
+            {
+              "location": "[parameters('resourceLocation')]",
+              "name": "[parameters('resourceName')]",
+              "type": "Microsoft.Web/sites",
+              "apiVersion": "2015-08-01",
+              "tags": {
+                "[concat('hidden-related:', variables('appServicePlan_ResourceId'))]": "empty"
+              },
+              "dependsOn": [
+                "[variables('appServicePlan_ResourceId')]",
+                "[variables('storage_ResourceId')]"
+              ],
+              "kind": "functionapp",
+              "properties": {
+                "name": "[parameters('resourceName')]",
+                "kind": "functionapp",
+                "httpsOnly": true,
+                "reserved": false,
+                "serverFarmId": "[variables('appServicePlan_ResourceId')]",
+                "siteConfig": {
+                  "alwaysOn": true,
+                  "linuxFxVersion": "dotnet|3.1"
+                }
+              },
+              "identity": {
+                "type": "SystemAssigned"
+              },
+              "resources": [
+                {
+                  "name": "appsettings",
+                  "type": "config",
+                  "apiVersion": "2015-08-01",
+                  "dependsOn": [
+                    "[variables('function_ResourceId')]"
+                  ],
+                  "properties": {
+                    "AzureWebJobsStorage": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storage_name'), ';AccountKey=', listKeys(variables('storage_ResourceId'), '2017-10-01').keys[0].value, ';EndpointSuffix=', 'core.windows.net')]",
+                    "FUNCTIONS_EXTENSION_VERSION": "~3",
+                    "FUNCTIONS_WORKER_RUNTIME": "dotnet"
+                  }
+                }
+              ]
+            },
+            {
+              "location": "[parameters('resourceGroupLocation')]",
+              "name": "[variables('storage_name')]",
+              "type": "Microsoft.Storage/storageAccounts",
+              "apiVersion": "2017-10-01",
+              "tags": {
+                "[concat('hidden-related:', concat('/providers/Microsoft.Web/sites/', parameters('resourceName')))]": "empty"
+              },
+              "properties": {
+                "supportsHttpsTrafficOnly": true
+              },
+              "sku": {
+                "name": "Standard_LRS"
+              },
+              "kind": "Storage"
+            },
+            {
+              "location": "[parameters('resourceGroupLocation')]",
+              "name": "[variables('appServicePlan_name')]",
+              "type": "Microsoft.Web/serverFarms",
+              "apiVersion": "2015-02-01",
+              "kind": "linux",
+              "properties": {
+                "name": "[variables('appServicePlan_name')]",
+                "sku": "Standard",
+                "workerSizeId": "0",
+                "reserved": true
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
--- a/examples/WireMock.Net.WebApplication.NET6/WireMock.Net.WebApplication.NET6.csproj
+++ b/examples/WireMock.Net.WebApplication.NET6/WireMock.Net.WebApplication.NET6.csproj
@@ -1,33 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

-	<PropertyGroup>
-		<TargetFramework>net6</TargetFramework>
-		<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
-		<StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
-		<AssemblyName>WireMock.Net.WebApplication</AssemblyName>
-		<RootNamespace>WireMock.Net.WebApplication</RootNamespace>
-		<UserSecretsId>efcf4a18-fd7c-4622-1111-336d65290599</UserSecretsId>
-		<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
-	</PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net6</TargetFramework>
+        <!--<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>-->
+        <StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
+        <AssemblyName>WireMock.Net.WebApplication</AssemblyName>
+        <RootNamespace>WireMock.Net.WebApplication</RootNamespace>
+        <UserSecretsId>efcf4a18-fd7c-4622-1111-336d65290599</UserSecretsId>
+        <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
+    </PropertyGroup>

-	<ItemGroup>
-	  <Content Remove="Properties\1.launchSettings.json" />
-	</ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    </ItemGroup>

-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-	</ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+        <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    </ItemGroup>

-	<ItemGroup>
-		<ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-		<ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Content Update="appsettings.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
+    <ItemGroup>
+        <Content Update="appsettings.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>

 </Project>
--- a/examples/WireMock.Net.WebApplication.NET6/appsettings.json
+++ b/examples/WireMock.Net.WebApplication.NET6/appsettings.json
@@ -15,15 +15,7 @@
    "WireMockServerSettings": {
        "StartAdminInterface": true,
        "Urls": [
-            "https://localhost:8081/"
-        ],
-        "AllowPartialMapping": false,
-        "HandleRequestsSynchronously": true,
-        "ThrowExceptionWhenMatcherFails": true,
-        "ProxyAndRecordSettings": {
-            "Url": "http://postman-echo.com/post",
-            "SaveMapping": true,
-            "SaveMappingToFile": true
-        }
+            "http://localhost"
+        ]
    }
 }
--- a/examples/WireMockAzureQueueExample/.gitignore
+++ b/examples/WireMockAzureQueueExample/.gitignore
@@ -0,0 +1,264 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# Azure Functions localsettings file
+local.settings.json
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+#*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
--- a/examples/WireMockAzureQueueExample/Function1.cs
+++ b/examples/WireMockAzureQueueExample/Function1.cs
@@ -0,0 +1,13 @@
+using Microsoft.Azure.WebJobs;
+using Microsoft.Extensions.Logging;
+
+namespace WireMockAzureQueueExample;
+
+public class Function1
+{
+    [FunctionName("Function1")]
+    public void Run([QueueTrigger("myqueue-items", Connection = "ConnectionStringToWireMock")]string myQueueItem, ILogger log)
+    {
+        log.LogWarning($"C# Queue trigger function processed: {myQueueItem}");
+    }
+}
--- a/examples/WireMockAzureQueueExample/Properties/launchSettings.json
+++ b/examples/WireMockAzureQueueExample/Properties/launchSettings.json
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "WireMockAzureQueueExample": {
+      "commandName": "Project",
+      "commandLineArgs": "--port 7290",
+      "launchBrowser": false
+    }
+  }
+}
--- a/examples/WireMockAzureQueueExample/Properties/serviceDependencies.json
+++ b/examples/WireMockAzureQueueExample/Properties/serviceDependencies.json
@@ -0,0 +1,14 @@
+{
+  "dependencies": {
+    "appInsights1": {
+      "type": "appInsights"
+    },
+    "secrets1": {
+      "type": "secrets"
+    },
+    "storage1": {
+      "type": "storage",
+      "connectionId": "AzureWebJobsStorage"
+    }
+  }
+}
--- a/examples/WireMockAzureQueueExample/Properties/serviceDependencies.local.json
+++ b/examples/WireMockAzureQueueExample/Properties/serviceDependencies.local.json
@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "appInsights1": {
+      "type": "appInsights.sdk"
+    },
+    "secrets1": {
+      "type": "secrets.user"
+    },
+    "storage1": {
+      "secretStore": null,
+      "resourceId": null,
+      "type": "storage.emulator",
+      "connectionId": "AzureWebJobsStorage"
+    }
+  }
+}
--- a/examples/WireMockAzureQueueExample/WireMockAzureQueueExample.csproj
+++ b/examples/WireMockAzureQueueExample/WireMockAzureQueueExample.csproj
@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
+    <UserSecretsId>bb7d8355-68c4-4f81-8c2d-6cdd80cd7602</UserSecretsId>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
+    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.12.1" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.12.0" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="host.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="local.settings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
+</Project>
--- a/examples/WireMockAzureQueueExample/host.json
+++ b/examples/WireMockAzureQueueExample/host.json
@@ -0,0 +1,11 @@
+{
+    "version": "2.0",
+    "logging": {
+        "applicationInsights": {
+            "samplingSettings": {
+                "isEnabled": true,
+                "excludedTypes": "Request"
+            }
+        }
+    }
+}
--- a/examples/WireMockAzureQueueExample/local.settings.json
+++ b/examples/WireMockAzureQueueExample/local.settings.json
@@ -0,0 +1,7 @@
+{
+    "IsEncrypted": false,
+    "Values": {
+        "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+        "FUNCTIONS_WORKER_RUNTIME": "dotnet"
+    }
+}
--- a/examples/WireMockAzureQueueProxy/Program.cs
+++ b/examples/WireMockAzureQueueProxy/Program.cs
@@ -0,0 +1,40 @@
+using Newtonsoft.Json;
+using WireMock.Logging;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMockAzureQueueProxy;
+
+static class Program
+{
+    static void Main(params string[] args)
+    {
+        var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            Logger = new WireMockConsoleLogger(),
+            Urls = new[] { "http://localhost:20001/" },
+            StartAdminInterface = false,
+            ReadStaticMappings = true,
+            WatchStaticMappings = true,
+            WatchStaticMappingsInSubdirectories = true,
+            //ProxyAndRecordSettings = new ProxyAndRecordSettings
+            //{
+            //    Url = "http://127.0.0.1:10001",
+            //    SaveMapping = true,
+            //    SaveMappingToFile = true,
+            //    AppendGuidToSavedMappingFile = true
+            //}
+        });
+
+        System.Console.WriteLine("Press any key to stop the server");
+        System.Console.ReadKey();
+        server.Stop();
+
+        System.Console.WriteLine("Displaying all requests");
+        var allRequests = server.LogEntries;
+        System.Console.WriteLine(JsonConvert.SerializeObject(allRequests, Formatting.Indented));
+
+        System.Console.WriteLine("Press any key to quit");
+        System.Console.ReadKey();
+    }
+}
--- a/examples/WireMockAzureQueueProxy/WireMockAzureQueueProxy.csproj
+++ b/examples/WireMockAzureQueueProxy/WireMockAzureQueueProxy.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+        <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Update="__admin\mappings\*.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+</Project>
--- a/_devstoreaccount1_myqueue-items_messages_41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88.json
+++ b/_devstoreaccount1_myqueue-items_messages_41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88.json
@@ -0,0 +1,44 @@
+{
+    "Guid": "b4a2ff02-fb7f-4496-8c04-9aafc4f5f8f7",
+    "Title": "Proxy Mapping for DELETE /devstoreaccount1/myqueue-items/messages/41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88",
+    "Description": "Proxy Mapping for DELETE /devstoreaccount1/myqueue-items/messages/41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88",
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/devstoreaccount1/myqueue-items/messages/41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88",
+                    "IgnoreCase": false
+                }
+            ]
+        },
+        "Methods": [
+            "DELETE"
+        ],
+        "Params": [
+            {
+                "Name": "popreceipt",
+                "Matchers": [
+                    {
+                        "Name": "WildcardMatcher",
+                        "Pattern": "*",
+                        "IgnoreCase": false
+                    }
+                ]
+            }
+        ]
+    },
+    "Response": {
+        "StatusCode": 204,
+        "Headers": {
+            "Server": "Azurite-Queue/3.19.0",
+            "x-ms-client-request-id": "{{request.headers.x-ms-client-request-id}}",
+            "x-ms-request-id": "{{Random Type=\"Guid\"}}",
+            "x-ms-version": "2021-10-04",
+            "Date": "{{DateTime.Now \"ddd, dd MMM yyy HH’:’mm’:’ss ‘GMT’\"}}",
+            "Connection": "keep-alive",
+            "Keep-Alive": "timeout=5"
+        },
+        "UseTransformer": true
+    }
+}
--- a/examples/WireMockAzureQueueProxy/__admin/mappings/GET
+++ b/examples/WireMockAzureQueueProxy/__admin/mappings/GET
@@ -0,0 +1,60 @@
+{
+    "Scenario": "AzureQueue Get Messages",
+    "WhenStateIs": "No more messages",
+    "SetStateTo": "No more messages",
+    "Guid": "4c871968-29ee-472b-a548-170444d4cc3e",
+    "Title": "Proxy Mapping for GET NO MSG /devstoreaccount1/myqueue-items/messages",
+    "Description": "Proxy Mapping for GET NO MSG /devstoreaccount1/myqueue-items/messages",
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/devstoreaccount1/myqueue-items/messages",
+                    "IgnoreCase": false
+                }
+            ]
+        },
+        "Methods": [
+            "GET"
+        ],
+        "Params": [
+            {
+                "Name": "numofmessages",
+                "Matchers": [
+                    {
+                        "Name": "ExactMatcher",
+                        "Pattern": "16",
+                        "IgnoreCase": false
+                    }
+                ]
+            },
+            {
+                "Name": "visibilitytimeout",
+                "Matchers": [
+                    {
+                        "Name": "ExactMatcher",
+                        "Pattern": "600",
+                        "IgnoreCase": false
+                    }
+                ]
+            }
+        ]
+    },
+    "Response": {
+        "StatusCode": 200,
+        "Body": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><QueueMessagesList/>",
+        "Headers": {
+            "Content-Type": "application/xml",
+            "Server": "Azurite-Queue/3.19.0",
+            "x-ms-client-request-id": "{{request.headers.x-ms-client-request-id}}",
+            "x-ms-request-id": "{{Random Type=\"Guid\"}}",
+            "x-ms-version": "2021-10-04",
+            "Date": "{{DateTime.Now \"ddd, dd MMM yyy HH’:’mm’:’ss ‘GMT’\"}}",
+            "Connection": "keep-alive",
+            "Keep-Alive": "timeout=5",
+            "Transfer-Encoding": "chunked"
+        },
+        "UseTransformer": true
+    }
+}
--- a/examples/WireMockAzureQueueProxy/__admin/mappings/GET
+++ b/examples/WireMockAzureQueueProxy/__admin/mappings/GET
@@ -0,0 +1,59 @@
+{
+    "Scenario": "AzureQueue Get Messages",
+    "SetStateTo": "No more messages",
+    "Guid": "da9c6799-fbf8-41b6-8933-0df50f821ebb",
+    "Title": "Proxy Mapping for GET /devstoreaccount1/myqueue-items/messages",
+    "Description": "Proxy Mapping for GET /devstoreaccount1/myqueue-items/messages",
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/devstoreaccount1/myqueue-items/messages",
+                    "IgnoreCase": false
+                }
+            ]
+        },
+        "Methods": [
+            "GET"
+        ],
+        "Params": [
+            {
+                "Name": "numofmessages",
+                "Matchers": [
+                    {
+                        "Name": "WildcardMatcher",
+                        "Pattern": "*",
+                        "IgnoreCase": true
+                    }
+                ]
+            },
+            {
+                "Name": "visibilitytimeout",
+                "Matchers": [
+                    {
+                        "Name": "WildcardMatcher",
+                        "Pattern": "*",
+                        "IgnoreCase": false
+                    }
+                ]
+            }
+        ]
+    },
+    "Response": {
+        "StatusCode": 200,
+        "Body": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><QueueMessagesList><QueueMessage><MessageId>41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88</MessageId><InsertionTime>Sat, 29 Oct 2022 07:11:40 GMT</InsertionTime><ExpirationTime>Sat, 31 Dec 2022 07:11:40 GMT</ExpirationTime><PopReceipt>MjlPY3QyMDIyMDc6MTE6NDAyMjU2</PopReceipt><TimeNextVisible>Sat, 29 Oct 2022 07:21:40 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>c3RlZg==</MessageText></QueueMessage></QueueMessagesList>",
+        "Headers": {
+            "Content-Type": "application/xml",
+            "Server": "Azurite-Queue/3.19.0",
+            "x-ms-client-request-id": "{{request.headers.x-ms-client-request-id}}",
+            "x-ms-request-id": "{{Random Type=\"Guid\"}}",
+            "x-ms-version": "2021-10-04",
+            "Date": "{{DateTime.Now \"ddd, dd MMM yyy HH’:’mm’:’ss ‘GMT’\"}}",
+            "Connection": "keep-alive",
+            "Keep-Alive": "timeout=5",
+            "Transfer-Encoding": "chunked"
+        },
+        "UseTransformer": true
+    }
+}
--- a/examples/WireMockAzureQueueProxy/__admin/mappings/HEAD
+++ b/examples/WireMockAzureQueueProxy/__admin/mappings/HEAD
@@ -0,0 +1,46 @@
+{
+    "Guid": "17c7a389-98e1-4383-975d-54c82d1e3860",
+    "Title": "Proxy Mapping for HEAD /devstoreaccount1/myqueue-items",
+    "Description": "Proxy Mapping for HEAD /devstoreaccount1/myqueue-items",
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/devstoreaccount1/myqueue-items",
+                    "IgnoreCase": false
+                }
+            ]
+        },
+        "Methods": [
+            "HEAD"
+        ],
+        "Params": [
+            {
+                "Name": "comp",
+                "Matchers": [
+                    {
+                        "Name": "ExactMatcher",
+                        "Pattern": "metadata",
+                        "IgnoreCase": false
+                    }
+                ]
+            }
+        ]
+    },
+    "Response": {
+        "StatusCode": 200,
+        "Body": "",
+        "Headers": {
+            "Server": "Azurite-Queue/3.19.0",
+            "x-ms-client-request-id": "{{request.headers.x-ms-client-request-id}}",
+            "x-ms-approximate-messages-count": "0",
+            "x-ms-request-id": "{{Random Type=\"Guid\"}}",
+            "x-ms-version": "2021-10-04",
+            "Date": "{{DateTime.Now \"ddd, dd MMM yyy HH’:’mm’:’ss ‘GMT’\"}}",
+            "Connection": "keep-alive",
+            "Keep-Alive": "timeout=5"
+        },
+        "UseTransformer": true
+    }
+}
--- a/src/WireMock.Net.Abstractions/Admin/Settings/ProxyAndRecordSettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/ProxyAndRecordSettingsModel.cs
@@ -1,67 +1,71 @@
-namespace WireMock.Admin.Settings
+namespace WireMock.Admin.Settings;
+
+[FluentBuilder.AutoGenerateBuilder]
+public class ProxyAndRecordSettingsModel
 {
-    [FluentBuilder.AutoGenerateBuilder]
-    public class ProxyAndRecordSettingsModel
-    {
-        /// <summary>
-        /// The clientCertificate thumbprint or subject name fragment to use.
-        /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
-        /// </summary>
-        public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
+    /// <summary>
+    /// The clientCertificate thumbprint or subject name fragment to use.
+    /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+    /// </summary>
+    public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }

-        /// <summary>
-        /// Defines the WebProxySettings.
-        /// </summary>
-        public WebProxySettingsModel WebProxySettings { get; set; }
+    /// <summary>
+    /// Defines the WebProxySettings.
+    /// </summary>
+    public WebProxySettingsModel WebProxySettings { get; set; }

-        /// <summary>
-        /// Proxy requests should follow redirection (30x).
-        /// </summary>
-        public bool? AllowAutoRedirect { get; set; }
+    /// <summary>
+    /// Proxy requests should follow redirection (30x).
+    /// </summary>
+    public bool? AllowAutoRedirect { get; set; }

-        /// <summary>
-        /// The URL to proxy.
-        /// </summary>
-        public string Url { get; set; }
+    /// <summary>
+    /// The URL to proxy.
+    /// </summary>
+    public string Url { get; set; }

-        /// <summary>
-        /// Save the mapping for each request/response to the internal Mappings.
-        /// </summary>
-        public bool SaveMapping { get; set; }
+    /// <summary>
+    /// Save the mapping for each request/response to the internal Mappings.
+    /// </summary>
+    public bool SaveMapping { get; set; }

-        /// <summary>
-        /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
-        /// </summary>
-        public bool SaveMappingToFile { get; set; }
+    /// <summary>
+    /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
+    /// </summary>
+    public bool SaveMappingToFile { get; set; }

-        /// <summary>
-        /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
-        /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
-        /// </summary>
-        public string SaveMappingForStatusCodePattern { get; set; } = "*";
+    /// <summary>
+    /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
+    /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
+    /// </summary>
+    public string SaveMappingForStatusCodePattern { get; set; } = "*";

-        /// <summary>
-        /// Defines a list from headers which will be excluded from the saved mappings.
-        /// </summary>
-        public string[] ExcludedHeaders { get; set; }
+    /// <summary>
+    /// Defines a list from headers which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedHeaders { get; set; }

-        /// <summary>
-        /// Defines a list of cookies which will be excluded from the saved mappings.
-        /// </summary>
-        public string[] ExcludedCookies { get; set; }
+    /// <summary>
+    /// Defines a list of cookies which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedCookies { get; set; }

-        /// <summary>
-        /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
-        /// </summary>
-        // public bool PreferProxyMapping { get; set; }
+    /// <summary>
+    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
+    /// </summary>
+    // public bool PreferProxyMapping { get; set; }

-        /// <summary>
-        /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
-        /// - <c>false</c>, the default matchers will be used.
-        /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
-        ///
-        /// Default value is false.
-        /// </summary>
-        public bool UseDefinedRequestMatchers { get; set; }
-    }
+    /// <summary>
+    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
+    /// - <c>false</c>, the default matchers will be used.
+    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
+    ///
+    /// Default value is false.
+    /// </summary>
+    public bool UseDefinedRequestMatchers { get; set; }
+
+    /// <summary>
+    /// Append an unique GUID to the filename from the saved mapping file.
+    /// </summary>
+    public bool AppendGuidToSavedMappingFile { get; set; }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
@@ -1,82 +1,99 @@
 using System.Text.RegularExpressions;
 using WireMock.Handlers;
+using WireMock.Types;

-namespace WireMock.Admin.Settings
+namespace WireMock.Admin.Settings;
+
+/// <summary>
+/// Settings
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class SettingsModel
 {
    /// <summary>
-    /// Settings
+    /// Gets or sets the global delay in milliseconds.
    /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class SettingsModel
-    {
-        /// <summary>
-        /// Gets or sets the global delay in milliseconds.
-        /// </summary>
-        public int? GlobalProcessingDelay { get; set; }
+    public int? GlobalProcessingDelay { get; set; }

-        /// <summary>
-        /// Gets or sets if partial mapping is allowed.
-        /// </summary>
-        public bool? AllowPartialMapping { get; set; }
+    /// <summary>
+    /// Gets or sets if partial mapping is allowed.
+    /// </summary>
+    public bool? AllowPartialMapping { get; set; }

-        /// <summary>
-        /// Gets or sets the RequestLog expiration in hours
-        /// </summary>
-        public int? RequestLogExpirationDuration { get; set; }
+    /// <summary>
+    /// Gets or sets the RequestLog expiration in hours
+    /// </summary>
+    public int? RequestLogExpirationDuration { get; set; }

-        /// <summary>
-        /// Gets or sets the MaxRequestLog count.
-        /// </summary>
-        public int? MaxRequestLogCount { get; set; }
+    /// <summary>
+    /// Gets or sets the MaxRequestLog count.
+    /// </summary>
+    public int? MaxRequestLogCount { get; set; }

-        /// <summary>
-        /// Allow a Body for all HTTP Methods. (default set to false).
-        /// </summary>
-        public bool? AllowBodyForAllHttpMethods { get; set; }
+    /// <summary>
+    /// Allow a Body for all HTTP Methods. (default set to false).
+    /// </summary>
+    public bool? AllowBodyForAllHttpMethods { get; set; }

-        /// <summary>
-        /// Handle all requests synchronously. (default set to false).
-        /// </summary>
-        public bool? HandleRequestsSynchronously { get; set; }
+    /// <summary>
+    /// Handle all requests synchronously. (default set to false).
+    /// </summary>
+    public bool? HandleRequestsSynchronously { get; set; }

-        /// <summary>
-        /// Throw an exception when the Matcher fails because of invalid input. (default set to false).
-        /// </summary>
-        public bool? ThrowExceptionWhenMatcherFails { get; set; }
+    /// <summary>
+    /// Throw an exception when the Matcher fails because of invalid input. (default set to false).
+    /// </summary>
+    public bool? ThrowExceptionWhenMatcherFails { get; set; }

-        /// <summary>
-        /// Use the RegexExtended instead of the default <see cref="Regex"/>.  (default set to true).
-        /// </summary>
-        public bool? UseRegexExtended { get; set; }
+    /// <summary>
+    /// Use the RegexExtended instead of the default <see cref="Regex"/>.  (default set to true).
+    /// </summary>
+    public bool? UseRegexExtended { get; set; }

-        /// <summary>
-        /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to false).
-        /// </summary>
-        public bool? SaveUnmatchedRequests { get; set; }
+    /// <summary>
+    /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to false).
+    /// </summary>
+    public bool? SaveUnmatchedRequests { get; set; }

-        /// <summary>
-        /// Gets or sets if the static mappings should be read at startup.
-        /// </summary>
-        public bool? ReadStaticMappings { get; set; }
+    /// <summary>
+    /// Gets or sets if the static mappings should be read at startup.
+    /// </summary>
+    public bool? ReadStaticMappings { get; set; }

-        /// <summary>
-        /// Watch the static mapping files + folder for changes when running.
-        /// </summary>
-        public bool? WatchStaticMappings { get; set; }
+    /// <summary>
+    /// Watch the static mapping files + folder for changes when running.
+    /// </summary>
+    public bool? WatchStaticMappings { get; set; }

-        /// <summary>
-        /// A value indicating whether subdirectories within the static mappings path should be monitored.
-        /// </summary>
-        public bool? WatchStaticMappingsInSubdirectories { get; set; }
+    /// <summary>
+    /// A value indicating whether subdirectories within the static mappings path should be monitored.
+    /// </summary>
+    public bool? WatchStaticMappingsInSubdirectories { get; set; }

-        /// <summary>
-        /// Policies to use when using CORS. By default CORS is disabled. [Optional]
-        /// </summary>
-        public string? CorsPolicyOptions { get; set; }
+    /// <summary>
+    /// Policies to use when using CORS. By default CORS is disabled. [Optional]
+    /// </summary>
+    public string? CorsPolicyOptions { get; set; }

-        /// <summary>
-        /// The proxy and record settings.
-        /// </summary>
-        public ProxyAndRecordSettingsModel? ProxyAndRecordSettings { get; set; }
-    }
+    /// <summary>
+    /// The proxy and record settings.
+    /// </summary>
+    public ProxyAndRecordSettingsModel? ProxyAndRecordSettings { get; set; }
+
+    /// <summary>
+    /// Defines on which scheme (http/https) to host. (This overrides the <c>UseSSL</c> value).
+    /// </summary>
+    public HostingScheme? HostingScheme { get; set; }
+
+    /// <summary>
+    /// Don't save the response-string in the LogEntry when WithBody(Func{IRequestMessage, string}) or WithBody(Func{IRequestMessage, Task{string}}) is used. (default set to false).
+    /// </summary>
+    public bool? DoNotSaveDynamicResponseInLogEntry { get; set; }
+
+    /// <summary>
+    /// See <seealso cref="QueryParameterMultipleValueSupport"/>.
+    ///
+    /// Default value = "All".
+    /// </summary>
+    public QueryParameterMultipleValueSupport? QueryParameterMultipleValueSupport { get; set; }
 }
--- a/src/WireMock.Net.Abstractions/Constants/HttpRequestMethod.cs
+++ b/src/WireMock.Net.Abstractions/Constants/HttpRequestMethod.cs
@@ -1,9 +1,9 @@
-namespace WireMock.Http;
+namespace WireMock.Constants;

 /// <summary>
 /// https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
 /// </summary>
-internal static class HttpRequestMethods
+public static class HttpRequestMethod
 {
    public const string CONNECT = "CONNECT";
    public const string DELETE = "DELETE";
--- a/src/WireMock.Net.Abstractions/IRequestMessage.cs
+++ b/src/WireMock.Net.Abstractions/IRequestMessage.cs
@@ -28,7 +28,7 @@ public interface IRequestMessage
    /// <summary>
    /// The ProxyUrl (if a proxy is used).
    /// </summary>
-    string ProxyUrl { get; set; }
+    string? ProxyUrl { get; set; }

    /// <summary>
    /// Gets the DateTime.
--- a/src/WireMock.Net.Abstractions/Models/IBodyData.cs
+++ b/src/WireMock.Net.Abstractions/Models/IBodyData.cs
@@ -1,6 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
 using System.Text;
-using JetBrains.Annotations;
 using WireMock.Types;

 namespace WireMock.Util;
@@ -59,4 +57,9 @@ public interface IBodyData
    /// The body encoding.
    /// </summary>
    Encoding? Encoding { get; set; }
+
+    /// <summary>
+    /// Defines if this BodyData is the result of a dynamically created response-string. (
+    /// </summary>
+    public string? IsFuncUsed { get; set; }
 }
--- a/src/WireMock.Net.Abstractions/Server/IWireMockServer.cs
+++ b/src/WireMock.Net.Abstractions/Server/IWireMockServer.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
-using JetBrains.Annotations;
 using WireMock.Admin.Mappings;
 using WireMock.Logging;
-using WireMock.Matchers.Request;

 namespace WireMock.Server
 {
@@ -144,6 +142,11 @@ namespace WireMock.Server
        /// </summary>
        void ResetScenarios();

+        /// <summary>
+        /// Resets a specific Scenario by the name.
+        /// </summary>
+        bool ResetScenario(string name);
+
        /// <summary>
        /// Resets the LogEntries.
        /// </summary>
--- a/src/WireMock.Net.Abstractions/Types/QueryParameterMultipleValueSupport.cs
+++ b/src/WireMock.Net.Abstractions/Types/QueryParameterMultipleValueSupport.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace WireMock.Types;
+
+[Flags]
+public enum QueryParameterMultipleValueSupport
+{
+    // Support none
+    None = 0x0,
+
+    // Support "&" as multi-value-separator --> "key=value&key=anotherValue"
+    Ampersand = 0x1,
+
+    // Support ";" as multi-value-separator --> "key=value;key=anotherValue"
+    SemiColon = 0x2,
+
+    // Support "," as multi-value-separator -->  "key=1,2"
+    Comma = 0x4,
+
+    // Support "&" and ";" as multi-value-separator --> "key=value&key=anotherValue" and also "key=value;key=anotherValue"
+    AmpersandAndSemiColon = Ampersand | SemiColon,
+
+    // Support "&" and ";" as multi-value-separator
+    NoComma = AmpersandAndSemiColon,
+
+    // Support all multi-value-separators ("&" and ";" and ",")
+    All = Ampersand | SemiColon | Comma
+}
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -31,11 +31,11 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />

        <!-- See also https://mstack.nl/blog/20210801-source-generators -->
-        <PackageReference Include="FluentBuilder" Version="0.5.1">
+        <PackageReference Include="FluentBuilder" Version="0.7.0">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs
@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
 using FluentAssertions.Execution;
+using WireMock.Constants;
 using WireMock.Server;
 using WireMock.Types;

@@ -12,9 +13,10 @@ namespace WireMock.FluentAssertions;

 public class WireMockAssertions
 {
+    private const string Any = "*";
    private readonly int? _callsCount;
    private IReadOnlyList<IRequestMessage> _requestMessages;
-    private IReadOnlyList<KeyValuePair<string, WireMockList<string>>> _headers;
+    private readonly IReadOnlyList<KeyValuePair<string, WireMockList<string>>> _headers;

    public WireMockAssertions(IWireMockServer subject, int? callsCount)
    {
@@ -27,12 +29,13 @@ public class WireMockAssertions
    public AndWhichConstraint<WireMockAssertions, string> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
    {
        Func<IRequestMessage, bool> predicate = request => string.Equals(request.AbsoluteUrl, absoluteUrl, StringComparison.OrdinalIgnoreCase);
+
        var (filter, condition) = BuildFilterAndCondition(predicate);

        Execute.Assertion
            .BecauseOf(because, becauseArgs)
            .Given(() => _requestMessages)
-            .ForCondition(requests => requests.Any())
+            .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
@@ -53,15 +56,17 @@ public class WireMockAssertions
    public AndWhichConstraint<WireMockAssertions, string> AtUrl(string url, string because = "", params object[] becauseArgs)
    {
        Func<IRequestMessage, bool> predicate = request => string.Equals(request.Url, url, StringComparison.OrdinalIgnoreCase);
+
        var (filter, condition) = BuildFilterAndCondition(predicate);

        Execute.Assertion
            .BecauseOf(because, becauseArgs)
            .Given(() => _requestMessages)
-            .ForCondition(requests => requests.Any())
+            .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)
+                url
+            )
            .Then
            .ForCondition(condition)
            .FailWith(
@@ -79,12 +84,13 @@ public class WireMockAssertions
    public AndWhichConstraint<WireMockAssertions, string> WithProxyUrl(string proxyUrl, string because = "", params object[] becauseArgs)
    {
        Func<IRequestMessage, bool> predicate = request => string.Equals(request.ProxyUrl, proxyUrl, StringComparison.OrdinalIgnoreCase);
+
        var (filter, condition) = BuildFilterAndCondition(predicate);

        Execute.Assertion
            .BecauseOf(because, becauseArgs)
            .Given(() => _requestMessages)
-            .ForCondition(requests => requests.Any())
+            .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
@@ -94,8 +100,7 @@ public class WireMockAssertions
            .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)
+                requests => requests.Select(request => request.ProxyUrl)
            );

        _requestMessages = filter(_requestMessages).ToList();
@@ -107,23 +112,23 @@ public class WireMockAssertions
    public AndWhichConstraint<WireMockAssertions, string> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
    {
        Func<IRequestMessage, bool> predicate = request => string.Equals(request.ClientIP, clientIP, StringComparison.OrdinalIgnoreCase);
+
        var (filter, condition) = BuildFilterAndCondition(predicate);

        Execute.Assertion
            .BecauseOf(because, becauseArgs)
            .Given(() => _requestMessages)
-            .ForCondition(requests => requests.Any())
+            .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(requests =>
-                (_callsCount == null && requests.Any(req => req.ClientIP == clientIP)) ||
-                (_callsCount == requests.Count(req => req.ClientIP == clientIP))
+                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));
+                _ => clientIP, requests => requests.Select(request => request.ClientIP)
+            );

        _requestMessages = filter(_requestMessages).ToList();

@@ -165,50 +170,57 @@ public class WireMockAssertions

    [CustomAssertion]
    public AndConstraint<WireMockAssertions> UsingConnect(string because = "", params object[] becauseArgs)
-        => UsingMethod("CONNECT", because, becauseArgs);
+        => UsingMethod(HttpRequestMethod.CONNECT, because, becauseArgs);

    [CustomAssertion]
    public AndConstraint<WireMockAssertions> UsingDelete(string because = "", params object[] becauseArgs)
-        => UsingMethod("DELETE", because, becauseArgs);
+        => UsingMethod(HttpRequestMethod.DELETE, because, becauseArgs);

    [CustomAssertion]
    public AndConstraint<WireMockAssertions> UsingGet(string because = "", params object[] becauseArgs)
-        => UsingMethod("GET", because, becauseArgs);
+        => UsingMethod(HttpRequestMethod.GET, because, becauseArgs);

    [CustomAssertion]
    public AndConstraint<WireMockAssertions> UsingHead(string because = "", params object[] becauseArgs)
-        => UsingMethod("HEAD", because, becauseArgs);
+        => UsingMethod(HttpRequestMethod.HEAD, because, becauseArgs);

    [CustomAssertion]
    public AndConstraint<WireMockAssertions> UsingOptions(string because = "", params object[] becauseArgs)
-        => UsingMethod("OPTIONS", because, becauseArgs);
+        => UsingMethod(HttpRequestMethod.OPTIONS, because, becauseArgs);

    [CustomAssertion]
    public AndConstraint<WireMockAssertions> UsingPost(string because = "", params object[] becauseArgs)
-        => UsingMethod("POST", because, becauseArgs);
+        => UsingMethod(HttpRequestMethod.POST, because, becauseArgs);

    [CustomAssertion]
    public AndConstraint<WireMockAssertions> UsingPatch(string because = "", params object[] becauseArgs)
-        => UsingMethod("PATCH", because, becauseArgs);
+        => UsingMethod(HttpRequestMethod.PATCH, because, becauseArgs);

    [CustomAssertion]
    public AndConstraint<WireMockAssertions> UsingPut(string because = "", params object[] becauseArgs)
-        => UsingMethod("PUT", because, becauseArgs);
+        => UsingMethod(HttpRequestMethod.PUT, because, becauseArgs);

    [CustomAssertion]
    public AndConstraint<WireMockAssertions> UsingTrace(string because = "", params object[] becauseArgs)
-        => UsingMethod("TRACE", because, 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)
    {
-        Func<IRequestMessage, bool> predicate = request => string.Equals(request.Method, method, StringComparison.OrdinalIgnoreCase);
+        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);

        Execute.Assertion
            .BecauseOf(because, becauseArgs)
            .Given(() => _requestMessages)
-            .ForCondition(requests => requests.Any())
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
            .FailWith(
                "Expected {context:wiremockserver} to have been called using method {0}{reason}, but no calls were made.",
                method
@@ -230,12 +242,6 @@ public class WireMockAssertions
    {
        Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter = requests => requests.Where(predicate).ToList();

-        return
-        (
-            filter,
-            requests =>
-                (_callsCount == null && filter(_requestMessages).Any()) ||
-                (_callsCount == filter(_requestMessages).Count())
-        );
+        return (filter, requests => (_callsCount is null && filter(requests).Any()) || _callsCount == filter(requests).Count);
    }
 }
--- a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
+++ b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
@@ -30,7 +30,7 @@
 	</PropertyGroup>

 	<ItemGroup>
-		<PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
+		<PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 	</ItemGroup>

--- a/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
+++ b/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
@@ -154,8 +154,8 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
                throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
            }

-#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0 || NET6_0)
-            Assembly assembly;
+#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0 || NET6_0 || NET7_0)
+        Assembly assembly;
            try
            {
                assembly = CSScriptLib.CSScript.Evaluator.CompileCode(source);
--- a/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
+++ b/src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj
@@ -4,7 +4,7 @@
    <Description>A CSharpCodeMatcher which can be used to match WireMock.Net Requests using C# code.</Description>
    <AssemblyTitle>WireMock.Net.Matchers.CSharpCode</AssemblyTitle>
    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
    <PackageTags>wiremock;matchers;matcher;csharp;csharpcode</PackageTags>
    <RootNamespace>WireMock</RootNamespace>
@@ -31,7 +31,7 @@
  <Target Name="CheckIfShouldKillVBCSCompiler" />

  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />

    <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
@@ -45,7 +45,7 @@
    <PackageReference Include="CS-Script" Version="3.30.3" />
  </ItemGroup>

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

--- a/src/WireMock.Net.OpenApiParser/Extensions/DictionaryExtensions.cs
+++ b/src/WireMock.Net.OpenApiParser/Extensions/DictionaryExtensions.cs
@@ -1,21 +1,20 @@
 #if NET46 || NETSTANDARD2_0
 using System.Collections.Generic;

-namespace WireMock.Net.OpenApiParser.Extensions
+namespace WireMock.Net.OpenApiParser.Extensions;
+
+internal static class DictionaryExtensions
 {
-    internal static class DictionaryExtensions
+    public static bool TryAdd<TKey, TValue>(this Dictionary<TKey, TValue>? dictionary, TKey key, TValue value)
    {
-        public static bool TryAdd<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, TValue value)
+        if (dictionary is null || dictionary.ContainsKey(key))
        {
-            if (dictionary is null || dictionary.ContainsKey(key))
-            {
-                return false;
-            }
-
-            dictionary[key] = value;
-
-            return true;
+            return false;
        }
+
+        dictionary[key] = value;
+
+        return true;
    }
 }
-#endif
+#endif
--- a/src/WireMock.Net.OpenApiParser/Extensions/OpenApiSchemaExtensions.cs
+++ b/src/WireMock.Net.OpenApiParser/Extensions/OpenApiSchemaExtensions.cs
@@ -1,92 +1,91 @@
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using WireMock.Net.OpenApiParser.Types;

-namespace WireMock.Net.OpenApiParser.Extensions
+namespace WireMock.Net.OpenApiParser.Extensions;
+
+internal static class OpenApiSchemaExtensions
 {
-    internal static class OpenApiSchemaExtensions
+    /// <summary>
+    /// https://stackoverflow.com/questions/48111459/how-to-define-a-property-that-can-be-string-or-null-in-openapi-swagger
+    /// </summary>
+    public static bool TryGetXNullable(this OpenApiSchema schema, out bool value)
    {
-        /// <summary>
-        /// https://stackoverflow.com/questions/48111459/how-to-define-a-property-that-can-be-string-or-null-in-openapi-swagger
-        /// </summary>
-        public static bool TryGetXNullable(this OpenApiSchema schema, out bool value)
+        value = false;
+
+        if (schema.Extensions.TryGetValue("x-nullable", out IOpenApiExtension e) && e is OpenApiBoolean openApiBoolean)
        {
-            value = false;
-
-            if (schema.Extensions.TryGetValue("x-nullable", out IOpenApiExtension e) && e is OpenApiBoolean openApiBoolean)
-            {
-                value = openApiBoolean.Value;
-                return true;
-            }
-
-            return false;
+            value = openApiBoolean.Value;
+            return true;
        }

-        public static SchemaType GetSchemaType(this OpenApiSchema schema)
+        return false;
+    }
+
+    public static SchemaType GetSchemaType(this OpenApiSchema? schema)
+    {
+        switch (schema?.Type)
        {
-            switch (schema?.Type)
-            {
-                case "object":
-                    return SchemaType.Object;
+            case "object":
+                return SchemaType.Object;

-                case "array":
-                    return SchemaType.Array;
+            case "array":
+                return SchemaType.Array;

-                case "integer":
-                    return SchemaType.Integer;
+            case "integer":
+                return SchemaType.Integer;

-                case "number":
-                    return SchemaType.Number;
+            case "number":
+                return SchemaType.Number;

-                case "boolean":
-                    return SchemaType.Boolean;
+            case "boolean":
+                return SchemaType.Boolean;

-                case "string":
-                    return SchemaType.String;
+            case "string":
+                return SchemaType.String;

-                case "file":
-                    return SchemaType.File;
+            case "file":
+                return SchemaType.File;

-                default:
-                    return SchemaType.Unknown;
-            }
+            default:
+                return SchemaType.Unknown;
        }
+    }

-        public static SchemaFormat GetSchemaFormat(this OpenApiSchema schema)
+    public static SchemaFormat GetSchemaFormat(this OpenApiSchema? schema)
+    {
+        switch (schema?.Format)
        {
-            switch (schema?.Format)
-            {
-                case "float":
-                    return SchemaFormat.Float;
+            case "float":
+                return SchemaFormat.Float;

-                case "double":
-                    return SchemaFormat.Double;
+            case "double":
+                return SchemaFormat.Double;

-                case "int32":
-                    return SchemaFormat.Int32;
+            case "int32":
+                return SchemaFormat.Int32;

-                case "int64":
-                    return SchemaFormat.Int64;
+            case "int64":
+                return SchemaFormat.Int64;

-                case "date":
-                    return SchemaFormat.Date;
+            case "date":
+                return SchemaFormat.Date;

-                case "date-time":
-                    return SchemaFormat.DateTime;
+            case "date-time":
+                return SchemaFormat.DateTime;

-                case "password":
-                    return SchemaFormat.Password;
+            case "password":
+                return SchemaFormat.Password;

-                case "byte":
-                    return SchemaFormat.Byte;
+            case "byte":
+                return SchemaFormat.Byte;

-                case "binary":
-                    return SchemaFormat.Binary;
+            case "binary":
+                return SchemaFormat.Binary;

-                default:
-                    return SchemaFormat.Undefined;
-            }
+            default:
+                return SchemaFormat.Undefined;
        }
    }
 }
--- a/src/WireMock.Net.OpenApiParser/Extensions/WireMockServerExtensions.cs
+++ b/src/WireMock.Net.OpenApiParser/Extensions/WireMockServerExtensions.cs
@@ -1,97 +1,94 @@
-using System.IO;
+using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.ComTypes;
 using JetBrains.Annotations;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
-using SharpYaml.Model;
 using Stef.Validation;
 using WireMock.Net.OpenApiParser.Settings;
 using WireMock.Server;

-namespace WireMock.Net.OpenApiParser.Extensions
+namespace WireMock.Net.OpenApiParser.Extensions;
+
+/// <summary>
+/// Some extension methods for <see cref="IWireMockServer"/>.
+/// </summary>
+public static class WireMockServerExtensions
 {
    /// <summary>
-    /// Some extension methods for <see cref="IWireMockServer"/>.
+    /// Register the mappings via an OpenAPI (swagger) V2 or V3 file.
    /// </summary>
-    public static class WireMockServerExtensions
+    /// <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)
    {
-        /// <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, null, out 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="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
-        /// <param name="settings">Additional settings</param>
-        [PublicAPI]
-        public static IWireMockServer WithMappingFromOpenApiFile(this IWireMockServer server, string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
-        {
-            Guard.NotNull(server, nameof(server));
-            Guard.NotNullOrEmpty(path, nameof(path));
+    /// <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>
+    /// <param name="settings">Additional settings</param>
+    [PublicAPI]
+    public static IWireMockServer WithMappingFromOpenApiFile(this IWireMockServer server, string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+    {
+        Guard.NotNull(server, nameof(server));
+        Guard.NotNullOrEmpty(path, nameof(path));

-            var mappings = new WireMockOpenApiParser().FromFile(path, settings, out diagnostic);
+        var mappings = new WireMockOpenApiParser().FromFile(path, settings, out diagnostic);

-            return server.WithMapping(mappings.ToArray());
-        }
+        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, null, 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="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, nameof(server));
-            Guard.NotNull(stream, nameof(stream));
-            Guard.NotNull(settings, nameof(settings));
+    /// <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);
+        var mappings = new WireMockOpenApiParser().FromStream(stream, settings, out diagnostic);

-            return server.WithMapping(mappings.ToArray());
-        }
+        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, nameof(server));
-            Guard.NotNull(document, nameof(document));
+    /// <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)
+    {
+        Guard.NotNull(server);
+        Guard.NotNull(document);

-            var mappings = new WireMockOpenApiParser().FromDocument(document, settings);
+        var mappings = new WireMockOpenApiParser().FromDocument(document, settings);

-            return server.WithMapping(mappings.ToArray());
-        }
+        return server.WithMapping(mappings.ToArray());
    }
 }
--- a/src/WireMock.Net.OpenApiParser/IWireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/IWireMockOpenApiParser.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
@@ -35,7 +35,7 @@ namespace WireMock.Net.OpenApiParser
        /// <param name="document">The source OpenApiDocument</param>
        /// <param name="settings">Additional settings [optional]</param>
        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings settings = null);
+        IEnumerable<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings? settings = null);

        /// <summary>
        /// Generate <see cref="IEnumerable{MappingModel}"/> from a <seealso cref="Stream"/>.
--- a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
+++ b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using Microsoft.OpenApi;
@@ -15,371 +16,365 @@ using WireMock.Net.OpenApiParser.Settings;
 using WireMock.Net.OpenApiParser.Types;
 using WireMock.Net.OpenApiParser.Utils;

-namespace WireMock.Net.OpenApiParser.Mappers
+namespace WireMock.Net.OpenApiParser.Mappers;
+
+internal class OpenApiPathsMapper
 {
-    internal class OpenApiPathsMapper
+    private const string HeaderContentType = "Content-Type";
+
+    private readonly WireMockOpenApiParserSettings _settings;
+    private readonly ExampleValueGenerator _exampleValueGenerator;
+
+    public OpenApiPathsMapper(WireMockOpenApiParserSettings settings)
    {
-        private const string HeaderContentType = "Content-Type";
+        _settings = Guard.NotNull(settings);
+        _exampleValueGenerator = new ExampleValueGenerator(settings);
+    }

-        private readonly WireMockOpenApiParserSettings _settings;
-        private readonly ExampleValueGenerator _exampleValueGenerator;
+    public IEnumerable<MappingModel> ToMappingModels(OpenApiPaths paths, IList<OpenApiServer> servers)
+    {
+        return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
+    }

-        public OpenApiPathsMapper(WireMockOpenApiParserSettings settings)
+    private IEnumerable<MappingModel> MapPaths(OpenApiPaths paths, IList<OpenApiServer> servers)
+    {
+        return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
+    }
+
+    private IEnumerable<MappingModel> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
+    {
+        return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers));
+    }
+
+    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();
+
+        TryGetContent(response.Value?.Content, out OpenApiMediaType? responseContent, out string? responseContentType);
+        var responseSchema = response.Value?.Content?.FirstOrDefault().Value?.Schema;
+        var responseExample = responseContent?.Example;
+        var responseSchemaExample = responseContent?.Schema?.Example;
+
+        var body = responseExample != null ? MapOpenApiAnyToJToken(responseExample) :
+            responseSchemaExample != null ? MapOpenApiAnyToJToken(responseSchemaExample) :
+            MapSchemaToObject(responseSchema);
+
+        var requestBodyModel = new BodyModel();
+        if (operation.RequestBody != null && operation.RequestBody.Content != null && operation.RequestBody.Required)
        {
-            _settings = Guard.NotNull(settings, nameof(settings));
-            _exampleValueGenerator = new ExampleValueGenerator(settings);
+            var request = operation.RequestBody.Content;
+            TryGetContent(request, out OpenApiMediaType? requestContent, out _);
+
+            var requestBodySchema = operation.RequestBody.Content.First().Value?.Schema;
+            var requestBodyExample = requestContent!.Example;
+            var requestBodySchemaExample = requestContent.Schema?.Example;
+
+            var requestBodyMapped = requestBodyExample != null ? MapOpenApiAnyToJToken(requestBodyExample) :
+                requestBodySchemaExample != null ? MapOpenApiAnyToJToken(requestBodySchemaExample) :
+                MapSchemaToObject(requestBodySchema);
+
+            requestBodyModel = MapRequestBody(requestBodyMapped);
        }

-        public IEnumerable<MappingModel> ToMappingModels(OpenApiPaths paths, IList<OpenApiServer> servers)
+        if (!int.TryParse(response.Key, out var httpStatusCode))
        {
-            return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
+            httpStatusCode = 200;
        }

-        private IEnumerable<MappingModel> MapPaths(OpenApiPaths paths, IList<OpenApiServer> servers)
+        return new MappingModel
        {
-            return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
-        }
-
-        private IEnumerable<MappingModel> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
-        {
-            return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers));
-        }
-
-        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();
-
-            TryGetContent(response.Value?.Content, out OpenApiMediaType responseContent, out string responseContentType);
-            var responseSchema = response.Value?.Content?.FirstOrDefault().Value?.Schema;
-            var responseExample = responseContent?.Example;
-            var responseSchemaExample = responseContent?.Schema?.Example;
-
-            var body = responseExample != null ? MapOpenApiAnyToJToken(responseExample) :
-                                   responseSchemaExample != null ? MapOpenApiAnyToJToken(responseSchemaExample) :
-                                   MapSchemaToObject(responseSchema);
-
-            var requestBodyModel = new BodyModel();
-            if (operation.RequestBody != null && operation.RequestBody.Content != null && operation.RequestBody.Required)
+            Guid = Guid.NewGuid(),
+            Request = new RequestModel
            {
-                var request = operation.RequestBody.Content;
-                TryGetContent(request, out OpenApiMediaType requestContent, out string requestContentType);
-
-                var requestBodySchema = operation.RequestBody.Content.First().Value?.Schema;
-                var requestBodyExample = requestContent.Example;
-                var requestBodySchemaExample = requestContent.Schema?.Example;
-
-                var requestBodyMapped = requestBodyExample != null ? MapOpenApiAnyToJToken(requestBodyExample) :
-                                   requestBodySchemaExample != null ? MapOpenApiAnyToJToken(requestBodySchemaExample) :
-                                   MapSchemaToObject(requestBodySchema);
-
-                requestBodyModel = MapRequestBody(requestBodyMapped);
+                Methods = new[] { httpMethod },
+                Path = 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 = body
            }
+        };
+    }

-            if (!int.TryParse(response.Key, out var httpStatusCode))
+    private BodyModel? MapRequestBody(object? requestBody)
+    {
+        if (requestBody == null)
+        {
+            return null;
+        }
+
+        return new BodyModel
+        {
+            Matcher = new MatcherModel
            {
-                httpStatusCode = 200;
+                Name = "JsonMatcher",
+                Pattern = JsonConvert.SerializeObject(requestBody, Formatting.Indented),
+                IgnoreCase = _settings.RequestBodyIgnoreCase
            }
+        };
+    }

-            return new MappingModel
-            {
-                Guid = Guid.NewGuid(),
-                Request = new RequestModel
+    private 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 object? MapSchemaToObject(OpenApiSchema? schema, string? name = null)
+    {
+        if (schema == null)
+        {
+            return null;
+        }
+
+        switch (schema.GetSchemaType())
+        {
+            case SchemaType.Array:
+                var jArray = new JArray();
+                for (int i = 0; i < _settings.NumberOfArrayItems; i++)
                {
-                    Methods = new[] { httpMethod },
-                    Path = 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 = body
-                }
-            };
-        }
-
-        private BodyModel MapRequestBody(object requestBody)
-        {
-            if (requestBody == null)
-            {
-                return null;
-            }
-
-            return new BodyModel
-            {
-                Matcher = new MatcherModel
-                {
-                    Name = "JsonMatcher",
-                    Pattern = JsonConvert.SerializeObject(requestBody, Formatting.Indented),
-                    IgnoreCase = _settings.RequestBodyIgnoreCase
-                }
-            };
-        }
-
-        private bool TryGetContent(IDictionary<string, OpenApiMediaType> contents, out OpenApiMediaType openApiMediaType, 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 object MapSchemaToObject(OpenApiSchema schema, string name = null)
-        {
-            if (schema == null)
-            {
-                return null;
-            }
-
-            switch (schema.GetSchemaType())
-            {
-                case SchemaType.Array:
-                    var jArray = new JArray();
-                    for (int i = 0; i < _settings.NumberOfArrayItems; i++)
+                    if (schema.Items.Properties.Count > 0)
                    {
-                        if (schema.Items.Properties.Count > 0)
+                        var arrayItem = new JObject();
+                        foreach (var property in schema.Items.Properties)
                        {
-                            var arrayItem = new JObject();
-                            foreach (var property in schema.Items.Properties)
+                            var objectValue = MapSchemaToObject(property.Value, property.Key);
+                            if (objectValue is JProperty jp)
                            {
-                                var objectValue = MapSchemaToObject(property.Value, property.Key);
-                                if (objectValue is JProperty jp)
-                                {
-                                    arrayItem.Add(jp);
-                                }
-                                else
-                                {
-                                    arrayItem.Add(new JProperty(property.Key, objectValue));
-                                }
+                                arrayItem.Add(jp);
                            }
-
-                            jArray.Add(arrayItem);
-                        }
-                        else
-                        {
-                            jArray.Add(MapSchemaToObject(schema.Items, name));
-                        }
-                    }
-
-                    if (schema.AllOf.Count > 0)
-                    {
-                        jArray.Add(MapSchemaAllOfToObject(schema));
-                    }
-
-                    return jArray;
-
-                case SchemaType.Boolean:
-                case SchemaType.Integer:
-                case SchemaType.Number:
-                case SchemaType.String:
-                    return _exampleValueGenerator.GetExampleValue(schema);
-
-                case SchemaType.Object:
-                    var propertyAsJObject = new JObject();
-                    foreach (var schemaProperty in schema.Properties)
-                    {
-                        propertyAsJObject.Add(MapPropertyAsJObject(schemaProperty.Value, schemaProperty.Key));
-                    }
-                    if (schema.AllOf.Count > 0)
-                    {
-                        foreach (var property in schema.AllOf)
-                        {
-                            foreach (var item in property.Properties)
+                            else
                            {
-                                propertyAsJObject.Add(MapPropertyAsJObject(item.Value, item.Key));
+                                arrayItem.Add(new JProperty(property.Key, objectValue));
                            }
                        }
+
+                        jArray.Add(arrayItem);
+                    }
+                    else
+                    {
+                        jArray.Add(MapSchemaToObject(schema.Items, name));
                    }
-
-                    return name != null ? new JProperty(name, propertyAsJObject) : (JToken)propertyAsJObject;
-
-                default:
-                    return null;
-            }
-        }
-
-        private JObject MapSchemaAllOfToObject(OpenApiSchema schema)
-        {
-            var arrayItem = new JObject();
-            foreach (var property in schema.AllOf)
-            {
-                foreach (var item in property.Properties)
-                {
-                    arrayItem.Add(MapPropertyAsJObject(item.Value, item.Key));
                }
-            }
-            return arrayItem;
-        }

-        private object MapPropertyAsJObject(OpenApiSchema openApiSchema, string key)
-        {
-            if (openApiSchema.GetSchemaType() == SchemaType.Object || openApiSchema.GetSchemaType() == SchemaType.Array)
-            {
-                var mapped = MapSchemaToObject(openApiSchema, key);
-                if (mapped is JProperty jp)
+                if (schema.AllOf.Count > 0)
                {
-                    return jp;
+                    jArray.Add(MapSchemaAllOfToObject(schema));
                }
-                else
+
+                return jArray;
+
+            case SchemaType.Boolean:
+            case SchemaType.Integer:
+            case SchemaType.Number:
+            case SchemaType.String:
+                return _exampleValueGenerator.GetExampleValue(schema);
+
+            case SchemaType.Object:
+                var propertyAsJObject = new JObject();
+                foreach (var schemaProperty in schema.Properties)
                {
-                    return new JProperty(key, mapped);
+                    propertyAsJObject.Add(MapPropertyAsJObject(schemaProperty.Value, schemaProperty.Key));
                }
-            }
-            else
+
+                if (schema.AllOf.Count > 0)
+                {
+                    foreach (var property in schema.AllOf)
+                    {
+                        foreach (var item in property.Properties)
+                        {
+                            propertyAsJObject.Add(MapPropertyAsJObject(item.Value, item.Key));
+                        }
+                    }
+                }
+
+                return name != null ? new JProperty(name, propertyAsJObject) : propertyAsJObject;
+
+            default:
+                return null;
+        }
+    }
+
+    private JObject MapSchemaAllOfToObject(OpenApiSchema schema)
+    {
+        var arrayItem = new JObject();
+        foreach (var property in schema.AllOf)
+        {
+            foreach (var item in property.Properties)
            {
-                // bool propertyIsNullable = openApiSchema.Nullable || (openApiSchema.TryGetXNullable(out bool x) && x);
-                return new JProperty(key, _exampleValueGenerator.GetExampleValue(openApiSchema));
+                arrayItem.Add(MapPropertyAsJObject(item.Value, item.Key));
            }
        }
+        return arrayItem;
+    }

-        private string MapPathWithParameters(string path, IEnumerable<OpenApiParameter> parameters)
+    private object MapPropertyAsJObject(OpenApiSchema openApiSchema, string key)
+    {
+        if (openApiSchema.GetSchemaType() == SchemaType.Object || openApiSchema.GetSchemaType() == SchemaType.Array)
        {
-            if (parameters == null)
+            var mapped = MapSchemaToObject(openApiSchema, key);
+            if (mapped is JProperty jp)
            {
-                return path;
+                return jp;
            }

-            string 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;
+            return new JProperty(key, mapped);
        }

-        private string MapBasePath(IList<OpenApiServer> servers)
+        // bool propertyIsNullable = openApiSchema.Nullable || (openApiSchema.TryGetXNullable(out bool x) && x);
+        return new JProperty(key, _exampleValueGenerator.GetExampleValue(openApiSchema));
+    }
+
+    private string MapPathWithParameters(string path, IEnumerable<OpenApiParameter>? parameters)
+    {
+        if (parameters == null)
        {
-            if (servers == null || servers.Count == 0)
-            {
-                return string.Empty;
-            }
+            return path;
+        }

-            OpenApiServer server = servers.First();
-            if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out Uri uriResult))
-            {
-                return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString();
-            }
+        string 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 string MapBasePath(IList<OpenApiServer>? servers)
+    {
+        if (servers == null || servers.Count == 0)
+        {
            return string.Empty;
        }

-        private JToken MapOpenApiAnyToJToken(IOpenApiAny any)
+        OpenApiServer server = servers.First();
+        if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out Uri uriResult))
        {
-            if (any == null)
-            {
-                return null;
-            }
-
-            using var outputString = new StringWriter();
-            var writer = new OpenApiJsonWriter(outputString);
-            any.Write(writer, OpenApiSpecVersion.OpenApi3_0);
-
-            if (any.AnyType == AnyType.Array)
-            {
-                return JArray.Parse(outputString.ToString());
-            }
-            else
-            {
-                return JObject.Parse(outputString.ToString());
-            }
+            return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString();
        }

-        private IDictionary<string, object> MapHeaders(string responseContentType, IDictionary<string, OpenApiHeader> headers)
+        return string.Empty;
+    }
+
+    private JToken? MapOpenApiAnyToJToken(IOpenApiAny? any)
+    {
+        if (any == null)
        {
-            var mappedHeaders = headers.ToDictionary(
-                item => item.Key,
-                item => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern
-            );
-
-            if (!string.IsNullOrEmpty(responseContentType))
-            {
-                mappedHeaders.TryAdd(HeaderContentType, responseContentType);
-            }
-
-            return mappedHeaders.Keys.Any() ? mappedHeaders : null;
+            return null;
        }

-        private IList<ParamModel> MapQueryParameters(IEnumerable<OpenApiParameter> queryParameters)
+        using var outputString = new StringWriter();
+        var writer = new OpenApiJsonWriter(outputString);
+        any.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+
+        if (any.AnyType == AnyType.Array)
        {
-            var list = queryParameters
-                .Where(req => req.Required)
-                .Select(qp => new ParamModel
+            return JArray.Parse(outputString.ToString());
+        }
+
+        return JObject.Parse(outputString.ToString());
+    }
+
+    private IDictionary<string, object?>? MapHeaders(string responseContentType, IDictionary<string, OpenApiHeader> headers)
+    {
+        var mappedHeaders = headers.ToDictionary(
+            item => item.Key,
+            _ => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern
+        );
+
+        if (!string.IsNullOrEmpty(responseContentType))
+        {
+            mappedHeaders.TryAdd(HeaderContentType, responseContentType);
+        }
+
+        return mappedHeaders.Keys.Any() ? mappedHeaders : null;
+    }
+
+    private IList<ParamModel>? MapQueryParameters(IEnumerable<OpenApiParameter> queryParameters)
+    {
+        var list = queryParameters
+            .Where(req => req.Required)
+            .Select(qp => new ParamModel
+            {
+                Name = qp.Name,
+                IgnoreCase = _settings.QueryParameterPatternIgnoreCase,
+                Matchers = new[]
                {
-                    Name = qp.Name,
-                    IgnoreCase = _settings.QueryParameterPatternIgnoreCase,
-                    Matchers = new[]
-                    {
-                        GetExampleMatcherModel(qp.Schema, _settings.QueryParameterPatternToUse)
-                    }
-                })
-                .ToList();
+                    GetExampleMatcherModel(qp.Schema, _settings.QueryParameterPatternToUse)
+                }
+            })
+            .ToList();

-            return list.Any() ? list : null;
-        }
+        return list.Any() ? list : null;
+    }

-        private IList<HeaderModel> MapRequestHeaders(IEnumerable<OpenApiParameter> headers)
-        {
-            var list = headers
-                .Where(req => req.Required)
-                .Select(qp => new HeaderModel
+    private IList<HeaderModel>? MapRequestHeaders(IEnumerable<OpenApiParameter> headers)
+    {
+        var list = headers
+            .Where(req => req.Required)
+            .Select(qp => new HeaderModel
+            {
+                Name = qp.Name,
+                IgnoreCase = _settings.HeaderPatternIgnoreCase,
+                Matchers = new[]
                {
-                    Name = qp.Name,
-                    IgnoreCase = _settings.HeaderPatternIgnoreCase,
-                    Matchers = new[]
-                    {
-                        GetExampleMatcherModel(qp.Schema, _settings.HeaderPatternToUse)
-                    }
-                })
-                .ToList();
+                    GetExampleMatcherModel(qp.Schema, _settings.HeaderPatternToUse)
+                }
+            })
+            .ToList();

-            return list.Any() ? list : null;
-        }
+        return list.Any() ? list : null;
+    }

-        private MatcherModel GetExampleMatcherModel(OpenApiSchema schema, ExampleValueType type)
+    private MatcherModel GetExampleMatcherModel(OpenApiSchema? schema, ExampleValueType type)
+    {
+        return type switch
        {
-            return type switch
-            {
-                ExampleValueType.Value => new MatcherModel { Name = "ExactMatcher", Pattern = GetExampleValueAsStringForSchemaType(schema), IgnoreCase = _settings.IgnoreCaseExampleValues },
+            ExampleValueType.Value => new MatcherModel { Name = "ExactMatcher", Pattern = GetExampleValueAsStringForSchemaType(schema), IgnoreCase = _settings.IgnoreCaseExampleValues },

-                _ => new MatcherModel { Name = "WildcardMatcher", Pattern = "*" }
-            };
-        }
+            _ => new MatcherModel { Name = "WildcardMatcher", Pattern = "*" }
+        };
+    }

-        private string GetExampleValueAsStringForSchemaType(OpenApiSchema schema)
+    private string GetExampleValueAsStringForSchemaType(OpenApiSchema? schema)
+    {
+        var value = _exampleValueGenerator.GetExampleValue(schema);
+
+        return value switch
        {
-            var value = _exampleValueGenerator.GetExampleValue(schema);
+            string valueAsString => valueAsString,

-            return value switch
-            {
-                string valueAsString => valueAsString,
-
-                _ => value.ToString(),
-            };
-        }
+            _ => value.ToString(),
+        };
    }
 }
--- a/src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs
@@ -1,58 +1,60 @@
-using System;
+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; set; }
-        /// <summary>
-        /// An example value for an Integer.
-        /// </summary>
-        int Integer { get; set; }
-        /// <summary>
-        /// An example value for a Float.
-        /// </summary>
-        float Float { get; set; }
-        /// <summary>
-        /// An example value for a Double.
-        /// </summary>
-        double Double { get; set; }
-
-        /// <summary>
-        /// An example value for a Date.
-        /// </summary>
-        Func<DateTime> Date { get; set; }
-
-        /// <summary>
-        /// An example value for a DateTime.
-        /// </summary>
-        Func<DateTime> DateTime { get; set; }
-
-        /// <summary>
-        /// An example value for Bytes.
-        /// </summary>
-        byte[] Bytes { get; set; }
-
-        /// <summary>
-        /// An example value for a Object.
-        /// </summary>
-        object Object { get; set; }
-
-        /// <summary>
-        /// An example value for a String.
-        /// </summary>
-        string String { get; set; }
-
-        /// <summary>
-        /// OpenApi Schema to generate dynamic examples more accurate
-        /// </summary>
-        OpenApiSchema Schema { get; set; }
-    }
+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; set; }
+
+    /// <summary>
+    /// An example value for an Integer.
+    /// </summary>
+    int Integer { get; set; }
+
+    /// <summary>
+    /// An example value for a Float.
+    /// </summary>
+    float Float { get; set; }
+
+    /// <summary>
+    /// An example value for a Double.
+    /// </summary>
+    double Double { get; set; }
+
+    /// <summary>
+    /// An example value for a Date.
+    /// </summary>
+    Func<DateTime> Date { get; set; }
+
+    /// <summary>
+    /// An example value for a DateTime.
+    /// </summary>
+    Func<DateTime> DateTime { get; set; }
+
+    /// <summary>
+    /// An example value for Bytes.
+    /// </summary>
+    byte[] Bytes { get; set; }
+
+    /// <summary>
+    /// An example value for a Object.
+    /// </summary>
+    object Object { get; set; }
+
+    /// <summary>
+    /// An example value for a String.
+    /// </summary>
+    string String { get; set; }
+
+    /// <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,34 +1,42 @@
-using System;
+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 { get { return RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true; } set { } }
-        /// <inheritdoc />
-        public virtual int Integer { get { return RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42; } set { } }
-        /// <inheritdoc />
-        public virtual float Float { get { return RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f; } set { } }
-        /// <inheritdoc />
-        public virtual double Double { get { return RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d; } set { } }
-        /// <inheritdoc />
-        public virtual Func<DateTime> Date { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow.Date; } set { } }
-        /// <inheritdoc />
-        public virtual Func<DateTime> DateTime { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow; } set { } }
-        /// <inheritdoc />
-        public virtual byte[] Bytes { get { return RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate(); } set { } }
-        /// <inheritdoc />
-        public virtual object Object { get; set; } = "example-object";
-        /// <inheritdoc />
-        public virtual string String { get { return RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string"; } set { } }
-        /// <inheritdoc />
-        public virtual OpenApiSchema Schema { get; set; }
-    }
+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 { get => RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true; set { } }
+
+    /// <inheritdoc />
+    public virtual int Integer { get => RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42; set { } }
+
+    /// <inheritdoc />
+    public virtual float Float { get => RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f; set { } }
+
+    /// <inheritdoc />
+    public virtual double Double { get => RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d; set { } }
+
+    /// <inheritdoc />
+    public virtual Func<DateTime> Date { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow.Date; } set { } }
+
+    /// <inheritdoc />
+    public virtual Func<DateTime> DateTime { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow; } set { } }
+
+    /// <inheritdoc />
+    public virtual byte[] Bytes { get => RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate(); set { } }
+
+    /// <inheritdoc />
+    public virtual object Object { get; set; } = "example-object";
+
+    /// <inheritdoc />
+    public virtual string String { get => RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string"; set { } }
+
+    /// <inheritdoc />
+    public virtual OpenApiSchema? Schema { get; set; }
 }
--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
@@ -1,32 +1,40 @@
-using System;
+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 { get; set; } = true;
-        /// <inheritdoc />
-        public virtual int Integer { get; set; } = 42;
-        /// <inheritdoc />
-        public virtual float Float { get; set; } = 4.2f;
-        /// <inheritdoc />
-        public virtual double Double { get; set; } = 4.2d;
-        /// <inheritdoc />
-        public virtual Func<DateTime> Date { get; set; } = () => System.DateTime.UtcNow.Date;
-        /// <inheritdoc />
-        public virtual Func<DateTime> DateTime { get; set; } = () => System.DateTime.UtcNow;
-        /// <inheritdoc />
-        public virtual byte[] Bytes { get; set; } = { 48, 49, 50 };
-        /// <inheritdoc />
-        public virtual object Object { get; set; } = "example-object";
-        /// <inheritdoc />
-        public virtual string String { get; set; } = "example-string";
-        /// <inheritdoc />
-        public virtual OpenApiSchema Schema { get; set; } = new OpenApiSchema();
-    }
+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 { get; set; } = true;
+
+    /// <inheritdoc />
+    public virtual int Integer { get; set; } = 42;
+
+    /// <inheritdoc />
+    public virtual float Float { get; set; } = 4.2f;
+
+    /// <inheritdoc />
+    public virtual double Double { get; set; } = 4.2d;
+
+    /// <inheritdoc />
+    public virtual Func<DateTime> Date { get; set; } = () => System.DateTime.UtcNow.Date;
+
+    /// <inheritdoc />
+    public virtual Func<DateTime> DateTime { get; set; } = () => System.DateTime.UtcNow;
+
+    /// <inheritdoc />
+    public virtual byte[] Bytes { get; set; } = { 48, 49, 50 };
+
+    /// <inheritdoc />
+    public virtual object Object { get; set; } = "example-object";
+
+    /// <inheritdoc />
+    public virtual string String { get; set; } = "example-string";
+
+    /// <inheritdoc />
+    public virtual OpenApiSchema? Schema { get; set; } = new OpenApiSchema();
 }
--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserSettings.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserSettings.cs
@@ -1,64 +1,63 @@
 using WireMock.Net.OpenApiParser.Types;

-namespace WireMock.Net.OpenApiParser.Settings
+namespace WireMock.Net.OpenApiParser.Settings;
+
+/// <summary>
+/// The WireMockOpenApiParser Settings
+/// </summary>
+public class WireMockOpenApiParserSettings
 {
    /// <summary>
-    /// The WireMockOpenApiParser Settings
+    /// The number of array items to generate (default is 3).
    /// </summary>
-    public class WireMockOpenApiParserSettings
-    {
-        /// <summary>
-        /// The number of array items to generate (default is 3).
-        /// </summary>
-        public int NumberOfArrayItems { get; set; } = 3;
+    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 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 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 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>
+    /// 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 true).
-        /// </summary>
-        public bool HeaderPatternIgnoreCase { get; set; } = true;
+    /// <summary>
+    /// Is a Header match case insensitive? (default is true).
+    /// </summary>
+    public bool HeaderPatternIgnoreCase { get; set; } = true;

-        /// <summary>
-        /// Is a Query Parameter match case insensitive? (default is true).
-        /// </summary>
-        public bool QueryParameterPatternIgnoreCase { get; set; } = true;
+    /// <summary>
+    /// Is a Query Parameter match case insensitive? (default is true).
+    /// </summary>
+    public bool QueryParameterPatternIgnoreCase { get; set; } = true;

-        /// <summary>
-        /// Is a Request Body match case insensitive? (default is true).
-        /// </summary>
-        public bool RequestBodyIgnoreCase { get; set; } = true;
+    /// <summary>
+    /// Is a Request Body match case insensitive? (default is true).
+    /// </summary>
+    public bool RequestBodyIgnoreCase { get; set; } = true;

-        /// <summary>
-        /// Is a ExampleValue match case insensitive? (default is true).
-        /// </summary>
-        public bool IgnoreCaseExampleValues { get; set; } = true;
+    /// <summary>
+    /// Is a ExampleValue match case insensitive? (default is true).
+    /// </summary>
+    public bool IgnoreCaseExampleValues { get; set; } = true;

-        /// <summary>
-        /// Are examples generated dynamically? (default is false).
-        /// </summary>
-        public bool DynamicExamples { get; set; } = false;
-    }
+    /// <summary>
+    /// Are examples generated dynamically? (default is false).
+    /// </summary>
+    public bool DynamicExamples { get; set; } = false;
 }
--- a/src/WireMock.Net.OpenApiParser/Types/ExampleValueType.cs
+++ b/src/WireMock.Net.OpenApiParser/Types/ExampleValueType.cs
@@ -1,20 +1,19 @@
-namespace WireMock.Net.OpenApiParser.Types
+namespace WireMock.Net.OpenApiParser.Types;
+
+/// <summary>
+/// The example value to use
+/// </summary>
+public enum ExampleValueType
 {
    /// <summary>
-    /// The example value to use
+    /// 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>
-    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,
+    Value,

-        /// <summary>
-        /// Just use a Wildcard (*) character.
-        /// </summary>
-        Wildcard
-    }
+    /// <summary>
+    /// Just use a Wildcard (*) character.
+    /// </summary>
+    Wildcard
 }
--- a/src/WireMock.Net.OpenApiParser/Types/SchemaFormat.cs
+++ b/src/WireMock.Net.OpenApiParser/Types/SchemaFormat.cs
@@ -1,25 +1,24 @@
-namespace WireMock.Net.OpenApiParser.Types
+namespace WireMock.Net.OpenApiParser.Types;
+
+internal enum SchemaFormat
 {
-    internal enum SchemaFormat
-    {
-        Float,
+    Float,

-        Double,
+    Double,

-        Int32,
+    Int32,

-        Int64,
+    Int64,

-        Date,
+    Date,

-        DateTime,
+    DateTime,

-        Password,
+    Password,

-        Byte,
+    Byte,

-        Binary,
+    Binary,

-        Undefined
-    }
+    Undefined
 }
--- a/src/WireMock.Net.OpenApiParser/Types/SchemaType.cs
+++ b/src/WireMock.Net.OpenApiParser/Types/SchemaType.cs
@@ -1,21 +1,20 @@
-namespace WireMock.Net.OpenApiParser.Types
+namespace WireMock.Net.OpenApiParser.Types;
+
+internal enum SchemaType
 {
-    internal enum SchemaType
-    {
-        Object,
+    Object,

-        Array,
+    Array,

-        String,
+    String,

-        Integer,
+    Integer,

-        Number,
+    Number,

-        Boolean,
+    Boolean,

-        File,
+    File,

-        Unknown
-    }
+    Unknown
 }
--- a/src/WireMock.Net.OpenApiParser/Utils/DateTimeUtils.cs
+++ b/src/WireMock.Net.OpenApiParser/Utils/DateTimeUtils.cs
@@ -1,18 +1,17 @@
-using System;
+using System;
 using System.Globalization;

-namespace WireMock.Net.OpenApiParser.Utils
-{
-    internal static class DateTimeUtils
-    {
-        public static string ToRfc3339DateTime(DateTime dateTime)
-        {
-            return dateTime.ToString("yyyy-MM-dd'T'HH:mm:ss.fffzzz", DateTimeFormatInfo.InvariantInfo);
-        }
+namespace WireMock.Net.OpenApiParser.Utils;

-        public static string ToRfc3339Date(DateTime dateTime)
-        {
-            return dateTime.ToString("yyyy-MM-dd", DateTimeFormatInfo.InvariantInfo);
-        }
+internal static class DateTimeUtils
+{
+    public static string ToRfc3339DateTime(DateTime dateTime)
+    {
+        return dateTime.ToString("yyyy-MM-dd'T'HH:mm:ss.fffzzz", DateTimeFormatInfo.InvariantInfo);
+    }
+
+    public static string ToRfc3339Date(DateTime dateTime)
+    {
+        return dateTime.ToString("yyyy-MM-dd", DateTimeFormatInfo.InvariantInfo);
    }
 }
--- a/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
+++ b/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
@@ -7,121 +7,120 @@ using WireMock.Net.OpenApiParser.Extensions;
 using WireMock.Net.OpenApiParser.Settings;
 using WireMock.Net.OpenApiParser.Types;

-namespace WireMock.Net.OpenApiParser.Utils
+namespace WireMock.Net.OpenApiParser.Utils;
+
+internal class ExampleValueGenerator
 {
-    internal class ExampleValueGenerator
+    private readonly WireMockOpenApiParserSettings _settings;
+
+    public ExampleValueGenerator(WireMockOpenApiParserSettings settings)
    {
-        private readonly WireMockOpenApiParserSettings _settings;
+        _settings = Guard.NotNull(settings);

-        public ExampleValueGenerator(WireMockOpenApiParserSettings settings)
+        // Check if user provided an own implementation
+        if (settings.ExampleValues is null)
        {
-            _settings = Guard.NotNull(settings, nameof(settings));
-
-            // Check if user provided an own implementation
-            if (settings.ExampleValues is null)
+            if (_settings.DynamicExamples)
            {
-                if (_settings.DynamicExamples)
-                {
-                    _settings.ExampleValues = new WireMockOpenApiParserDynamicExampleValues();
-                }
-                else
-                {
-                    _settings.ExampleValues = new WireMockOpenApiParserExampleValues();
-                }
+                _settings.ExampleValues = new WireMockOpenApiParserDynamicExampleValues();
            }
-        }
-
-        public object GetExampleValue(OpenApiSchema schema)
-        {
-            var schemaExample = schema?.Example;
-            var schemaEnum = GetRandomEnumValue(schema?.Enum);
-
-            _settings.ExampleValues.Schema = schema;
-
-            switch (schema?.GetSchemaType())
+            else
            {
-                case SchemaType.Boolean:
-                    var exampleBoolean = (OpenApiBoolean)schemaExample;
-                    return exampleBoolean is null ? _settings.ExampleValues.Boolean : exampleBoolean.Value;
-
-                case SchemaType.Integer:
-                    switch (schema?.GetSchemaFormat())
-                    {
-                        case SchemaFormat.Int64:
-                            var exampleLong = (OpenApiLong)schemaExample;
-                            var enumLong = (OpenApiLong)schemaEnum;
-                            var valueLongEnumOrExample = enumLong is null ? exampleLong?.Value : enumLong?.Value;
-                            return valueLongEnumOrExample ?? _settings.ExampleValues.Integer;
-
-                        default:
-                            var exampleInteger = (OpenApiInteger)schemaExample;
-                            var enumInteger = (OpenApiInteger)schemaEnum;
-                            var valueIntegerEnumOrExample = enumInteger is null ? exampleInteger?.Value : enumInteger?.Value;
-                            return valueIntegerEnumOrExample ?? _settings.ExampleValues.Integer;
-                    }
-
-                case SchemaType.Number:
-                    switch (schema?.GetSchemaFormat())
-                    {
-                        case SchemaFormat.Float:
-                            var exampleFloat = (OpenApiFloat)schemaExample;
-                            var enumFloat = (OpenApiFloat)schemaEnum;
-                            var valueFloatEnumOrExample = enumFloat is null ? exampleFloat?.Value : enumFloat?.Value;
-                            return valueFloatEnumOrExample ?? _settings.ExampleValues.Float;
-
-                        default:
-                            var exampleDouble = (OpenApiDouble)schemaExample;
-                            var enumDouble = (OpenApiDouble)schemaEnum;
-                            var valueDoubleEnumOrExample = enumDouble is null ? exampleDouble?.Value : enumDouble?.Value;
-                            return valueDoubleEnumOrExample ?? _settings.ExampleValues.Double;
-                    }
-
-                default:
-                    switch (schema?.GetSchemaFormat())
-                    {
-                        case SchemaFormat.Date:
-                            var exampleDate = (OpenApiDate)schemaExample;
-                            var enumDate = (OpenApiDate)schemaEnum;
-                            var valueDateEnumOrExample = enumDate is null ? exampleDate?.Value : enumDate?.Value;
-                            return DateTimeUtils.ToRfc3339Date(valueDateEnumOrExample ?? _settings.ExampleValues.Date());
-
-                        case SchemaFormat.DateTime:
-                            var exampleDateTime = (OpenApiDateTime)schemaExample;
-                            var enumDateTime = (OpenApiDateTime)schemaEnum;
-                            var valueDateTimeEnumOrExample = enumDateTime is null ? exampleDateTime?.Value : enumDateTime?.Value;
-                            return DateTimeUtils.ToRfc3339DateTime(valueDateTimeEnumOrExample?.DateTime ?? _settings.ExampleValues.DateTime());
-
-                        case SchemaFormat.Byte:
-                            var exampleByte = (OpenApiByte)schemaExample;
-                            var enumByte = (OpenApiByte)schemaEnum;
-                            var valueByteEnumOrExample = enumByte is null ? exampleByte?.Value : enumByte?.Value;
-                            return valueByteEnumOrExample ?? _settings.ExampleValues.Bytes;
-
-                        case SchemaFormat.Binary:
-                            var exampleBinary = (OpenApiBinary)schemaExample;
-                            var enumBinary = (OpenApiBinary)schemaEnum;
-                            var valueBinaryEnumOrExample = enumBinary is null ? exampleBinary?.Value : enumBinary?.Value;
-                            return valueBinaryEnumOrExample ?? _settings.ExampleValues.Object;
-
-                        default:
-                            var exampleString = (OpenApiString)schemaExample;
-                            var enumString = (OpenApiString)schemaEnum;
-                            var valueStringEnumOrExample = enumString is null ? exampleString?.Value : enumString?.Value;
-                            return valueStringEnumOrExample ?? _settings.ExampleValues.String;
-                    }
+                _settings.ExampleValues = new WireMockOpenApiParserExampleValues();
            }
        }
-
-        private static IOpenApiAny GetRandomEnumValue(IList<IOpenApiAny> schemaEnum)
-        {
-            if (schemaEnum?.Count > 0)
-            {
-                int maxValue = schemaEnum.Count - 1;
-                int randomEnum = new Random().Next(0, maxValue);
-                return schemaEnum[randomEnum];
-            }
-
-            return null;
-        }
+    }
+
+    public object GetExampleValue(OpenApiSchema? schema)
+    {
+        var schemaExample = schema?.Example;
+        var schemaEnum = GetRandomEnumValue(schema?.Enum);
+
+        _settings.ExampleValues.Schema = schema;
+
+        switch (schema?.GetSchemaType())
+        {
+            case SchemaType.Boolean:
+                var exampleBoolean = schemaExample as OpenApiBoolean;
+                return exampleBoolean is null ? _settings.ExampleValues.Boolean : exampleBoolean.Value;
+
+            case SchemaType.Integer:
+                switch (schema?.GetSchemaFormat())
+                {
+                    case SchemaFormat.Int64:
+                        var exampleLong = (OpenApiLong)schemaExample;
+                        var enumLong = (OpenApiLong)schemaEnum;
+                        var valueLongEnumOrExample = enumLong is null ? exampleLong?.Value : enumLong?.Value;
+                        return valueLongEnumOrExample ?? _settings.ExampleValues.Integer;
+
+                    default:
+                        var exampleInteger = (OpenApiInteger)schemaExample;
+                        var enumInteger = (OpenApiInteger)schemaEnum;
+                        var valueIntegerEnumOrExample = enumInteger is null ? exampleInteger?.Value : enumInteger?.Value;
+                        return valueIntegerEnumOrExample ?? _settings.ExampleValues.Integer;
+                }
+
+            case SchemaType.Number:
+                switch (schema?.GetSchemaFormat())
+                {
+                    case SchemaFormat.Float:
+                        var exampleFloat = (OpenApiFloat)schemaExample;
+                        var enumFloat = (OpenApiFloat)schemaEnum;
+                        var valueFloatEnumOrExample = enumFloat is null ? exampleFloat?.Value : enumFloat?.Value;
+                        return valueFloatEnumOrExample ?? _settings.ExampleValues.Float;
+
+                    default:
+                        var exampleDouble = (OpenApiDouble)schemaExample;
+                        var enumDouble = (OpenApiDouble)schemaEnum;
+                        var valueDoubleEnumOrExample = enumDouble is null ? exampleDouble?.Value : enumDouble?.Value;
+                        return valueDoubleEnumOrExample ?? _settings.ExampleValues.Double;
+                }
+
+            default:
+                switch (schema?.GetSchemaFormat())
+                {
+                    case SchemaFormat.Date:
+                        var exampleDate = (OpenApiDate)schemaExample;
+                        var enumDate = (OpenApiDate)schemaEnum;
+                        var valueDateEnumOrExample = enumDate is null ? exampleDate?.Value : enumDate?.Value;
+                        return DateTimeUtils.ToRfc3339Date(valueDateEnumOrExample ?? _settings.ExampleValues.Date());
+
+                    case SchemaFormat.DateTime:
+                        var exampleDateTime = (OpenApiDateTime)schemaExample;
+                        var enumDateTime = (OpenApiDateTime)schemaEnum;
+                        var valueDateTimeEnumOrExample = enumDateTime is null ? exampleDateTime?.Value : enumDateTime?.Value;
+                        return DateTimeUtils.ToRfc3339DateTime(valueDateTimeEnumOrExample?.DateTime ?? _settings.ExampleValues.DateTime());
+
+                    case SchemaFormat.Byte:
+                        var exampleByte = (OpenApiByte)schemaExample;
+                        var enumByte = (OpenApiByte)schemaEnum;
+                        var valueByteEnumOrExample = enumByte is null ? exampleByte?.Value : enumByte?.Value;
+                        return valueByteEnumOrExample ?? _settings.ExampleValues.Bytes;
+
+                    case SchemaFormat.Binary:
+                        var exampleBinary = (OpenApiBinary)schemaExample;
+                        var enumBinary = (OpenApiBinary)schemaEnum;
+                        var valueBinaryEnumOrExample = enumBinary is null ? exampleBinary?.Value : enumBinary?.Value;
+                        return valueBinaryEnumOrExample ?? _settings.ExampleValues.Object;
+
+                    default:
+                        var exampleString = (OpenApiString)schemaExample;
+                        var enumString = (OpenApiString)schemaEnum;
+                        var valueStringEnumOrExample = enumString is null ? exampleString?.Value : enumString?.Value;
+                        return valueStringEnumOrExample ?? _settings.ExampleValues.String;
+                }
+        }
+    }
+
+    private static IOpenApiAny? GetRandomEnumValue(IList<IOpenApiAny>? schemaEnum)
+    {
+        if (schemaEnum?.Count > 0)
+        {
+            int maxValue = schemaEnum.Count - 1;
+            int randomEnum = new Random().Next(0, maxValue);
+            return schemaEnum[randomEnum];
+        }
+
+        return null;
    }
 }
--- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
+++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
@@ -12,7 +12,7 @@
        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <LangVersion>8.0</LangVersion>
+        <LangVersion>10</LangVersion>
    </PropertyGroup>

    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -22,11 +22,15 @@
    <ItemGroup>
        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
        <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="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.16" />
-        <PackageReference Include="Stef.Validation" Version="0.1.0" />
+        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.17" />
+        <PackageReference Include="Stef.Validation" Version="0.1.1" />
    </ItemGroup>

    <ItemGroup>
--- a/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using JetBrains.Annotations;
@@ -9,60 +9,59 @@ using WireMock.Admin.Mappings;
 using WireMock.Net.OpenApiParser.Mappers;
 using WireMock.Net.OpenApiParser.Settings;

-namespace WireMock.Net.OpenApiParser
+namespace WireMock.Net.OpenApiParser;
+
+/// <summary>
+/// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock.Net MappingModels.
+/// </summary>
+public class WireMockOpenApiParser : IWireMockOpenApiParser
 {
-    /// <summary>
-    /// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock.Net MappingModels.
-    /// </summary>
-    public class WireMockOpenApiParser : IWireMockOpenApiParser
+    private readonly OpenApiStreamReader _reader = new OpenApiStreamReader();
+
+    /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, out OpenApiDiagnostic)" />
+    [PublicAPI]
+    public IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
    {
-        private readonly OpenApiStreamReader _reader = new OpenApiStreamReader();
+        return FromFile(path, new WireMockOpenApiParserSettings(), out diagnostic);
+    }

-        /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, out OpenApiDiagnostic)" />
-        [PublicAPI]
-        public IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
+    /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, WireMockOpenApiParserSettings, out OpenApiDiagnostic)" />
+    [PublicAPI]
+    public IEnumerable<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+    {
+        OpenApiDocument document;
+        if (Path.GetExtension(path).EndsWith("raml", StringComparison.OrdinalIgnoreCase))
        {
-            return FromFile(path, new WireMockOpenApiParserSettings(), out diagnostic);
+            diagnostic = new OpenApiDiagnostic();
+            document = new RamlConverter().ConvertToOpenApiDocument(path);
+        }
+        else
+        {
+            var reader = new OpenApiStreamReader();
+            document = reader.Read(File.OpenRead(path), out diagnostic);
        }

-        /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, WireMockOpenApiParserSettings, out OpenApiDiagnostic)" />
-        [PublicAPI]
-        public IEnumerable<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);
+    }

-            return FromDocument(document, settings);
-        }
+    /// <inheritdoc cref="IWireMockOpenApiParser.FromStream(Stream, out OpenApiDiagnostic)" />
+    [PublicAPI]
+    public IEnumerable<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic)
+    {
+        return FromDocument(_reader.Read(stream, out diagnostic));
+    }

-        /// <inheritdoc cref="IWireMockOpenApiParser.FromStream(Stream, out OpenApiDiagnostic)" />
-        [PublicAPI]
-        public IEnumerable<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic)
-        {
-            return FromDocument(_reader.Read(stream, out diagnostic));
-        }
+    /// <inheritdoc cref="IWireMockOpenApiParser.FromStream(Stream, WireMockOpenApiParserSettings, out OpenApiDiagnostic)" />
+    [PublicAPI]
+    public IEnumerable<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+    {
+        return FromDocument(_reader.Read(stream, out diagnostic), settings);
+    }

-        /// <inheritdoc cref="IWireMockOpenApiParser.FromStream(Stream, WireMockOpenApiParserSettings, out OpenApiDiagnostic)" />
-        [PublicAPI]
-        public IEnumerable<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
-        {
-            return FromDocument(_reader.Read(stream, out diagnostic), settings);
-        }
-
-        /// <inheritdoc cref="IWireMockOpenApiParser.FromDocument(OpenApiDocument, WireMockOpenApiParserSettings)" />
-        [PublicAPI]
-        public IEnumerable<MappingModel> FromDocument(OpenApiDocument openApiDocument, WireMockOpenApiParserSettings settings = null)
-        {
-            return new OpenApiPathsMapper(settings).ToMappingModels(openApiDocument.Paths, openApiDocument.Servers);
-        }
+    /// <inheritdoc cref="IWireMockOpenApiParser.FromDocument(OpenApiDocument, WireMockOpenApiParserSettings)" />
+    [PublicAPI]
+    public IEnumerable<MappingModel> FromDocument(OpenApiDocument openApiDocument, WireMockOpenApiParserSettings? settings = null)
+    {
+        return new OpenApiPathsMapper(settings).ToMappingModels(openApiDocument.Paths, openApiDocument.Servers);
    }
 }
--- a/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
+++ b/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
@@ -1,4 +1,4 @@
-using RestEase;
+using RestEase;
 using System;
 using System.Collections.Generic;
 using System.Net.Http.Headers;
@@ -179,6 +179,20 @@ namespace WireMock.Client
        [Post("scenarios")]
        Task<StatusModel> ResetScenariosAsync();

+        /// <summary>
+        /// Delete (reset) a specific scenario
+        /// </summary>
+        [Delete("scenarios/{name}")]
+        [AllowAnyStatusCode]
+        Task<StatusModel> DeleteScenarioAsync([Path] string name);
+
+        /// <summary>
+        /// Delete (reset) all scenarios
+        /// </summary>
+        [Post("scenarios/{name}/reset")]
+        [AllowAnyStatusCode]
+        Task<StatusModel> ResetScenarioAsync([Path] string name);
+
        /// <summary>
        /// Create a new File
        /// </summary>
--- a/src/WireMock.Net.StandAlone/StandAloneApp.cs
+++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs
@@ -15,7 +15,7 @@ namespace WireMock.Net.StandAlone;
 /// </summary>
 public static class StandAloneApp
 {
-    private static readonly string Version = typeof(StandAloneApp).GetTypeInfo().Assembly.GetName().Version.ToString();
+    private static readonly string Version = typeof(StandAloneApp).GetTypeInfo().Assembly.GetName().Version!.ToString();

    /// <summary>
    /// Start WireMock.Net standalone Server based on the WireMockServerSettings.
--- a/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
+++ b/src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj
@@ -3,7 +3,7 @@
    <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
    <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0;net7.0</TargetFrameworks>
    <GenerateDocumentationFile>true</GenerateDocumentationFile>
    <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
    <PackageId>WireMock.Net.StandAlone</PackageId>
@@ -36,7 +36,7 @@
  </PropertyGroup>

  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" PrivateAssets="All" />
    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
  </ItemGroup>

--- a/src/WireMock.Net.xUnit/WireMock.Net.xUnit.csproj
+++ b/src/WireMock.Net.xUnit/WireMock.Net.xUnit.csproj
@@ -27,7 +27,7 @@
    <ItemGroup>
        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="Stef.Validation" Version="0.1.0" />
+        <PackageReference Include="Stef.Validation" Version="0.1.1" />
        <PackageReference Include="xUnit.abstractions" Version="2.0.3" />
    </ItemGroup>

--- a/src/WireMock.Net/Http/HttpClientBuilder.cs
+++ b/src/WireMock.Net/Http/HttpClientBuilder.cs
@@ -9,7 +9,7 @@ internal static class HttpClientBuilder
 {
    public static HttpClient Build(HttpClientSettings settings)
    {
-#if NETSTANDARD || NETCOREAPP3_1 || NET5_0 || NET6_0
+#if NETSTANDARD || NETCOREAPP3_1 || NET5_0 || NET6_0 || NET7_0
        var handler = new HttpClientHandler
        {
            CheckCertificateRevocationList = false,
--- a/src/WireMock.Net/Http/HttpResponseMessageHelper.cs
+++ b/src/WireMock.Net/Http/HttpResponseMessageHelper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Threading.Tasks;
 using WireMock.Util;
@@ -35,15 +36,18 @@ internal static class HttpResponseMessageHelper
                contentEncodingHeader = headers.First(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentEncoding, StringComparison.OrdinalIgnoreCase)).Value;
            }

-            var bodyParserSettings = new BodyParserSettings
+            if (httpResponseMessage.StatusCode != HttpStatusCode.NoContent) // A body is not allowed for 204.
            {
-                Stream = stream,
-                ContentType = contentTypeHeader?.FirstOrDefault(),
-                DeserializeJson = deserializeJson,
-                ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
-                DecompressGZipAndDeflate = decompressGzipAndDeflate
-            };
-            responseMessage.BodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+                var bodyParserSettings = new BodyParserSettings
+                {
+                    Stream = stream,
+                    ContentType = contentTypeHeader?.FirstOrDefault(),
+                    DeserializeJson = deserializeJson,
+                    ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
+                    DecompressGZipAndDeflate = decompressGzipAndDeflate
+                };
+                responseMessage.BodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
+            }
        }

        foreach (var header in headers)
--- a/src/WireMock.Net/Http/WebhookSender.cs
+++ b/src/WireMock.Net/Http/WebhookSender.cs
@@ -89,7 +89,7 @@ internal class WebhookSender
        };

        // Create HttpRequestMessage
-        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, webhookRequest.Url);
+        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, webhookRequestUrl);

        // Delay (if required)
        if (TryGetDelay(webhookRequest, out var delay))
--- a/src/WireMock.Net/Logging/LogEntry.cs
+++ b/src/WireMock.Net/Logging/LogEntry.cs
@@ -12,13 +12,13 @@ public class LogEntry : ILogEntry
    public Guid Guid { get; set; }

    /// <inheritdoc cref="ILogEntry.RequestMessage" />
-    public IRequestMessage RequestMessage { get; set; }
+    public IRequestMessage RequestMessage { get; set; } = null!;

    /// <inheritdoc cref="ILogEntry.ResponseMessage" />
-    public IResponseMessage ResponseMessage { get; set; }
+    public IResponseMessage ResponseMessage { get; set; } = null!;

    /// <inheritdoc cref="ILogEntry.RequestMatchResult" />
-    public IRequestMatchResult RequestMatchResult { get; set; }
+    public IRequestMatchResult RequestMatchResult { get; set; } = null!;

    /// <inheritdoc cref="ILogEntry.MappingGuid" />
    public Guid? MappingGuid { get; set; }
@@ -33,5 +33,5 @@ public class LogEntry : ILogEntry
    public string? PartialMappingTitle { get; set; }

    /// <inheritdoc cref="ILogEntry.PartialMatchResult" />
-    public IRequestMatchResult PartialMatchResult { get; set; }
+    public IRequestMatchResult PartialMatchResult { get; set; } = null!;
 }
--- a/src/WireMock.Net/Logging/WireMockConsoleLogger.cs
+++ b/src/WireMock.Net/Logging/WireMockConsoleLogger.cs
@@ -2,73 +2,72 @@ using Newtonsoft.Json;
 using System;
 using WireMock.Admin.Requests;

-namespace WireMock.Logging
+namespace WireMock.Logging;
+
+/// <summary>
+/// WireMockConsoleLogger which logs to Console
+/// </summary>
+/// <seealso cref="IWireMockLogger" />
+public class WireMockConsoleLogger : IWireMockLogger
 {
    /// <summary>
-    /// WireMockConsoleLogger which logs to Console
+    /// Initializes a new instance of the <see cref="WireMockConsoleLogger"/> class.
    /// </summary>
-    /// <seealso cref="IWireMockLogger" />
-    public class WireMockConsoleLogger : IWireMockLogger
+    public WireMockConsoleLogger()
    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WireMockConsoleLogger"/> class.
-        /// </summary>
-        public WireMockConsoleLogger()
-        {
-            Console.OutputEncoding = System.Text.Encoding.UTF8;
-        }
+        Console.OutputEncoding = System.Text.Encoding.UTF8;
+    }

-        /// <see cref="IWireMockLogger.Debug"/>
-        public void Debug(string formatString, params object[] args)
-        {
-            Console.WriteLine(Format("Debug", formatString, args));
-        }
+    /// <see cref="IWireMockLogger.Debug"/>
+    public void Debug(string formatString, params object[] args)
+    {
+        Console.WriteLine(Format("Debug", formatString, args));
+    }

-        /// <see cref="IWireMockLogger.Info"/>
-        public void Info(string formatString, params object[] args)
-        {
-            Console.WriteLine(Format("Info", formatString, args));
-        }
+    /// <see cref="IWireMockLogger.Info"/>
+    public void Info(string formatString, params object[] args)
+    {
+        Console.WriteLine(Format("Info", formatString, args));
+    }

-        /// <see cref="IWireMockLogger.Warn"/>
-        public void Warn(string formatString, params object[] args)
-        {
-            Console.WriteLine(Format("Warn", formatString, args));
-        }
+    /// <see cref="IWireMockLogger.Warn"/>
+    public void Warn(string formatString, params object[] args)
+    {
+        Console.WriteLine(Format("Warn", formatString, args));
+    }

-        /// <see cref="IWireMockLogger.Error(string, object[])"/>
-        public void Error(string formatString, params object[] args)
-        {
-            Console.WriteLine(Format("Error", formatString, args));
-        }
+    /// <see cref="IWireMockLogger.Error(string, object[])"/>
+    public void Error(string formatString, params object[] args)
+    {
+        Console.WriteLine(Format("Error", formatString, args));
+    }

-        /// <see cref="IWireMockLogger.Error(string, Exception)"/>
-        public void Error(string formatString, Exception exception)
-        {
-            Console.WriteLine(Format("Error", formatString, exception.Message));
+    /// <see cref="IWireMockLogger.Error(string, Exception)"/>
+    public void Error(string formatString, Exception exception)
+    {
+        Console.WriteLine(Format("Error", formatString, exception.Message));

-            if (exception is AggregateException ae)
+        if (exception is AggregateException ae)
+        {
+            ae.Handle(ex =>
            {
-                ae.Handle(ex =>
-                {
-                    Console.WriteLine(Format("Error", "Exception {0}", ex.Message));
-                    return true;
-                });
-            }
-        }
-
-        /// <see cref="IWireMockLogger.DebugRequestResponse"/>
-        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
-        {
-            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
-            Console.WriteLine(Format("DebugRequestResponse", "Admin[{0}] {1}", isAdminRequest, message));
-        }
-
-        private static string Format(string level, string formatString, params object[] args)
-        {
-            var message = args.Length > 0 ? string.Format(formatString, args) : formatString;
-
-            return $"{DateTime.UtcNow} [{level}] : {message}";
+                Console.WriteLine(Format("Error", "Exception {0}", ex.Message));
+                return true;
+            });
        }
    }
+
+    /// <see cref="IWireMockLogger.DebugRequestResponse"/>
+    public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+    {
+        string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+        Console.WriteLine(Format("DebugRequestResponse", "Admin[{0}] {1}", isAdminRequest, message));
+    }
+
+    private static string Format(string level, string formatString, params object[] args)
+    {
+        var message = args.Length > 0 ? string.Format(formatString, args) : formatString;
+
+        return $"{DateTime.UtcNow} [{level}] : {message}";
+    }
 }
--- a/src/WireMock.Net/Logging/WireMockNullLogger.cs
+++ b/src/WireMock.Net/Logging/WireMockNullLogger.cs
@@ -1,48 +1,47 @@
-using System;
+using System;
 using WireMock.Admin.Requests;

-namespace WireMock.Logging
+namespace WireMock.Logging;
+
+/// <summary>
+/// WireMockNullLogger which does not log.
+/// </summary>
+/// <seealso cref="IWireMockLogger" />
+public class WireMockNullLogger : IWireMockLogger
 {
-    /// <summary>
-    /// WireMockNullLogger which does not log.
-    /// </summary>
-    /// <seealso cref="IWireMockLogger" />
-    public class WireMockNullLogger : IWireMockLogger
+    /// <see cref="IWireMockLogger.Debug"/>
+    public void Debug(string formatString, params object[] args)
    {
-        /// <see cref="IWireMockLogger.Debug"/>
-        public void Debug(string formatString, params object[] args)
-        {
-            // Log nothing
-        }
+        // Log nothing
+    }

-        /// <see cref="IWireMockLogger.Info"/>
-        public void Info(string formatString, params object[] args)
-        {
-            // Log nothing
-        }
+    /// <see cref="IWireMockLogger.Info"/>
+    public void Info(string formatString, params object[] args)
+    {
+        // Log nothing
+    }

-        /// <see cref="IWireMockLogger.Warn"/>
-        public void Warn(string formatString, params object[] args)
-        {
-            // Log nothing
-        }
+    /// <see cref="IWireMockLogger.Warn"/>
+    public void Warn(string formatString, params object[] args)
+    {
+        // Log nothing
+    }

-        /// <see cref="IWireMockLogger.Error(string, object[])"/>
-        public void Error(string formatString, params object[] args)
-        {
-            // Log nothing
-        }
+    /// <see cref="IWireMockLogger.Error(string, object[])"/>
+    public void Error(string formatString, params object[] args)
+    {
+        // Log nothing
+    }

-        /// <see cref="IWireMockLogger.Error(string, Exception)"/>
-        public void Error(string formatString, Exception exception)
-        {
-            // Log nothing
-        }
+    /// <see cref="IWireMockLogger.Error(string, Exception)"/>
+    public void Error(string formatString, Exception exception)
+    {
+        // Log nothing
+    }

-        /// <see cref="IWireMockLogger.DebugRequestResponse"/>
-        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
-        {
-            // Log nothing
-        }
+    /// <see cref="IWireMockLogger.DebugRequestResponse"/>
+    public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+    {
+        // Log nothing
    }
 }
--- a/src/WireMock.Net/Matchers/LinqMatcher.cs
+++ b/src/WireMock.Net/Matchers/LinqMatcher.cs
@@ -21,6 +21,7 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher

    /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
    public MatchBehaviour MatchBehaviour { get; }
+
    /// <inheritdoc cref="IMatcher.ThrowException"/>
    public bool ThrowException { get; }

--- a/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageBodyMatcher.cs
@@ -104,7 +104,7 @@ public class RequestMessageBodyMatcher : IRequestMatcher
    /// Initializes a new instance of the <see cref="RequestMessageBodyMatcher"/> class.
    /// </summary>
    /// <param name="func">The function.</param>
-    public RequestMessageBodyMatcher(Func<IBodyData, bool> func)
+    public RequestMessageBodyMatcher(Func<IBodyData?, bool> func)
    {
        BodyDataFunc = Guard.NotNull(func);
    }
--- a/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
+++ b/src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs
@@ -53,7 +53,8 @@ public class RequestMessageParamMatcher : IRequestMatcher
    /// <param name="key">The key.</param>
    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
    /// <param name="values">The values.</param>
-    public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, string key, bool ignoreCase, string[]? values) : this(matchBehaviour, key, ignoreCase, values?.Select(value => new ExactMatcher(matchBehaviour, ignoreCase, false, MatchOperator.And, value)).Cast<IStringMatcher>().ToArray())
+    public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, string key, bool ignoreCase, params string[]? values) :
+        this(matchBehaviour, key, ignoreCase, values?.Select(value => new ExactMatcher(matchBehaviour, ignoreCase, false, MatchOperator.And, value)).Cast<IStringMatcher>().ToArray())
    {
    }

@@ -64,7 +65,7 @@ public class RequestMessageParamMatcher : IRequestMatcher
    /// <param name="key">The key.</param>
    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
    /// <param name="matchers">The matchers.</param>
-    public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, string key, bool ignoreCase, IStringMatcher[]? matchers)
+    public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, string key, bool ignoreCase, params IStringMatcher[]? matchers)
    {
        MatchBehaviour = matchBehaviour;
        Key = Guard.NotNull(key);
@@ -95,7 +96,7 @@ public class RequestMessageParamMatcher : IRequestMatcher
            return MatchScores.ToScore(requestMessage.Query != null && Funcs.Any(f => f(requestMessage.Query)));
        }

-        var valuesPresentInRequestMessage = ((RequestMessage)requestMessage).GetParameter(Key!, IgnoreCase ?? false);
+        var valuesPresentInRequestMessage = ((RequestMessage)requestMessage).GetParameter(Key, IgnoreCase ?? false);
        if (valuesPresentInRequestMessage == null)
        {
            // Key is not present at all, just return Mismatch
--- a/src/WireMock.Net/Models/BodyData.cs
+++ b/src/WireMock.Net/Models/BodyData.cs
@@ -1,41 +1,43 @@
 using System.Text;
 using WireMock.Types;

-namespace WireMock.Util
+namespace WireMock.Util;
+
+/// <summary>
+/// BodyData
+/// </summary>
+public class BodyData : IBodyData
 {
-    /// <summary>
-    /// BodyData
-    /// </summary>
-    public class BodyData : IBodyData
-    {
-        /// <inheritdoc cref="IBodyData.Encoding" />
-        public Encoding? Encoding { get; set; }
+    /// <inheritdoc cref="IBodyData.Encoding" />
+    public Encoding? Encoding { get; set; }

-        /// <inheritdoc />
-        public string? BodyAsString { get; set; }
+    /// <inheritdoc />
+    public string? BodyAsString { get; set; }

-        /// <inheritdoc cref="IBodyData.BodyAsJson" />
-        public object? BodyAsJson { get; set; }
+    /// <inheritdoc cref="IBodyData.BodyAsJson" />
+    public object? BodyAsJson { get; set; }

-        /// <inheritdoc cref="IBodyData.BodyAsBytes" />
-        public byte[]? BodyAsBytes { get; set; }
+    /// <inheritdoc cref="IBodyData.BodyAsBytes" />
+    public byte[]? BodyAsBytes { get; set; }

-        /// <inheritdoc cref="IBodyData.BodyAsJsonIndented" />
-        public bool? BodyAsJsonIndented { get; set; }
+    /// <inheritdoc cref="IBodyData.BodyAsJsonIndented" />
+    public bool? BodyAsJsonIndented { get; set; }

-        /// <inheritdoc cref="IBodyData.BodyAsFile" />
-        public string? BodyAsFile { get; set; }
+    /// <inheritdoc cref="IBodyData.BodyAsFile" />
+    public string? BodyAsFile { get; set; }

-        /// <inheritdoc cref="IBodyData.BodyAsFileIsCached" />
-        public bool? BodyAsFileIsCached { get; set; }
+    /// <inheritdoc cref="IBodyData.BodyAsFileIsCached" />
+    public bool? BodyAsFileIsCached { get; set; }

-        /// <inheritdoc cref="IBodyData.DetectedBodyType" />
-        public BodyType? DetectedBodyType { get; set; }
+    /// <inheritdoc cref="IBodyData.DetectedBodyType" />
+    public BodyType? DetectedBodyType { get; set; }

-        /// <inheritdoc cref="IBodyData.DetectedBodyTypeFromContentType" />
-        public BodyType? DetectedBodyTypeFromContentType { get; set; }
+    /// <inheritdoc cref="IBodyData.DetectedBodyTypeFromContentType" />
+    public BodyType? DetectedBodyTypeFromContentType { get; set; }

-        /// <inheritdoc cref="IRequestMessage.DetectedCompression" />
-        public string? DetectedCompression { get; set; }
-    }
+    /// <inheritdoc cref="IRequestMessage.DetectedCompression" />
+    public string? DetectedCompression { get; set; }
+
+    /// <inheritdoc />
+    public string? IsFuncUsed { get; set; }
 }
--- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.NETCore.cs
+++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.NETCore.cs
@@ -1,4 +1,4 @@
-#if NETCOREAPP3_1 || NET5_0 || NET6_0
+#if NETCOREAPP3_1 || NET5_0 || NET6_0 || NET7_0
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using WireMock.Types;
--- a/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
+++ b/src/WireMock.Net/Owin/AspNetCoreSelfHost.cs
@@ -69,7 +69,7 @@ namespace WireMock.Owin
                    services.AddSingleton<IOwinRequestMapper, OwinRequestMapper>();
                    services.AddSingleton<IOwinResponseMapper, OwinResponseMapper>();

-#if NETCOREAPP3_1 || NET5_0 || NET6_0
+#if NETCOREAPP3_1 || NET5_0 || NET6_0 || NET7_0
                    AddCors(services);
 #endif
                    _wireMockMiddlewareOptions.AdditionalServiceRegistration?.Invoke(services);
@@ -78,7 +78,7 @@ namespace WireMock.Owin
                {
                    appBuilder.UseMiddleware<GlobalExceptionMiddleware>();

-#if NETCOREAPP3_1 || NET5_0 || NET6_0
+#if NETCOREAPP3_1 || NET5_0 || NET6_0 || NET7_0
                    UseCors(appBuilder);
 #endif
                    _wireMockMiddlewareOptions.PreWireMockMiddlewareInit?.Invoke(appBuilder);
@@ -137,6 +137,8 @@ namespace WireMock.Owin
                _logger.Info("Server using .NET 5.0");
 #elif NET6_0
                _logger.Info("Server using .NET 6.0");
+#elif NET7_0
+                _logger.Info("Server using .NET 7.0");
 #elif NET46
                _logger.Info("Server using .NET Framework 4.6.1 or higher");
 #endif
--- a/src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs
+++ b/src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs
@@ -3,13 +3,13 @@ using System.Collections.Concurrent;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Types;
 using WireMock.Util;
 #if !USE_ASPNETCORE
 using Owin;
 #else
 using IAppBuilder = Microsoft.AspNetCore.Builder.IApplicationBuilder;
 using Microsoft.Extensions.DependencyInjection;
-using WireMock.Types;
 #endif

 namespace WireMock.Owin;
@@ -69,4 +69,8 @@ internal interface IWireMockMiddlewareOptions
    bool CustomCertificateDefined { get; }

    bool? SaveUnmatchedRequests { get; set; }
+
+    bool? DoNotSaveDynamicResponseInLogEntry { get; set; }
+
+    QueryParameterMultipleValueSupport? QueryParameterMultipleValueSupport { get; set; }
 }
--- a/src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs
+++ b/src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs
@@ -68,7 +68,7 @@ namespace WireMock.Owin.Mappers
                body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
            }

-            return new RequestMessage(urlDetails, method, clientIP, body, headers, cookies) { DateTime = DateTime.UtcNow };
+            return new RequestMessage(options, urlDetails, method, clientIP, body, headers, cookies) { DateTime = DateTime.UtcNow };
        }

        private static (UrlDetails UrlDetails, string ClientIP) ParseRequest(IRequest request)
--- a/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs
@@ -81,11 +81,11 @@ namespace WireMock.Owin.Mappers
            var statusCodeType = responseMessage.StatusCode?.GetType();
            switch (statusCodeType)
            {
-                case Type typeAsIntOrEnum when typeAsIntOrEnum == typeof(int) || typeAsIntOrEnum == typeof(int?) || typeAsIntOrEnum.GetTypeInfo().IsEnum:
+                case { } typeAsIntOrEnum when typeAsIntOrEnum == typeof(int) || typeAsIntOrEnum == typeof(int?) || typeAsIntOrEnum.GetTypeInfo().IsEnum:
                    response.StatusCode = MapStatusCode((int)responseMessage.StatusCode!);
                    break;

-                case Type typeAsString when typeAsString == typeof(string):
+                case { } typeAsString when typeAsString == typeof(string):
                    // Note: this case will also match on null 
                    int.TryParse(responseMessage.StatusCode as string, out int result);
                    response.StatusCode = MapStatusCode(result);
@@ -99,7 +99,14 @@ namespace WireMock.Owin.Mappers

            if (bytes != null)
            {
-                await response.Body.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
+                try
+                {
+                    await response.Body.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
+                }
+                catch (Exception ex)
+                {
+                    _options.Logger.Warn("Error writing response body. Exception : {0}", ex);
+                }
            }
        }

@@ -123,7 +130,7 @@ namespace WireMock.Owin.Mappers
            switch (responseMessage.BodyData?.DetectedBodyType)
            {
                case BodyType.String:
-                    return (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(responseMessage.BodyData.BodyAsString);
+                    return (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(responseMessage.BodyData.BodyAsString!);

                case BodyType.Json:
                    var formatting = responseMessage.BodyData.BodyAsJsonIndented == true
@@ -136,7 +143,7 @@ namespace WireMock.Owin.Mappers
                    return responseMessage.BodyData.BodyAsBytes;

                case BodyType.File:
-                    return _options.FileSystemHandler?.ReadResponseBodyAsFile(responseMessage.BodyData.BodyAsFile);
+                    return _options.FileSystemHandler?.ReadResponseBodyAsFile(responseMessage.BodyData.BodyAsFile!);
            }

            return null;
@@ -154,7 +161,7 @@ namespace WireMock.Owin.Mappers
                });

            // Set other headers
-            foreach (var item in responseMessage.Headers)
+            foreach (var item in responseMessage.Headers!)
            {
                var headerName = item.Key;
                var value = item.Value;
--- a/src/WireMock.Net/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddleware.cs
@@ -32,22 +32,25 @@ namespace WireMock.Owin
        private readonly IOwinRequestMapper _requestMapper;
        private readonly IOwinResponseMapper _responseMapper;
        private readonly IMappingMatcher _mappingMatcher;
+        private readonly LogEntryMapper _logEntryMapper;

 #if !USE_ASPNETCORE
        public WireMockMiddleware(Next next, IWireMockMiddlewareOptions options, IOwinRequestMapper requestMapper, IOwinResponseMapper responseMapper, IMappingMatcher mappingMatcher) : base(next)
        {
-            _options = Guard.NotNull(options, nameof(options));
-            _requestMapper = Guard.NotNull(requestMapper, nameof(requestMapper));
-            _responseMapper = Guard.NotNull(responseMapper, nameof(responseMapper));
-            _mappingMatcher = Guard.NotNull(mappingMatcher, nameof(mappingMatcher));
+            _options = Guard.NotNull(options);
+            _requestMapper = Guard.NotNull(requestMapper);
+            _responseMapper = Guard.NotNull(responseMapper);
+            _mappingMatcher = Guard.NotNull(mappingMatcher);
+            _logEntryMapper = new LogEntryMapper(options);
        }
 #else
        public WireMockMiddleware(Next next, IWireMockMiddlewareOptions options, IOwinRequestMapper requestMapper, IOwinResponseMapper responseMapper, IMappingMatcher mappingMatcher)
        {
-            _options = Guard.NotNull(options, nameof(options));
-            _requestMapper = Guard.NotNull(requestMapper, nameof(requestMapper));
-            _responseMapper = Guard.NotNull(responseMapper, nameof(responseMapper));
-            _mappingMatcher = Guard.NotNull(mappingMatcher, nameof(mappingMatcher));
+            _options = Guard.NotNull(options);
+            _requestMapper = Guard.NotNull(requestMapper);
+            _responseMapper = Guard.NotNull(responseMapper);
+            _mappingMatcher = Guard.NotNull(mappingMatcher);
+            _logEntryMapper = new LogEntryMapper(options);
        }
 #endif

@@ -264,31 +267,57 @@ namespace WireMock.Owin

        private void LogRequest(LogEntry entry, bool addRequest)
        {
-            _options.Logger.DebugRequestResponse(LogEntryMapper.Map(entry), entry.RequestMessage.Path.StartsWith("/__admin/"));
+            _options.Logger.DebugRequestResponse(_logEntryMapper.Map(entry), entry.RequestMessage.Path.StartsWith("/__admin/"));

-            if (addRequest)
+            // If addRequest is set to true and MaxRequestLogCount is null or does have a value greater than 0, try to add a new request log.
+            if (addRequest && _options.MaxRequestLogCount is null or > 0)
            {
-                _options.LogEntries.Add(entry);
+                TryAddLogEntry(entry);
            }

-            if (_options.MaxRequestLogCount != null)
+            // In case MaxRequestLogCount has a value greater than 0, try to delete existing request logs based on the count.
+            if (_options.MaxRequestLogCount is > 0)
            {
                var logEntries = _options.LogEntries.ToList();
                foreach (var logEntry in logEntries.OrderBy(le => le.RequestMessage.DateTime).Take(logEntries.Count - _options.MaxRequestLogCount.Value))
                {
-                    _options.LogEntries.Remove(logEntry);
+                    TryRemoveLogEntry(logEntry);
                }
            }

-            if (_options.RequestLogExpirationDuration != null)
+            // In case RequestLogExpirationDuration has a value greater than 0, try to delete existing request logs based on the date.
+            if (_options.RequestLogExpirationDuration is > 0)
            {
                var checkTime = DateTime.UtcNow.AddHours(-_options.RequestLogExpirationDuration.Value);
-
                foreach (var logEntry in _options.LogEntries.ToList().Where(le => le.RequestMessage.DateTime < checkTime))
                {
-                    _options.LogEntries.Remove(logEntry);
+                    TryRemoveLogEntry(logEntry);
                }
            }
        }
+
+        private void TryAddLogEntry(LogEntry logEntry)
+        {
+            try
+            {
+                _options.LogEntries.Add(logEntry);
+            }
+            catch
+            {
+                // Ignore exception (can happen during stress testing)
+            }
+        }
+
+        private void TryRemoveLogEntry(LogEntry logEntry)
+        {
+            try
+            {
+                _options.LogEntries.Remove(logEntry);
+            }
+            catch
+            {
+                // Ignore exception (can happen during stress testing)
+            }
+        }
    }
 }
--- a/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
@@ -26,7 +26,7 @@ internal class WireMockMiddlewareOptions : IWireMockMiddlewareOptions

    public ConcurrentDictionary<Guid, IMapping> Mappings { get; } = new ConcurrentDictionary<Guid, IMapping>();

-    public ConcurrentDictionary<string, ScenarioState> Scenarios { get; } = new();
+    public ConcurrentDictionary<string, ScenarioState> Scenarios { get; } = new(StringComparer.OrdinalIgnoreCase);

    public ConcurrentObservableCollection<LogEntry> LogEntries { get; } = new();

@@ -84,4 +84,10 @@ internal class WireMockMiddlewareOptions : IWireMockMiddlewareOptions

    /// <inheritdoc cref="IWireMockMiddlewareOptions.SaveUnmatchedRequests"/>
    public bool? SaveUnmatchedRequests { get; set; }
+
+    /// <inheritdoc />
+    public bool? DoNotSaveDynamicResponseInLogEntry { get; set; }
+
+    /// <inheritdoc />
+    public QueryParameterMultipleValueSupport? QueryParameterMultipleValueSupport { get; set; }
 }
--- a/src/WireMock.Net/Pact/Models/V2/Interaction.cs
+++ b/src/WireMock.Net/Pact/Models/V2/Interaction.cs
@@ -1,3 +1,4 @@
+#pragma warning disable CS1591
 namespace WireMock.Pact.Models.V2;

 public class Interaction
--- a/src/WireMock.Net/Pact/Models/V2/MatchingRule.cs
+++ b/src/WireMock.Net/Pact/Models/V2/MatchingRule.cs
@@ -1,25 +1,25 @@
-namespace WireMock.Pact.Models.V2
+#pragma warning disable CS1591
+namespace WireMock.Pact.Models.V2;
+
+public class MatchingRule
 {
-    public class MatchingRule
-    {
-        /// <summary>
-        /// type or regex
-        /// </summary>
-        public string Match { get; set; } = "type";
+    /// <summary>
+    /// type or regex
+    /// </summary>
+    public string Match { get; set; } = "type";

-        /// <summary>
-        /// Used for Match = "type"
-        /// </summary>
-        public string Min { get; set; }
+    /// <summary>
+    /// Used for Match = "type"
+    /// </summary>
+    public string Min { get; set; }

-        /// <summary>
-        /// Used for Match = "type"
-        /// </summary>
-        public string Max { get; set; }
+    /// <summary>
+    /// Used for Match = "type"
+    /// </summary>
+    public string Max { get; set; }

-        /// <summary>
-        /// Used for Match = "regex"
-        /// </summary>
-        public string Regex { get; set; }
-    }
+    /// <summary>
+    /// Used for Match = "regex"
+    /// </summary>
+    public string Regex { get; set; }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	080efe4fcb	1.5.12	2022-12-03 14:12:15 +01:00
Stef Heyenrath	53adb17e07	Update some dependencies (#857 ) * fb * . * linq * ,,, * anno * log * rd	2022-12-03 11:45:44 +01:00
Stef Heyenrath	795dcf42e2	Add .Net 7 (#853 ) * Add .NET 7 * UseDotNet * 7 * Ubuntu 6 * 'Use .NET 7' * 67 * . * use 7 * use 7 * test = 7 * coverage.7.0.opencover.xml	2022-12-03 11:03:57 +01:00
Stef Heyenrath	be1cbc5a12	Fix logic for QueryParameterMultipleValueSupport (#854 ) * Add more QueryParameterMultipleValueSupport NoComma tests * fix tests * fx * cf * Fix * cf * select id, name, value from table where id in (1, 2, 3, 4, 5)	2022-12-03 11:03:45 +01:00
Stef Heyenrath	35d42a5c0d	Fix Linux CI build + Fix opencover (#851 ) * Fix Linux CI Test (opencover.xml) * 2 * Build & Execute Unit tests * ,cmd * cout * 12 * b * server * b =b * /p:CoverletOutput=./test/WireMock.Net.Tests/WireMock.Net.Tests * co? * 2p * 2? * failOnStderr: false * e0 * cc * pub * sc * coverlet * props * pt * coverage.net6.0.opencover.xml	2022-11-25 18:13:02 +01:00
Stef Heyenrath	429d6830ae	1.5.11	2022-11-24 21:47:56 +01:00
Stef Heyenrath	38634ac65a	Use try-catch when adding or removing logEntry (#848 ) * Use try-catch when removing logEntry * . * try catch add * Add extra check * ...	2022-11-21 07:30:27 +01:00
Stef Heyenrath	ef5f988786	Add Settings.QueryParameterMultipleValueSupport (#836 ) * QueryParameterMultipleValueSupport * . * , * ,	2022-11-08 19:27:44 +01:00
Stef Heyenrath	1e44f52ad6	1.5.10	2022-11-06 13:29:12 +01:00
Stef Heyenrath	7fd1d30d0e	Add WireMockNullLogger as valid commandline logger option (#845 ) * Add WireMockNullLogger as valid commandline logger option * .	2022-11-06 13:25:26 +01:00
Gerhard Gradnig	49b29d74dc	Webhook: Use the transformed URL to create the HttpRequestMessage (#843 ) Co-authored-by: Gerhard Gradnig <gerhard.gradnig@admiral.at>	2022-11-05 10:54:39 +01:00
Stef Heyenrath	80931e9fb5	Update Azure.Storage NuGets	2022-10-29 14:06:43 +02:00
Stef Heyenrath	cce344ff83	1.5.9	2022-10-29 14:02:30 +02:00
Stef Heyenrath	0972d2cb8f	Add option to ProxySettings to append guid to mapping file (#838 ) * Add option to ProxySettings to append guid to mapping file * . * . * .	2022-10-29 13:58:29 +02:00
dependabot[bot]	a39b7fc633	Bump Microsoft.AspNetCore.Server.Kestrel.Core (#837 ) Bumps [Microsoft.AspNetCore.Server.Kestrel.Core](https://github.com/aspnet/AspNetCore) from 2.1.7 to 2.1.25. - [Release notes](https://github.com/aspnet/AspNetCore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/aspnet/AspNetCore/compare/v2.1.7...v2.1.25) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Server.Kestrel.Core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-27 07:46:01 +02:00
Stef Heyenrath	31298d281d	Support deleting / resetting a single scenario (#834 ) * Support deleting / resetting a single scenario * move files	2022-10-26 08:43:51 +02:00
Stef Heyenrath	b4c32dd66b	WireMock.Net.WebApplication.NET6	2022-10-25 17:19:13 +02:00
Stef Heyenrath	57115f1a3d	Add setting to skip saving the string-response in the logging when using WithBody(Func...) (#828 ) * Add extra unit-test for Response WithBody (dynamic code) * DoNotSaveDynamicResponseInLogEntry * update SettingsModel * fix * .	2022-10-21 14:47:26 +02:00
Stef Heyenrath	306c69f478	Fixes for WireMock.Net.FluentAssertions (callcount behaviour) (#832 ) * UsingAnyMethod * fix * .	2022-10-17 21:50:24 +02:00
Stef Heyenrath	fb8fec0376	Update funding.yml	2022-10-16 09:17:41 +02:00