select id, name, value from table where id in (1, 2, 3, 4, 5)

cf
Merge branch 'master' into stef-849
2026-05-17 12:26:53 +02:00 · 2022-11-30 18:53:50 +01:00 · 2022-11-30 15:39:09 +01:00 · 2022-11-30 15:35:38 +01:00 · 2022-11-30 15:23:36 +01:00 · 2022-11-30 11:55:31 +01:00
283 changed files with 14315 additions and 10921 deletions
@@ -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
@@ -1,3 +1,65 @@
+# 1.5.11 (24 November 2022)
+- [#836](https://github.com/WireMock-Net/WireMock.Net/pull/836) - Add Settings.QueryParameterMultipleValueSupport [feature] contributed by [StefH](https://github.com/StefH)
+- [#848](https://github.com/WireMock-Net/WireMock.Net/pull/848) - Use try-catch when adding or removing logEntry [bug] contributed by [StefH](https://github.com/StefH)
+- [#846](https://github.com/WireMock-Net/WireMock.Net/issues/846) - Exception ArgumentOutOfRangeException [bug]
+
+# 1.5.10 (06 November 2022)
+- [#843](https://github.com/WireMock-Net/WireMock.Net/pull/843) - Webhook Templating: Use the transformed URL to create the HttpRequestMessage contributed by [ggradnig](https://github.com/ggradnig)
+- [#845](https://github.com/WireMock-Net/WireMock.Net/pull/845) - Add WireMockNullLogger as valid commandline logger option [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.9 (29 October 2022)
+- [#828](https://github.com/WireMock-Net/WireMock.Net/pull/828) - Add setting to skip saving the string-response in the logging when using WithBody(Func...) [feature] contributed by [StefH](https://github.com/StefH)
+- [#832](https://github.com/WireMock-Net/WireMock.Net/pull/832) - Fixes for WireMock.Net.FluentAssertions (callcount behaviour) [feature] contributed by [StefH](https://github.com/StefH)
+- [#834](https://github.com/WireMock-Net/WireMock.Net/pull/834) - Support deleting / resetting a single scenario [feature] contributed by [StefH](https://github.com/StefH)
+- [#837](https://github.com/WireMock-Net/WireMock.Net/pull/837) - Bump Microsoft.AspNetCore.Server.Kestrel.Core from 2.1.7 to 2.1.25 in /examples/WireMock.Net.StandAlone.Net461 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#838](https://github.com/WireMock-Net/WireMock.Net/pull/838) - Add option to ProxySettings to append guid to mapping file contributed by [StefH](https://github.com/StefH)
+- [#826](https://github.com/WireMock-Net/WireMock.Net/issues/826) - Dynamic Body not to be cached when a Func is used to created the body [feature]
+
+# 1.5.8 (16 October 2022)
+- [#816](https://github.com/WireMock-Net/WireMock.Net/pull/816) - Some fixes to WireMock.Net.Assertions [feature] contributed by [StefH](https://github.com/StefH)
+- [#817](https://github.com/WireMock-Net/WireMock.Net/pull/817) - ExactMatcher : IgnoreCase [feature] contributed by [StefH](https://github.com/StefH)
+- [#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 &amp; 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&#8230; [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 &quot;StartAdminInterface&quot; 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]
+
 # 1.5.2 (24 July 2022)
 - [#769](https://github.com/WireMock-Net/WireMock.Net/pull/769) - Bump Microsoft.AspNetCore.Server.Kestrel.Core from 2.1.3 to 2.1.7 in /examples/WireMock.Net.StandAlone.Net461 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
 - [#770](https://github.com/WireMock-Net/WireMock.Net/pull/770) - Added some more tests for JsonMatcher + refactored some code to use nullable [test] contributed by [StefH](https://github.com/StefH)
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <VersionPrefix>1.5.2</VersionPrefix>
+        <VersionPrefix>1.5.11</VersionPrefix>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -20,15 +20,18 @@
        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
    </PropertyGroup>

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

-SET version=1.5.2
+SET version=1.5.11

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

@@ -1,6 +1,6 @@
-# 1.5.2 (24 July 2022)
- #769 Bump Microsoft.AspNetCore.Server.Kestrel.Core from 2.1.3 to 2.1.7 in /examples/WireMock.Net.StandAlone.Net461 [dependencies]
- #770 Added some more tests for JsonMatcher + refactored some code to use nullable [test]
- #771 JsonPartialMatcher - support Regex [feature]
+# 1.5.11 (24 November 2022)
+- #836 Add Settings.QueryParameterMultipleValueSupport [feature]
+- #848 Use try-catch when adding or removing logEntry [bug]
+- #846 Exception ArgumentOutOfRangeException [bug]

 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
@@ -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}
@@ -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>
@@ -44,12 +44,10 @@ jobs:
      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
      arguments: '--configuration Debug --framework net6.0'

-  - task: DotNetCoreCLI@2
-    displayName: 'Execute Unit tests'
+  - task: CmdLine@2
    inputs:
-      command: 'test'
-      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--no-build --configuration Debug --framework net6.0 --collect:"XPlat Code Coverage" --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
+      script: 'dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --no-build --configuration Debug --framework net6.0'
+    displayName: 'Execute Unit Tests with Coverage'
   
  - task: SonarCloudAnalyze@1
    displayName: 'SonarCloud: Run Code Analysis'
@@ -76,7 +74,7 @@ jobs:
  - task: PublishBuildArtifacts@1
    displayName: Publish coverage file
    inputs:
-      PathtoPublish: '/home/vsts/work/1/s/test/WireMock.Net.Tests/coverage.net6.0.opencover.xml'
+      PathtoPublish: './test/WireMock.Net.Tests/coverage.net6.0.opencover.xml'

 - job: Windows_Build_Test

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "WSL": {
+      "commandName": "WSL2",
+      "distributionName": ""
+    }
+  }
+}
@@ -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
@@ -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();
+    }
+}
@@ -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>
@@ -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-----
@@ -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-----
@@ -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-----
@@ -0,0 +1,5 @@
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIJZTv6ujGrEwxW+ab1+CtZouRd8PK7PsklVMvJwm1uDmoAoGCCqGSM49
+AwEHoUQDQgAE39VoI268uDuIeKmRzr9e9jgMSGeuJTvTG7+cSXmeDymrVgIGXQgm
+qKA8TDXpJNrRhWMd/fpsnWu1JwJUjBmspQ==
+-----END EC PRIVATE KEY-----
@@ -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-----
@@ -0,0 +1,4 @@
+-----BEGIN PUBLIC KEY-----
+MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE39VoI268uDuIeKmRzr9e9jgMSGeu
+JTvTG7+cSXmeDymrVgIGXQgmqKA8TDXpJNrRhWMd/fpsnWu1JwJUjBmspQ==
+-----END PUBLIC KEY-----
@@ -1,12 +1,12 @@
-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
 {
    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
@@ -19,4 +19,3 @@ namespace WireMock.Net.Console.NETCoreApp
        MainApp.Run();
    }
 }
-}
@@ -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");
@@ -1,8 +1,8 @@
-using System.IO;
+using System.IO;
 using log4net.Config;

-namespace WireMock.Net.ConsoleApplication
-{
+namespace WireMock.Net.ConsoleApplication;
+
 static class Program
 {
    static void Main(params string[] args)
@@ -12,4 +12,3 @@ namespace WireMock.Net.ConsoleApplication
        MainApp.Run();
    }
 }
-}
@@ -80,7 +80,6 @@
    <None Include="App.config">
      <SubType>Designer</SubType>
    </None>
-    <None Include="libman.json" />
    <None Include="log4net.config">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
@@ -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>
@@ -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>
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
  </startup>
  <runtime>
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -8,9 +8,10 @@
    <OutputType>Exe</OutputType>
    <RootNamespace>WireMock.Net.Service</RootNamespace>
    <AssemblyName>WireMock.Net.Service</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <PlatformTarget>AnyCPU</PlatformTarget>
@@ -11,6 +11,6 @@
  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
  <package id="Owin" version="1.0" targetFramework="net452" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" requireReinstallation="true" />
  <package id="XPath2" version="1.1.3" targetFramework="net452" />
 </packages>
@@ -3,6 +3,14 @@
        "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"
        }
    }
 }
@@ -1,12 +1,12 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using log4net.Config;
 using WireMock.Server;
 using WireMock.Settings;

-namespace WireMock.Net.StandAlone.Net452
-{
+namespace WireMock.Net.StandAlone.Net452;
+
 public class Program
 {
    static void Main(params string[] args)
@@ -15,7 +15,7 @@ namespace WireMock.Net.StandAlone.Net452

        if (WireMockServerSettingsParser.TryParseArguments(args, out var settings))
        {
-                settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+            Console.WriteLine("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));

            WireMockServer.Start(settings);

@@ -24,4 +24,3 @@ namespace WireMock.Net.StandAlone.Net452
        }
    }
 }
-}
@@ -1,17 +1,17 @@
-using System;
+using System;
 using System.Linq;
 using WireMock.Server;
 using WireMock.Settings;

-namespace WireMock.Net.StandAlone.Net461
-{
+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}'")));
+            Console.WriteLine("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));

            WireMockServer.Start(settings);

@@ -20,4 +20,3 @@ namespace WireMock.Net.StandAlone.Net461
        }
    }
 }
-}
@@ -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" />
@@ -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
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}
@@ -2,7 +2,7 @@

    <PropertyGroup>
        <TargetFramework>net6</TargetFramework>
