Update Azure.Storage NuGets

* Add option to ProxySettings to append guid to mapping file

* .

* .

* .

.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

CHANGELOG.md

@@ -1,3 +1,52 @@
+# 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)
+- [#824](https://github.com/WireMock-Net/WireMock.Net/pull/824) - WebHook - Transform Url [feature] contributed by [StefH](https://github.com/StefH)
+- [#814](https://github.com/WireMock-Net/WireMock.Net/issues/814) - WithHeader cannot handle multiple requests with the same header key values [bug]
+- [#815](https://github.com/WireMock-Net/WireMock.Net/issues/815) - Why does UsingMethod check _callscount? [bug]
+- [#822](https://github.com/WireMock-Net/WireMock.Net/issues/822) - Webhook with generic url, body and custom header values [feature]
+
+# 1.5.7 (11 October 2022)
+- [#818](https://github.com/WireMock-Net/WireMock.Net/pull/818) - Add option to run the server on http & https [feature] contributed by [StefH](https://github.com/StefH)
+- [#821](https://github.com/WireMock-Net/WireMock.Net/pull/821) - Add UseDefinedRequestMatchers to ProxyAndRecordSettings [feature] contributed by [StefH](https://github.com/StefH)
+- [#823](https://github.com/WireMock-Net/WireMock.Net/pull/823) - Add implicit operators to WireMockList contributed by [StefH](https://github.com/StefH)
+- [#819](https://github.com/WireMock-Net/WireMock.Net/issues/819) - Can I preserve Mapping title and matchers for proxy response? [feature]
+
+# 1.5.6 (12 September 2022)
+- [#803](https://github.com/WireMock-Net/WireMock.Net/pull/803) - WebHook : UseFireAndForget + Delay [feature] contributed by [StefH](https://github.com/StefH)
+- [#804](https://github.com/WireMock-Net/WireMock.Net/pull/804) - Change nuget to package reference for WireMock.Net.Console.Net472.Cla… [feature] contributed by [mattisking](https://github.com/mattisking)
+- [#806](https://github.com/WireMock-Net/WireMock.Net/pull/806) - Tweak middleware and fix bug in example [feature] contributed by [mattisking](https://github.com/mattisking)
+- [#801](https://github.com/WireMock-Net/WireMock.Net/issues/801) - Webhook Delays [feature]
+
+# 1.5.5 (03 September 2022)
+- [#798](https://github.com/WireMock-Net/WireMock.Net/pull/798) - Add support to use 'mapping' object in in reponse templating [feature] contributed by [StefH](https://github.com/StefH)
+- [#800](https://github.com/WireMock-Net/WireMock.Net/pull/800) - Bump Microsoft.Owin from 4.1.1 to 4.2.2 in /src/WireMock.Net (net46) [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#802](https://github.com/WireMock-Net/WireMock.Net/pull/802) - Add assertions for request methods contributed by [rafaelmfonseca](https://github.com/rafaelmfonseca)
+- [#772](https://github.com/WireMock-Net/WireMock.Net/issues/772) - How to get matched mapping by HttpRequest or HttpRequestMessage [feature]
+
+# 1.5.4 (24 August 2022)
+- [#778](https://github.com/WireMock-Net/WireMock.Net/pull/778) - Fix Proxying when StartAdminInterface=true [bug] contributed by [StefH](https://github.com/StefH)
+- [#781](https://github.com/WireMock-Net/WireMock.Net/pull/781) - Update some NuGet packages [feature] contributed by [StefH](https://github.com/StefH)
+- [#783](https://github.com/WireMock-Net/WireMock.Net/pull/783) - Fix WithBody when using Pact and added more nullable annotations [feature] contributed by [StefH](https://github.com/StefH)
+- [#787](https://github.com/WireMock-Net/WireMock.Net/pull/787) - Add support for PEM certificates contributed by [StefH](https://github.com/StefH)
+- [#789](https://github.com/WireMock-Net/WireMock.Net/pull/789) - Add support for Matcher.Pattern in Pact Body mapping [feature] contributed by [StefH](https://github.com/StefH)
+- [#790](https://github.com/WireMock-Net/WireMock.Net/pull/790) - Add Response.WithBody with IJsonConverter [feature] contributed by [StefH](https://github.com/StefH)
+- [#795](https://github.com/WireMock-Net/WireMock.Net/pull/795) - Add check for duplicate Guids when posting multiple mappings in one request contributed by [StefH](https://github.com/StefH)
+- [#797](https://github.com/WireMock-Net/WireMock.Net/pull/797) - Fix WithHeader when using RejectOnMatch [bug] contributed by [flts](https://github.com/flts)
+- [#775](https://github.com/WireMock-Net/WireMock.Net/issues/775) - When "StartAdminInterface" is true then each time is generated new mapping from the proxy [bug]
+- [#784](https://github.com/WireMock-Net/WireMock.Net/issues/784) - Response body is missing in generated pact file when IBodyResponseBuilder.WithBody is used [bug]
+- [#785](https://github.com/WireMock-Net/WireMock.Net/issues/785) - Support for PEM certificates when using ssl [feature]
+- [#788](https://github.com/WireMock-Net/WireMock.Net/issues/788) - Request body is missing in generated pact file for requests that include matching on request body [bug]
+- [#796](https://github.com/WireMock-Net/WireMock.Net/issues/796) - RequestMessageHeaderMatcher with MatchBehaviour.RejectOnMatch reverses match results twice [bug]
+
 # 1.5.3 (29 July 2022)
 - [#777](https://github.com/WireMock-Net/WireMock.Net/pull/777) - Update Scriban.Signed to version 5.5.0 [feature] contributed by [StefH](https://github.com/StefH)
 - [#776](https://github.com/WireMock-Net/WireMock.Net/issues/776) - Update Scriban.Signed to support more functions, e.g math.random [feature]

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.3</VersionPrefix>
+        <VersionPrefix>1.5.9</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -25,10 +25,6 @@
         <!--<None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>-->
     </ItemGroup>
 
-    <PropertyGroup Condition="'$(TargetFramework)' != 'net45'">
-        <!--<Nullable>enable</Nullable>-->
-    </PropertyGroup>
-
     <Choose>
         <!-- The environment variable `Prerelease` is set in the azure-pipelines.yml file. -->
         <When Condition=" '$(Prerelease)' != '' ">

Generate-ReleaseNotes.cmd

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

PackageReleaseNotes.txt

@@ -1,5 +1,9 @@
-# 1.5.3 (29 July 2022)
-- #777 Update Scriban.Signed to version 5.5.0 [feature]
-- #776 Update Scriban.Signed to support more functions, e.g math.random [feature]
+# 1.5.9 (29 October 2022)
+- #828 Add setting to skip saving the string-response in the logging when using WithBody(Func...) [feature]
+- #832 Fixes for WireMock.Net.FluentAssertions (callcount behaviour) [feature]
+- #834 Support deleting / resetting a single scenario [feature]
+- #837 Bump Microsoft.AspNetCore.Server.Kestrel.Core from 2.1.7 to 2.1.25 in /examples/WireMock.Net.StandAlone.Net461 [dependencies]
+- #838 Add option to ProxySettings to append guid to mapping file
+- #826 Dynamic Body not to be cached when a Func is used to created the body [feature]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

WireMock.Net 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
@@ -103,6 +104,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.xUnit", "src\WireMock.Net.xUnit\WireMock.Net.xUnit.csproj", "{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44}"
 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
@@ -245,6 +252,18 @@ Global
 		{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
@@ -286,6 +305,9 @@ Global
 		{3F7AA023-6833-4856-A08A-4B5717B592B8} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{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}

WireMock.Net Solution.sln.DotSettings

@@ -1,18 +1,30 @@
 <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>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TSV/@EntryIndexedValue">TSV</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TTL/@EntryIndexedValue">TTL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WWW/@EntryIndexedValue">WWW</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XMS/@EntryIndexedValue">XMS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XUA/@EntryIndexedValue">XUA</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Flurl/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=funcs/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=guidb/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Guids/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pacticipant/@EntryIndexedValue">True</s:Boolean>
@@ -24,6 +36,8 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Victoor/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhook/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhooks/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=wiremock/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=wiremockserver/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Xeger/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=xunit/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>

examples/WireMock.Net.Client/Properties/launchSettings.json

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "WSL": {
+      "commandName": "WSL2",
+      "distributionName": ""
+    }
+  }
+}

examples/WireMock.Net.Console.NET6.WithCertificate/HowTo.txt

@@ -0,0 +1,16 @@
+https://www.scottbrady91.com/openssl/creating-elliptical-curve-keys-using-openssl
+
+# find your curve
+openssl ecparam -list_curves
+
+# generate a private key for a curve
+openssl ecparam -name prime256v1 -genkey -noout -out private-key.pem
+
+# generate corresponding public key
+openssl ec -in private-key.pem -pubout -out public-key.pem
+
+# optional: create a self-signed certificate
+openssl req -new -x509 -key private-key.pem -out cert.pem -days 360
+
+# optional: convert pem to pfx
+openssl pkcs12 -export -inkey private-key.pem -in cert.pem -out cert.pfx

examples/WireMock.Net.Console.NET6.WithCertificate/Program.cs

@@ -0,0 +1,52 @@
+using System.IO;
+using WireMock.Logging;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.NET6.WithCertificate;
+
+class Program
+{
+    static void Main(string[] args)
+    {
+        var serverEC = WireMockServer.Start(new WireMockServerSettings
+        {
+            Urls = new[] { "https://localhost:8433/" },
+            StartAdminInterface = true,
+            Logger = new WireMockConsoleLogger(),
+            CertificateSettings = new WireMockCertificateSettings
+            {
+                // https://www.scottbrady91.com/c-sharp/pem-loading-in-dotnet-core-and-dotnet
+                // https://www.scottbrady91.com/openssl/creating-elliptical-curve-keys-using-openssl
+                X509CertificateFilePath = "cert.pem",
+                X509CertificatePassword = @"
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJZTv6ujGrEwxW+ab1+CtZouRd8PK7PsklVMvJwm1uDmoAoGCCqGSM49
+AwEHoUQDQgAE39VoI268uDuIeKmRzr9e9jgMSGeuJTvTG7+cSXmeDymrVgIGXQgm
+qKA8TDXpJNrRhWMd/fpsnWu1JwJUjBmspQ==
+-----END EC PRIVATE KEY-----"
+            }
+        });
+        System.Console.WriteLine("WireMockServer listening at {0}", serverEC.Url);
+
+        var serverRSA = WireMockServer.Start(new WireMockServerSettings
+        {
+            Urls = new[] { "https://localhost:8434/" },
+            StartAdminInterface = true,
+            Logger = new WireMockConsoleLogger(),
+            CertificateSettings = new WireMockCertificateSettings
+            {
+                // https://www.scottbrady91.com/c-sharp/pem-loading-in-dotnet-core-and-dotnet
+                // https://www.scottbrady91.com/openssl/creating-rsa-keys-using-openssl
+                X509CertificateFilePath = "cert-rsa.pem",
+                X509CertificatePassword = File.ReadAllText("private-key-rsa.pem")
+            }
+        });
+        System.Console.WriteLine("WireMockServer listening at {0}", serverRSA.Url);
+
+        System.Console.WriteLine("Press any key to stop the server(s)");
+        System.Console.ReadKey();
+        serverEC.Stop();
+        serverRSA.Stop();
+    }
+}

examples/WireMock.Net.Console.NET6.WithCertificate/WireMock.Net.Console.NET6.WithCertificate.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="*.pem">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="*.pfx">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="nlog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

examples/WireMock.Net.Console.NET6.WithCertificate/cert-rsa.pem

@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIErzCCAxegAwIBAgIUeVJ5l3LJPakcwhBGXNfa7UawgPcwDQYJKoZIhvcNAQEL
+BQAwZzELMAkGA1UEBhMCTkwxEzARBgNVBAgMClNvbWUtU3RhdGUxFTATBgNVBAoM
+DFdpcmVNb2NrLk5ldDEVMBMGA1UECwwMV2lyZU1vY2suTmV0MRUwEwYDVQQDDAxX
+aXJlTW9jay5OZXQwHhcNMjIwODEyMTQzMjUxWhcNMzIwNjIwMTQzMjUxWjBnMQsw
+CQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEVMBMGA1UECgwMV2lyZU1v
+Y2suTmV0MRUwEwYDVQQLDAxXaXJlTW9jay5OZXQxFTATBgNVBAMMDFdpcmVNb2Nr
+Lk5ldDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALyF2sKsueDaZ78r
+fQ5IyqWJLYXnYRT94xVfiPoRQNex7JMYwdIt+xEPcfhIlyODxYRxzYTSuXi/cBOM
+/svTewIdBmDDyyCDboZ+P8THlzdwCLNHUPONQqJtc0msLVfwPuvDeZIwhIn9CDwC
+1EXstWLEePxu1i2/PAfUudYeQunjrP10DE06fyW+ZH7sMSPOSyY4BO4Rt0dk3Cws
+U/CEl+bSN5Kx2WkyPxbOvZLa66JmQEaeSZ4ypkhujWE1LuIIQE94P28BzFpHtDWO
+1+42K8mqjdnO8eH1/IfAMmOE/o3rKoI4C5aUPyJpDOaz5KFCqdCSBHlb2uo3lqgd
+yYOCrVOLIsljp8H4ncfs1AUo+tExNW/5jWYegAZGXLArrWktHEbwa4f+9ZMa7+VS
+lKpx6hLI7eMSHBCsQJ7yH8QyLhr0HMjoDw38isGV+mK/N1u47s4oaTQyG+HXH+e/
+Shj5OSKnLWBV/eX7YSAJ1hqHgmAbwl/BnuGI3SBXSK4mcjcNvQIDAQABo1MwUTAd
+BgNVHQ4EFgQUYhrgWXNdcFpnyz0mifPqYM+kyK4wHwYDVR0jBBgwFoAUYhrgWXNd
+cFpnyz0mifPqYM+kyK4wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
+AYEAmfJZJ019pO7ZXDQ85nEC99+x9+MUnSZ6UuMIiy2VMcS/oea8ugQ4NBYVPpQS
+O/xiYENpw36+H4+ctv1tdAbZELGGLBahkkzZedLyiFObxDALu0PP7jQYr4nUjfQj
+B/fWuTcCrVmuH3yiutw/sALd1su63VjjZiOCwxMB8LV4T0ojBTHA2D4rqLTiSRgs
+sP3CRoWDI2JIr2afM/K8SMczRbo/5ovv0YF9kFcwG9WDEa/oQ67Yu05GFBnItYmT
+QP+Br5WiPTLOON9TKm1ZgxLwrhJNHfD2+u9uudkVF5uWyg9ZvB8sYmIw5wSvUFl5
+SDj1Pxy4olim54BL5wIwlMMQu+fKp6T89iShgN/NEot3JKW3zDpa/t93IjJXGOlh
+O4ECoUzXCtDTnc6aais2SoYjbveP2wduS9MHAQinjTiepzYbhJbySURKqCBu1mN2
+EFsU9Pzd1+MA3ZbRfhvl8Jvwdp5GqaFyCqgqmP5oPOcd9ncJowyfobfdqzYMXPGl
+bu9i
+-----END CERTIFICATE-----

examples/WireMock.Net.Console.NET6.WithCertificate/cert.pem

@@ -0,0 +1,13 @@
+-----BEGIN CERTIFICATE-----
+MIIB9TCCAZugAwIBAgIUYH7UM/DAXzosxsT+ea2jdYvhqqMwCgYIKoZIzj0EAwIw
+UDELMAkGA1UEBhMCTkwxEzARBgNVBAgMClNvbWUtU3RhdGUxFTATBgNVBAoMDFdp
+cmVNb2NrLk5ldDEVMBMGA1UEAwwMV2lyZU1vY2suTmV0MB4XDTIyMDgxMTE2MjE0
+NFoXDTMyMDYxOTE2MjE0NFowUDELMAkGA1UEBhMCTkwxEzARBgNVBAgMClNvbWUt
+U3RhdGUxFTATBgNVBAoMDFdpcmVNb2NrLk5ldDEVMBMGA1UEAwwMV2lyZU1vY2su
+TmV0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE39VoI268uDuIeKmRzr9e9jgM
+SGeuJTvTG7+cSXmeDymrVgIGXQgmqKA8TDXpJNrRhWMd/fpsnWu1JwJUjBmspaNT
+MFEwHQYDVR0OBBYEFILL8V+fAtMnccWKGAdkx2Dh/v/TMB8GA1UdIwQYMBaAFILL
+8V+fAtMnccWKGAdkx2Dh/v/TMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
+SAAwRQIgKDLAG8OWK6GF5HV4kmWz3kp2V3yVsNK2V9Lw3dSE+YsCIQCK1EEBvuqc
+0ncZV4ETVnOY23PWFOMk1VwN2aoTi5n++Q==
+-----END CERTIFICATE-----

examples/WireMock.Net.Console.NET6.WithCertificate/private-key-rsa.pem

@@ -0,0 +1,39 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIG5AIBAAKCAYEAvIXawqy54Npnvyt9DkjKpYkthedhFP3jFV+I+hFA17HskxjB
+0i37EQ9x+EiXI4PFhHHNhNK5eL9wE4z+y9N7Ah0GYMPLIINuhn4/xMeXN3AIs0dQ
+841Com1zSawtV/A+68N5kjCEif0IPALURey1YsR4/G7WLb88B9S51h5C6eOs/XQM
+TTp/Jb5kfuwxI85LJjgE7hG3R2TcLCxT8ISX5tI3krHZaTI/Fs69ktrromZARp5J
+njKmSG6NYTUu4ghAT3g/bwHMWke0NY7X7jYryaqN2c7x4fX8h8AyY4T+jesqgjgL
+lpQ/ImkM5rPkoUKp0JIEeVva6jeWqB3Jg4KtU4siyWOnwfidx+zUBSj60TE1b/mN
+Zh6ABkZcsCutaS0cRvBrh/71kxrv5VKUqnHqEsjt4xIcEKxAnvIfxDIuGvQcyOgP
+DfyKwZX6Yr83W7juzihpNDIb4dcf579KGPk5IqctYFX95fthIAnWGoeCYBvCX8Ge
+4YjdIFdIriZyNw29AgMBAAECggGBAJcMsNDWUECG/iVAFP0C+ctUdDMbxr9pBS+0
+0i168XdhSeo6JeHfkZCDzY9fqil8hR+vhznrFUxYJtajW+u4UJDK7LdPaUttw3rj
+YPir6s8yZuYuOABMqJ04EO1wlQwmpGOGxbuKQEfHg3eB1M8J7/No9H9d1yHkXZbw
+rM2QhZCdKZgSCWE/g2ycdizz1hOYUMIYlGqjqzP67iY+hirqMkNxH7Hb6hTNe5ss
+ntwxqCcAwnNSlC2661yRp5nBYQUeEfgXAx/cZZ6cILjX6JanDsML/PRY1hOm5hCZ
+8/8satOGtd37rgr1cP/kvNMf7uLI8hIeC4JSCymUh6lU6ERpWRoQV8DUE60ztFbi
+bQbGU/rseznBN8O1cM6fjduno/n8d4q5wGLjAbIai+xxxTSksbnlvkthRAUfK9/Y
+rUdMxqgkDnecCAHof8UPz/Vg3n9J9wl6waFrKa+Kseda1wEB/jf51fb/t0sJP2Dq
+n2kcp239zwalUr2XnXfENfeL9IDBiQKBwQDsogaTFy7E5P+66B1ZRDP2X6WgFedH
+tjMCVXG4K4VOWp6xMfhieq2d+amMoYi/J3cxS8qDIM64q55caTaB3KTodGrzmvax
+avqG58Mpyv9VdEDzMI29D7Xtx5ykoAAWOmQaByH/4J+3IBX6efRDGmSvmoqPoa0V
+ChMO0Gw6O9GsH/kVEy2nRaj9dJpOqo05jhh9LLye2stPycCHzYybYqjs0Nt1uboY
+3mbiCJBWJ8jZk9KeFhrqCkYB1zZJIJVybJ8CgcEAy/PRm0NZDUx6IJKnwDXBriE0
+Qih1ZcvdVi907nhYAlBpAPWisGls6EghBQsfvQ4ZPwHAFBlDu/72JrqGJhkP61mP
+D/xT9d59xSU5N90doiInrTHAOoyZEdpul9QvCXxKuFFl3RZnxn0RwPgc23sZUcny
+aM4DIWk1541Z84Lxv3tFLXoG5uvqpCkSwEBd9iu0EMHlmoPFkEkY41Q3/zTs46FY
+fnWLSdRahKDFHrZTgyu4i/3clbbp9m1cpWLwzUwjAoHAVpSWCT2jPCF5vD5vdpjw
+1kV6yU8aV2+/zCvNNxCdbuTTSYw6EHZIjhOqSK1V5nMfNmc/yqi3WnRYtgE9E1jS
+8cae11Es0A+PaMrl6qW+tNqbZR+vzKwx6bVuiAGO5pMoyyku9HuQlKVlxUbX67F9
+g47tAc6rEJamEHaMEuaOOgdc0Kw6uQhQ46PFTeEzWQq3xR0YSptNZn0wN8AqoTQB
+ENz+X128TJsbU7rEbPGTmKBwoKz/3gAySzwePbVxWPOLAoHAAsqehtKAKIdwcHux
+YhcaRIjdzz4AhVkp+WEC57Sr97QkC8hQ5rs6q185XHlPgOXtgIhEmcHSxILz2Yna
+BjF3n1AFfkGE4Kuf6w/cXaBgJHT1OBCjQenkunLT6q4TyrxxxV4P19vTpcrWcF60
+/mgL66uo7rhLIKzw+O9dWNDlACruwnWWHJkECCUrxYfcAV+NwmD1BI1jKdtmRM5F
+Se/ughsWO/zd4C/Q4VnV+Nqj//qcNwZNe5saTq4mg3j8NMMjAoHBANRR+WLpgr3f
+Kh9vNA+v1gnBUFImheWrJ+Eu75q1sGKrz3gZ8glhewf37YbJVuSKFMEBAg1qobWG
+/2B26beXia/NprVuV5vqJNuts29W1/WuDKE7BsNya/quDA1WxTQAzhSA54DYtWXw
+UgVTPtEQXL9Wbk2wF98tWiUio4VjV++geVql4qKQUet1IMo1RgRgbQL5hn/rDH0g
+ZOX552VdK1xivWQRVA4486eKHlW/lbKJjX0Os6qhNIF57qVquIRQPw==
+-----END RSA PRIVATE KEY-----

examples/WireMock.Net.Console.NET6.WithCertificate/private-key.pem

@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJZTv6ujGrEwxW+ab1+CtZouRd8PK7PsklVMvJwm1uDmoAoGCCqGSM49
+AwEHoUQDQgAE39VoI268uDuIeKmRzr9e9jgMSGeuJTvTG7+cSXmeDymrVgIGXQgm
+qKA8TDXpJNrRhWMd/fpsnWu1JwJUjBmspQ==
+-----END EC PRIVATE KEY-----

examples/WireMock.Net.Console.NET6.WithCertificate/public-key-rsa.pem

@@ -0,0 +1,11 @@
+-----BEGIN PUBLIC KEY-----
+MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvIXawqy54Npnvyt9DkjK
+pYkthedhFP3jFV+I+hFA17HskxjB0i37EQ9x+EiXI4PFhHHNhNK5eL9wE4z+y9N7
+Ah0GYMPLIINuhn4/xMeXN3AIs0dQ841Com1zSawtV/A+68N5kjCEif0IPALURey1
+YsR4/G7WLb88B9S51h5C6eOs/XQMTTp/Jb5kfuwxI85LJjgE7hG3R2TcLCxT8ISX
+5tI3krHZaTI/Fs69ktrromZARp5JnjKmSG6NYTUu4ghAT3g/bwHMWke0NY7X7jYr
+yaqN2c7x4fX8h8AyY4T+jesqgjgLlpQ/ImkM5rPkoUKp0JIEeVva6jeWqB3Jg4Kt
+U4siyWOnwfidx+zUBSj60TE1b/mNZh6ABkZcsCutaS0cRvBrh/71kxrv5VKUqnHq
+Esjt4xIcEKxAnvIfxDIuGvQcyOgPDfyKwZX6Yr83W7juzihpNDIb4dcf579KGPk5
+IqctYFX95fthIAnWGoeCYBvCX8Ge4YjdIFdIriZyNw29AgMBAAE=
+-----END PUBLIC KEY-----

examples/WireMock.Net.Console.NET6.WithCertificate/public-key.pem

@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE39VoI268uDuIeKmRzr9e9jgMSGeu
+JTvTG7+cSXmeDymrVgIGXQgmqKA8TDXpJNrRhWMd/fpsnWu1JwJUjBmspQ==
+-----END PUBLIC KEY-----

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

@@ -1,22 +1,21 @@
-using System.IO;
+using System.IO;
 using System.Reflection;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
 using WireMock.Net.ConsoleApplication;
 
-namespace WireMock.Net.Console.NETCoreApp
+namespace WireMock.Net.Console.NETCoreApp;
+
+static class Program
 {
-    static class Program
+    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+    private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+    static void Main(params string[] args)
     {
-        private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
-        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+        XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
 
-        static void Main(params string[] args)
-        {
-            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
-
-            MainApp.Run();
-        }
+        MainApp.Run();
     }
 }

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

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using Newtonsoft.Json;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Models;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
@@ -39,6 +40,19 @@ namespace WireMock.Net.ConsoleApplication
             var s = WireMockServer.Start();
             s.Stop();
 
+            var httpAndHttpsWithPort = WireMockServer.Start(new WireMockServerSettings
+            {
+                HostingScheme = HostingScheme.HttpAndHttps,
+                Port = 12399
+            });
+            httpAndHttpsWithPort.Stop();
+
+            var httpAndHttpsFree = WireMockServer.Start(new WireMockServerSettings
+            {
+                HostingScheme = HostingScheme.HttpAndHttps
+            });
+            httpAndHttpsFree.Stop();
+
             string url1 = "http://localhost:9091/";
             string url2 = "http://localhost:9092/";
             string url3 = "https://localhost:9443/";
@@ -576,6 +590,40 @@ namespace WireMock.Net.ConsoleApplication
                     };
                 }));
 
+            server.Given(Request.Create().WithPath(new WildcardMatcher("/multi-webhook", true)).UsingPost())
+                .WithWebhook(new[] {
+                    new Webhook()
+                    {
+                        Request = new WebhookRequest
+                        {
+                            Url = "http://localhost:12345/foo1",
+                            Method = "post",
+                            BodyData = new BodyData
+                            {
+                                BodyAsString = "OK 1!", DetectedBodyType = BodyType.String
+                            },
+                            Delay = 1000
+                        }
+                    },
+                    new Webhook()
+                    {
+                        Request = new WebhookRequest
+                        {
+                            Url = "http://localhost:12345/foo2",
+                            Method = "post",
+                            BodyData = new BodyData
+                            {
+                                BodyAsString = "OK 2!",
+                                DetectedBodyType = BodyType.String
+                            },
+                            MinimumRandomDelay = 3000,
+                            MaximumRandomDelay = 7000
+                        }
+                    }
+                })
+                .WithWebhookFireAndForget(true)
+                .RespondWith(Response.Create().WithBody("a-response"));
+
             System.Console.WriteLine(JsonConvert.SerializeObject(server.MappingModels, Formatting.Indented));
 
             System.Console.WriteLine("Press any key to stop the server");

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

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

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

@@ -80,7 +80,6 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
-    <None Include="libman.json" />
     <None Include="log4net.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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

@@ -43,7 +43,7 @@
       <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
     </Reference>
     <Reference Include="Fare, Version=2.2.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Fare.2.2.0\lib\net35\Fare.dll</HintPath>
+      <HintPath>..\..\packages\Fare.2.2.1\lib\net35\Fare.dll</HintPath>
     </Reference>
     <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>
@@ -262,7 +262,7 @@
       <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.15\lib\net45\RandomDataGenerator.dll</HintPath>
+      <HintPath>..\..\packages\RandomDataGenerator.Net.1.0.16\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>
@@ -342,15 +342,6 @@
     <Reference Include="TinyMapper, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\TinyMapper.3.0.3\lib\net40\TinyMapper.dll</HintPath>
     </Reference>
-    <Reference Include="WireMock.Net, Version=1.5.1.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Net.1.5.1\lib\net461\WireMock.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="WireMock.Net.Abstractions, Version=1.5.1.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Net.Abstractions.1.5.1\lib\net451\WireMock.Net.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="WireMock.Org.Abstractions, Version=1.5.1.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Org.Abstractions.1.5.1\lib\net45\WireMock.Org.Abstractions.dll</HintPath>
-    </Reference>
     <Reference Include="XPath2, Version=1.1.3.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\XPath2.1.1.3\lib\net452\XPath2.dll</HintPath>
     </Reference>
@@ -388,6 +379,16 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net472" />
-  <package id="Fare" version="2.2.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" />
@@ -126,7 +126,7 @@
   <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.15" targetFramework="net472" />
+  <package id="RandomDataGenerator.Net" version="1.0.16" 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" />
@@ -147,9 +147,6 @@
   <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="TinyMapper" version="3.0.3" targetFramework="net472" />
-  <package id="WireMock.Net" version="1.5.1" targetFramework="net472" />
-  <package id="WireMock.Net.Abstractions" version="1.5.1" targetFramework="net472" />
-  <package id="WireMock.Org.Abstractions" version="1.5.1" targetFramework="net472" />
   <package id="XPath2" version="1.1.3" targetFramework="net472" />
   <package id="XPath2.Extensions" version="1.1.3" targetFramework="net472" />
 </packages>

examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json

@@ -1,8 +1,16 @@
 {
-  "profiles": {
-    "WireMock.Net.StandAlone.NETCoreApp": {
-        "commandName": "Project",
-        "commandLineArgs": "--Urls http://localhost:9091 --CorsPolicyOptions AllowAll --WireMockLogger WireMockConsoleLogger"
+    "profiles": {
+        "WireMock.Net.StandAlone.NETCoreApp": {
+            "commandName": "Project",
+            "commandLineArgs": "--Urls http://localhost:9091 --CorsPolicyOptions AllowAll --WireMockLogger WireMockConsoleLogger"
+        },
+        "WireMock.Net.StandAlone.NETCoreAppNoPort": {
+            "commandName": "Project",
+            "commandLineArgs": "--CorsPolicyOptions AllowAll --WireMockLogger WireMockConsoleLogger"
+        },
+        "WireMock.Net.StandAlone.NETCoreAppWithHostingProtocol": {
+            "commandName": "Project",
+            "commandLineArgs": "--HostingProtocol HttpAndHttps --CorsPolicyOptions AllowAll --WireMockLogger WireMockConsoleLogger"
+        }
     }
-  }
 }

examples/WireMock.Net.StandAlone.Net452/Program.cs

@@ -1,27 +1,26 @@
-using System;
-using System.IO;
-using System.Linq;
-using log4net.Config;
-using WireMock.Server;
-using WireMock.Settings;
-
-namespace WireMock.Net.StandAlone.Net452
-{
-    public class Program
-    {
-        static void Main(params string[] args)
-        {
-            XmlConfigurator.Configure(new FileInfo("log4net.config"));
-
-            if (WireMockServerSettingsParser.TryParseArguments(args, out var settings))
-            {
-                settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+using System;
+using System.IO;
+using System.Linq;
+using log4net.Config;
+using WireMock.Server;
+using WireMock.Settings;
 
-                WireMockServer.Start(settings);
+namespace WireMock.Net.StandAlone.Net452;
 
-                Console.WriteLine("Press any key to stop the server");
-                Console.ReadKey();
-            }
-        }
-    }
+public class Program
+{
+    static void Main(params string[] args)
+    {
+        XmlConfigurator.Configure(new FileInfo("log4net.config"));
+
+        if (WireMockServerSettingsParser.TryParseArguments(args, out var settings))
+        {
+            Console.WriteLine("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+            WireMockServer.Start(settings);
+
+            Console.WriteLine("Press any key to stop the server");
+            Console.ReadKey();
+        }
+    }
 }

examples/WireMock.Net.StandAlone.Net461/Program.cs

@@ -1,23 +1,22 @@
-using System;
-using System.Linq;
-using WireMock.Server;
-using WireMock.Settings;
-
-namespace WireMock.Net.StandAlone.Net461
-{
-    static class Program
-    {
-        static void Main(string[] args)
-        {
-            if (WireMockServerSettingsParser.TryParseArguments(args, out var settings))
-            {
-                settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+using System;
+using System.Linq;
+using WireMock.Server;
+using WireMock.Settings;
 
-                WireMockServer.Start(settings);
+namespace WireMock.Net.StandAlone.Net461;
 
-                Console.WriteLine("Press any key to stop the server");
-                Console.ReadKey();
-            }
-        }
-    }
+static class Program
+{
+    static void Main(string[] args)
+    {
+        if (WireMockServerSettingsParser.TryParseArguments(args, out var settings))
+        {
+            Console.WriteLine("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+            WireMockServer.Start(settings);
+
+            Console.WriteLine("Press any key to stop the server");
+            Console.ReadKey();
+        }
+    }
 }

examples/WireMock.Net.StandAlone.Net461/packages.config

@@ -24,7 +24,7 @@
   <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.Core" version="2.1.25" 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" />

examples/WireMock.Net.WebApplication.NET6/Properties/ServiceDependencies/WireMockNetWebApplicationNET6Linux - Zip Deploy/profile.arm.json

@@ -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
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}

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>

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

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

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

examples/WireMockAzureQueueExample/Properties/launchSettings.json

@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "WireMockAzureQueueExample": {
+      "commandName": "Project",
+      "commandLineArgs": "--port 7290",
+      "launchBrowser": false
+    }
+  }
+}

examples/WireMockAzureQueueExample/Properties/serviceDependencies.json

@@ -0,0 +1,14 @@
+{
+  "dependencies": {
+    "appInsights1": {
+      "type": "appInsights"
+    },
+    "secrets1": {
+      "type": "secrets"
+    },
+    "storage1": {
+      "type": "storage",
+      "connectionId": "AzureWebJobsStorage"
+    }
+  }
+}

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

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>

examples/WireMockAzureQueueExample/host.json

@@ -0,0 +1,11 @@
+{
+    "version": "2.0",
+    "logging": {
+        "applicationInsights": {
+            "samplingSettings": {
+                "isEnabled": true,
+                "excludedTypes": "Request"
+            }
+        }
+    }
+}

examples/WireMockAzureQueueExample/local.settings.json

@@ -0,0 +1,7 @@
+{
+    "IsEncrypted": false,
+    "Values": {
+        "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+        "FUNCTIONS_WORKER_RUNTIME": "dotnet"
+    }
+}

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

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>

examples/WireMockAzureQueueProxy/__admin/mappings/DELETE _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
+    }
+}

examples/WireMockAzureQueueProxy/__admin/mappings/GET No Messages _devstoreaccount1_myqueue-items_messages.json

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

examples/WireMockAzureQueueProxy/__admin/mappings/GET With Messages _devstoreaccount1_myqueue-items_messages.json

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

examples/WireMockAzureQueueProxy/__admin/mappings/HEAD _devstoreaccount1_myqueue-items.json

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

src/WireMock.Net.Abstractions/Admin/Mappings/CookieModel.cs

@@ -1,31 +1,39 @@
 using System.Collections.Generic;
 
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// Cookie Model
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class CookieModel
 {
     /// <summary>
-    /// Cookie Model
+    /// Gets or sets the name.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class CookieModel
-    {
-        /// <summary>
-        /// Gets or sets the name.
-        /// </summary>
-        public string Name { get; set; } = null!;
+    public string Name { get; set; } = null!;
 
-        /// <summary>
-        /// Gets or sets the matchers.
-        /// </summary>
-        public IList<MatcherModel>? Matchers { get; set; }
+    /// <summary>
+    /// Gets or sets the matchers.
+    /// </summary>
+    public IList<MatcherModel>? Matchers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the ignore case.
-        /// </summary>
-        public bool? IgnoreCase { get; set; }
+    /// <summary>
+    /// Gets or sets the ignore case.
+    /// </summary>
+    public bool? IgnoreCase { get; set; }
 
-        /// <summary>
-        /// Reject on match.
-        /// </summary>
-        public bool? RejectOnMatch { get; set; }
-    }
+    /// <summary>
+    /// Reject on match.
+    /// </summary>
+    public bool? RejectOnMatch { get; set; }
+
+    /// <summary>
+    /// The Operator to use when matchers are defined. [Optional]
+    /// - null      = Same as "or".
+    /// - "or"      = Only one pattern should match.
+    /// - "and"     = All patterns should match.
+    /// - "average" = The average value from all patterns.
+    /// </summary>
+    public string? MatchOperator { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs

@@ -74,4 +74,9 @@ public class MappingModel
     /// The Webhooks.
     /// </summary>
     public WebhookModel[]? Webhooks { get; set; }
+
+    /// <summary>
+    /// Fire and forget for webhooks.
+    /// </summary>
+    public bool? UseWebhooksFireAndForget { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Mappings/WebProxyModel.cs

@@ -1,24 +1,23 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// WebProxy settings
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class WebProxyModel
 {
     /// <summary>
-    /// WebProxy settings
+    /// A string instance that contains the address of the proxy server.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class WebProxyModel
-    {
-        /// <summary>
-        /// A string instance that contains the address of the proxy server.
-        /// </summary>
-        public string Address { get; set; }
+    public string Address { get; set; } = null!;
 
-        /// <summary>
-        /// The user name associated with the credentials.
-        /// </summary>
-        public string UserName { get; set; }
+    /// <summary>
+    /// The user name associated with the credentials. [optional]
+    /// </summary>
+    public string? UserName { get; set; }
 
-        /// <summary>
-        /// The password for the user name associated with the credentials.
-        /// </summary>
-        public string Password { get; set; }
-    }
+    /// <summary>
+    /// The password for the user name associated with the credentials. [optional]
+    /// </summary>
+    public string? Password { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Mappings/WebhookModel.cs

@@ -1,14 +1,13 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// The Webhook
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class WebhookModel
 {
     /// <summary>
-    /// The Webhook
+    /// The Webhook Request.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class WebhookModel
-    {
-        /// <summary>
-        /// The Webhook Request.
-        /// </summary>
-        public WebhookRequestModel Request { get; set; }
-    }
+    public WebhookRequestModel Request { get; set; } = null!;
 }

src/WireMock.Net.Abstractions/Admin/Mappings/WebhookRequestModel.cs

@@ -1,52 +1,65 @@
 using System.Collections.Generic;
-using WireMock.Types;
 
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// RequestModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class WebhookRequestModel
 {
     /// <summary>
-    /// RequestModel
+    /// Gets or sets the Url.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class WebhookRequestModel
-    {
-        /// <summary>
-        /// Gets or sets the Url.
-        /// </summary>
-        public string Url { get; set; }
+    public string Url { get; set; } = null!;
 
-        /// <summary>
-        /// The method
-        /// </summary>
-        public string Method { get; set; }
+    /// <summary>
+    /// The method
+    /// </summary>
+    public string Method { get; set; } = null!;
 
-        /// <summary>
-        /// Gets or sets the headers.
-        /// </summary>
-        public IDictionary<string, string>? Headers { get; set; }
+    /// <summary>
+    /// Gets or sets the headers.
+    /// </summary>
+    public IDictionary<string, string>? Headers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the body.
-        /// </summary>
-        public string? Body { get; set; }
+    /// <summary>
+    /// Gets or sets the body.
+    /// </summary>
+    public string? Body { get; set; }
 
-        /// <summary>
-        /// Gets or sets the body (as JSON object).
-        /// </summary>
-        public object? BodyAsJson { get; set; }
+    /// <summary>
+    /// Gets or sets the body (as JSON object).
+    /// </summary>
+    public object? BodyAsJson { get; set; }
 
-        /// <summary>
-        /// Use ResponseMessage Transformer.
-        /// </summary>
-        public bool? UseTransformer { get; set; }
+    /// <summary>
+    /// Use ResponseMessage Transformer.
+    /// </summary>
+    public bool? UseTransformer { get; set; }
 
-        /// <summary>
-        /// Gets the type of the transformer.
-        /// </summary>
-        public string TransformerType { get; set; }
+    /// <summary>
+    /// Gets the type of the transformer.
+    /// </summary>
+    public string? TransformerType { get; set; }
 
-        /// <summary>
-        /// The ReplaceNodeOptions to use when transforming a JSON node.
-        /// </summary>
-        public string TransformerReplaceNodeOptions { get; set; }
-    }
+    /// <summary>
+    /// The ReplaceNodeOptions to use when transforming a JSON node.
+    /// </summary>
+    public string? TransformerReplaceNodeOptions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the delay in milliseconds.
+    /// </summary>
+    public int? Delay { get; set; }
+
+    /// <summary>
+    /// Gets or sets the minimum random delay in milliseconds.
+    /// </summary>
+    public int? MinimumRandomDelay { get; set; }
+
+    /// <summary>
+    /// Gets or sets the maximum random delay in milliseconds.
+    /// </summary>
+    public int? MaximumRandomDelay { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Requests/LogEntryModel.cs

@@ -30,12 +30,12 @@ public class LogEntryModel
     /// <summary>
     /// The mapping unique title.
     /// </summary>
-    public string MappingTitle { get; set; }
+    public string? MappingTitle { get; set; }
 
     /// <summary>
     /// The request match result.
     /// </summary>
-    public LogRequestMatchModel RequestMatchResult { get; set; }
+    public LogRequestMatchModel? RequestMatchResult { get; set; }
 
     /// <summary>
     /// The partial mapping unique identifier.
@@ -45,10 +45,10 @@ public class LogEntryModel
     /// <summary>
     /// The partial mapping unique title.
     /// </summary>
-    public string PartialMappingTitle { get; set; }
+    public string? PartialMappingTitle { get; set; }
 
     /// <summary>
     /// The partial request match result.
     /// </summary>
-    public LogRequestMatchModel PartialRequestMatchResult { get; set; }
+    public LogRequestMatchModel? PartialRequestMatchResult { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Settings/ProxyAndRecordSettingsModel.cs

@@ -1,58 +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>
+    /// Append an unique GUID to the filename from the saved mapping file.
+    /// </summary>
+    public bool AppendGuidToSavedMappingFile { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs

@@ -1,82 +1,92 @@
 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; }
 }

src/WireMock.Net.Abstractions/Constants/HttpRequestMethod.cs

@@ -0,0 +1,17 @@
+namespace WireMock.Constants;
+
+/// <summary>
+/// https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
+/// </summary>
+public static class HttpRequestMethod
+{
+    public const string CONNECT = "CONNECT";
+    public const string DELETE = "DELETE";
+    public const string GET = "GET";
+    public const string HEAD = "HEAD";
+    public const string OPTIONS = "OPTIONS";
+    public const string PATCH = "PATCH";
+    public const string POST = "POST";
+    public const string PUT = "PUT";
+    public const string TRACE = "TRACE";
+}

src/WireMock.Net.Abstractions/IResponseMessage.cs

@@ -3,60 +3,59 @@ using WireMock.ResponseBuilders;
 using WireMock.Types;
 using WireMock.Util;
 
-namespace WireMock
+namespace WireMock;
+
+/// <summary>
+/// IResponseMessage
+/// </summary>
+public interface IResponseMessage
 {
     /// <summary>
-    /// IResponseMessage
+    /// The Body.
     /// </summary>
-    public interface IResponseMessage
-    {
-        /// <summary>
-        /// The Body.
-        /// </summary>
-        IBodyData? BodyData { get; }
+    IBodyData? BodyData { get; }
 
-        /// <summary>
-        /// Gets the body destination (SameAsSource, String or Bytes).
-        /// </summary>
-        string BodyDestination { get; }
+    /// <summary>
+    /// Gets the body destination (Null, SameAsSource, String or Bytes).
+    /// </summary>
+    string? BodyDestination { get; }
 
-        /// <summary>
-        /// Gets or sets the body.
-        /// </summary>
-        string BodyOriginal { get; }
+    /// <summary>
+    /// Gets or sets the body.
+    /// </summary>
+    string? BodyOriginal { get; }
 
-        /// <summary>
-        /// Gets the Fault percentage.
-        /// </summary>
-        double? FaultPercentage { get; }
+    /// <summary>
+    /// Gets the Fault percentage.
+    /// </summary>
+    double? FaultPercentage { get; }
 
-        /// <summary>
-        /// The FaultType.
-        /// </summary>
-        FaultType FaultType { get; }
+    /// <summary>
+    /// The FaultType.
+    /// </summary>
+    FaultType FaultType { get; }
 
-        /// <summary>
-        /// Gets the headers.
-        /// </summary>
-        IDictionary<string, WireMockList<string>>? Headers { get; }
+    /// <summary>
+    /// Gets the headers.
+    /// </summary>
+    IDictionary<string, WireMockList<string>>? Headers { get; }
 
-        /// <summary>
-        /// Gets or sets the status code.
-        /// </summary>
-        object StatusCode { get; }
+    /// <summary>
+    /// Gets or sets the status code.
+    /// </summary>
+    object? StatusCode { get; }
 
-        /// <summary>
-        /// Adds the header.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="value">The value.</param>
-        void AddHeader(string name, string value);
+    /// <summary>
+    /// Adds the header.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="value">The value.</param>
+    void AddHeader(string name, string value);
 
-        /// <summary>
-        /// Adds the header.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="values">The values.</param>
-        void AddHeader(string name, params string[] values);
-    }
+    /// <summary>
+    /// Adds the header.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="values">The values.</param>
+    void AddHeader(string name, params string[] values);
 }

src/WireMock.Net.Abstractions/Logging/ILogEntry.cs

@@ -1,56 +1,55 @@
-using System;
+using System;
 using WireMock.Matchers.Request;
 
-namespace WireMock.Logging
+namespace WireMock.Logging;
+
+/// <summary>
+/// ILogEntry
+/// </summary>
+public interface ILogEntry
 {
     /// <summary>
-    /// ILogEntry
+    /// Gets the unique identifier.
     /// </summary>
-    public interface ILogEntry
-    {
-        /// <summary>
-        /// Gets the unique identifier.
-        /// </summary>
-        Guid Guid { get; }
+    Guid Guid { get; }
 
-        /// <summary>
-        /// Gets the mapping unique identifier.
-        /// </summary>
-        Guid? MappingGuid { get; }
+    /// <summary>
+    /// Gets the mapping unique identifier.
+    /// </summary>
+    Guid? MappingGuid { get; }
 
-        /// <summary>
-        /// Gets the mapping unique title.
-        /// </summary>
-        string MappingTitle { get; }
+    /// <summary>
+    /// Gets the mapping unique title.
+    /// </summary>
+    string? MappingTitle { get; }
 
-        /// <summary>
-        /// Gets the partial mapping unique identifier.
-        /// </summary>
-        Guid? PartialMappingGuid { get; }
+    /// <summary>
+    /// Gets the partial mapping unique identifier.
+    /// </summary>
+    Guid? PartialMappingGuid { get; }
 
-        /// <summary>
-        /// Gets the partial mapping unique title.
-        /// </summary>
-        string PartialMappingTitle { get; }
+    /// <summary>
+    /// Gets the partial mapping unique title.
+    /// </summary>
+    string? PartialMappingTitle { get; }
 
-        /// <summary>
-        /// Gets the partial match result.
-        /// </summary>
-        IRequestMatchResult PartialMatchResult { get; }
+    /// <summary>
+    /// Gets the partial match result.
+    /// </summary>
+    IRequestMatchResult PartialMatchResult { get; }
 
-        /// <summary>
-        /// Gets the request match result.
-        /// </summary>
-        IRequestMatchResult RequestMatchResult { get; }
+    /// <summary>
+    /// Gets the request match result.
+    /// </summary>
+    IRequestMatchResult RequestMatchResult { get; }
 
-        /// <summary>
-        /// Gets the request message.
-        /// </summary>
-        IRequestMessage RequestMessage { get; }
+    /// <summary>
+    /// Gets the request message.
+    /// </summary>
+    IRequestMessage RequestMessage { get; }
 
-        /// <summary>
-        /// Gets the response message.
-        /// </summary>
-        IResponseMessage ResponseMessage { get; }
-    }
+    /// <summary>
+    /// Gets the response message.
+    /// </summary>
+    IResponseMessage ResponseMessage { get; }
 }

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;
@@ -13,12 +11,12 @@ public interface IBodyData
     /// <summary>
     /// The body (as bytearray).
     /// </summary>
-    byte[] BodyAsBytes { get; set; }
+    byte[]? BodyAsBytes { get; set; }
 
     /// <summary>
     /// Gets or sets the body as a file.
     /// </summary>
-    string BodyAsFile { get; set; }
+    string? BodyAsFile { get; set; }
 
     /// <summary>
     /// Is the body as file cached?
@@ -38,7 +36,7 @@ public interface IBodyData
     /// <summary>
     /// The body as string, this is defined when BodyAsString or BodyAsJson are not null.
     /// </summary>
-    string BodyAsString { get; set; }
+    string? BodyAsString { get; set; }
 
     /// <summary>
     /// The detected body type (detection based on body content).
@@ -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; }
 }

src/WireMock.Net.Abstractions/Models/ITimeSettings.cs

@@ -1,25 +1,24 @@
 using System;
 
-namespace WireMock.Models
+namespace WireMock.Models;
+
+/// <summary>
+/// TimeSettings: Start, End and TTL
+/// </summary>
+public interface ITimeSettings
 {
     /// <summary>
-    /// TimeSettings: Start, End and TTL
+    /// Gets or sets the DateTime from which this mapping should be used. In case this is not defined, it's used (default behavior).
     /// </summary>
-    public interface ITimeSettings
-    {
-        /// <summary>
-        /// Gets or sets the DateTime from which this mapping should be used. In case this is not defined, it's used (default behavior).
-        /// </summary>
-        DateTime? Start { get; set; }
+    DateTime? Start { get; set; }
 
-        /// <summary>
-        /// Gets or sets the DateTime from until this mapping should be used. In case this is not defined, it's used forever (default behavior).
-        /// </summary>
-        DateTime? End { get; set; }
+    /// <summary>
+    /// Gets or sets the DateTime from until this mapping should be used. In case this is not defined, it's used forever (default behavior).
+    /// </summary>
+    DateTime? End { get; set; }
 
-        /// <summary>
-        /// Gets or sets the TTL (Time To Live) in seconds for this mapping. In case this is not defined, it's used (default behavior).
-        /// </summary>
-        int? TTL { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the TTL (Time To Live) in seconds for this mapping. In case this is not defined, it's used (default behavior).
+    /// </summary>
+    int? TTL { get; set; }
 }

src/WireMock.Net.Abstractions/Models/IWebhook.cs

@@ -1,13 +1,12 @@
-namespace WireMock.Models
+namespace WireMock.Models;
+
+/// <summary>
+/// IWebhook
+/// </summary>
+public interface IWebhook
 {
     /// <summary>
-    /// IWebhook
+    /// Request
     /// </summary>
-    public interface IWebhook
-    {
-        /// <summary>
-        /// Request
-        /// </summary>
-        IWebhookRequest Request { get; set; }
-    }
+    IWebhookRequest Request { get; set; }
 }

src/WireMock.Net.Abstractions/Models/IWebhookRequest.cs

@@ -2,46 +2,60 @@ using System.Collections.Generic;
 using WireMock.Types;
 using WireMock.Util;
 
-namespace WireMock.Models
+namespace WireMock.Models;
+
+/// <summary>
+/// IWebhookRequest
+/// </summary>
+public interface IWebhookRequest
 {
     /// <summary>
-    /// IWebhookRequest
+    /// The Webhook Url.
     /// </summary>
-    public interface IWebhookRequest
-    {
-        /// <summary>
-        /// The Webhook Url.
-        /// </summary>
-        string Url { get; set; }
+    string Url { get; set; }
 
-        /// <summary>
-        /// The method to use.
-        /// </summary>
-        string Method { get; set; }
+    /// <summary>
+    /// The method to use.
+    /// </summary>
+    string Method { get; set; }
 
-        /// <summary>
-        /// The Headers to send.
-        /// </summary>
-        IDictionary<string, WireMockList<string>>? Headers { get; }
+    /// <summary>
+    /// The Headers to send.
+    /// </summary>
+    IDictionary<string, WireMockList<string>>? Headers { get; }
 
-        /// <summary>
-        /// The body to send.
-        /// </summary>
-        IBodyData? BodyData { get; set; }
+    /// <summary>
+    /// The body to send.
+    /// </summary>
+    IBodyData? BodyData { get; set; }
 
-        /// <summary>
-        /// Use Transformer.
-        /// </summary>
-        bool? UseTransformer { get; set; }
+    /// <summary>
+    /// Use Transformer.
+    /// </summary>
+    bool? UseTransformer { get; set; }
 
-        /// <summary>
-        /// The transformer type.
-        /// </summary>
-        TransformerType TransformerType { get; set; }
+    /// <summary>
+    /// The transformer type.
+    /// </summary>
+    TransformerType TransformerType { get; set; }
 
-        /// <summary>
-        /// The ReplaceNodeOptions to use when transforming a JSON node.
-        /// </summary>
-        ReplaceNodeOptions TransformerReplaceNodeOptions { get; set; }
-    }
+    /// <summary>
+    /// The ReplaceNodeOptions to use when transforming a JSON node.
+    /// </summary>
+    ReplaceNodeOptions TransformerReplaceNodeOptions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the delay in milliseconds.
+    /// </summary>
+    int? Delay { get; set; }
+
+    /// <summary>
+    /// Gets or sets the minimum random delay in milliseconds.
+    /// </summary>
+    int? MinimumRandomDelay { get; set; }
+
+    /// <summary>
+    /// Gets or sets the maximum random delay in milliseconds.
+    /// </summary>
+    int? MaximumRandomDelay { get; set; }
 }

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>

src/WireMock.Net.Abstractions/Types/HostingScheme.cs

@@ -0,0 +1,15 @@
+using System;
+
+namespace WireMock.Types;
+
+[Flags]
+public enum HostingScheme
+{
+    None = 0x0,
+
+    Http = 0x1,
+
+    Https = 0x2,
+
+    HttpAndHttps = Http | Https
+}

src/WireMock.Net.Abstractions/Types/WireMockList.cs

@@ -1,44 +1,69 @@
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 
-namespace WireMock.Types
+namespace WireMock.Types;
+
+/// <summary>
+/// A special List which overrides the ToString() to return first value.
+/// </summary>
+/// <typeparam name="T">The generic type</typeparam>
+/// <seealso cref="List{T}" />
+public class WireMockList<T> : List<T>
 {
     /// <summary>
-    /// A special List which overrides the ToString() to return first value.
+    /// Initializes a new instance of the <see cref="WireMockList{T}"/> class.
     /// </summary>
-    /// <typeparam name="T">The generic type</typeparam>
-    /// <seealso cref="List{T}" />
-    public class WireMockList<T> : List<T>
+    public WireMockList()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WireMockList{T}"/> class.
-        /// </summary>
-        public WireMockList()
-        {
-        }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WireMockList{T}"/> class.
-        /// </summary>
-        /// <param name="collection">The collection whose elements are copied to the new list.</param>
-        public WireMockList(params T[] collection) : base(collection)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockList{T}"/> class.
+    /// </summary>
+    /// <param name="collection">The collection whose elements are copied to the new list.</param>
+    public WireMockList(params T[] collection) : base(collection)
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WireMockList{T}"/> class.
-        /// </summary>
-        /// <param name="collection">The collection whose elements are copied to the new list.</param>
-        public WireMockList(IEnumerable<T> collection) : base(collection)
-        {
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockList{T}"/> class.
+    /// </summary>
+    /// <param name="collection">The collection whose elements are copied to the new list.</param>
+    public WireMockList(IEnumerable<T> collection) : base(collection)
+    {
+    }
 
-        /// <summary>
-        /// Returns a <see cref="string" /> that represents this instance.
-        /// </summary>
-        public override string ToString()
+    /// <summary>
+    /// Operator for setting T
+    /// </summary>
+    /// <param name="value">The value to set.</param>
+    public static implicit operator WireMockList<T>(T value) => new(value);
+
+    /// <summary>
+    /// Operator for setting T[]
+    /// </summary>
+    /// <param name="values">The values to set.</param>
+    public static implicit operator WireMockList<T>(T[] values) => new(values);
+
+    /// <summary>
+    /// Returns a <see cref="string" /> that represents this instance.
+    /// </summary>
+    public override string ToString()
+    {
+        switch (Count)
         {
-            return this.Any() ? this.First().ToString() : base.ToString();
+            case 0:
+                return string.Empty;
+
+            case 1:
+                if (this[0] is string strValue)
+                {
+                    return strValue;
+                }
+
+                return this[0]?.ToString();
+
+            default:
+                return base.ToString();
         }
     }
 }

src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj

@@ -35,7 +35,7 @@
         <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.4.9">
+        <PackageReference Include="FluentBuilder" Version="0.5.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs

@@ -1,97 +1,138 @@
 #pragma warning disable CS1591
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using FluentAssertions;
 using FluentAssertions.Execution;
+using WireMock.Constants;
 using WireMock.Server;
+using WireMock.Types;
 
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions;
 
 public class WireMockAssertions
 {
-    private readonly IWireMockServer _subject;
+    private const string Any = "*";
     private readonly int? _callsCount;
+    private IReadOnlyList<IRequestMessage> _requestMessages;
+    private readonly IReadOnlyList<KeyValuePair<string, WireMockList<string>>> _headers;
 
     public WireMockAssertions(IWireMockServer subject, int? callsCount)
     {
-        _subject = subject;
         _callsCount = callsCount;
+        _requestMessages = subject.LogEntries.Select(logEntry => logEntry.RequestMessage).ToList();
+        _headers = _requestMessages.SelectMany(req => req.Headers).ToList();
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
+    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(() => _subject.LogEntries.Select(x => x.RequestMessage).ToList())
-            .ForCondition(requests => requests.Any())
+            .Given(() => _requestMessages)
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
             .FailWith(
                 "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but no calls were made.",
-                absoluteUrl)
+                absoluteUrl
+            )
             .Then
-            .ForCondition(x => _callsCount == null && x.Any(y => y.AbsoluteUrl == absoluteUrl) || _callsCount == x.Count(y => y.AbsoluteUrl == absoluteUrl))
+            .ForCondition(condition)
             .FailWith(
                 "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
-                _ => absoluteUrl, requests => requests.Select(request => request.AbsoluteUrl));
+                _ => absoluteUrl, requests => requests.Select(request => request.AbsoluteUrl)
+            );
 
-        return new AndConstraint<WireMockAssertions>(this);
+        _requestMessages = filter(_requestMessages).ToList();
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, absoluteUrl);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> AtUrl(string url, string because = "", params object[] becauseArgs)
+    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(() => _subject.LogEntries.Select(x => x.RequestMessage).ToList())
-            .ForCondition(requests => requests.Any())
+            .Given(() => _requestMessages)
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
             .FailWith(
                 "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but no calls were made.",
-                url)
+                url
+            )
             .Then
-            .ForCondition(x => _callsCount == null && x.Any(y => y.Url == url) || _callsCount == x.Count(y => y.Url == url))
+            .ForCondition(condition)
             .FailWith(
                 "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but didn't find it among the calls to {1}.",
-                _ => url, requests => requests.Select(request => request.Url));
+                _ => url,
+                requests => requests.Select(request => request.Url)
+            );
 
-        return new AndConstraint<WireMockAssertions>(this);
+        _requestMessages = filter(_requestMessages).ToList();
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, url);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithProxyUrl(string proxyUrl, string because = "", params object[] becauseArgs)
+    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(() => _subject.LogEntries.Select(x => x.RequestMessage).ToList())
-            .ForCondition(requests => requests.Any())
+            .Given(() => _requestMessages)
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
             .FailWith(
                 "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but no calls were made.",
-                proxyUrl)
+                proxyUrl
+            )
             .Then
-            .ForCondition(x => _callsCount == null && x.Any(y => y.ProxyUrl == proxyUrl) || _callsCount == x.Count(y => y.ProxyUrl == proxyUrl))
+            .ForCondition(condition)
             .FailWith(
                 "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but didn't find it among the calls with {1}.",
-                _ => proxyUrl, requests => requests.Select(request => request.ProxyUrl));
+                _ => proxyUrl,
+                requests => requests.Select(request => request.ProxyUrl)
+            );
 
-        return new AndConstraint<WireMockAssertions>(this);
+        _requestMessages = filter(_requestMessages).ToList();
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, proxyUrl);
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
+    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(() => _subject.LogEntries.Select(x => x.RequestMessage).ToList())
-            .ForCondition(requests => requests.Any())
+            .Given(() => _requestMessages)
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
             .FailWith(
                 "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but no calls were made.",
-                clientIP)
+                clientIP
+            )
             .Then
-            .ForCondition(x => _callsCount == null && x.Any(y => y.ClientIP == clientIP) || _callsCount == x.Count(y => y.ClientIP == clientIP))
+            .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)
+            );
 
-        return new AndConstraint<WireMockAssertions>(this);
+        _requestMessages = filter(_requestMessages).ToList();
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, clientIP);
     }
 
     [CustomAssertion]
@@ -101,32 +142,106 @@ public class WireMockAssertions
     [CustomAssertion]
     public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
     {
-        var headersDictionary = _subject.LogEntries.SelectMany(x => x.RequestMessage.Headers)
-            .ToDictionary(x => x.Key, x => x.Value);
-
         using (new AssertionScope("headers from requests sent"))
         {
-            headersDictionary.Should().ContainKey(expectedKey, because, becauseArgs);
+            _headers.Select(h => h.Key).Should().Contain(expectedKey, because, becauseArgs);
         }
 
         using (new AssertionScope($"header \"{expectedKey}\" from requests sent with value(s)"))
         {
+            var headerValues = _headers.First(h => h.Key == expectedKey).Value;
+
             if (expectedValues.Length == 1)
             {
-                headersDictionary[expectedKey].Should().Contain(expectedValues.First());
+                headerValues.Should().Contain(expectedValues.First(), because, becauseArgs);
             }
             else
             {
-                var trimmedHeaderValues = string.Join(",", headersDictionary[expectedKey].Select(x => x)).Split(',')
-                    .Select(x => x.Trim())
-                    .ToList();
+                var trimmedHeaderValues = string.Join(",", headerValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
                 foreach (var expectedValue in expectedValues)
                 {
-                    trimmedHeaderValues.Should().Contain(expectedValue);
+                    trimmedHeaderValues.Should().Contain(expectedValue, because, becauseArgs);
                 }
             }
         }
 
         return new AndConstraint<WireMockAssertions>(this);
     }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingConnect(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.CONNECT, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingDelete(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.DELETE, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingGet(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.GET, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingHead(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.HEAD, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingOptions(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.OPTIONS, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingPost(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.POST, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingPatch(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.PATCH, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingPut(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.PUT, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingTrace(string because = "", params object[] becauseArgs)
+        => UsingMethod(HttpRequestMethod.TRACE, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingAnyMethod(string because = "", params object[] becauseArgs)
+        => UsingMethod(Any, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> UsingMethod(string method, string because = "", params object[] becauseArgs)
+    {
+        var any = method == Any;
+        Func<IRequestMessage, bool> predicate = request => (any && !string.IsNullOrEmpty(request.Method)) ||
+                                                           string.Equals(request.Method, method, StringComparison.OrdinalIgnoreCase);
+
+        var (filter, condition) = BuildFilterAndCondition(predicate);
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => _requestMessages)
+            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called using method {0}{reason}, but no calls were made.",
+                method
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called using method {0}{reason}, but didn't find it among the methods {1}.",
+                _ => method,
+                requests => requests.Select(request => request.Method)
+            );
+
+        _requestMessages = filter(_requestMessages).ToList();
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    private (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, bool> predicate)
+    {
+        Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter = requests => requests.Where(predicate).ToList();
+
+        return (filter, requests => (_callsCount is null && filter(requests).Any()) || _callsCount == filter(requests).Count);
+    }
 }

src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj

@@ -22,6 +22,7 @@
 		<!--<DelaySign>true</DelaySign>-->
 		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <LangVersion>10</LangVersion>
 	</PropertyGroup>
 
 	<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

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

@@ -59,7 +59,7 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
         MatchOperator = matchOperator;
     }
 
-    public double IsMatch(string input)
+    public double IsMatch(string? input)
     {
         return IsMatchInternal(input);
     }

src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj

@@ -25,7 +25,7 @@
         <PackageReference Include="RamlToOpenApiConverter" Version="0.6.1" />
         <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
-        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.15" />
+        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.16" />
         <PackageReference Include="Stef.Validation" Version="0.1.0" />
     </ItemGroup>
 

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>

src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs

@@ -1,4 +1,5 @@
 #if !NETSTANDARD1_3
+using System;
 using System.Globalization;
 using System.IdentityModel.Tokens.Jwt;
 using System.Text.RegularExpressions;
@@ -6,67 +7,72 @@ using AnyOfTypes;
 using Microsoft.IdentityModel.Protocols;
 using Microsoft.IdentityModel.Protocols.OpenIdConnect;
 using Microsoft.IdentityModel.Tokens;
+using Stef.Validation;
 using WireMock.Matchers;
 using WireMock.Models;
 
-namespace WireMock.Authentication
+namespace WireMock.Authentication;
+
+/// <summary>
+/// https://www.c-sharpcorner.com/article/how-to-validate-azure-ad-token-using-console-application/
+/// https://stackoverflow.com/questions/38684865/validation-of-an-azure-ad-bearer-token-in-a-console-application
+/// </summary>
+internal class AzureADAuthenticationMatcher : IStringMatcher
 {
-    /// <summary>
-    /// https://www.c-sharpcorner.com/article/how-to-validate-azure-ad-token-using-console-application/
-    /// https://stackoverflow.com/questions/38684865/validation-of-an-azure-ad-bearer-token-in-a-console-application
-    /// </summary>
-    internal class AzureADAuthenticationMatcher : IStringMatcher
+    private const string BearerPrefix = "Bearer ";
+
+    private readonly string _audience;
+    private readonly string _stsDiscoveryEndpoint;
+
+    public AzureADAuthenticationMatcher(string tenant, string audience)
     {
-        private const string BearerPrefix = "Bearer ";
+        _audience = Guard.NotNullOrEmpty(audience);
+        _stsDiscoveryEndpoint = string.Format(CultureInfo.InvariantCulture, "https://login.microsoftonline.com/{0}/.well-known/openid-configuration", Guard.NotNullOrEmpty(tenant));
+    }
 
-        private readonly string _audience;
-        private readonly string _stsDiscoveryEndpoint;
+    public string Name => nameof(AzureADAuthenticationMatcher);
 
-        public AzureADAuthenticationMatcher(string tenant, string audience)
+    public MatchBehaviour MatchBehaviour => MatchBehaviour.AcceptOnMatch;
+
+    public bool ThrowException => false;
+
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return EmptyArray<AnyOf<string, StringPattern>>.Value;
+    }
+
+    public MatchOperator MatchOperator { get; } = MatchOperator.Or;
+
+    public double IsMatch(string? input)
+    {
+        if (string.IsNullOrEmpty(input))
         {
-            _audience = audience;
-            _stsDiscoveryEndpoint = string.Format(CultureInfo.InvariantCulture, "https://login.microsoftonline.com/{0}/.well-known/openid-configuration", tenant);
+            return MatchScores.Mismatch;
         }
 
-        public string Name => nameof(AzureADAuthenticationMatcher);
+        var token = Regex.Replace(input, BearerPrefix, string.Empty, RegexOptions.IgnoreCase);
 
-        public MatchBehaviour MatchBehaviour => MatchBehaviour.AcceptOnMatch;
-
-        public bool ThrowException => false;
-
-        public AnyOf<string, StringPattern>[] GetPatterns()
+        try
         {
-            return new AnyOf<string, StringPattern>[0];
+            var configManager = new ConfigurationManager<OpenIdConnectConfiguration>(_stsDiscoveryEndpoint, new OpenIdConnectConfigurationRetriever());
+            var config = configManager.GetConfigurationAsync().ConfigureAwait(false).GetAwaiter().GetResult();
+
+            var validationParameters = new TokenValidationParameters
+            {
+                ValidAudience = _audience,
+                ValidIssuer = config.Issuer,
+                IssuerSigningKeys = config.SigningKeys,
+                ValidateLifetime = true
+            };
+
+            // Throws an Exception as the token is invalid (expired, invalid-formatted, etc.)
+            new JwtSecurityTokenHandler().ValidateToken(token, validationParameters, out var _);
+
+            return MatchScores.Perfect;
         }
-
-        public MatchOperator MatchOperator { get; } = MatchOperator.Or;
-
-        public double IsMatch(string input)
+        catch
         {
-            var token = Regex.Replace(input, BearerPrefix, string.Empty, RegexOptions.IgnoreCase);
-
-            try
-            {
-                var configManager = new ConfigurationManager<OpenIdConnectConfiguration>(_stsDiscoveryEndpoint, new OpenIdConnectConfigurationRetriever());
-                var config = configManager.GetConfigurationAsync().ConfigureAwait(false).GetAwaiter().GetResult();
-
-                var validationParameters = new TokenValidationParameters
-                {
-                    ValidAudience = _audience,
-                    ValidIssuer = config.Issuer,
-                    IssuerSigningKeys = config.SigningKeys,
-                    ValidateLifetime = true
-                };
-
-                // Throws an Exception as the token is invalid (expired, invalid-formatted, etc.)
-                new JwtSecurityTokenHandler().ValidateToken(token, validationParameters, out var _);
-
-                return MatchScores.Perfect;
-            }
-            catch
-            {
-                return MatchScores.Mismatch;
-            }
+            return MatchScores.Mismatch;
         }
     }
 }

src/WireMock.Net/Authentication/BasicAuthenticationMatcher.cs

@@ -2,19 +2,18 @@ using System;
 using System.Text;
 using WireMock.Matchers;
 
-namespace WireMock.Authentication
+namespace WireMock.Authentication;
+
+internal class BasicAuthenticationMatcher : RegexMatcher
 {
-    internal class BasicAuthenticationMatcher : RegexMatcher
+    public BasicAuthenticationMatcher(string username, string password) : base(BuildPattern(username, password))
     {
-        public BasicAuthenticationMatcher(string username, string password) : base(BuildPattern(username, password))
-        {
-        }
+    }
 
-        public override string Name => nameof(BasicAuthenticationMatcher);
+    public override string Name => nameof(BasicAuthenticationMatcher);
 
-        private static string BuildPattern(string username, string password)
-        {
-            return "^(?i)BASIC " + Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password)) + "$";
-        }
+    private static string BuildPattern(string username, string password)
+    {
+        return "^(?i)BASIC " + Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password)) + "$";
     }
 }

src/WireMock.Net/Compatibility/EmptyArray.cs

@@ -0,0 +1,11 @@
+// ReSharper disable once CheckNamespace
+namespace System;
+
+internal static class EmptyArray<T>
+{
+#if NET451 || NET452
+    public static readonly T[] Value = new T[0];
+#else
+    public static readonly T[] Value = Array.Empty<T>();
+#endif
+}

src/WireMock.Net/Compatibility/WebProxy.cs

@@ -1,28 +1,26 @@
-#if NETSTANDARD1_3
-using System;
-using System.Net;
+#if NETSTANDARD1_3
 
-namespace System.Net
+// ReSharper disable once CheckNamespace
+namespace System.Net;
+
+internal class WebProxy : IWebProxy
 {
-    internal class WebProxy : IWebProxy
+    private readonly string _proxy;
+    public ICredentials? Credentials { get; set; }
+
+    public WebProxy(string proxy)
     {
-        private readonly string _proxy;
-        public ICredentials Credentials { get; set; }
+        _proxy = proxy;
+    }
 
-        public WebProxy(string proxy)
-        {
-            _proxy = proxy;
-        }
+    public Uri GetProxy(Uri destination)
+    {
+        return new Uri(_proxy);
+    }
 
-        public Uri GetProxy(Uri destination)
-        {
-            return new Uri(_proxy);
-        }
-
-        public bool IsBypassed(Uri host)
-        {
-            return true;
-        }
+    public bool IsBypassed(Uri host)
+    {
+        return true;
     }
 }
 #endif

src/WireMock.Net/Extensions/AnyOfExtensions.cs

@@ -1,26 +1,24 @@
 using System.Collections.Generic;
 using System.Linq;
 using AnyOfTypes;
-using JetBrains.Annotations;
 using WireMock.Models;
 
-namespace WireMock.Extensions
+namespace WireMock.Extensions;
+
+internal static class AnyOfExtensions
 {
-    internal static class AnyOfExtensions
+    public static string GetPattern(this AnyOf<string, StringPattern> value)
     {
-        public static string GetPattern([NotNull] this AnyOf<string, StringPattern> value)
-        {
-            return value.IsFirst ? value.First : value.Second.Pattern;
-        }
+        return value.IsFirst ? value.First : value.Second.Pattern;
+    }
 
-        public static AnyOf<string, StringPattern>[] ToAnyOfPatterns([NotNull] this IEnumerable<string> patterns)
-        {
-            return patterns.Select(p => p.ToAnyOfPattern()).ToArray();
-        }
+    public static AnyOf<string, StringPattern>[] ToAnyOfPatterns(this IEnumerable<string> patterns)
+    {
+        return patterns.Select(p => p.ToAnyOfPattern()).ToArray();
+    }
 
-        public static AnyOf<string, StringPattern> ToAnyOfPattern([CanBeNull] this string pattern)
-        {
-            return new AnyOf<string, StringPattern>(pattern);
-        }
+    public static AnyOf<string, StringPattern> ToAnyOfPattern(this string pattern)
+    {
+        return new AnyOf<string, StringPattern>(pattern);
     }
 }

src/WireMock.Net/Extensions/TimeSettingsExtensions.cs

@@ -1,35 +1,34 @@
 using System;
-using JetBrains.Annotations;
 using WireMock.Models;
 
-namespace WireMock.Extensions
+namespace WireMock.Extensions;
+
+internal static class TimeSettingsExtensions
 {
-    internal static class TimeSettingsExtensions
+    public static bool IsValid(this ITimeSettings? settings)
     {
-        public static bool IsValid([CanBeNull] this ITimeSettings settings)
+        if (settings == null)
         {
-            if (settings == null)
-            {
-                return true;
-            }
-
-            var now = DateTime.Now;
-            var start = settings.Start != null ? settings.Start.Value : now;
-            DateTime end;
-            if (settings.End != null)
-            {
-                end = settings.End.Value;
-            }
-            else if (settings.TTL != null)
-            {
-                end = start.AddSeconds(settings.TTL.Value);
-            }
-            else
-            {
-                end = DateTime.MaxValue;
-            }
-
-            return now >= start && now <= end;
+            return true;
         }
+
+        var now = DateTime.Now;
+        var start = settings.Start ?? now;
+        DateTime end;
+
+        if (settings.End != null)
+        {
+            end = settings.End.Value;
+        }
+        else if (settings.TTL != null)
+        {
+            end = start.AddSeconds(settings.TTL.Value);
+        }
+        else
+        {
+            end = DateTime.MaxValue;
+        }
+
+        return now >= start && now <= end;
     }
 }

src/WireMock.Net/Http/ByteArrayContentHelper.cs

@@ -1,30 +1,28 @@
-using System.Net.Http;
+using System.Net.Http;
 using System.Net.Http.Headers;
-using JetBrains.Annotations;
 using Stef.Validation;
 
-namespace WireMock.Http
+namespace WireMock.Http;
+
+internal static class ByteArrayContentHelper
 {
-    internal static class ByteArrayContentHelper
+    /// <summary>
+    /// Creates a ByteArrayContent object.
+    /// </summary>
+    /// <param name="content">The byte[] content (cannot be null)</param>
+    /// <param name="contentType">The ContentType (can be null)</param>
+    /// <returns>ByteArrayContent</returns>
+    internal static ByteArrayContent Create(byte[] content, MediaTypeHeaderValue? contentType)
     {
-        /// <summary>
-        /// Creates a ByteArrayContent object.
-        /// </summary>
-        /// <param name="content">The byte[] content (cannot be null)</param>
-        /// <param name="contentType">The ContentType (can be null)</param>
-        /// <returns>ByteArrayContent</returns>
-        internal static ByteArrayContent Create([NotNull] byte[] content, [CanBeNull] MediaTypeHeaderValue contentType)
+        Guard.NotNull(content);
+
+        var byteContent = new ByteArrayContent(content);
+        if (contentType != null)
         {
-            Guard.NotNull(content, nameof(content));
-
-            var byteContent = new ByteArrayContent(content);
-            if (contentType != null)
-            {
-                byteContent.Headers.Remove(HttpKnownHeaderNames.ContentType);
-                byteContent.Headers.ContentType = contentType;
-            }
-
-            return byteContent;
+            byteContent.Headers.Remove(HttpKnownHeaderNames.ContentType);
+            byteContent.Headers.ContentType = contentType;
         }
+
+        return byteContent;
     }
-}
+}

src/WireMock.Net/Http/HttpKnownHeaderNames.cs

@@ -1,122 +1,121 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
 using System;
 using System.Linq;
 
-namespace WireMock.Http
+namespace WireMock.Http;
+
+/// <summary>
+/// Copied from https://raw.githubusercontent.com/dotnet/corefx/master/src/Common/src/System/Net/HttpKnownHeaderNames.cs
+/// </summary>
+internal static class HttpKnownHeaderNames
 {
-    /// <summary>
-    /// Copied from https://raw.githubusercontent.com/dotnet/corefx/master/src/Common/src/System/Net/HttpKnownHeaderNames.cs
-    /// </summary>
-    internal static class HttpKnownHeaderNames
+    // https://docs.microsoft.com/en-us/dotnet/api/system.net.webheadercollection.isrestricted
+    private static readonly string[] RestrictedResponseHeaders =
     {
-        // https://docs.microsoft.com/en-us/dotnet/api/system.net.webheadercollection.isrestricted
-        private static readonly string[] RestrictedResponseHeaders =
-        {
-            Accept,
-            Connection,
-            ContentLength,
-            ContentType,
-            Date, // RFC1123Pattern
-            Expect,
-            Host,
-            IfModifiedSince,
-            Range,
-            Referer,
-            TransferEncoding,
-            UserAgent,
-            ProxyConnection
-        };
+        Accept,
+        Connection,
+        ContentLength,
+        ContentType,
+        Date, // RFC1123Pattern
+        Expect,
+        Host,
+        IfModifiedSince,
+        Range,
+        Referer,
+        TransferEncoding,
+        UserAgent,
+        ProxyConnection
+    };
 
-        /// <summary>Tests whether the specified HTTP header can be set for the response.</summary>
-        /// <param name="headerName">The header to test.</param>
-        /// <returns>true if the header is restricted; otherwise, false.</returns>
-        public static bool IsRestrictedResponseHeader(string headerName) => RestrictedResponseHeaders.Contains(headerName, StringComparer.OrdinalIgnoreCase);
+    /// <summary>Tests whether the specified HTTP header can be set for the response.</summary>
+    /// <param name="headerName">The header to test.</param>
+    /// <returns>true if the header is restricted; otherwise, false.</returns>
+    public static bool IsRestrictedResponseHeader(string headerName) => RestrictedResponseHeaders.Contains(headerName, StringComparer.OrdinalIgnoreCase);
 
-        public const string Accept = "Accept";
-        public const string AcceptCharset = "Accept-Charset";
-        public const string AcceptEncoding = "Accept-Encoding";
-        public const string AcceptLanguage = "Accept-Language";
-        public const string AcceptPatch = "Accept-Patch";
-        public const string AcceptRanges = "Accept-Ranges";
-        public const string AccessControlAllowCredentials = "Access-Control-Allow-Credentials";
-        public const string AccessControlAllowHeaders = "Access-Control-Allow-Headers";
-        public const string AccessControlAllowMethods = "Access-Control-Allow-Methods";
-        public const string AccessControlAllowOrigin = "Access-Control-Allow-Origin";
-        public const string AccessControlExposeHeaders = "Access-Control-Expose-Headers";
-        public const string AccessControlMaxAge = "Access-Control-Max-Age";
-        public const string Age = "Age";
-        public const string Allow = "Allow";
-        public const string AltSvc = "Alt-Svc";
-        public const string Authorization = "Authorization";
-        public const string CacheControl = "Cache-Control";
-        public const string Connection = "Connection";
-        public const string ContentDisposition = "Content-Disposition";
-        public const string ContentEncoding = "Content-Encoding";
-        public const string ContentLanguage = "Content-Language";
-        public const string ContentLength = "Content-Length";
-        public const string ContentLocation = "Content-Location";
-        public const string ContentMD5 = "Content-MD5";
-        public const string ContentRange = "Content-Range";
-        public const string ContentSecurityPolicy = "Content-Security-Policy";
-        public const string ContentType = "Content-Type";
-        public const string Cookie = "Cookie";
-        public const string Cookie2 = "Cookie2";
-        public const string Date = "Date";
-        public const string ETag = "ETag";
-        public const string Expect = "Expect";
-        public const string Expires = "Expires";
-        public const string From = "From";
-        public const string Host = "Host";
-        public const string IfMatch = "If-Match";
-        public const string IfModifiedSince = "If-Modified-Since";
-        public const string IfNoneMatch = "If-None-Match";
-        public const string IfRange = "If-Range";
-        public const string IfUnmodifiedSince = "If-Unmodified-Since";
-        public const string KeepAlive = "Keep-Alive";
-        public const string LastModified = "Last-Modified";
-        public const string Link = "Link";
-        public const string Location = "Location";
-        public const string MaxForwards = "Max-Forwards";
-        public const string Origin = "Origin";
-        public const string P3P = "P3P";
-        public const string Pragma = "Pragma";
-        public const string ProxyAuthenticate = "Proxy-Authenticate";
-        public const string ProxyAuthorization = "Proxy-Authorization";
-        public const string ProxyConnection = "Proxy-Connection";
-        public const string PublicKeyPins = "Public-Key-Pins";
-        public const string Range = "Range";
-        public const string Referer = "Referer"; // NB: The spelling-mistake "Referer" for "Referrer" must be matched.
-        public const string RetryAfter = "Retry-After";
-        public const string SecWebSocketAccept = "Sec-WebSocket-Accept";
-        public const string SecWebSocketExtensions = "Sec-WebSocket-Extensions";
-        public const string SecWebSocketKey = "Sec-WebSocket-Key";
-        public const string SecWebSocketProtocol = "Sec-WebSocket-Protocol";
-        public const string SecWebSocketVersion = "Sec-WebSocket-Version";
-        public const string Server = "Server";
-        public const string SetCookie = "Set-Cookie";
-        public const string SetCookie2 = "Set-Cookie2";
-        public const string StrictTransportSecurity = "Strict-Transport-Security";
-        public const string TE = "TE";
-        public const string TSV = "TSV";
-        public const string Trailer = "Trailer";
-        public const string TransferEncoding = "Transfer-Encoding";
-        public const string Upgrade = "Upgrade";
-        public const string UpgradeInsecureRequests = "Upgrade-Insecure-Requests";
-        public const string UserAgent = "User-Agent";
-        public const string Vary = "Vary";
-        public const string Via = "Via";
-        public const string WWWAuthenticate = "WWW-Authenticate";
-        public const string Warning = "Warning";
-        public const string XAspNetVersion = "X-AspNet-Version";
-        public const string XContentDuration = "X-Content-Duration";
-        public const string XContentTypeOptions = "X-Content-Type-Options";
-        public const string XFrameOptions = "X-Frame-Options";
-        public const string XMSEdgeRef = "X-MSEdge-Ref";
-        public const string XPoweredBy = "X-Powered-By";
-        public const string XRequestID = "X-Request-ID";
-        public const string XUACompatible = "X-UA-Compatible";
-    }
+    public const string Accept = "Accept";
+    public const string AcceptCharset = "Accept-Charset";
+    public const string AcceptEncoding = "Accept-Encoding";
+    public const string AcceptLanguage = "Accept-Language";
+    public const string AcceptPatch = "Accept-Patch";
+    public const string AcceptRanges = "Accept-Ranges";
+    public const string AccessControlAllowCredentials = "Access-Control-Allow-Credentials";
+    public const string AccessControlAllowHeaders = "Access-Control-Allow-Headers";
+    public const string AccessControlAllowMethods = "Access-Control-Allow-Methods";
+    public const string AccessControlAllowOrigin = "Access-Control-Allow-Origin";
+    public const string AccessControlExposeHeaders = "Access-Control-Expose-Headers";
+    public const string AccessControlMaxAge = "Access-Control-Max-Age";
+    public const string Age = "Age";
+    public const string Allow = "Allow";
+    public const string AltSvc = "Alt-Svc";
+    public const string Authorization = "Authorization";
+    public const string CacheControl = "Cache-Control";
+    public const string Connection = "Connection";
+    public const string ContentDisposition = "Content-Disposition";
+    public const string ContentEncoding = "Content-Encoding";
+    public const string ContentLanguage = "Content-Language";
+    public const string ContentLength = "Content-Length";
+    public const string ContentLocation = "Content-Location";
+    public const string ContentMD5 = "Content-MD5";
+    public const string ContentRange = "Content-Range";
+    public const string ContentSecurityPolicy = "Content-Security-Policy";
+    public const string ContentType = "Content-Type";
+    public const string Cookie = "Cookie";
+    public const string Cookie2 = "Cookie2";
+    public const string Date = "Date";
+    public const string ETag = "ETag";
+    public const string Expect = "Expect";
+    public const string Expires = "Expires";
+    public const string From = "From";
+    public const string Host = "Host";
+    public const string IfMatch = "If-Match";
+    public const string IfModifiedSince = "If-Modified-Since";
+    public const string IfNoneMatch = "If-None-Match";
+    public const string IfRange = "If-Range";
+    public const string IfUnmodifiedSince = "If-Unmodified-Since";
+    public const string KeepAlive = "Keep-Alive";
+    public const string LastModified = "Last-Modified";
+    public const string Link = "Link";
+    public const string Location = "Location";
+    public const string MaxForwards = "Max-Forwards";
+    public const string Origin = "Origin";
+    public const string P3P = "P3P";
+    public const string Pragma = "Pragma";
+    public const string ProxyAuthenticate = "Proxy-Authenticate";
+    public const string ProxyAuthorization = "Proxy-Authorization";
+    public const string ProxyConnection = "Proxy-Connection";
+    public const string PublicKeyPins = "Public-Key-Pins";
+    public const string Range = "Range";
+    public const string Referer = "Referer"; // NB: The spelling-mistake "Referer" for "Referrer" must be matched.
+    public const string RetryAfter = "Retry-After";
+    public const string SecWebSocketAccept = "Sec-WebSocket-Accept";
+    public const string SecWebSocketExtensions = "Sec-WebSocket-Extensions";
+    public const string SecWebSocketKey = "Sec-WebSocket-Key";
+    public const string SecWebSocketProtocol = "Sec-WebSocket-Protocol";
+    public const string SecWebSocketVersion = "Sec-WebSocket-Version";
+    public const string Server = "Server";
+    public const string SetCookie = "Set-Cookie";
+    public const string SetCookie2 = "Set-Cookie2";
+    public const string StrictTransportSecurity = "Strict-Transport-Security";
+    public const string TE = "TE";
+    public const string TSV = "TSV";
+    public const string Trailer = "Trailer";
+    public const string TransferEncoding = "Transfer-Encoding";
+    public const string Upgrade = "Upgrade";
+    public const string UpgradeInsecureRequests = "Upgrade-Insecure-Requests";
+    public const string UserAgent = "User-Agent";
+    public const string Vary = "Vary";
+    public const string Via = "Via";
+    public const string WWWAuthenticate = "WWW-Authenticate";
+    public const string Warning = "Warning";
+    public const string XAspNetVersion = "X-AspNet-Version";
+    public const string XContentDuration = "X-Content-Duration";
+    public const string XContentTypeOptions = "X-Content-Type-Options";
+    public const string XFrameOptions = "X-Frame-Options";
+    public const string XMSEdgeRef = "X-MSEdge-Ref";
+    public const string XPoweredBy = "X-Powered-By";
+    public const string XRequestID = "X-Request-ID";
+    public const string XUACompatible = "X-UA-Compatible";
 }

src/WireMock.Net/Http/HttpRequestMessageHelper.cs

@@ -3,89 +3,87 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using JetBrains.Annotations;
 using Newtonsoft.Json;
-using WireMock.Types;
 using Stef.Validation;
+using WireMock.Types;
 
-namespace WireMock.Http
+namespace WireMock.Http;
+
+internal static class HttpRequestMessageHelper
 {
-    internal static class HttpRequestMessageHelper
+    internal static HttpRequestMessage Create(IRequestMessage requestMessage, string url)
     {
-        internal static HttpRequestMessage Create([NotNull] IRequestMessage requestMessage, [NotNull] string url)
+        Guard.NotNull(requestMessage);
+        Guard.NotNullOrEmpty(url);
+
+        var httpRequestMessage = new HttpRequestMessage(new HttpMethod(requestMessage.Method), url);
+
+        MediaTypeHeaderValue? contentType = null;
+        if (requestMessage.Headers != null && requestMessage.Headers.ContainsKey(HttpKnownHeaderNames.ContentType))
         {
-            Guard.NotNull(requestMessage, nameof(requestMessage));
-            Guard.NotNullOrEmpty(url, nameof(url));
+            var value = requestMessage.Headers[HttpKnownHeaderNames.ContentType].FirstOrDefault();
+            MediaTypeHeaderValue.TryParse(value, out contentType);
+        }
 
-            var httpRequestMessage = new HttpRequestMessage(new HttpMethod(requestMessage.Method), url);
+        switch (requestMessage.BodyData?.DetectedBodyType)
+        {
+            case BodyType.Bytes:
+                httpRequestMessage.Content = ByteArrayContentHelper.Create(requestMessage.BodyData.BodyAsBytes, contentType);
+                break;
 
-            MediaTypeHeaderValue contentType = null;
-            if (requestMessage.Headers != null && requestMessage.Headers.ContainsKey(HttpKnownHeaderNames.ContentType))
-            {
-                var value = requestMessage.Headers[HttpKnownHeaderNames.ContentType].FirstOrDefault();
-                MediaTypeHeaderValue.TryParse(value, out contentType);
-            }
+            case BodyType.Json:
+                httpRequestMessage.Content = StringContentHelper.Create(JsonConvert.SerializeObject(requestMessage.BodyData.BodyAsJson), contentType);
+                break;
 
-            switch (requestMessage.BodyData?.DetectedBodyType)
-            {
-                case BodyType.Bytes:
-                    httpRequestMessage.Content = ByteArrayContentHelper.Create(requestMessage.BodyData.BodyAsBytes, contentType);
-                    break;
+            case BodyType.String:
+                httpRequestMessage.Content = StringContentHelper.Create(requestMessage.BodyData.BodyAsString, contentType);
+                break;
+        }
 
-                case BodyType.Json:
-                    httpRequestMessage.Content = StringContentHelper.Create(JsonConvert.SerializeObject(requestMessage.BodyData.BodyAsJson), contentType);
-                    break;
-
-                case BodyType.String:
-                    httpRequestMessage.Content = StringContentHelper.Create(requestMessage.BodyData.BodyAsString, contentType);
-                    break;
-            }
-
-            // Overwrite the host header
-            httpRequestMessage.Headers.Host = new Uri(url).Authority;
-
-            // Set other headers if present
-            if (requestMessage.Headers == null || requestMessage.Headers.Count == 0)
-            {
-                return httpRequestMessage;
-            }
-
-            var excludeHeaders = new List<string> { HttpKnownHeaderNames.Host, HttpKnownHeaderNames.ContentLength };
-            if (contentType != null)
-            {
-                // Content-Type should be set on the content
-                excludeHeaders.Add(HttpKnownHeaderNames.ContentType);
-            }
-
-            foreach (var header in requestMessage.Headers.Where(h => !excludeHeaders.Contains(h.Key, StringComparer.OrdinalIgnoreCase)))
-            {
-                // Skip if already added. We need to ToList() else calling httpRequestMessage.Headers.Contains() with a header starting with a ":" throws an exception.
-                if (httpRequestMessage.Headers.ToList().Any(h => string.Equals(h.Key, header.Key, StringComparison.OrdinalIgnoreCase)))
-                {
-                    continue;
-                }
-
-                // Skip if already added. We need to ToList() else calling httpRequestMessage.Content.Headers.Contains(...) with a header starting with a ":" throws an exception.
-                if (httpRequestMessage.Content != null && httpRequestMessage.Content.Headers.ToList().Any(h => string.Equals(h.Key, header.Key, StringComparison.OrdinalIgnoreCase)))
-                {
-                    continue;
-                }
-
-                // Try to add to request headers. If failed - try to add to content headers. If still fails, just ignore this header.
-                try
-                {
-                    if (!httpRequestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value))
-                    {
-                        httpRequestMessage.Content?.Headers.TryAddWithoutValidation(header.Key, header.Value);
-                    }
-                }
-                catch
-                {
-                    // Just continue
-                }
-            }
+        // Overwrite the host header
+        httpRequestMessage.Headers.Host = new Uri(url).Authority;
 
+        // Set other headers if present
+        if (requestMessage.Headers == null || requestMessage.Headers.Count == 0)
+        {
             return httpRequestMessage;
         }
+
+        var excludeHeaders = new List<string> { HttpKnownHeaderNames.Host, HttpKnownHeaderNames.ContentLength };
+        if (contentType != null)
+        {
+            // Content-Type should be set on the content
+            excludeHeaders.Add(HttpKnownHeaderNames.ContentType);
+        }
+
+        foreach (var header in requestMessage.Headers.Where(h => !excludeHeaders.Contains(h.Key, StringComparer.OrdinalIgnoreCase)))
+        {
+            // Skip if already added. We need to ToList() else calling httpRequestMessage.Headers.Contains() with a header starting with a ":" throws an exception.
+            if (httpRequestMessage.Headers.ToList().Any(h => string.Equals(h.Key, header.Key, StringComparison.OrdinalIgnoreCase)))
+            {
+                continue;
+            }
+
+            // Skip if already added. We need to ToList() else calling httpRequestMessage.Content.Headers.Contains(...) with a header starting with a ":" throws an exception.
+            if (httpRequestMessage.Content != null && httpRequestMessage.Content.Headers.ToList().Any(h => string.Equals(h.Key, header.Key, StringComparison.OrdinalIgnoreCase)))
+            {
+                continue;
+            }
+
+            // Try to add to request headers. If failed - try to add to content headers. If still fails, just ignore this header.
+            try
+            {
+                if (!httpRequestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value))
+                {
+                    httpRequestMessage.Content?.Headers.TryAddWithoutValidation(header.Key, header.Value);
+                }
+            }
+            catch
+            {
+                // Just continue
+            }
+        }
+
+        return httpRequestMessage;
     }
 }

src/WireMock.Net/Http/HttpRequestMethods.cs

@@ -1,18 +0,0 @@
-namespace WireMock.Http
-{
-    /// <summary>
-    /// https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
-    /// </summary>
-    internal static class HttpRequestMethods
-    {
-        public const string CONNECT = "CONNECT";
-        public const string DELETE = "DELETE";
-        public const string GET = "GET";
-        public const string HEAD = "HEAD";
-        public const string OPTIONS = "OPTIONS";
-        public const string PATCH = "PATCH";
-        public const string POST = "POST";
-        public const string PUT = "PUT";
-        public const string TRACE = "TRACE";
-    }
-}

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)

src/WireMock.Net/Http/StringContentHelper.cs

@@ -1,25 +1,23 @@
-using System.Net.Http;
+using System.Net.Http;
 using System.Net.Http.Headers;
-using JetBrains.Annotations;
 using Stef.Validation;
 
-namespace WireMock.Http
-{
-    internal static class StringContentHelper
-    {
-        /// <summary>
-        /// Creates a StringContent object.
-        /// </summary>
-        /// <param name="content">The string content (cannot be null)</param>
-        /// <param name="contentType">The ContentType (can be null)</param>
-        /// <returns>StringContent</returns>
-        internal static StringContent Create([NotNull] string content, [CanBeNull] MediaTypeHeaderValue contentType)
-        {
-            Guard.NotNull(content, nameof(content));
+namespace WireMock.Http;
 
-            var stringContent = new StringContent(content);
-            stringContent.Headers.ContentType = contentType;
-            return stringContent;
-        }
+internal static class StringContentHelper
+{
+    /// <summary>
+    /// Creates a StringContent object.
+    /// </summary>
+    /// <param name="content">The string content (cannot be null)</param>
+    /// <param name="contentType">The ContentType (can be null)</param>
+    /// <returns>StringContent</returns>
+    internal static StringContent Create(string content, MediaTypeHeaderValue? contentType)
+    {
+        Guard.NotNull(content);
+
+        var stringContent = new StringContent(content);
+        stringContent.Headers.ContentType = contentType;
+        return stringContent;
     }
 }

src/WireMock.Net/Http/WebhookSender.cs

@@ -1,9 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Net.Http;
+using System.Threading;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
+using Stef.Validation;
 using WireMock.Models;
 using WireMock.Settings;
 using WireMock.Transformers;
@@ -11,75 +13,106 @@ using WireMock.Transformers.Handlebars;
 using WireMock.Transformers.Scriban;
 using WireMock.Types;
 using WireMock.Util;
-using Stef.Validation;
 
-namespace WireMock.Http
+namespace WireMock.Http;
+
+internal class WebhookSender
 {
-    internal class WebhookSender
+    private const string ClientIp = "::1";
+    private static readonly ThreadLocal<Random> Random = new(() => new Random(DateTime.UtcNow.Millisecond));
+
+    private readonly WireMockServerSettings _settings;
+
+    public WebhookSender(WireMockServerSettings settings)
     {
-        private const string ClientIp = "::1";
+        _settings = Guard.NotNull(settings);
+    }
 
-        private readonly WireMockServerSettings _settings;
+    public async Task<HttpResponseMessage> SendAsync(
+        HttpClient client,
+        IMapping mapping,
+        IWebhookRequest webhookRequest,
+        IRequestMessage originalRequestMessage,
+        IResponseMessage originalResponseMessage
+    )
+    {
+        Guard.NotNull(client);
+        Guard.NotNull(mapping);
+        Guard.NotNull(webhookRequest);
+        Guard.NotNull(originalRequestMessage);
+        Guard.NotNull(originalResponseMessage);
 
-        public WebhookSender(WireMockServerSettings settings)
+        IBodyData? bodyData;
+        IDictionary<string, WireMockList<string>>? headers;
+        string webhookRequestUrl;
+        if (webhookRequest.UseTransformer == true)
         {
-            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
-        }
-
-        public Task<HttpResponseMessage> SendAsync(HttpClient client, IWebhookRequest request, IRequestMessage originalRequestMessage, IResponseMessage originalResponseMessage)
-        {
-            Guard.NotNull(client);
-            Guard.NotNull(request);
-            Guard.NotNull(originalRequestMessage);
-            Guard.NotNull(originalResponseMessage);
-
-            IBodyData? bodyData;
-            IDictionary<string, WireMockList<string>>? headers;
-            if (request.UseTransformer == true)
+            ITransformer transformer;
+            switch (webhookRequest.TransformerType)
             {
-                ITransformer responseMessageTransformer;
-                switch (request.TransformerType)
-                {
-                    case TransformerType.Handlebars:
-                        var factoryHandlebars = new HandlebarsContextFactory(_settings.FileSystemHandler, _settings.HandlebarsRegistrationCallback);
-                        responseMessageTransformer = new Transformer(factoryHandlebars);
-                        break;
+                case TransformerType.Handlebars:
+                    var factoryHandlebars = new HandlebarsContextFactory(_settings.FileSystemHandler, _settings.HandlebarsRegistrationCallback);
+                    transformer = new Transformer(factoryHandlebars);
+                    break;
 
-                    case TransformerType.Scriban:
-                    case TransformerType.ScribanDotLiquid:
-                        var factoryDotLiquid = new ScribanContextFactory(_settings.FileSystemHandler, request.TransformerType);
-                        responseMessageTransformer = new Transformer(factoryDotLiquid);
-                        break;
+                case TransformerType.Scriban:
+                case TransformerType.ScribanDotLiquid:
+                    var factoryDotLiquid = new ScribanContextFactory(_settings.FileSystemHandler, webhookRequest.TransformerType);
+                    transformer = new Transformer(factoryDotLiquid);
+                    break;
 
-                    default:
-                        throw new NotImplementedException($"TransformerType '{request.TransformerType}' is not supported.");
-                }
-
-                (bodyData, headers) = responseMessageTransformer.Transform(originalRequestMessage, originalResponseMessage, request.BodyData, request.Headers, request.TransformerReplaceNodeOptions);
-            }
-            else
-            {
-                bodyData = request.BodyData;
-                headers = request.Headers;
+                default:
+                    throw new NotImplementedException($"TransformerType '{webhookRequest.TransformerType}' is not supported.");
             }
 
-            // Create RequestMessage
-            var requestMessage = new RequestMessage(
-                new UrlDetails(request.Url),
-                request.Method,
-                ClientIp,
-                bodyData,
-                headers?.ToDictionary(x => x.Key, x => x.Value.ToArray())
-            )
-            {
-                DateTime = DateTime.UtcNow
-            };
-
-            // Create HttpRequestMessage
-            var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, request.Url);
-
-            // Call the URL
-            return client.SendAsync(httpRequestMessage);
+            bodyData = transformer.TransformBody(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.BodyData, webhookRequest.TransformerReplaceNodeOptions);
+            headers = transformer.TransformHeaders(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Headers);
+            webhookRequestUrl = transformer.TransformString(mapping, originalRequestMessage, originalResponseMessage, webhookRequest.Url);
         }
+        else
+        {
+            bodyData = webhookRequest.BodyData;
+            headers = webhookRequest.Headers;
+            webhookRequestUrl = webhookRequest.Url;
+        }
+
+        // Create RequestMessage
+        var requestMessage = new RequestMessage(
+            new UrlDetails(webhookRequestUrl),
+            webhookRequest.Method,
+            ClientIp,
+            bodyData,
+            headers?.ToDictionary(x => x.Key, x => x.Value.ToArray())
+        )
+        {
+            DateTime = DateTime.UtcNow
+        };
+
+        // Create HttpRequestMessage
+        var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, webhookRequest.Url);
+
+        // Delay (if required)
+        if (TryGetDelay(webhookRequest, out var delay))
+        {
+            await Task.Delay(delay.Value).ConfigureAwait(false);
+        }
+
+        // Call the URL
+        return await client.SendAsync(httpRequestMessage).ConfigureAwait(false);
+    }
+
+    private static bool TryGetDelay(IWebhookRequest webhookRequest, [NotNullWhen(true)] out int? delay)
+    {
+        delay = webhookRequest.Delay;
+        var minimumDelay = webhookRequest.MinimumRandomDelay;
+        var maximumDelay = webhookRequest.MaximumRandomDelay;
+
+        if (minimumDelay is not null && maximumDelay is not null && maximumDelay >= minimumDelay)
+        {
+            delay = Random.Value!.Next(minimumDelay.Value, maximumDelay.Value);
+            return true;
+        }
+
+        return delay is not null;
     }
 }

src/WireMock.Net/HttpsCertificate/CertificateLoader.cs

@@ -2,90 +2,42 @@ using System;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WireMock.HttpsCertificate
+namespace WireMock.HttpsCertificate;
+
+internal static class CertificateLoader
 {
-    internal static class CertificateLoader
+    private const string ExtensionPem = ".PEM";
+
+    /// <summary>
+    /// Used by the WireMock.Net server
+    /// </summary>
+    public static X509Certificate2 LoadCertificate(
+        string? storeName,
+        string? storeLocation,
+        string? thumbprintOrSubjectName,
+        string? filePath,
+        string? passwordOrKey,
+        string host)
     {
-        /// <summary>
-        /// Used by the WireMock.Net server
-        /// </summary>
-        public static X509Certificate2 LoadCertificate(
-            string storeName,
-            string storeLocation,
-            string thumbprintOrSubjectName,
-            string filePath,
-            string password,
-            string host)
+        if (!string.IsNullOrEmpty(storeName) && !string.IsNullOrEmpty(storeLocation))
         {
-            if (!string.IsNullOrEmpty(storeName) && !string.IsNullOrEmpty(storeLocation))
-            {
-                var thumbprintOrSubjectNameOrHost = thumbprintOrSubjectName ?? host;
+            var thumbprintOrSubjectNameOrHost = thumbprintOrSubjectName ?? host;
 
-                var certStore = new X509Store((StoreName)Enum.Parse(typeof(StoreName), storeName), (StoreLocation)Enum.Parse(typeof(StoreLocation), storeLocation));
-                try
-                {
-                    certStore.Open(OpenFlags.ReadOnly);
-
-                    // Attempt to find by Thumbprint first
-                    var matchingCertificates = certStore.Certificates.Find(X509FindType.FindByThumbprint, thumbprintOrSubjectNameOrHost, false);
-                    if (matchingCertificates.Count == 0)
-                    {
-                        // Fallback to SubjectName
-                        matchingCertificates = certStore.Certificates.Find(X509FindType.FindBySubjectName, thumbprintOrSubjectNameOrHost, false);
-                        if (matchingCertificates.Count == 0)
-                        {
-                            // No certificates matched the search criteria.
-                            throw new FileNotFoundException($"No Certificate found with in store '{storeName}', location '{storeLocation}' for Thumbprint or SubjectName '{thumbprintOrSubjectNameOrHost}'.");
-                        }
-                    }
-
-                    // Use the first matching certificate.
-                    return matchingCertificates[0];
-                }
-                finally
-                {
-#if NETSTANDARD || NET46
-                    certStore.Dispose();
-#else
-                    certStore.Close();
-#endif
-                }
-            }
-
-            if (!string.IsNullOrEmpty(filePath) && !string.IsNullOrEmpty(password))
-            {
-                return new X509Certificate2(filePath, password);
-            }
-
-            if (!string.IsNullOrEmpty(filePath))
-            {
-                return new X509Certificate2(filePath);
-            }
-
-            throw new InvalidOperationException("X509StoreName and X509StoreLocation OR X509CertificateFilePath are mandatory. Note that X509CertificatePassword is optional.");
-        }
-
-        /// <summary>
-        /// Used for Proxy
-        /// </summary>
-        public static X509Certificate2 LoadCertificate(string thumbprintOrSubjectName)
-        {
-            var certStore = new X509Store(StoreName.My, StoreLocation.LocalMachine);
+            var certStore = new X509Store((StoreName)Enum.Parse(typeof(StoreName), storeName), (StoreLocation)Enum.Parse(typeof(StoreLocation), storeLocation));
             try
             {
-                // Certificate must be in the local machine store
                 certStore.Open(OpenFlags.ReadOnly);
 
                 // Attempt to find by Thumbprint first
-                var matchingCertificates = certStore.Certificates.Find(X509FindType.FindByThumbprint, thumbprintOrSubjectName, false);
+                var matchingCertificates = certStore.Certificates.Find(X509FindType.FindByThumbprint, thumbprintOrSubjectNameOrHost, false);
                 if (matchingCertificates.Count == 0)
                 {
                     // Fallback to SubjectName
-                    matchingCertificates = certStore.Certificates.Find(X509FindType.FindBySubjectName, thumbprintOrSubjectName, false);
+                    matchingCertificates = certStore.Certificates.Find(X509FindType.FindBySubjectName, thumbprintOrSubjectNameOrHost, false);
                     if (matchingCertificates.Count == 0)
                     {
                         // No certificates matched the search criteria.
-                        throw new FileNotFoundException("No certificate found with specified Thumbprint or SubjectName.", thumbprintOrSubjectName);
+                        throw new FileNotFoundException($"No Certificate found with in store '{storeName}', location '{storeLocation}' for Thumbprint or SubjectName '{thumbprintOrSubjectNameOrHost}'.");
                     }
                 }
 
@@ -101,5 +53,76 @@ namespace WireMock.HttpsCertificate
 #endif
             }
         }
+
+        if (!string.IsNullOrEmpty(filePath))
+        {
+            if (filePath!.EndsWith(ExtensionPem, StringComparison.OrdinalIgnoreCase))
+            {
+                // PEM logic based on: https://www.scottbrady91.com/c-sharp/pem-loading-in-dotnet-core-and-dotnet
+#if NET5_0_OR_GREATER
+                if (!string.IsNullOrEmpty(passwordOrKey))
+                {
+                    var certPem = File.ReadAllText(filePath);
+                    var cert = X509Certificate2.CreateFromPem(certPem, passwordOrKey);
+                    const string defaultPasswordPem = "WireMock.Net";
+                    return new X509Certificate2(cert.Export(X509ContentType.Pfx, defaultPasswordPem), defaultPasswordPem);
+                }
+                return X509Certificate2.CreateFromPemFile(filePath);
+
+#elif NETCOREAPP3_1
+                var cert = new X509Certificate2(filePath);
+                if (!string.IsNullOrEmpty(passwordOrKey))
+                {
+                    var key = System.Security.Cryptography.ECDsa.Create()!;
+                    key.ImportECPrivateKey(System.Text.Encoding.UTF8.GetBytes(passwordOrKey), out _);
+                    return cert.CopyWithPrivateKey(key);
+                }
+                return cert;
+#else                
+                throw new InvalidOperationException("Loading a PEM Certificate is only supported for .NET Core App 3.1, .NET 5.0 and higher.");
+#endif
+            }
+
+            return !string.IsNullOrEmpty(passwordOrKey) ? new X509Certificate2(filePath, passwordOrKey) : new X509Certificate2(filePath);
+        }
+
+        throw new InvalidOperationException("X509StoreName and X509StoreLocation OR X509CertificateFilePath are mandatory. Note that X509CertificatePassword is optional.");
+    }
+
+    /// <summary>
+    /// Used for Proxy
+    /// </summary>
+    public static X509Certificate2 LoadCertificate(string thumbprintOrSubjectName)
+    {
+        var certStore = new X509Store(StoreName.My, StoreLocation.LocalMachine);
+        try
+        {
+            // Certificate must be in the local machine store
+            certStore.Open(OpenFlags.ReadOnly);
+
+            // Attempt to find by Thumbprint first
+            var matchingCertificates = certStore.Certificates.Find(X509FindType.FindByThumbprint, thumbprintOrSubjectName, false);
+            if (matchingCertificates.Count == 0)
+            {
+                // Fallback to SubjectName
+                matchingCertificates = certStore.Certificates.Find(X509FindType.FindBySubjectName, thumbprintOrSubjectName, false);
+                if (matchingCertificates.Count == 0)
+                {
+                    // No certificates matched the search criteria.
+                    throw new FileNotFoundException("No certificate found with specified Thumbprint or SubjectName.", thumbprintOrSubjectName);
+                }
+            }
+
+            // Use the first matching certificate.
+            return matchingCertificates[0];
+        }
+        finally
+        {
+#if NETSTANDARD || NET46
+            certStore.Dispose();
+#else
+            certStore.Close();
+#endif
+        }
     }
 }

src/WireMock.Net/HttpsCertificate/PublicCertificateHelper.cs

@@ -1,16 +1,16 @@
-using System;
+using System;
 using System.Security.Cryptography.X509Certificates;
 
-namespace WireMock.HttpsCertificate
+namespace WireMock.HttpsCertificate;
+
+/// <summary>
+/// Only used for NetStandard 1.3
+/// </summary>
+internal static class PublicCertificateHelper
 {
-    /// <summary>
-    /// Only used for NetStandard 1.3
-    /// </summary>
-    internal static class PublicCertificateHelper
-    {
-        // 1] Generate using https://www.pluralsight.com/blog/software-development/selfcert-create-a-self-signed-certificate-interactively-gui-or-programmatically-in-net
-        // 2] Converted to Base64
-        private const string Data = @"MIIQMgIBAzCCD+4GCSqGSIb3DQEHAaCCD98Egg/bMIIP1zCCCogGCSqGSIb3DQEHAaCCCnkEggp1
+    // 1] Generate using https://www.pluralsight.com/blog/software-development/selfcert-create-a-self-signed-certificate-interactively-gui-or-programmatically-in-net
+    // 2] Converted to Base64
+    private const string Data = @"MIIQMgIBAzCCD+4GCSqGSIb3DQEHAaCCD98Egg/bMIIP1zCCCogGCSqGSIb3DQEHAaCCCnkEggp1
 MIIKcTCCCm0GCyqGSIb3DQEMCgECoIIJfjCCCXowHAYKKoZIhvcNAQwBAzAOBAi1j9x1jTfUewIC
 B9AEgglYa48lP16+isiGEVT7zwN3XwaPwPOHZcQ7tRA/DA8LZnZbwU7XhtPObF5bZcHn4engX2An
 ISFpe2S5XJ7BfHmsGOO7Bxj6C2IcZIPTefvAd9vWE0WUAGN11SLhJ3fB/ZRt3Nys7JCJzywQCkYK
@@ -85,10 +85,9 @@ TLNGa+UmMnPsnBjlAJ6l9VPsa4uJM2DIQKtZXWq4DkhSAYKF6joIP7nKMDswHzAHBgUrDgMCGgQU
 wTM1Z+CJZG9xAcf1zAVGl4ggYyYEFGBFyJ8VBwijS2zy1qwN1WYGtcWoAgIH0A==
 ";
 
-        public static X509Certificate2 GetX509Certificate2()
-        {
-            byte[] data = Convert.FromBase64String(Data);
-            return new X509Certificate2(data);
-        }
+    public static X509Certificate2 GetX509Certificate2()
+    {
+        byte[] data = Convert.FromBase64String(Data);
+        return new X509Certificate2(data);
     }
 }

src/WireMock.Net/IMapping.cs

@@ -20,22 +20,22 @@ public interface IMapping
     /// <summary>
     /// Gets the TimeSettings (Start, End and TTL).
     /// </summary>
-    ITimeSettings TimeSettings { get; }
+    ITimeSettings? TimeSettings { get; }
 
     /// <summary>
     /// Gets the unique title.
     /// </summary>
-    string Title { get; }
+    string? Title { get; }
 
     /// <summary>
     /// Gets the description.
     /// </summary>
-    string Description { get; }
+    string? Description { get; }
 
     /// <summary>
     /// The full filename path for this mapping (only defined for static mappings).
     /// </summary>
-    string Path { get; set; }
+    string? Path { get; set; }
 
     /// <summary>
     /// Gets the priority.  (A low value means higher priority.)
@@ -112,12 +112,17 @@ public interface IMapping
     /// </summary>
     IWebhook[]? Webhooks { get; }
 
+    /// <summary>
+    /// Use Fire and Forget for the defined webhook(s). [Optional]
+    /// </summary>
+    public bool? UseWebhooksFireAndForget { get; set; }
+
     /// <summary>
     /// ProvideResponseAsync
     /// </summary>
     /// <param name="requestMessage">The request message.</param>
     /// <returns>The <see cref="ResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
-    Task<(IResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(IRequestMessage requestMessage);
+    Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IRequestMessage requestMessage);
 
     /// <summary>
     /// Gets the RequestMatchResult based on the RequestMessage.

src/WireMock.Net/Logging/LogEntry.cs

@@ -1,38 +1,37 @@
-using System;
+using System;
 using WireMock.Matchers.Request;
 
-namespace WireMock.Logging
+namespace WireMock.Logging;
+
+/// <summary>
+/// LogEntry
+/// </summary>
+public class LogEntry : ILogEntry
 {
-    /// <summary>
-    /// LogEntry
-    /// </summary>
-    public class LogEntry : ILogEntry
-    {
-        /// <inheritdoc cref="ILogEntry.Guid" />
-        public Guid Guid { get; set; }
+    /// <inheritdoc cref="ILogEntry.Guid" />
+    public Guid Guid { get; set; }
 
-        /// <inheritdoc cref="ILogEntry.RequestMessage" />
-        public IRequestMessage RequestMessage { get; set; }
+    /// <inheritdoc cref="ILogEntry.RequestMessage" />
+    public IRequestMessage RequestMessage { get; set; } = null!;
 
-        /// <inheritdoc cref="ILogEntry.ResponseMessage" />
-        public IResponseMessage ResponseMessage { get; set; }
+    /// <inheritdoc cref="ILogEntry.ResponseMessage" />
+    public IResponseMessage ResponseMessage { get; set; } = null!;
 
-        /// <inheritdoc cref="ILogEntry.RequestMatchResult" />
-        public IRequestMatchResult RequestMatchResult { get; set; }
+    /// <inheritdoc cref="ILogEntry.RequestMatchResult" />
+    public IRequestMatchResult RequestMatchResult { get; set; } = null!;
 
-        /// <inheritdoc cref="ILogEntry.MappingGuid" />
-        public Guid? MappingGuid { get; set; }
+    /// <inheritdoc cref="ILogEntry.MappingGuid" />
+    public Guid? MappingGuid { get; set; }
 
-        /// <inheritdoc cref="ILogEntry.MappingTitle" />
-        public string MappingTitle { get; set; }
+    /// <inheritdoc cref="ILogEntry.MappingTitle" />
+    public string? MappingTitle { get; set; }
 
-        /// <inheritdoc cref="ILogEntry.PartialMappingGuid" />
-        public Guid? PartialMappingGuid { get; set; }
+    /// <inheritdoc cref="ILogEntry.PartialMappingGuid" />
+    public Guid? PartialMappingGuid { get; set; }
 
-        /// <inheritdoc cref="ILogEntry.PartialMappingTitle" />
-        public string PartialMappingTitle { get; set; }
+    /// <inheritdoc cref="ILogEntry.PartialMappingTitle" />
+    public string? PartialMappingTitle { get; set; }
 
-        /// <inheritdoc cref="ILogEntry.PartialMatchResult" />
-        public IRequestMatchResult PartialMatchResult { get; set; }
-    }
+    /// <inheritdoc cref="ILogEntry.PartialMatchResult" />
+    public IRequestMatchResult PartialMatchResult { get; set; } = null!;
 }

src/WireMock.Net/Mapping.cs

@@ -1,149 +1,153 @@
 using System;
 using System.Threading.Tasks;
-using JetBrains.Annotations;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.ResponseProviders;
 using WireMock.Settings;
 
-namespace WireMock
+namespace WireMock;
+
+/// <summary>
+/// The Mapping.
+/// </summary>
+public class Mapping : IMapping
 {
+    /// <inheritdoc />
+    public Guid Guid { get; }
+
+    /// <inheritdoc />
+    public string? Title { get; }
+
+    /// <inheritdoc />
+    public string? Description { get; }
+
+    /// <inheritdoc />
+    public string? Path { get; set; }
+
+    /// <inheritdoc />
+    public int Priority { get; }
+
+    /// <inheritdoc />
+    public string? Scenario { get; }
+
+    /// <inheritdoc />
+    public string? ExecutionConditionState { get; }
+
+    /// <inheritdoc />
+    public string? NextState { get; }
+
+    /// <inheritdoc />
+    public int? StateTimes { get; }
+
+    /// <inheritdoc />
+    public IRequestMatcher RequestMatcher { get; }
+
+    /// <inheritdoc />
+    public IResponseProvider Provider { get; }
+
+    /// <inheritdoc />
+    public WireMockServerSettings Settings { get; }
+
+    /// <inheritdoc />
+    public bool IsStartState => Scenario == null || Scenario != null && NextState != null && ExecutionConditionState == null;
+
+    /// <inheritdoc />
+    public bool IsAdminInterface => Provider is DynamicResponseProvider or DynamicAsyncResponseProvider or ProxyAsyncResponseProvider;
+
+    /// <inheritdoc />
+    public bool IsProxy => Provider is ProxyAsyncResponseProvider;
+
+    /// <inheritdoc />
+    public bool LogMapping => Provider is not (DynamicResponseProvider or DynamicAsyncResponseProvider);
+
+    /// <inheritdoc />
+    public IWebhook[]? Webhooks { get; }
+
+    /// <inheritdoc />
+    public bool? UseWebhooksFireAndForget { get; set; }
+
+    /// <inheritdoc />
+    public ITimeSettings? TimeSettings { get; }
+
     /// <summary>
-    /// The Mapping.
+    /// Initializes a new instance of the <see cref="Mapping"/> class.
     /// </summary>
-    public class Mapping : IMapping
+    /// <param name="guid">The unique identifier.</param>
+    /// <param name="title">The unique title (can be null).</param>
+    /// <param name="description">The description (can be null).</param>
+    /// <param name="path">The full file path from this mapping title (can be null).</param>
+    /// <param name="settings">The WireMockServerSettings.</param>
+    /// <param name="requestMatcher">The request matcher.</param>
+    /// <param name="provider">The provider.</param>
+    /// <param name="priority">The priority for this mapping.</param>
+    /// <param name="scenario">The scenario. [Optional]</param>
+    /// <param name="executionConditionState">State in which the current mapping can occur. [Optional]</param>
+    /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
+    /// <param name="stateTimes">Only when the current state is executed this number, the next state which will occur. [Optional]</param>
+    /// <param name="webhooks">The Webhooks. [Optional]</param>
+    /// <param name="useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]</param>
+    /// <param name="timeSettings">The TimeSettings. [Optional]</param>
+    public Mapping(
+        Guid guid,
+        string? title,
+        string? description,
+        string? path,
+        WireMockServerSettings settings,
+        IRequestMatcher requestMatcher,
+        IResponseProvider provider,
+        int priority,
+        string? scenario,
+        string? executionConditionState,
+        string? nextState,
+        int? stateTimes,
+        IWebhook[]? webhooks,
+        bool? useWebhooksFireAndForget,
+        ITimeSettings? timeSettings)
     {
-        /// <inheritdoc />
-        public Guid Guid { get; }
+        Guid = guid;
+        Title = title;
+        Description = description;
+        Path = path;
+        Settings = settings;
+        RequestMatcher = requestMatcher;
+        Provider = provider;
+        Priority = priority;
+        Scenario = scenario;
+        ExecutionConditionState = executionConditionState;
+        NextState = nextState;
+        StateTimes = stateTimes;
+        Webhooks = webhooks;
+        UseWebhooksFireAndForget = useWebhooksFireAndForget;
+        TimeSettings = timeSettings;
+    }
 
-        /// <inheritdoc />
-        public string Title { get; }
+    /// <inheritdoc cref="IMapping.ProvideResponseAsync" />
+    public Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IRequestMessage requestMessage)
+    {
+        return Provider.ProvideResponseAsync(this, requestMessage, Settings);
+    }
 
-        /// <inheritdoc />
-        public string Description { get; }
+    /// <inheritdoc cref="IMapping.GetRequestMatchResult" />
+    public IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage, string? nextState)
+    {
+        var result = new RequestMatchResult();
 
-        /// <inheritdoc />
-        public string Path { get; set; }
+        RequestMatcher.GetMatchingScore(requestMessage, result);
 
-        /// <inheritdoc />
-        public int Priority { get; }
-
-        /// <inheritdoc />
-        public string Scenario { get; }
-
-        /// <inheritdoc />
-        public string ExecutionConditionState { get; }
-
-        /// <inheritdoc />
-        public string NextState { get; }
-
-        /// <inheritdoc />
-        public int? StateTimes { get; }
-
-        /// <inheritdoc />
-        public IRequestMatcher RequestMatcher { get; }
-
-        /// <inheritdoc />
-        public IResponseProvider Provider { get; }
-
-        /// <inheritdoc />
-        public WireMockServerSettings Settings { get; }
-
-        /// <inheritdoc />
-        public bool IsStartState => Scenario == null || Scenario != null && NextState != null && ExecutionConditionState == null;
-
-        /// <inheritdoc />
-        public bool IsAdminInterface => Provider is DynamicResponseProvider || Provider is DynamicAsyncResponseProvider || Provider is ProxyAsyncResponseProvider;
-
-        /// <inheritdoc />
-        public bool IsProxy => Provider is ProxyAsyncResponseProvider;
-
-        /// <inheritdoc />
-        public bool LogMapping => !(Provider is DynamicResponseProvider || Provider is DynamicAsyncResponseProvider);
-
-        /// <inheritdoc />
-        public IWebhook[] Webhooks { get; }
-
-        /// <inheritdoc />
-        public ITimeSettings TimeSettings { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Mapping"/> class.
-        /// </summary>
-        /// <param name="guid">The unique identifier.</param>
-        /// <param name="title">The unique title (can be null).</param>
-        /// <param name="description">The description (can be null).</param>
-        /// <param name="path">The full file path from this mapping title (can be null).</param>
-        /// <param name="settings">The WireMockServerSettings.</param>
-        /// <param name="requestMatcher">The request matcher.</param>
-        /// <param name="provider">The provider.</param>
-        /// <param name="priority">The priority for this mapping.</param>
-        /// <param name="scenario">The scenario. [Optional]</param>
-        /// <param name="executionConditionState">State in which the current mapping can occur. [Optional]</param>
-        /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
-        /// <param name="stateTimes">Only when the current state is executed this number, the next state which will occur. [Optional]</param>
-        /// <param name="webhooks">The Webhooks. [Optional]</param>
-        /// <param name="timeSettings">The TimeSettings. [Optional]</param>
-        public Mapping(
-            Guid guid,
-            string? title,
-            string? description,
-            string? path,
-            WireMockServerSettings settings,
-            IRequestMatcher requestMatcher,
-            IResponseProvider provider,
-            int priority,
-            string? scenario,
-            string? executionConditionState,
-            string? nextState,
-            int? stateTimes,
-            IWebhook[]? webhooks,
-            ITimeSettings? timeSettings)
+        // Only check state if Scenario is defined
+        if (Scenario != null)
         {
-            Guid = guid;
-            Title = title;
-            Description = description;
-            Path = path;
-            Settings = settings;
-            RequestMatcher = requestMatcher;
-            Provider = provider;
-            Priority = priority;
-            Scenario = scenario;
-            ExecutionConditionState = executionConditionState;
-            NextState = nextState;
-            StateTimes = stateTimes;
-            Webhooks = webhooks;
-            TimeSettings = timeSettings;
+            var matcher = new RequestMessageScenarioAndStateMatcher(nextState, ExecutionConditionState);
+            matcher.GetMatchingScore(requestMessage, result);
+            //// If ExecutionConditionState is null, this means that request is the start from a scenario. So just return.
+            //if (ExecutionConditionState != null)
+            //{
+            //    // ExecutionConditionState is not null, so get score for matching with the nextState.
+            //    var matcher = new RequestMessageScenarioAndStateMatcher(nextState, ExecutionConditionState);
+            //    matcher.GetMatchingScore(requestMessage, result);
+            //}
         }
 
-        /// <inheritdoc cref="IMapping.ProvideResponseAsync" />
-        public Task<(IResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(IRequestMessage requestMessage)
-        {
-            return Provider.ProvideResponseAsync(requestMessage, Settings);
-        }
-
-        /// <inheritdoc cref="IMapping.GetRequestMatchResult" />
-        public IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage, string nextState)
-        {
-            var result = new RequestMatchResult();
-
-            RequestMatcher.GetMatchingScore(requestMessage, result);
-
-            // Only check state if Scenario is defined
-            if (Scenario != null)
-            {
-                var matcher = new RequestMessageScenarioAndStateMatcher(nextState, ExecutionConditionState);
-                matcher.GetMatchingScore(requestMessage, result);
-                //// If ExecutionConditionState is null, this means that request is the start from a scenario. So just return.
-                //if (ExecutionConditionState != null)
-                //{
-                //    // ExecutionConditionState is not null, so get score for matching with the nextState.
-                //    var matcher = new RequestMessageScenarioAndStateMatcher(nextState, ExecutionConditionState);
-                //    matcher.GetMatchingScore(requestMessage, result);
-                //}
-            }
-
-            return result;
-        }
+        return result;
     }
 }

src/WireMock.Net/Matchers/ContentTypeMatcher.cs

@@ -18,7 +18,7 @@ public class ContentTypeMatcher : WildcardMatcher
     /// </summary>
     /// <param name="pattern">The pattern.</param>
     /// <param name="ignoreCase">IgnoreCase (default false)</param>
-    public ContentTypeMatcher([NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
+    public ContentTypeMatcher(AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
     {
     }
 
@@ -28,7 +28,7 @@ public class ContentTypeMatcher : WildcardMatcher
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="pattern">The pattern.</param>
     /// <param name="ignoreCase">IgnoreCase (default false)</param>
-    public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
+    public ContentTypeMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
     {
     }
 
@@ -57,7 +57,7 @@ public class ContentTypeMatcher : WildcardMatcher
     /// <inheritdoc cref="RegexMatcher.IsMatch"/>
     public override double IsMatch(string? input)
     {
-        if (string.IsNullOrEmpty(input) || !MediaTypeHeaderValue.TryParse(input, out MediaTypeHeaderValue contentType))
+        if (string.IsNullOrEmpty(input) || !MediaTypeHeaderValue.TryParse(input, out var contentType))
         {
             return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.Mismatch);
         }

src/WireMock.Net/Matchers/ExactMatcher.cs

@@ -1,7 +1,7 @@
+using System;
 using System.Linq;
 using AnyOfTypes;
 using Stef.Validation;
-using WireMock.Extensions;
 using WireMock.Models;
 
 namespace WireMock.Matchers;
@@ -9,8 +9,8 @@ namespace WireMock.Matchers;
 /// <summary>
 /// ExactMatcher
 /// </summary>
-/// <seealso cref="IStringMatcher" />
-public class ExactMatcher : IStringMatcher
+/// <seealso cref="IStringMatcher" /> and <seealso cref="IIgnoreCaseMatcher" />
+public class ExactMatcher : IStringMatcher, IIgnoreCaseMatcher
 {
     private readonly AnyOf<string, StringPattern>[] _values;
 
@@ -24,7 +24,16 @@ public class ExactMatcher : IStringMatcher
     /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
     /// </summary>
     /// <param name="values">The values.</param>
-    public ExactMatcher(params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, values)
+    public ExactMatcher(params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, false, false, MatchOperator.Or, values)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+    /// </summary>
+    /// <param name="ignoreCase">Ignore the case from the pattern(s).</param>
+    /// <param name="values">The values.</param>
+    public ExactMatcher(bool ignoreCase, params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, ignoreCase, false, MatchOperator.Or, values)
     {
     }
 
@@ -32,11 +41,13 @@ public class ExactMatcher : IStringMatcher
     /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
     /// </summary>
     /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="ignoreCase">Ignore the case from the pattern(s).</param>
     /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
     /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use. (default = "Or")</param>
     /// <param name="values">The values.</param>
     public ExactMatcher(
         MatchBehaviour matchBehaviour,
+        bool ignoreCase = false,
         bool throwException = false,
         MatchOperator matchOperator = MatchOperator.Or,
         params AnyOf<string, StringPattern>[] values)
@@ -45,13 +56,18 @@ public class ExactMatcher : IStringMatcher
 
         MatchBehaviour = matchBehaviour;
         ThrowException = throwException;
+        IgnoreCase = ignoreCase;
         MatchOperator = matchOperator;
     }
 
     /// <inheritdoc cref="IStringMatcher.IsMatch"/>
     public double IsMatch(string? input)
     {
-        double score = MatchScores.ToScore(_values.Select(v => v.GetPattern() == input).ToArray(), MatchOperator);
+        Func<string?, bool> equals = IgnoreCase
+            ? pattern => string.Equals(pattern, input, StringComparison.OrdinalIgnoreCase)
+            : pattern => pattern == input;
+
+        double score = MatchScores.ToScore(_values.Select(v => equals(v)).ToArray(), MatchOperator);
         return MatchBehaviourHelper.Convert(MatchBehaviour, score);
     }
 
@@ -66,4 +82,7 @@ public class ExactMatcher : IStringMatcher
 
     /// <inheritdoc cref="IMatcher.Name"/>
     public string Name => "ExactMatcher";
+
+    /// <inheritdoc />
+    public bool IgnoreCase { get; }
 }

src/WireMock.Net/Matchers/ICSharpCodeMatcher.cs

@@ -1,11 +1,10 @@
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// CSharpCode / CS-Script Matcher
+/// </summary>
+/// <inheritdoc cref="IObjectMatcher"/>
+/// <inheritdoc cref="IStringMatcher"/>
+public interface ICSharpCodeMatcher : IObjectMatcher, IStringMatcher
 {
-    /// <summary>
-    /// CSharpCode / CS-Script Matcher
-    /// </summary>
-    /// <inheritdoc cref="IObjectMatcher"/>
-    /// <inheritdoc cref="IStringMatcher"/>
-    public interface ICSharpCodeMatcher : IObjectMatcher, IStringMatcher
-    {
-    }
 }

src/WireMock.Net/Matchers/IIgnoreCaseMatcher.cs

@@ -1,14 +1,13 @@
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// IIgnoreCaseMatcher
+/// </summary>
+/// <inheritdoc cref="IMatcher"/>
+public interface IIgnoreCaseMatcher : IMatcher
 {
     /// <summary>
-    /// IIgnoreCaseMatcher
+    /// Ignore the case from the pattern.
     /// </summary>
-    /// <inheritdoc cref="IMatcher"/>
-    public interface IIgnoreCaseMatcher : IMatcher
-    {
-        /// <summary>
-        /// Ignore the case from the pattern.
-        /// </summary>
-        bool IgnoreCase { get; }
-    }
+    bool IgnoreCase { get; }
 }

src/WireMock.Net/Matchers/IMatcher.cs

@@ -1,23 +1,22 @@
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// IMatcher
+/// </summary>
+public interface IMatcher
 {
     /// <summary>
-    /// IMatcher
+    /// Gets the name.
     /// </summary>
-    public interface IMatcher
-    {
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        string Name { get; }
+    string Name { get; }
 
-        /// <summary>
-        /// Gets the match behaviour.
-        /// </summary>
-        MatchBehaviour MatchBehaviour { get; }
+    /// <summary>
+    /// Gets the match behaviour.
+    /// </summary>
+    MatchBehaviour MatchBehaviour { get; }
 
-        /// <summary>
-        /// Should this matcher throw an exception?
-        /// </summary>
-        bool ThrowException { get; }
-    }
+    /// <summary>
+    /// Should this matcher throw an exception?
+    /// </summary>
+    bool ThrowException { get; }
 }

src/WireMock.Net/Matchers/IObjectMatcher.cs

@@ -1,15 +1,14 @@
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// IObjectMatcher
+/// </summary>
+public interface IObjectMatcher : IMatcher
 {
     /// <summary>
-    /// IObjectMatcher
+    /// Determines whether the specified input is match.
     /// </summary>
-    public interface IObjectMatcher : IMatcher
-    {
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
-        double IsMatch(object? input);
-    }
+    /// <param name="input">The input.</param>
+    /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+    double IsMatch(object? input);
 }

src/WireMock.Net/Matchers/IValueMatcher.cs

@@ -1,15 +1,14 @@
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// IValueMatcher
+/// </summary>
+/// <seealso cref="IObjectMatcher" />
+public interface IValueMatcher : IObjectMatcher
 {
     /// <summary>
-    /// IValueMatcher
+    /// Gets the value (can be a string or an object).
     /// </summary>
-    /// <seealso cref="IObjectMatcher" />
-    public interface IValueMatcher : IObjectMatcher
-    {
-        /// <summary>
-        /// Gets the value (can be a string or an object).
-        /// </summary>
-        /// <returns>Value</returns>
-        object Value { get; }
-    }
+    /// <returns>Value</returns>
+    object Value { get; }
 }

src/WireMock.Net/Matchers/JmesPathMatcher.cs

@@ -6,115 +6,114 @@ using Stef.Validation;
 using WireMock.Extensions;
 using WireMock.Models;
 
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// http://jmespath.org/
+/// </summary>
+public class JmesPathMatcher : IStringMatcher, IObjectMatcher
 {
+    private readonly AnyOf<string, StringPattern>[] _patterns;
+
+    /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <inheritdoc cref="IMatcher.ThrowException"/>
+    public bool ThrowException { get; }
+
     /// <summary>
-    /// http://jmespath.org/
+    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
     /// </summary>
-    public class JmesPathMatcher : IStringMatcher, IObjectMatcher
+    /// <param name="patterns">The patterns.</param>
+    public JmesPathMatcher(params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, patterns.ToAnyOfPatterns())
     {
-        private readonly AnyOf<string, StringPattern>[] _patterns;
-
-        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
-        public MatchBehaviour MatchBehaviour { get; }
-
-        /// <inheritdoc cref="IMatcher.ThrowException"/>
-        public bool ThrowException { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher(params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, patterns.ToAnyOfPatterns())
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, patterns)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
-        /// </summary>
-        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
-        /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher(bool throwException = false, MatchOperator matchOperator = MatchOperator.Or, params AnyOf<string, StringPattern>[] patterns) :
-            this(MatchBehaviour.AcceptOnMatch, throwException, matchOperator, patterns)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
-        /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher(
-            MatchBehaviour matchBehaviour,
-            bool throwException = false,
-            MatchOperator matchOperator = MatchOperator.Or,
-            params AnyOf<string, StringPattern>[] patterns)
-        {
-            _patterns = Guard.NotNull(patterns);
-            MatchBehaviour = matchBehaviour;
-            ThrowException = throwException;
-            MatchOperator = matchOperator;
-        }
-
-        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-        public double IsMatch(string? input)
-        {
-            double match = MatchScores.Mismatch;
-            if (input != null)
-            {
-                try
-                {
-                    var results = _patterns.Select(pattern => bool.Parse(new JmesPath().Transform(input, pattern.GetPattern()))).ToArray();
-                    match = MatchScores.ToScore(results, MatchOperator);
-                }
-                catch (JsonException)
-                {
-                    if (ThrowException)
-                    {
-                        throw;
-                    }
-                }
-            }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
-        }
-
-        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
-        public double IsMatch(object? input)
-        {
-            double match = MatchScores.Mismatch;
-
-            // When input is null or byte[], return Mismatch.
-            if (input != null && !(input is byte[]))
-            {
-                string inputAsString = JsonConvert.SerializeObject(input);
-                return IsMatch(inputAsString);
-            }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
-        }
-
-        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public AnyOf<string, StringPattern>[] GetPatterns()
-        {
-            return _patterns;
-        }
-
-        /// <inheritdoc />
-        public MatchOperator MatchOperator { get; }
-
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public string Name => "JmesPathMatcher";
     }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
+    /// </summary>
+    /// <param name="patterns">The patterns.</param>
+    public JmesPathMatcher(params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, MatchOperator.Or, patterns)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
+    /// </summary>
+    /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
+    /// <param name="patterns">The patterns.</param>
+    public JmesPathMatcher(bool throwException = false, MatchOperator matchOperator = MatchOperator.Or, params AnyOf<string, StringPattern>[] patterns) :
+        this(MatchBehaviour.AcceptOnMatch, throwException, matchOperator, patterns)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+    /// <param name="matchOperator">The <see cref="Matchers.MatchOperator"/> to use.</param>
+    /// <param name="patterns">The patterns.</param>
+    public JmesPathMatcher(
+        MatchBehaviour matchBehaviour,
+        bool throwException = false,
+        MatchOperator matchOperator = MatchOperator.Or,
+        params AnyOf<string, StringPattern>[] patterns)
+    {
+        _patterns = Guard.NotNull(patterns);
+        MatchBehaviour = matchBehaviour;
+        ThrowException = throwException;
+        MatchOperator = matchOperator;
+    }
+
+    /// <inheritdoc cref="IStringMatcher.IsMatch"/>
+    public double IsMatch(string? input)
+    {
+        double match = MatchScores.Mismatch;
+        if (input != null)
+        {
+            try
+            {
+                var results = _patterns.Select(pattern => bool.Parse(new JmesPath().Transform(input, pattern.GetPattern()))).ToArray();
+                match = MatchScores.ToScore(results, MatchOperator);
+            }
+            catch (JsonException)
+            {
+                if (ThrowException)
+                {
+                    throw;
+                }
+            }
+        }
+
+        return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+    }
+
+    /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+    public double IsMatch(object? input)
+    {
+        double match = MatchScores.Mismatch;
+
+        // When input is null or byte[], return Mismatch.
+        if (input != null && !(input is byte[]))
+        {
+            string inputAsString = JsonConvert.SerializeObject(input);
+            return IsMatch(inputAsString);
+        }
+
+        return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+    }
+
+    /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+    public AnyOf<string, StringPattern>[] GetPatterns()
+    {
+        return _patterns;
+    }
+
+    /// <inheritdoc />
+    public MatchOperator MatchOperator { get; }
+
+    /// <inheritdoc cref="IMatcher.Name"/>
+    public string Name => "JmesPathMatcher";
 }

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -119,7 +119,7 @@ public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
                 return tokenValue;
 
             case string stringValue:
-                return JsonUtils.Parse(stringValue)!;
+                return JsonUtils.Parse(stringValue);
 
             case IEnumerable enumerableValue:
                 return JArray.FromObject(enumerableValue);

src/WireMock.Net/Matchers/JsonPartialMatcher.cs

@@ -29,7 +29,7 @@ public class JsonPartialMatcher : AbstractJsonPartialMatcher
     /// <inheritdoc />
     protected override bool IsMatch(string value, string input)
     {
-        var exactStringMatcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, ThrowException, MatchOperator.Or, value);
+        var exactStringMatcher = new ExactMatcher(MatchBehaviour.AcceptOnMatch, IgnoreCase, ThrowException, MatchOperator.Or, value);
         return MatchScores.IsPerfect(exactStringMatcher.IsMatch(input));
     }
 }

src/WireMock.Net/Matchers/LinqMatcher.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Linq;
 using System.Linq.Dynamic.Core;
 using AnyOfTypes;
@@ -20,6 +21,7 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher
 
     /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
     public MatchBehaviour MatchBehaviour { get; }
+
     /// <inheritdoc cref="IMatcher.ThrowException"/>
     public bool ThrowException { get; }
 
@@ -68,7 +70,7 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher
     }
 
     /// <inheritdoc cref="IStringMatcher.IsMatch"/>
-    public double IsMatch(string input)
+    public double IsMatch(string? input)
     {
         double match = MatchScores.Mismatch;
 
@@ -94,7 +96,7 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher
     }
 
     /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
-    public double IsMatch(object input)
+    public double IsMatch(object? input)
     {
         double match = MatchScores.Mismatch;
 
@@ -105,9 +107,12 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher
                 value = valueAsJObject;
                 break;
 
-            default:
-                value = JObject.FromObject(input);
+            case { } valueAsObject:
+                value = JObject.FromObject(valueAsObject);
                 break;
+
+            default:
+                return MatchScores.Mismatch;
         }
 
         // Convert a single object to a Queryable JObject-list with 1 entry.

src/WireMock.Net/Matchers/MatchBehaviour.cs

@@ -1,18 +1,17 @@
-namespace WireMock.Matchers
+namespace WireMock.Matchers;
+
+/// <summary>
+/// MatchBehaviour
+/// </summary>
+public enum MatchBehaviour
 {
     /// <summary>
-    /// MatchBehaviour
+    /// Accept on match (default)
     /// </summary>
-    public enum MatchBehaviour
-    {
-        /// <summary>
-        /// Accept on match (default)
-        /// </summary>
-        AcceptOnMatch,
+    AcceptOnMatch,
 
-        /// <summary>
-        /// Reject on match
-        /// </summary>
-        RejectOnMatch
-    }
+    /// <summary>
+    /// Reject on match
+    /// </summary>
+    RejectOnMatch
 }

src/WireMock.Net/Matchers/MatchBehaviourHelper.cs

@@ -1,27 +1,26 @@
-namespace WireMock.Matchers
-{
-    internal static class MatchBehaviourHelper
-    {
-        /// <summary>
-        /// Converts the specified match behaviour and match value to a new match value.
-        /// 
-        /// if AcceptOnMatch --> return match (default)
-        /// if RejectOnMatch and match = 0.0 --> return 1.0
-        /// if RejectOnMatch and match = 0.? --> return 0.0
-        /// if RejectOnMatch and match = 1.0 --> return 0.0
-        /// </summary>
-        /// 
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="match">The match.</param>
-        /// <returns>match value</returns>
-        internal static double Convert(MatchBehaviour matchBehaviour, double match)
-        {
-            if (matchBehaviour == MatchBehaviour.AcceptOnMatch)
-            {
-                return match;
-            }
+namespace WireMock.Matchers;
 
-            return match <= MatchScores.Tolerance ? MatchScores.Perfect : MatchScores.Mismatch;
+internal static class MatchBehaviourHelper
+{
+    /// <summary>
+    /// Converts the specified match behaviour and match value to a new match value.
+    /// 
+    /// if AcceptOnMatch --> return match (default)
+    /// if RejectOnMatch and match = 0.0 --> return 1.0
+    /// if RejectOnMatch and match = 0.? --> return 0.0
+    /// if RejectOnMatch and match = 1.0 --> return 0.0
+    /// </summary>
+    /// 
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="match">The match.</param>
+    /// <returns>match value</returns>
+    internal static double Convert(MatchBehaviour matchBehaviour, double match)
+    {
+        if (matchBehaviour == MatchBehaviour.AcceptOnMatch)
+        {
+            return match;
         }
+
+        return match <= MatchScores.Tolerance ? MatchScores.Perfect : MatchScores.Mismatch;
     }
 }