-		<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+        <!--<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>-->
        <StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
        <AssemblyName>WireMock.Net.WebApplication</AssemblyName>
        <RootNamespace>WireMock.Net.WebApplication</RootNamespace>
@@ -10,10 +10,6 @@
        <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" />
@@ -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"
+        ]
    }
 }
@@ -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
@@ -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}");
+    }
+}
@@ -0,0 +1,9 @@
+{
+  "profiles": {
+    "WireMockAzureQueueExample": {
+      "commandName": "Project",
+      "commandLineArgs": "--port 7290",
+      "launchBrowser": false
+    }
+  }
+}
@@ -0,0 +1,14 @@
+{
+  "dependencies": {
+    "appInsights1": {
+      "type": "appInsights"
+    },
+    "secrets1": {
+      "type": "secrets"
+    },
+    "storage1": {
+      "type": "storage",
+      "connectionId": "AzureWebJobsStorage"
+    }
+  }
+}
@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "appInsights1": {
+      "type": "appInsights.sdk"
+    },
+    "secrets1": {
+      "type": "secrets.user"
+    },
+    "storage1": {
+      "secretStore": null,
+      "resourceId": null,
+      "type": "storage.emulator",
+      "connectionId": "AzureWebJobsStorage"
+    }
+  }
+}
@@ -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>
@@ -0,0 +1,11 @@
+{
+    "version": "2.0",
+    "logging": {
+        "applicationInsights": {
+            "samplingSettings": {
+                "isEnabled": true,
+                "excludedTypes": "Request"
+            }
+        }
+    }
+}
@@ -0,0 +1,7 @@
+{
+    "IsEncrypted": false,
+    "Values": {
+        "AzureWebJobsStorage": "UseDevelopmentStorage=true",
+        "FUNCTIONS_WORKER_RUNTIME": "dotnet"
+    }
+}
@@ -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();
+    }
+}
@@ -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>
@@ -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
+    }
+}
@@ -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
+    }
+}
@@ -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
+    }
+}
@@ -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
+    }
+}
@@ -1,7 +1,7 @@
 using System.Collections.Generic;

-namespace WireMock.Admin.Mappings
-{
+namespace WireMock.Admin.Mappings;
+
 /// <summary>
 /// Cookie Model
 /// </summary>
@@ -27,5 +27,13 @@ namespace WireMock.Admin.Mappings
    /// 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; }
 }
@@ -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; }
 }
@@ -1,5 +1,5 @@
-namespace WireMock.Admin.Mappings
-{
+namespace WireMock.Admin.Mappings;
+
 /// <summary>
 /// WebProxy settings
 /// </summary>
@@ -9,16 +9,15 @@
    /// <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.
+    /// The user name associated with the credentials. [optional]
    /// </summary>
-        public string UserName { get; set; }
+    public string? UserName { get; set; }

    /// <summary>
-        /// The password for the user name associated with the credentials.
+    /// The password for the user name associated with the credentials. [optional]
    /// </summary>
-        public string Password { get; set; }
-    }
+    public string? Password { get; set; }
 }
@@ -1,5 +1,5 @@
-namespace WireMock.Admin.Mappings
-{
+namespace WireMock.Admin.Mappings;
+
 /// <summary>
 /// The Webhook
 /// </summary>
@@ -9,6 +9,5 @@
    /// <summary>
    /// The Webhook Request.
    /// </summary>
-        public WebhookRequestModel Request { get; set; }
-    }
+    public WebhookRequestModel Request { get; set; } = null!;
 }
@@ -1,8 +1,7 @@
 using System.Collections.Generic;
-using WireMock.Types;

-namespace WireMock.Admin.Mappings
-{
+namespace WireMock.Admin.Mappings;
+
 /// <summary>
 /// RequestModel
 /// </summary>
@@ -12,12 +11,12 @@ namespace WireMock.Admin.Mappings
    /// <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; }
+    public string Method { get; set; } = null!;

    /// <summary>
    /// Gets or sets the headers.
@@ -42,11 +41,25 @@ namespace WireMock.Admin.Mappings
    /// <summary>
    /// Gets the type of the transformer.
    /// </summary>
-        public string TransformerType { get; set; }
+    public string? TransformerType { get; set; }

    /// <summary>
    /// The ReplaceNodeOptions to use when transforming a JSON node.
    /// </summary>
-        public string TransformerReplaceNodeOptions { get; set; }
-    }
+    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; }
 }
@@ -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; }
 }
@@ -1,5 +1,5 @@
-namespace WireMock.Admin.Settings
-{
+namespace WireMock.Admin.Settings;
+
 [FluentBuilder.AutoGenerateBuilder]
 public class ProxyAndRecordSettingsModel
 {
@@ -54,5 +54,18 @@ namespace WireMock.Admin.Settings
    /// 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; }
 }
@@ -1,8 +1,9 @@
 using System.Text.RegularExpressions;
 using WireMock.Handlers;
+using WireMock.Types;
+
+namespace WireMock.Admin.Settings;

-namespace WireMock.Admin.Settings
-{
 /// <summary>
 /// Settings
 /// </summary>
@@ -78,5 +79,21 @@ namespace WireMock.Admin.Settings
    /// The proxy and record settings.
    /// </summary>
    public ProxyAndRecordSettingsModel? ProxyAndRecordSettings { get; set; }
-    }
+
+    /// <summary>
+    /// Defines on which scheme (http/https) to host. (This overrides the <c>UseSSL</c> value).
+    /// </summary>
+    public HostingScheme? HostingScheme { get; set; }
+
+    /// <summary>
+    /// Don't save the response-string in the LogEntry when WithBody(Func{IRequestMessage, string}) or WithBody(Func{IRequestMessage, Task{string}}) is used. (default set to false).
+    /// </summary>
+    public bool? DoNotSaveDynamicResponseInLogEntry { get; set; }
+
+    /// <summary>
+    /// See <seealso cref="QueryParameterMultipleValueSupport"/>.
+    ///
+    /// Default value = "All".
+    /// </summary>
+    public QueryParameterMultipleValueSupport? QueryParameterMultipleValueSupport { get; set; }
 }
@@ -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";
+}
@@ -28,7 +28,7 @@ public interface IRequestMessage
    /// <summary>
    /// The ProxyUrl (if a proxy is used).
    /// </summary>
-    string ProxyUrl { get; set; }
+    string? ProxyUrl { get; set; }

    /// <summary>
    /// Gets the DateTime.
@@ -3,8 +3,8 @@ using WireMock.ResponseBuilders;
 using WireMock.Types;
 using WireMock.Util;

-namespace WireMock
-{
+namespace WireMock;
+
 /// <summary>
 /// IResponseMessage
 /// </summary>
@@ -16,14 +16,14 @@ namespace WireMock
    IBodyData? BodyData { get; }

    /// <summary>
-        /// Gets the body destination (SameAsSource, String or Bytes).
+    /// Gets the body destination (Null, SameAsSource, String or Bytes).
    /// </summary>
-        string BodyDestination { get; }
+    string? BodyDestination { get; }

    /// <summary>
    /// Gets or sets the body.
    /// </summary>
-        string BodyOriginal { get; }
+    string? BodyOriginal { get; }

    /// <summary>
    /// Gets the Fault percentage.
@@ -43,7 +43,7 @@ namespace WireMock
    /// <summary>
    /// Gets or sets the status code.
    /// </summary>
-        object StatusCode { get; }
+    object? StatusCode { get; }

    /// <summary>
    /// Adds the header.
@@ -59,4 +59,3 @@ namespace WireMock
    /// <param name="values">The values.</param>
    void AddHeader(string name, params string[] values);
 }
-}
@@ -1,8 +1,8 @@
-using System;
+using System;
 using WireMock.Matchers.Request;

-namespace WireMock.Logging
-{
+namespace WireMock.Logging;
+
 /// <summary>
 /// ILogEntry
 /// </summary>
@@ -21,7 +21,7 @@ namespace WireMock.Logging
    /// <summary>
    /// Gets the mapping unique title.
    /// </summary>
-        string MappingTitle { get; }
+    string? MappingTitle { get; }

    /// <summary>
    /// Gets the partial mapping unique identifier.
@@ -31,7 +31,7 @@ namespace WireMock.Logging
    /// <summary>
    /// Gets the partial mapping unique title.
    /// </summary>
-        string PartialMappingTitle { get; }
+    string? PartialMappingTitle { get; }

    /// <summary>
    /// Gets the partial match result.
@@ -53,4 +53,3 @@ namespace WireMock.Logging
    /// </summary>
    IResponseMessage ResponseMessage { get; }
 }
-}
@@ -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; }
 }
@@ -1,7 +1,7 @@
 using System;

-namespace WireMock.Models
-{
+namespace WireMock.Models;
+
 /// <summary>
 /// TimeSettings: Start, End and TTL
 /// </summary>
@@ -22,4 +22,3 @@ namespace WireMock.Models
    /// </summary>
    int? TTL { get; set; }
 }
-}
@@ -1,5 +1,5 @@
-namespace WireMock.Models
-{
+namespace WireMock.Models;
+
 /// <summary>
 /// IWebhook
 /// </summary>
@@ -10,4 +10,3 @@ namespace WireMock.Models
    /// </summary>
    IWebhookRequest Request { get; set; }
 }
-}
@@ -2,8 +2,8 @@ using System.Collections.Generic;
 using WireMock.Types;
 using WireMock.Util;

-namespace WireMock.Models
-{
+namespace WireMock.Models;
+
 /// <summary>
 /// IWebhookRequest
 /// </summary>
@@ -43,5 +43,19 @@ namespace WireMock.Models
    /// 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; }
 }
@@ -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>
@@ -0,0 +1,15 @@
+using System;
+
+namespace WireMock.Types;
+
+[Flags]
+public enum HostingScheme
+{
+    None = 0x0,
+
+    Http = 0x1,
+
+    Https = 0x2,
+
+    HttpAndHttps = Http | Https
+}
@@ -0,0 +1,28 @@
+using System;
+
+namespace WireMock.Types;
+
+[Flags]
+public enum QueryParameterMultipleValueSupport
+{
+    // Support none
+    None = 0x0,
+
+    // Support "&" as multi-value-separator --> "key=value&key=anotherValue"
+    Ampersand = 0x1,
+
+    // Support ";" as multi-value-separator --> "key=value;key=anotherValue"
+    SemiColon = 0x2,
+
+    // Support "," as multi-value-separator -->  "key=1,2"
+    Comma = 0x4,
+
+    // Support "&" and ";" as multi-value-separator --> "key=value&key=anotherValue" and also "key=value;key=anotherValue"
+    AmpersandAndSemiColon = Ampersand | SemiColon,
+
+    // Support "&" and ";" as multi-value-separator
+    NoComma = AmpersandAndSemiColon,
+
+    // Support all multi-value-separators ("&" and ";" and ",")
+    All = Ampersand | SemiColon | Comma
+}
@@ -1,8 +1,7 @@
-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>
@@ -33,12 +32,38 @@ namespace WireMock.Types
    {
    }

+    /// <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()
    {
-            return this.Any() ? this.First().ToString() : base.ToString();
+        switch (Count)
+        {
+            case 0:
+                return string.Empty;
+
+            case 1:
+                if (this[0] is string strValue)
+                {
+                    return strValue;
+                }
+
+                return this[0]?.ToString();
+
+            default:
+                return base.ToString();
        }
    }
 }
@@ -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>
@@ -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);
+    }
 }
@@ -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' ">
@@ -59,7 +59,7 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
        MatchOperator = matchOperator;
    }

-    public double IsMatch(string input)
+    public double IsMatch(string? input)
    {
        return IsMatchInternal(input);
    }
@@ -1,11 +1,11 @@
 #if NET46 || NETSTANDARD2_0
 using System.Collections.Generic;

-namespace WireMock.Net.OpenApiParser.Extensions
-{
+namespace WireMock.Net.OpenApiParser.Extensions;
+
 internal static class DictionaryExtensions
 {
-        public static bool TryAdd<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, TValue value)
+    public static bool TryAdd<TKey, TValue>(this Dictionary<TKey, TValue>? dictionary, TKey key, TValue value)
    {
        if (dictionary is null || dictionary.ContainsKey(key))
        {
@@ -17,5 +17,4 @@ namespace WireMock.Net.OpenApiParser.Extensions
        return true;
    }
 }
-}
 #endif
@@ -1,10 +1,10 @@
-using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Interfaces;
 using Microsoft.OpenApi.Models;
 using WireMock.Net.OpenApiParser.Types;

-namespace WireMock.Net.OpenApiParser.Extensions
-{
+namespace WireMock.Net.OpenApiParser.Extensions;
+
 internal static class OpenApiSchemaExtensions
 {
    /// <summary>
@@ -23,7 +23,7 @@ namespace WireMock.Net.OpenApiParser.Extensions
        return false;
    }

-        public static SchemaType GetSchemaType(this OpenApiSchema schema)
+    public static SchemaType GetSchemaType(this OpenApiSchema? schema)
    {
        switch (schema?.Type)
        {
@@ -53,7 +53,7 @@ namespace WireMock.Net.OpenApiParser.Extensions
        }
    }

-        public static SchemaFormat GetSchemaFormat(this OpenApiSchema schema)
+    public static SchemaFormat GetSchemaFormat(this OpenApiSchema? schema)
    {
        switch (schema?.Format)
        {
@@ -89,4 +89,3 @@ namespace WireMock.Net.OpenApiParser.Extensions
        }
    }
 }
-}
@@ -1,16 +1,14 @@
-using System.IO;
+using System.IO;
 using System.Linq;
-using System.Runtime.InteropServices.ComTypes;
 using JetBrains.Annotations;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
-using SharpYaml.Model;
 using Stef.Validation;
 using WireMock.Net.OpenApiParser.Settings;
 using WireMock.Server;

-namespace WireMock.Net.OpenApiParser.Extensions
-{
+namespace WireMock.Net.OpenApiParser.Extensions;
+
 /// <summary>
 /// Some extension methods for <see cref="IWireMockServer"/>.
 /// </summary>
@@ -25,7 +23,7 @@ namespace WireMock.Net.OpenApiParser.Extensions
    [PublicAPI]
    public static IWireMockServer WithMappingFromOpenApiFile(this IWireMockServer server, string path, out OpenApiDiagnostic diagnostic)
    {
-            return WithMappingFromOpenApiFile(server, path, null, out diagnostic);
+        return WithMappingFromOpenApiFile(server, path, new WireMockOpenApiParserSettings(), out diagnostic);
    }

    /// <summary>
@@ -55,7 +53,7 @@ namespace WireMock.Net.OpenApiParser.Extensions
    [PublicAPI]
    public static IWireMockServer WithMappingFromOpenApiStream(this IWireMockServer server, Stream stream, out OpenApiDiagnostic diagnostic)
    {
-            return WithMappingFromOpenApiStream(server, stream, null, out diagnostic);
+        return WithMappingFromOpenApiStream(server, stream, new WireMockOpenApiParserSettings(), out diagnostic);
    }

    /// <summary>
@@ -68,9 +66,9 @@ namespace WireMock.Net.OpenApiParser.Extensions
    [PublicAPI]
    public static IWireMockServer WithMappingFromOpenApiStream(this IWireMockServer server, Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
    {
-            Guard.NotNull(server, nameof(server));
-            Guard.NotNull(stream, nameof(stream));
-            Guard.NotNull(settings, nameof(settings));
+        Guard.NotNull(server);
+        Guard.NotNull(stream);
+        Guard.NotNull(settings);

        var mappings = new WireMockOpenApiParser().FromStream(stream, settings, out diagnostic);

@@ -84,14 +82,13 @@ namespace WireMock.Net.OpenApiParser.Extensions
    /// <param name="document">The OpenAPI document to use as mappings.</param>
    /// <param name="settings">Additional settings [optional]</param>
    [PublicAPI]
-        public static IWireMockServer WithMappingFromOpenApiDocument(this IWireMockServer server, OpenApiDocument document, WireMockOpenApiParserSettings settings = null)
+    public static IWireMockServer WithMappingFromOpenApiDocument(this IWireMockServer server, OpenApiDocument document, WireMockOpenApiParserSettings settings)
    {
-            Guard.NotNull(server, nameof(server));
-            Guard.NotNull(document, nameof(document));
+        Guard.NotNull(server);
+        Guard.NotNull(document);

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

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

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

-namespace WireMock.Net.OpenApiParser.Mappers
-{
+namespace WireMock.Net.OpenApiParser.Mappers;
+
 internal class OpenApiPathsMapper
 {
    private const string HeaderContentType = "Content-Type";
@@ -26,7 +27,7 @@ namespace WireMock.Net.OpenApiParser.Mappers

    public OpenApiPathsMapper(WireMockOpenApiParserSettings settings)
    {
-            _settings = Guard.NotNull(settings, nameof(settings));
+        _settings = Guard.NotNull(settings);
        _exampleValueGenerator = new ExampleValueGenerator(settings);
    }

@@ -53,7 +54,7 @@ namespace WireMock.Net.OpenApiParser.Mappers

        var response = operation.Responses.FirstOrDefault();

-            TryGetContent(response.Value?.Content, out OpenApiMediaType responseContent, out string responseContentType);
+        TryGetContent(response.Value?.Content, out OpenApiMediaType? responseContent, out string? responseContentType);
        var responseSchema = response.Value?.Content?.FirstOrDefault().Value?.Schema;
        var responseExample = responseContent?.Example;
        var responseSchemaExample = responseContent?.Schema?.Example;
@@ -66,10 +67,10 @@ namespace WireMock.Net.OpenApiParser.Mappers
        if (operation.RequestBody != null && operation.RequestBody.Content != null && operation.RequestBody.Required)
        {
            var request = operation.RequestBody.Content;
-                TryGetContent(request, out OpenApiMediaType requestContent, out string requestContentType);
+            TryGetContent(request, out OpenApiMediaType? requestContent, out _);

            var requestBodySchema = operation.RequestBody.Content.First().Value?.Schema;
-                var requestBodyExample = requestContent.Example;
+            var requestBodyExample = requestContent!.Example;
            var requestBodySchemaExample = requestContent.Schema?.Example;

            var requestBodyMapped = requestBodyExample != null ? MapOpenApiAnyToJToken(requestBodyExample) :
@@ -104,7 +105,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
        };
    }

-        private BodyModel MapRequestBody(object requestBody)
+    private BodyModel? MapRequestBody(object? requestBody)
    {
        if (requestBody == null)
        {
@@ -122,7 +123,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
        };
    }

-        private bool TryGetContent(IDictionary<string, OpenApiMediaType> contents, out OpenApiMediaType openApiMediaType, out string contentType)
+    private bool TryGetContent(IDictionary<string, OpenApiMediaType>? contents, [NotNullWhen(true)] out OpenApiMediaType? openApiMediaType, [NotNullWhen(true)] out string? contentType)
    {
        openApiMediaType = null;
        contentType = null;
@@ -147,7 +148,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
        return true;
    }

-        private object MapSchemaToObject(OpenApiSchema schema, string name = null)
+    private object? MapSchemaToObject(OpenApiSchema? schema, string? name = null)
    {
        if (schema == null)
        {
@@ -203,6 +204,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
                {
                    propertyAsJObject.Add(MapPropertyAsJObject(schemaProperty.Value, schemaProperty.Key));
                }
+
                if (schema.AllOf.Count > 0)
                {
                    foreach (var property in schema.AllOf)
@@ -214,7 +216,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
                    }
                }

-                    return name != null ? new JProperty(name, propertyAsJObject) : (JToken)propertyAsJObject;
+                return name != null ? new JProperty(name, propertyAsJObject) : propertyAsJObject;

            default:
                return null;
@@ -243,19 +245,15 @@ namespace WireMock.Net.OpenApiParser.Mappers
            {
                return jp;
            }
-                else
-                {
+
            return new JProperty(key, mapped);
        }
-            }
-            else
-            {
+
        // bool propertyIsNullable = openApiSchema.Nullable || (openApiSchema.TryGetXNullable(out bool x) && x);
        return new JProperty(key, _exampleValueGenerator.GetExampleValue(openApiSchema));
    }
-        }

-        private string MapPathWithParameters(string path, IEnumerable<OpenApiParameter> parameters)
+    private string MapPathWithParameters(string path, IEnumerable<OpenApiParameter>? parameters)
    {
        if (parameters == null)
        {
@@ -272,7 +270,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
        return newPath;
    }

-        private string MapBasePath(IList<OpenApiServer> servers)
+    private string MapBasePath(IList<OpenApiServer>? servers)
    {
        if (servers == null || servers.Count == 0)
        {
@@ -288,7 +286,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
        return string.Empty;
    }

-        private JToken MapOpenApiAnyToJToken(IOpenApiAny any)
+    private JToken? MapOpenApiAnyToJToken(IOpenApiAny? any)
    {
        if (any == null)
        {
@@ -303,17 +301,15 @@ namespace WireMock.Net.OpenApiParser.Mappers
        {
            return JArray.Parse(outputString.ToString());
        }
-            else
-            {
+
        return JObject.Parse(outputString.ToString());
    }
-        }

-        private IDictionary<string, object> MapHeaders(string responseContentType, IDictionary<string, OpenApiHeader> headers)
+    private IDictionary<string, object?>? MapHeaders(string responseContentType, IDictionary<string, OpenApiHeader> headers)
    {
        var mappedHeaders = headers.ToDictionary(
            item => item.Key,
-                item => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern
+            _ => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern
        );

        if (!string.IsNullOrEmpty(responseContentType))
@@ -324,7 +320,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
        return mappedHeaders.Keys.Any() ? mappedHeaders : null;
    }

-        private IList<ParamModel> MapQueryParameters(IEnumerable<OpenApiParameter> queryParameters)
+    private IList<ParamModel>? MapQueryParameters(IEnumerable<OpenApiParameter> queryParameters)
    {
        var list = queryParameters
            .Where(req => req.Required)
@@ -342,7 +338,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
        return list.Any() ? list : null;
    }

-        private IList<HeaderModel> MapRequestHeaders(IEnumerable<OpenApiParameter> headers)
+    private IList<HeaderModel>? MapRequestHeaders(IEnumerable<OpenApiParameter> headers)
    {
        var list = headers
            .Where(req => req.Required)
@@ -360,7 +356,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
        return list.Any() ? list : null;
    }

-        private MatcherModel GetExampleMatcherModel(OpenApiSchema schema, ExampleValueType type)
+    private MatcherModel GetExampleMatcherModel(OpenApiSchema? schema, ExampleValueType type)
    {
        return type switch
        {
@@ -370,7 +366,7 @@ namespace WireMock.Net.OpenApiParser.Mappers
        };
    }

-        private string GetExampleValueAsStringForSchemaType(OpenApiSchema schema)
+    private string GetExampleValueAsStringForSchemaType(OpenApiSchema? schema)
    {
        var value = _exampleValueGenerator.GetExampleValue(schema);

@@ -382,4 +378,3 @@ namespace WireMock.Net.OpenApiParser.Mappers
        };
    }
 }
-}
@@ -1,8 +1,8 @@
-using System;
+using System;
 using Microsoft.OpenApi.Models;

-namespace WireMock.Net.OpenApiParser.Settings
-{
+namespace WireMock.Net.OpenApiParser.Settings;
+
 /// <summary>
 /// A interface defining the example values to use for the different types.
 /// </summary>
@@ -12,14 +12,17 @@ namespace WireMock.Net.OpenApiParser.Settings
    /// An example value for a Boolean.
    /// </summary>
    bool Boolean { get; set; }
+
    /// <summary>
    /// An example value for an Integer.
    /// </summary>
    int Integer { get; set; }
+
    /// <summary>
    /// An example value for a Float.
    /// </summary>
    float Float { get; set; }
+
    /// <summary>
    /// An example value for a Double.
    /// </summary>
@@ -53,6 +56,5 @@ namespace WireMock.Net.OpenApiParser.Settings
    /// <summary>
    /// OpenApi Schema to generate dynamic examples more accurate
    /// </summary>
-        OpenApiSchema Schema { get; set; }
-    }
+    OpenApiSchema? Schema { get; set; }
 }
@@ -1,34 +1,42 @@
-using System;
+using System;
 using Microsoft.OpenApi.Models;
 using RandomDataGenerator.FieldOptions;
 using RandomDataGenerator.Randomizers;

-namespace WireMock.Net.OpenApiParser.Settings
-{
+namespace WireMock.Net.OpenApiParser.Settings;
+
 /// <summary>
 /// A class defining the random example values to use for the different types.
 /// </summary>
 public class WireMockOpenApiParserDynamicExampleValues : IWireMockOpenApiParserExampleValues
 {
    /// <inheritdoc />
-        public virtual bool Boolean { get { return RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true; } set { } }
+    public virtual bool Boolean { get => RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true; set { } }
+
    /// <inheritdoc />
-        public virtual int Integer { get { return RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42; } set { } }
+    public virtual int Integer { get => RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42; set { } }
+
    /// <inheritdoc />
-        public virtual float Float { get { return RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f; } set { } }
+    public virtual float Float { get => RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f; set { } }
+
    /// <inheritdoc />
-        public virtual double Double { get { return RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d; } set { } }
+    public virtual double Double { get => RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d; set { } }
+
    /// <inheritdoc />
    public virtual Func<DateTime> Date { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow.Date; } set { } }
+
    /// <inheritdoc />
    public virtual Func<DateTime> DateTime { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow; } set { } }
+
    /// <inheritdoc />
-        public virtual byte[] Bytes { get { return RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate(); } set { } }
+    public virtual byte[] Bytes { get => RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate(); set { } }
+
    /// <inheritdoc />
    public virtual object Object { get; set; } = "example-object";
+
    /// <inheritdoc />
-        public virtual string String { get { return RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string"; } set { } }
+    public virtual string String { get => RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string"; set { } }
+
    /// <inheritdoc />
-        public virtual OpenApiSchema Schema { get; set; }
-    }
+    public virtual OpenApiSchema? Schema { get; set; }
 }
@@ -1,8 +1,8 @@
-using System;
+using System;
 using Microsoft.OpenApi.Models;

-namespace WireMock.Net.OpenApiParser.Settings
-{
+namespace WireMock.Net.OpenApiParser.Settings;
+
 /// <summary>
 /// A class defining the example values to use for the different types.
 /// </summary>
@@ -10,23 +10,31 @@ namespace WireMock.Net.OpenApiParser.Settings
 {
    /// <inheritdoc />
    public virtual bool Boolean { get; set; } = true;
+
    /// <inheritdoc />
    public virtual int Integer { get; set; } = 42;
+
    /// <inheritdoc />
    public virtual float Float { get; set; } = 4.2f;
+
    /// <inheritdoc />
    public virtual double Double { get; set; } = 4.2d;
+
    /// <inheritdoc />
    public virtual Func<DateTime> Date { get; set; } = () => System.DateTime.UtcNow.Date;
+
    /// <inheritdoc />
    public virtual Func<DateTime> DateTime { get; set; } = () => System.DateTime.UtcNow;
+
    /// <inheritdoc />
    public virtual byte[] Bytes { get; set; } = { 48, 49, 50 };
+
    /// <inheritdoc />
    public virtual object Object { get; set; } = "example-object";
+
    /// <inheritdoc />
    public virtual string String { get; set; } = "example-string";
+
    /// <inheritdoc />
-        public virtual OpenApiSchema Schema { get; set; } = new OpenApiSchema();
-    }
+    public virtual OpenApiSchema? Schema { get; set; } = new OpenApiSchema();
 }
@@ -1,7 +1,7 @@
 using WireMock.Net.OpenApiParser.Types;

-namespace WireMock.Net.OpenApiParser.Settings
-{
+namespace WireMock.Net.OpenApiParser.Settings;
+
 /// <summary>
 /// The WireMockOpenApiParser Settings
 /// </summary>
@@ -34,7 +34,7 @@ namespace WireMock.Net.OpenApiParser.Settings
    /// - <see cref="WireMockOpenApiParserExampleValues"/>
    /// - <see cref="WireMockOpenApiParserDynamicExampleValues"/>
    /// </summary>
-        public IWireMockOpenApiParserExampleValues ExampleValues { get; set; }
+    public IWireMockOpenApiParserExampleValues? ExampleValues { get; set; }

    /// <summary>
    /// Is a Header match case insensitive? (default is true).
@@ -61,4 +61,3 @@ namespace WireMock.Net.OpenApiParser.Settings
    /// </summary>
    public bool DynamicExamples { get; set; } = false;
 }
-}
@@ -1,5 +1,5 @@
-namespace WireMock.Net.OpenApiParser.Types
-{
+namespace WireMock.Net.OpenApiParser.Types;
+
 /// <summary>
 /// The example value to use
 /// </summary>
@@ -17,4 +17,3 @@ namespace WireMock.Net.OpenApiParser.Types
    /// </summary>
    Wildcard
 }
-}
@@ -1,5 +1,5 @@
-namespace WireMock.Net.OpenApiParser.Types
-{
+namespace WireMock.Net.OpenApiParser.Types;
+
 internal enum SchemaFormat
 {
    Float,
@@ -22,4 +22,3 @@

    Undefined
 }
-}
@@ -1,5 +1,5 @@
-namespace WireMock.Net.OpenApiParser.Types
-{
+namespace WireMock.Net.OpenApiParser.Types;
+
 internal enum SchemaType
 {
    Object,
@@ -18,4 +18,3 @@

    Unknown
 }
-}
@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Globalization;

-namespace WireMock.Net.OpenApiParser.Utils
-{
+namespace WireMock.Net.OpenApiParser.Utils;
+
 internal static class DateTimeUtils
 {
    public static string ToRfc3339DateTime(DateTime dateTime)
@@ -15,4 +15,3 @@ namespace WireMock.Net.OpenApiParser.Utils
        return dateTime.ToString("yyyy-MM-dd", DateTimeFormatInfo.InvariantInfo);
    }
 }
-}
@@ -7,15 +7,15 @@ using WireMock.Net.OpenApiParser.Extensions;
 using WireMock.Net.OpenApiParser.Settings;
 using WireMock.Net.OpenApiParser.Types;

-namespace WireMock.Net.OpenApiParser.Utils
-{
+namespace WireMock.Net.OpenApiParser.Utils;
+
 internal class ExampleValueGenerator
 {
    private readonly WireMockOpenApiParserSettings _settings;

    public ExampleValueGenerator(WireMockOpenApiParserSettings settings)
    {
-            _settings = Guard.NotNull(settings, nameof(settings));
+        _settings = Guard.NotNull(settings);

        // Check if user provided an own implementation
        if (settings.ExampleValues is null)
@@ -31,7 +31,7 @@ namespace WireMock.Net.OpenApiParser.Utils
        }
    }

-        public object GetExampleValue(OpenApiSchema schema)
+    public object GetExampleValue(OpenApiSchema? schema)
    {
        var schemaExample = schema?.Example;
        var schemaEnum = GetRandomEnumValue(schema?.Enum);
@@ -41,7 +41,7 @@ namespace WireMock.Net.OpenApiParser.Utils
        switch (schema?.GetSchemaType())
        {
            case SchemaType.Boolean:
-                    var exampleBoolean = (OpenApiBoolean)schemaExample;
+                var exampleBoolean = schemaExample as OpenApiBoolean;
                return exampleBoolean is null ? _settings.ExampleValues.Boolean : exampleBoolean.Value;

            case SchemaType.Integer:
@@ -112,7 +112,7 @@ namespace WireMock.Net.OpenApiParser.Utils
        }
    }

-        private static IOpenApiAny GetRandomEnumValue(IList<IOpenApiAny> schemaEnum)
+    private static IOpenApiAny? GetRandomEnumValue(IList<IOpenApiAny>? schemaEnum)
    {
        if (schemaEnum?.Count > 0)
        {
@@ -124,4 +124,3 @@ namespace WireMock.Net.OpenApiParser.Utils
        return null;
    }
 }
-}
@@ -12,7 +12,7 @@
        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <LangVersion>8.0</LangVersion>
+        <LangVersion>10</LangVersion>
    </PropertyGroup>

    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -22,10 +22,14 @@
    <ItemGroup>
        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
        <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
+        <PackageReference Include="Nullable" Version="1.3.1">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
        <PackageReference Include="RamlToOpenApiConverter" Version="0.6.1" />
        <PackageReference Include="JetBrains.Annotations" Version="2022.1.0" PrivateAssets="All" />
        <PackageReference Include="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>

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using JetBrains.Annotations;
@@ -9,8 +9,8 @@ using WireMock.Admin.Mappings;
 using WireMock.Net.OpenApiParser.Mappers;
 using WireMock.Net.OpenApiParser.Settings;

-namespace WireMock.Net.OpenApiParser
-{
+namespace WireMock.Net.OpenApiParser;
+
 /// <summary>
 /// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock.Net MappingModels.
 /// </summary>
@@ -60,9 +60,8 @@ namespace WireMock.Net.OpenApiParser

    /// <inheritdoc cref="IWireMockOpenApiParser.FromDocument(OpenApiDocument, WireMockOpenApiParserSettings)" />
    [PublicAPI]
-        public IEnumerable<MappingModel> FromDocument(OpenApiDocument openApiDocument, WireMockOpenApiParserSettings settings = null)
+    public IEnumerable<MappingModel> FromDocument(OpenApiDocument openApiDocument, WireMockOpenApiParserSettings? settings = null)
    {
        return new OpenApiPathsMapper(settings).ToMappingModels(openApiDocument.Paths, openApiDocument.Servers);
    }
 }
-}
@@ -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>
@@ -15,7 +15,7 @@ namespace WireMock.Net.StandAlone;
 /// </summary>
 public static class StandAloneApp
 {
-    private static readonly string Version = typeof(StandAloneApp).GetTypeInfo().Assembly.GetName().Version.ToString();
+    private static readonly string Version = typeof(StandAloneApp).GetTypeInfo().Assembly.GetName().Version!.ToString();

    /// <summary>
    /// Start WireMock.Net standalone Server based on the WireMockServerSettings.
@@ -1,4 +1,5 @@
 #if !NETSTANDARD1_3
+using System;
 using System.Globalization;
 using System.IdentityModel.Tokens.Jwt;
 using System.Text.RegularExpressions;
@@ -6,11 +7,12 @@ 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
@@ -24,8 +26,8 @@ namespace WireMock.Authentication

    public AzureADAuthenticationMatcher(string tenant, string audience)
    {
-            _audience = audience;
-            _stsDiscoveryEndpoint = string.Format(CultureInfo.InvariantCulture, "https://login.microsoftonline.com/{0}/.well-known/openid-configuration", tenant);
+        _audience = Guard.NotNullOrEmpty(audience);
+        _stsDiscoveryEndpoint = string.Format(CultureInfo.InvariantCulture, "https://login.microsoftonline.com/{0}/.well-known/openid-configuration", Guard.NotNullOrEmpty(tenant));
    }

    public string Name => nameof(AzureADAuthenticationMatcher);
@@ -36,13 +38,18 @@ namespace WireMock.Authentication

    public AnyOf<string, StringPattern>[] GetPatterns()
    {
-            return new AnyOf<string, StringPattern>[0];
+        return EmptyArray<AnyOf<string, StringPattern>>.Value;
    }

    public MatchOperator MatchOperator { get; } = MatchOperator.Or;

-        public double IsMatch(string input)
+    public double IsMatch(string? input)
    {
+        if (string.IsNullOrEmpty(input))
+        {
+            return MatchScores.Mismatch;
+        }
+
        var token = Regex.Replace(input, BearerPrefix, string.Empty, RegexOptions.IgnoreCase);

        try
@@ -69,5 +76,4 @@ namespace WireMock.Authentication
        }
    }
 }
-}
 #endif
@@ -2,8 +2,8 @@ using System;
 using System.Text;
 using WireMock.Matchers;

-namespace WireMock.Authentication
-{
+namespace WireMock.Authentication;
+
 internal class BasicAuthenticationMatcher : RegexMatcher
 {
    public BasicAuthenticationMatcher(string username, string password) : base(BuildPattern(username, password))
@@ -17,4 +17,3 @@ namespace WireMock.Authentication
        return "^(?i)BASIC " + Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password)) + "$";
    }
 }
-}
@@ -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
+}
@@ -1,13 +1,12 @@
-#if NETSTANDARD1_3
-using System;
-using System.Net;
+#if NETSTANDARD1_3
+
+// ReSharper disable once CheckNamespace
+namespace System.Net;

-namespace System.Net
-{
 internal class WebProxy : IWebProxy
 {
    private readonly string _proxy;
-        public ICredentials Credentials { get; set; }
+    public ICredentials? Credentials { get; set; }

    public WebProxy(string proxy)
    {
@@ -24,5 +23,4 @@ namespace System.Net
        return true;
    }
 }
-}
 #endif
@@ -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
 {
-        public static string GetPattern([NotNull] this AnyOf<string, StringPattern> value)
+    public static string GetPattern(this AnyOf<string, StringPattern> value)
    {
        return value.IsFirst ? value.First : value.Second.Pattern;
    }

-        public static AnyOf<string, StringPattern>[] ToAnyOfPatterns([NotNull] this IEnumerable<string> patterns)
+    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)
+    public static AnyOf<string, StringPattern> ToAnyOfPattern(this string pattern)
    {
        return new AnyOf<string, StringPattern>(pattern);
    }
 }
-}
@@ -1,12 +1,11 @@
 using System;
-using JetBrains.Annotations;
 using WireMock.Models;

-namespace WireMock.Extensions
-{
+namespace WireMock.Extensions;
+
 internal static class TimeSettingsExtensions
 {
-        public static bool IsValid([CanBeNull] this ITimeSettings settings)
+    public static bool IsValid(this ITimeSettings? settings)
    {
        if (settings == null)
        {
@@ -14,8 +13,9 @@ namespace WireMock.Extensions
        }

        var now = DateTime.Now;
-            var start = settings.Start != null ? settings.Start.Value : now;
+        var start = settings.Start ?? now;
        DateTime end;
+
        if (settings.End != null)
        {
            end = settings.End.Value;
@@ -32,4 +32,3 @@ namespace WireMock.Extensions
        return now >= start && now <= end;
    }
 }
-}
@@ -1,10 +1,9 @@
-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
 {
    /// <summary>
@@ -13,9 +12,9 @@ namespace WireMock.Http
    /// <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)
+    internal static ByteArrayContent Create(byte[] content, MediaTypeHeaderValue? contentType)
    {
-            Guard.NotNull(content, nameof(content));
+        Guard.NotNull(content);

        var byteContent = new ByteArrayContent(content);
        if (contentType != null)
@@ -27,4 +26,3 @@ namespace WireMock.Http
        return byteContent;
    }
 }
-}
@@ -1,12 +1,12 @@
-// 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>
@@ -119,4 +119,3 @@ namespace WireMock.Http
    public const string XRequestID = "X-Request-ID";
    public const string XUACompatible = "X-UA-Compatible";
 }
-}
@@ -3,23 +3,22 @@ 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 HttpRequestMessage Create([NotNull] IRequestMessage requestMessage, [NotNull] string url)
+    internal static HttpRequestMessage Create(IRequestMessage requestMessage, string url)
    {
-            Guard.NotNull(requestMessage, nameof(requestMessage));
-            Guard.NotNullOrEmpty(url, nameof(url));
+        Guard.NotNull(requestMessage);
+        Guard.NotNullOrEmpty(url);

        var httpRequestMessage = new HttpRequestMessage(new HttpMethod(requestMessage.Method), url);

-            MediaTypeHeaderValue contentType = null;
+        MediaTypeHeaderValue? contentType = null;
        if (requestMessage.Headers != null && requestMessage.Headers.ContainsKey(HttpKnownHeaderNames.ContentType))
        {
            var value = requestMessage.Headers[HttpKnownHeaderNames.ContentType].FirstOrDefault();
@@ -88,4 +87,3 @@ namespace WireMock.Http
        return httpRequestMessage;
    }
 }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	88ff2a72db	select id, name, value from table where id in (1, 2, 3, 4, 5)	2022-11-30 18:53:50 +01:00
Stef Heyenrath	d5026e83b5	cf	2022-11-30 15:39:09 +01:00
Stef Heyenrath	b6b17d80cc	Merge branch 'master' into stef-849	2022-11-30 15:35:38 +01:00
Stef Heyenrath	c8ad9f49e4	Fix	2022-11-30 15:23:36 +01:00
Stef Heyenrath	0a4aca9ae9	cf	2022-11-30 11:55:31 +01:00
Stef Heyenrath	e5ed6036ee	fx	2022-11-30 10:03:41 +01:00
Stef Heyenrath	7b534635b9	fix tests	2022-11-30 08:19:10 +00:00
Stef Heyenrath	1562958172	Add more QueryParameterMultipleValueSupport NoComma tests	2022-11-30 07:36:13 +00:00
Stef Heyenrath	35d42a5c0d	Fix Linux CI build + Fix opencover (#851 ) * Fix Linux CI Test (opencover.xml) * 2 * Build & Execute Unit tests * ,cmd * cout * 12 * b * server * b =b * /p:CoverletOutput=./test/WireMock.Net.Tests/WireMock.Net.Tests * co? * 2p * 2? * failOnStderr: false * e0 * cc * pub * sc * coverlet * props * pt * coverage.net6.0.opencover.xml	2022-11-25 18:13:02 +01:00
Stef Heyenrath	429d6830ae	1.5.11	2022-11-24 21:47:56 +01:00
Stef Heyenrath	38634ac65a	Use try-catch when adding or removing logEntry (#848 ) * Use try-catch when removing logEntry * . * try catch add * Add extra check * ...	2022-11-21 07:30:27 +01:00
Stef Heyenrath	ef5f988786	Add Settings.QueryParameterMultipleValueSupport (#836 ) * QueryParameterMultipleValueSupport * . * , * ,	2022-11-08 19:27:44 +01:00
Stef Heyenrath	1e44f52ad6	1.5.10	2022-11-06 13:29:12 +01:00
Stef Heyenrath	7fd1d30d0e	Add WireMockNullLogger as valid commandline logger option (#845 ) * Add WireMockNullLogger as valid commandline logger option * .	2022-11-06 13:25:26 +01:00
Gerhard Gradnig	49b29d74dc	Webhook: Use the transformed URL to create the HttpRequestMessage (#843 ) Co-authored-by: Gerhard Gradnig <gerhard.gradnig@admiral.at>	2022-11-05 10:54:39 +01:00
Stef Heyenrath	80931e9fb5	Update Azure.Storage NuGets	2022-10-29 14:06:43 +02:00
Stef Heyenrath	cce344ff83	1.5.9	2022-10-29 14:02:30 +02:00
Stef Heyenrath	0972d2cb8f	Add option to ProxySettings to append guid to mapping file (#838 ) * Add option to ProxySettings to append guid to mapping file * . * . * .	2022-10-29 13:58:29 +02:00
dependabot[bot]	a39b7fc633	Bump Microsoft.AspNetCore.Server.Kestrel.Core (#837 ) Bumps [Microsoft.AspNetCore.Server.Kestrel.Core](https://github.com/aspnet/AspNetCore) from 2.1.7 to 2.1.25. - [Release notes](https://github.com/aspnet/AspNetCore/releases) - [Changelog](https://github.com/dotnet/aspnetcore/blob/main/docs/ReleasePlanning.md) - [Commits](https://github.com/aspnet/AspNetCore/compare/v2.1.7...v2.1.25) --- updated-dependencies: - dependency-name: Microsoft.AspNetCore.Server.Kestrel.Core dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-10-27 07:46:01 +02:00
Stef Heyenrath	31298d281d	Support deleting / resetting a single scenario (#834 ) * Support deleting / resetting a single scenario * move files	2022-10-26 08:43:51 +02:00
Stef Heyenrath	b4c32dd66b	WireMock.Net.WebApplication.NET6	2022-10-25 17:19:13 +02:00
Stef Heyenrath	57115f1a3d	Add setting to skip saving the string-response in the logging when using WithBody(Func...) (#828 ) * Add extra unit-test for Response WithBody (dynamic code) * DoNotSaveDynamicResponseInLogEntry * update SettingsModel * fix * .	2022-10-21 14:47:26 +02:00
Stef Heyenrath	306c69f478	Fixes for WireMock.Net.FluentAssertions (callcount behaviour) (#832 ) * UsingAnyMethod * fix * .	2022-10-17 21:50:24 +02:00
Stef Heyenrath	fb8fec0376	Update funding.yml	2022-10-16 09:17:41 +02:00
Stef Heyenrath	dd1a6fa508	1.5.8	2022-10-16 09:13:18 +02:00
Stef Heyenrath	36037627bc	WebHook - Transform Url (#824 ) * WebHook - Url * .	2022-10-15 08:55:05 +02:00
Stef Heyenrath	55afc8041f	ExactMatcher : IgnoreCase (#817 ) * ... * mm * fix some null warnings * fx	2022-10-15 08:23:58 +02:00
Stef Heyenrath	b523ab9125	Some fixes to WireMock.Net.Assertions (#816 ) * Add extra unit test for UsingPost * .X * ok * ok2 * header	2022-10-15 08:21:48 +02:00
Stef Heyenrath	14dd619763	1.5.7	2022-10-11 09:57:11 +02:00
Stef Heyenrath	430c01a461	Add implicit operators to WireMockList (#823 ) * Add implicit operators to WireMockList * .	2022-10-01 10:50:18 +02:00
Stef Heyenrath	f7b04f3234	Add UseDefinedRequestMatchers to ProxyAndRecordSettings (#821 ) * . * UseDefinedRequestMatchers * ok * . * ClientIP * t * fix ut * . * cf * cf2	2022-09-30 11:25:11 +02:00
Stef Heyenrath	c0b18631a3	Add option to run the server on http & https (#818 ) * HostingProtocol.HttpAndHttps * . * . * . * HostingScheme	2022-09-26 14:24:45 +02:00
Stef Heyenrath	fd996ab4ed	1.5.6	2022-09-12 20:45:26 +02:00
Stef Heyenrath	a57626c63a	1.5.6	2022-09-12 20:38:45 +02:00
Stef Heyenrath	98a0f2fa28	WebHook : UseFireAndForget + Delay (#803 ) * UseFireAndForget * ... * delay * async * updated code accorsing to proposal * Change nuget to package reference for WireMock.Net.Console.Net472.Classic, move the new FireAndForget into the main mapping, out of individual webhook mappings making it all or nothing, update tests, change Middleware to await or not the firing of all webhooks. Update models as needed. (#804) Co-authored-by: Matt Philmon <Matt_Philmon@carmax.com> * small update * Tweak middleware and fix bug in example (#806) Co-authored-by: Matt Philmon <Matt_Philmon@carmax.com> * .ConfigureAwait(false) Co-authored-by: mattisking <mattisking@gmail.com> Co-authored-by: Matt Philmon <Matt_Philmon@carmax.com>	2022-09-12 20:30:40 +02:00
Stef Heyenrath	13a06b9b38	1.5.5	2022-09-03 08:57:30 +02:00
Stef Heyenrath	74480c8ba9	Add support to use 'mapping' object in in reponse templating (#798 ) * mapping * . * .	2022-09-03 08:52:05 +02:00
Rafael Moreira Fonseca	862c04e722	Add assertions for request methods (#802 ) * Add assertions for request methods * Fix assertions tests when using connect method * Remove unnecessary clear and fix assert condition	2022-09-03 08:49:39 +02:00
dependabot[bot]	cd93422554	Bump Microsoft.Owin from 4.1.1 to 4.2.2 in /src/WireMock.Net (#800 ) Bumps [Microsoft.Owin](https://github.com/aspnet/AspNetKatana) from 4.1.1 to 4.2.2. - [Release notes](https://github.com/aspnet/AspNetKatana/releases) - [Commits](https://github.com/aspnet/AspNetKatana/compare/v4.1.1...v4.2.2) --- updated-dependencies: - dependency-name: Microsoft.Owin dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2022-08-31 21:19:37 +02:00
Stef Heyenrath	775c4fb2e3	1.5.4	2022-08-24 08:34:20 +02:00
Stef Heyenrath	2d4f513753	Update some NuGet packages (#781 )	2022-08-24 08:26:35 +02:00
Stef Heyenrath	3d29d7fb2f	Add Response.WithBody with IJsonConverter (#790 ) * Response_ProvideResponse_WithBody_IJsonConverter_SystemTextJson * Guard.NotNull(converter); * . * 0.1.0 * j	2022-08-23 15:49:54 +02:00
Florian	f704de65d8	Fixes header match handling using RejectOnMatch behavior (#797 ) Co-authored-by: flts <>	2022-08-23 07:52:45 +02:00
Stef Heyenrath	f0d6ed26bc	Add check for duplicate Guids when posting multiple mappings in one request (#795 ) * Add check for DuplicateGuids * Add check for duplicate Guids when posting mapping(s) * mappingModels * fix ut	2022-08-22 20:05:52 +02:00
Stef Heyenrath	330559b9fd	Add support for PEM certificates (#787 ) * Support PEM * net5 * 31 * txt * FILE * new * Fixed * . * . * RSA	2022-08-16 13:26:00 +02:00
Stef Heyenrath	e2bd56531d	Add support for Matcher.Pattern in Pact Body mapping (#789 ) * Add support for Matcher.Pattern in Pact Body mapping * SavePact_Get_Request_And_Response_WithNullBody	2022-08-15 09:28:16 +02:00
Stef Heyenrath	d2a1d0f069	Fix WithBody when using Pact and added more nullable annotations (#783 ) * More nullable annotations * . * . * FIX * pact * . * p * xxx * ... * auth * array * ...	2022-08-11 10:57:33 +02:00
Stef Heyenrath	b1af37f044	Fix Proxying when StartAdminInterface=true (#778 ) * ProxyHelper fixes * . * more reformat * .	2022-08-09 19:41:45 +02:00
Stef Heyenrath	be4b0addca	1.5.3	2022-07-29 13:21:22 +02:00
Stef Heyenrath	ae91ed2a79	Update Scriban.Signed to version 5.5.0 (#777 )	2022-07-29 13:18:23 +02:00