wip

* Adding netcoreapp3.0 and netcoreapp3.1 as a target framework

* Expanding NETSTANDARD check to include ASP.NET Core targets

* End of life netcoreapp3.0 changes and using NETCOREAPP3_1 instead of USE_ASPNETCORE where possible

.github/ISSUE_TEMPLATE/feature_request.md

@@ -16,7 +16,7 @@ A clear and concise description of what you want to happen.
 **Describe alternatives you've considered**
 A clear and concise description of any alternative solutions or features you've considered.
 
-**Is your feature request supported by [Handlebarsjs](https://handlebarsjs.com/)? Please provide details.**
+**Is your feature request supported by [WireMock (java version)](https://www.wiremock.org)? Please provide details.**
 Provide relevant information if requested feature is supported in [Handlebarsjs](https://handlebarsjs.com/) but is missing in our implementation.
 
 **Additional context**

CHANGELOG.md

@@ -1,3 +1,20 @@
+# 1.3.1 (30 September 2020)
+- [#509](https://github.com/WireMock-Net/WireMock.Net/pull/509) - Adding netcoreapp3.1 as a target framework [feature] contributed by [APIWT](https://github.com/APIWT)
+
+# 1.3.0 (29 September 2020)
+- [#508](https://github.com/WireMock-Net/WireMock.Net/pull/508) - Fix vulnerability in NuGet dependencies contributed by [StefH](https://github.com/StefH)
+- [#327](https://github.com/WireMock-Net/WireMock.Net/issues/327) - Index must be within the bounds of the List - Bug [bug]
+- [#507](https://github.com/WireMock-Net/WireMock.Net/issues/507) - Fix vulnerability found in Microsoft.AspNetCore dependency [feature]
+
+# 1.2.18 (13 August 2020)
+- [#496](https://github.com/WireMock-Net/WireMock.Net/pull/496) - Add setting to handle requests synchronously [feature] contributed by [StefH](https://github.com/StefH)
+- [#500](https://github.com/WireMock-Net/WireMock.Net/pull/500) - Add ThrowExceptionWhenMatcherFails option to all Matchers [feature] contributed by [StefH](https://github.com/StefH)
+- [#478](https://github.com/WireMock-Net/WireMock.Net/issues/478) - Sometimes returns status code 0 in unit tests with xunit test fixture (flaky test) [bug]
+
+# 1.2.17 (01 August 2020)
+- [#495](https://github.com/WireMock-Net/WireMock.Net/pull/495) - Scenario : stay on current state for a number of times contributed by [StefH](https://github.com/StefH)
+- [#494](https://github.com/WireMock-Net/WireMock.Net/issues/494) - Stay in Current State for specified number of requests [feature]
+
 # 1.2.16 (27 July 2020)
 - [#492](https://github.com/WireMock-Net/WireMock.Net/pull/492) - Mark FluentMockServer, FluentMockServerSettings, BlacklistedHeaders and BlacklistedCookies as obsolete [feature] contributed by [StefH](https://github.com/StefH)
 - [#489](https://github.com/WireMock-Net/WireMock.Net/issues/489) - Change "blacklist" and "whitelist" terms [feature]

Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.2.16</VersionPrefix>
+    <VersionPrefix>1.3.1</VersionPrefix>
     <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
     <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>

GitHubReleaseNotes.txt

@@ -1,3 +1,3 @@
 https://github.com/StefH/GitHubReleaseNotes
 
-GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.2.16
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.3.1

README.md

@@ -29,10 +29,10 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 
 | | Official | Preview |
 | - | - | - |
-|   **WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
+|   **WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
-|   **WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
+|   **WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
-|   **WireMock.Net.FluentAssertions** | [![NuGet Badge WireMock.Net.FluentAssertions](https://buildstats.info/nuget/WireMock.Net.FluentAssertions)](https://www.nuget.org/packages/WireMock.Net.FluentAssertions) | [![MyGet Badge WireMock.Net.FluentAssertions](https://buildstats.info/myget/wiremock-net/WireMock.Net.FluentAssertions)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.FluentAssertions)
+|   **WireMock.Net.FluentAssertions** | [![NuGet Badge WireMock.Net.FluentAssertions](https://buildstats.info/nuget/WireMock.Net.FluentAssertions)](https://www.nuget.org/packages/WireMock.Net.FluentAssertions) | [![MyGet Badge WireMock.Net.FluentAssertions](https://buildstats.info/myget/wiremock-net/WireMock.Net.FluentAssertions?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.FluentAssertions)
-|   **WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
+|   **WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
 
 ## Development
 For the supported frameworks and build information, see [this](https://github.com/WireMock-Net/WireMock.Net/wiki/Development-Information) page.

WireMock.Net Solution.sln

@@ -47,8 +47,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone.NET
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net452", "examples\WireMock.Net.StandAlone.Net452\WireMock.Net.StandAlone.Net452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA999}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NETCore2", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.NETCore2.csproj", "{049539C1-7A66-4559-AD7A-B1C73B97CBB0}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Proxy.Net452", "examples\WireMock.Net.Console.Proxy.Net452\WireMock.Net.Console.Proxy.Net452.csproj", "{26433A8F-BF01-4962-97EB-81BFFBB61096}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net461", "examples\WireMock.Net.StandAlone.Net461\WireMock.Net.StandAlone.Net461.csproj", "{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}"
@@ -63,13 +61,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCor
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.RequestLogTest", "examples\WireMock.Net.Console.RequestLogTest\WireMock.Net.Console.RequestLogTest.csproj", "{A9D039B9-7509-4CF1-9EFD-87EB82998575}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Client.Net472", "examples\WireMock.Net.Client.Net472\WireMock.Net.Client.Net472.csproj", "{02082E34-DEF2-47D0-AF0B-3326FAA908CE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.OpenApiParser", "src\WireMock.Net.OpenApiParser\WireMock.Net.OpenApiParser.csproj", "{D3804228-91F4-4502-9595-39584E5AADAD}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.OpenApiParser.ConsoleApp", "examples\WireMock.Net.OpenApiParser.ConsoleApp\WireMock.Net.OpenApiParser.ConsoleApp.csproj", "{5C09FB93-1535-4F92-AF26-21E8A061EE4A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.FluentAssertions", "src\WireMock.Net.FluentAssertions\WireMock.Net.FluentAssertions.csproj", "{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.FluentAssertions", "src\WireMock.Net.FluentAssertions\WireMock.Net.FluentAssertions.csproj", "{B6269AAC-170A-4346-8B9A-579DED3D9A95}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NETCore2", "examples\WireMock.Net.WebApplication.NETCore2\WireMock.Net.WebApplication.NETCore2.csproj", "{6F38CB3A-6DA1-408A-AECD-E434523C2838}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NETCore3", "examples\WireMock.Net.WebApplication.NETCore3\WireMock.Net.WebApplication.NETCore3.csproj", "{E1C56967-3DC7-46CB-A1DF-B13167A0D9D4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -125,10 +125,6 @@ Global
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.Build.0 = Release|Any CPU
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.Build.0 = Release|Any CPU
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -157,10 +153,6 @@ Global
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D3804228-91F4-4502-9595-39584E5AADAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5AADAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5AADAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -169,10 +161,18 @@ Global
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-4346-8B9A-579DED3D9A95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6F38CB3A-6DA1-408A-AECD-E434523C2838}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6F38CB3A-6DA1-408A-AECD-E434523C2838}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6F38CB3A-6DA1-408A-AECD-E434523C2838}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6F38CB3A-6DA1-408A-AECD-E434523C2838}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E1C56967-3DC7-46CB-A1DF-B13167A0D9D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E1C56967-3DC7-46CB-A1DF-B13167A0D9D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E1C56967-3DC7-46CB-A1DF-B13167A0D9D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E1C56967-3DC7-46CB-A1DF-B13167A0D9D4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -190,7 +190,6 @@ Global
 		{1995E414-F197-4AB4-90C2-68D806B5AF59} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{10E16614-61CA-48D8-8BDD-664C13913DED} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{668F689E-57B4-422E-8846-C0FF643CA999} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{26433A8F-BF01-4962-97EB-81BFFBB61096} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
@@ -198,10 +197,11 @@ Global
 		{668F689E-57B4-422E-8846-C0FF643CA268} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{83645809-9E01-4E81-8733-BA9497554ABF} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{D3804228-91F4-4502-9595-39584E5AADAD} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{2C837E73-5EDD-43AD-B65A-194E4A3AD9FE} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{B6269AAC-170A-4346-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{6F38CB3A-6DA1-408A-AECD-E434523C2838} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{E1C56967-3DC7-46CB-A1DF-B13167A0D9D4} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

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

@@ -133,7 +133,7 @@ namespace WireMock.Net.ConsoleApplication
                     .WithPath("/proxy-execute-keep-alive")
                 )
                 .RespondWith(Response.Create()
-                    .WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999", BlackListedHeaders = new[] { "Keep-Alive" } })
+                    .WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999", ExcludedHeaders = new[] { "Keep-Alive" } })
                     .WithHeader("Keep-Alive-Test", "stef")
                 );
 

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

@@ -28,7 +28,7 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp2
                     //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
                     SaveMapping = true,
                     SaveMappingToFile = false,
-                    BlackListedHeaders = new[] { "dnt", "Content-Length" }
+                    ExcludedHeaders = new[] { "dnt", "Content-Length" }
                 }
             });
 

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

@@ -22,7 +22,7 @@ namespace WireMock.Net.Console.Proxy.Net452
                     //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
                     SaveMapping = true,
                     SaveMappingToFile = false,
-                    BlackListedHeaders = new[] { "dnt", "Content-Length" }
+                    ExcludedHeaders = new[] { "dnt", "Content-Length" }
                 }
             });
 

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

@@ -19,7 +19,7 @@ namespace WireMock.Net.Console.Proxy.NETCoreApp
                     //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
                     SaveMapping = true,
                     SaveMappingToFile = false,
-                    BlackListedHeaders = new [] { "dnt", "Content-Length" }
+                    ExcludedHeaders = new [] { "dnt", "Content-Length" }
                 }
             });
 

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

@@ -14,7 +14,7 @@ namespace WireMock.Net.Console.RequestLogTest
     {
         static async Task Main(string[] args)
         {
-            var server = StandAloneApp.Start(new FluentMockServerSettings
+            var server = StandAloneApp.Start(new WireMockServerSettings
             {
                 Port = 19019,
                 StartAdminInterface = true,

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

@@ -80,8 +80,8 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="XPath2, Version=1.0.9.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
+    <Reference Include="XPath2, Version=1.1.0.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XPath2.1.0.10\lib\net40\XPath2.dll</HintPath>
+      <HintPath>..\..\packages\XPath2.1.1.0\lib\net40\XPath2.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

examples/WireMock.Net.Service/packages.config

@@ -13,5 +13,5 @@
   <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.3" targetFramework="net452" />
-  <package id="XPath2" version="1.0.10" targetFramework="net452" />
+  <package id="XPath2" version="1.1.0" targetFramework="net452" />
 </packages>

examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj

@@ -280,8 +280,8 @@
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="XPath2, Version=1.0.7.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
+    <Reference Include="XPath2, Version=1.1.0.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XPath2.1.0.6.1\lib\net40\XPath2.dll</HintPath>
+      <HintPath>..\..\packages\XPath2.1.1.0\lib\net40\XPath2.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

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

@@ -78,5 +78,5 @@
   <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net461" />
   <package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net461" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
-  <package id="XPath2" version="1.0.6.1" targetFramework="net461" />
+  <package id="XPath2" version="1.1.0" targetFramework="net461" />
 </packages>

examples/WireMock.Net.WebApplication.NETCore2/web.config

@@ -5,7 +5,7 @@
   -->
   <system.webServer>
     <handlers>
-      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
     </handlers>
     <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
   </system.webServer>

examples/WireMock.Net.WebApplication.NETCore3/App.cs

@@ -0,0 +1,28 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace WireMock.Net.WebApplication
+{
+    public class App : IHostedService
+    {
+        private readonly IWireMockService _service;
+        
+        public App(IWireMockService service)
+        {
+            _service = service;
+        }
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            _service.Start();
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            _service.Stop();
+            return Task.CompletedTask;
+        }
+    }
+}

examples/WireMock.Net.WebApplication.NETCore3/IWireMockService.cs

@@ -0,0 +1,9 @@
+namespace WireMock.Net.WebApplication
+{
+    public interface IWireMockService
+    {
+        void Start();
+
+        void Stop();
+    }
+}

examples/WireMock.Net.WebApplication.NETCore3/Program.cs

@@ -0,0 +1,30 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApplication
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateHostBuilder(args).Build().Run();
+        }
+
+        private static IHostBuilder CreateHostBuilder(string[] args)
+            => Host.CreateDefaultBuilder(args)
+                .ConfigureServices((host, services) => ConfigureServices(services, host.Configuration));
+
+        private static void ConfigureServices(IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddLogging(logging => logging.AddConsole().AddDebug());
+
+            services.AddTransient<IWireMockService, WireMockService>();
+            services.Configure<WireMockServerSettings>(configuration.GetSection("WireMockServerSettings"));
+
+            services.AddHostedService<App>();
+        }
+    }
+}

examples/WireMock.Net.WebApplication.NETCore3/Properties/launchSettings.json

@@ -0,0 +1,38 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iis": {
+      "applicationUrl": "http://localhost//wiremock",
+      "sslPort": 0
+    },
+    "iisExpress": {
+      "applicationUrl": "http://localhost:56513/",
+      "sslPort": 44304
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchUrl": "__admin/settings",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "WireMock.Net.WebApplication": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "launchUrl": "__admin/settings",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:56514/"
+    },
+    "IIS": {
+      "commandName": "IIS",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "development"
+      }
+    }
+  }
+}

examples/WireMock.Net.WebApplication.NETCore3/WireMock.Net.WebApplication.NETCore3.csproj

@@ -0,0 +1,32 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+    <StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
+    <AssemblyName>WireMock.Net.WebApplication</AssemblyName>
+    <RootNamespace>WireMock.Net.WebApplication</RootNamespace>
+    <UserSecretsId>efcf4a18-fd7c-4622-1111-336d65290599</UserSecretsId>
+    <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!--<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />-->
+    
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
+    
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>

examples/WireMock.Net.WebApplication.NETCore3/WireMockService.cs

@@ -0,0 +1,82 @@
+using System;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using WireMock.Admin.Requests;
+using WireMock.Logging;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApplication
+{
+    public class WireMockService : IWireMockService
+    {
+        private WireMockServer _server;
+        private readonly ILogger _logger;
+        private readonly WireMockServerSettings _settings;
+
+        private class Logger : IWireMockLogger
+        {
+            private readonly ILogger _logger;
+
+            public Logger(ILogger logger)
+            {
+                _logger = logger;
+            }
+
+            public void Debug(string formatString, params object[] args)
+            {
+                _logger.LogDebug(formatString, args);
+            }
+
+            public void Info(string formatString, params object[] args)
+            {
+                _logger.LogInformation(formatString, args);
+            }
+
+            public void Warn(string formatString, params object[] args)
+            {
+                _logger.LogWarning(formatString, args);
+            }
+
+            public void Error(string formatString, params object[] args)
+            {
+                _logger.LogError(formatString, args);
+            }
+
+            public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminrequest)
+            {
+                string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+                _logger.LogDebug("Admin[{0}] {1}", isAdminrequest, message);
+            }
+
+            public void Error(string formatString, Exception exception)
+            {
+                _logger.LogError(formatString, exception.Message);
+            }
+        }
+
+        public WireMockService(ILogger<WireMockService> logger, IOptions<WireMockServerSettings> settings)
+        {
+            _logger = logger;
+            _settings = settings.Value;
+
+            _settings.Logger = new Logger(logger);
+        }
+
+        public void Start()
+        {
+            _logger.LogInformation("WireMock.Net server starting");
+
+            _server = WireMockServer.Start(_settings);
+
+            _logger.LogInformation($"WireMock.Net server settings {JsonConvert.SerializeObject(_settings)}");
+        }
+
+        public void Stop()
+        {
+            _logger.LogInformation("WireMock.Net server stopping");
+            _server?.Stop();
+        }
+    }
+}

examples/WireMock.Net.WebApplication.NETCore3/appsettings.json

@@ -0,0 +1,20 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "Debug": {
+      "LogLevel": {
+        "Default": "Debug"
+      }
+    },
+    "Console": {
+      "LogLevel": {
+        "Default": "Debug"
+      }
+    }
+  },
+  "WireMockServerSettings": {
+    "AdminUsername": "a",
+    "AdminPassword": "b",
+    "StartAdminInterface": true
+  }
+}

examples/WireMock.Net.WebApplication.NETCore3/readme.md

@@ -0,0 +1,21 @@
+# Running in IIS
+
+Follow these links / steps:
+* https://weblog.west-wind.com/posts/2016/Jun/06/Publishing-and-Running-ASPNET-Core-Applications-with-IIS
+* https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/development-time-iis-support?view=aspnetcore-2.1
+* Create a `web.config` file
+
+## IIS Sites
+![IIS Multiple](resources/iis-wiremock1and2.png)
+
+## App Pool settings
+![IIS Multiple](resources/iis-apppool.png)
+
+## Publish Profiles
+Two example publish profiles are created:
+* [IIS Localhost 1](./Properties/PublishProfiles/IIS%20Localhost%201.pubxml)
+* [IIS Localhost 2](./Properties/PublishProfiles/IIS%20Localhost%202.pubxml)
+
+## Debugging
+Select the debug "IIS" if you want to debug in IIS.
+![IIS Debug](resources/iis-debug.png)

examples/WireMock.Net.WebApplication.NETCore3/web.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!--
+    Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
+  -->
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
+    </handlers>
+    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>

examples/WireMock.Net.WebApplication/Properties/PublishProfiles/IIS Localhost 1.pubxml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>MSDeploy</WebPublishMethod>
-    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
-    <ProjectGuid>049539c1-7a66-4559-ad7a-b1c73b97cbb0</ProjectGuid>
-    <SelfContained>true</SelfContained>
-    <_IsPortable>false</_IsPortable>
-    <MSDeployServiceURL>localhost</MSDeployServiceURL>
-    <DeployIisAppPath>Default Web Site/wiremock1</DeployIisAppPath>
-    <RemoteSitePhysicalPath />
-    <SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
-    <MSDeployPublishMethod>InProc</MSDeployPublishMethod>
-    <EnableMSDeployBackup>False</EnableMSDeployBackup>
-    <UserName />
-    <_SavePWD>False</_SavePWD>
-    <PublishDatabaseSettings>
-      <Objects xmlns="" />
-    </PublishDatabaseSettings>
-  </PropertyGroup>
-</Project>

examples/WireMock.Net.WebApplication/Properties/PublishProfiles/IIS Localhost 2.pubxml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-This file is used by the publish/package process of your Web project. You can customize the behavior of this process
-by editing this MSBuild file. In order to learn more about this please visit https://go.microsoft.com/fwlink/?LinkID=208121. 
--->
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <WebPublishMethod>MSDeploy</WebPublishMethod>
-    <LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>False</ExcludeApp_Data>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
-    <ProjectGuid>049539c1-7a66-4559-ad7a-b1c73b97cbb1</ProjectGuid>
-    <SelfContained>true</SelfContained>
-    <_IsPortable>false</_IsPortable>
-    <MSDeployServiceURL>localhost</MSDeployServiceURL>
-    <DeployIisAppPath>Default Web Site/wiremock2</DeployIisAppPath>
-    <RemoteSitePhysicalPath />
-    <SkipExtraFilesOnServer>True</SkipExtraFilesOnServer>
-    <MSDeployPublishMethod>InProc</MSDeployPublishMethod>
-    <EnableMSDeployBackup>False</EnableMSDeployBackup>
-    <UserName />
-    <_SavePWD>False</_SavePWD>
-    <PublishDatabaseSettings>
-      <Objects xmlns="" />
-    </PublishDatabaseSettings>
-  </PropertyGroup>
-</Project>

src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs

@@ -24,5 +24,10 @@
         /// Gets or sets a value indicating whether this <see cref="ScenarioStateModel"/> is finished.
         /// </summary>
         public bool Finished { get; set; }
+
+        /// <summary>
+        /// Gets or sets the state counter.
+        /// </summary>
+        public int Counter { get; set; }
     }
 }

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

@@ -26,8 +26,18 @@
         public int? MaxRequestLogCount { get; set; }
 
         /// <summary>
-        /// Gets or sets wether to allow a body for all HTTP methods.
+        /// Allow a Body for all HTTP Methods. (default set to false).
         /// </summary>
         public bool? AllowBodyForAllHttpMethods { get; set; }
+
+        /// <summary>
+        /// Handle all requests synchronously. (default set to false).
+        /// </summary>
+        public bool? HandleRequestsSynchronously { get; set; }
+
+        /// <summary>
+        /// Throw an exception when the Matcher fails because of invalid input. (default set to false).
+        /// </summary>
+        public bool? ThrowExceptionWhenMatcherFails { get; set; }
     }
 }

src/WireMock.Net.Abstractions/IResponseMessage.cs

@@ -45,7 +45,18 @@ namespace WireMock
         /// </summary>
         object StatusCode { get; }
 
-        //void AddHeader(string name, params string[] values);
+        /// <summary>
-        //void AddHeader(string name, string value);
+        /// Adds the header.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="value">The value.</param>
+        void AddHeader(string name, string value);
+
+        /// <summary>
+        /// Adds the header.
+        /// </summary>
+        /// <param name="name">The name.</param>
+        /// <param name="values">The values.</param>
+        void AddHeader(string name, params string[] values);
     }
 }

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

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

src/WireMock.Net.Abstractions/Matchers/Request/MatchDetail.cs

@@ -2,10 +2,19 @@
 
 namespace WireMock.Matchers.Request
 {
+    /// <summary>
+    /// MatchDetail
+    /// </summary>
     public class MatchDetail
     {
+        /// <summary>
+        /// Gets or sets the type of the matcher.
+        /// </summary>
         public Type MatcherType { get; set; }
 
+        /// <summary>
+        /// Gets or sets the score between 0.0 and 1.0
+        /// </summary>
         public double Score { get; set; }
     }
 }

src/WireMock.Net.Abstractions/Server/IWireMockServer.cs

@@ -27,9 +27,9 @@ namespace WireMock.Server
         /// </summary>
         IEnumerable<MappingModel> MappingModels { get; }
 
-        /// <summary>
+        // <summary>
-        /// Gets the mappings.
+        // Gets the mappings.
-        /// </summary>
+        // </summary>
         //[PublicAPI]
         //IEnumerable<IMapping> Mappings { get; }
 
@@ -62,9 +62,9 @@ namespace WireMock.Server
         void AddGlobalProcessingDelay(TimeSpan delay);
 
         /// <summary>
-        /// Allows the partial mapping.
+        /// Set the partial mapping to allowed (if true, you can also provide 'enforceHttpMethod').
         /// </summary>
-        void AllowPartialMapping(bool allow = true);
+        void AllowPartialMapping(bool allow = true, bool enforceHttpMethod = false);
 
         /// <summary>
         /// Deletes a LogEntry.

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

@@ -4,7 +4,7 @@
     <Description>Commonly used interfaces, models, enumerations and types.</Description>
     <AssemblyTitle>WireMock.Net.Abstractions</AssemblyTitle>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>netstandard1.0;netstandard2.0;netstandard2.1;net45</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard1.0;netstandard2.0;netstandard2.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
     <PackageId>WireMock.Net.Abstractions</PackageId>

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

@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<!--<Version>1.2.13-preview-01</Version>-->
 		<Description>FluentAssertions extensions for WireMock.Net</Description>
 		<AssemblyTitle>WireMock.Net.FluentAssertions</AssemblyTitle>
 		<Authors>Mahmoud Ali;Stef Heyenrath</Authors>
-		<TargetFrameworks>netstandard1.3;netstandard2.0;netstandard2.1;net451</TargetFrameworks>
+		<TargetFrameworks>net451;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<AssemblyName>WireMock.Net.FluentAssertions</AssemblyName>
 		<PackageId>WireMock.Net.FluentAssertions</PackageId>

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

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<Description>An OpenApi (swagger) parser to generate MappingModel or mapping.json file.</Description>
-		<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net46;netstandard2.0;netstandard2.1</TargetFrameworks>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<PackageTags>wiremock;openapi;OAS;converter;parser;openapiparser</PackageTags>
 		<ProjectGuid>{D3804228-91F4-4502-9595-39584E5AADAD}</ProjectGuid>
@@ -19,7 +19,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-		<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.0" />
+		<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
 		<PackageReference Include="RamlToOpenApiConverter" Version="0.1.1" />
 		<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />

src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj

@@ -4,7 +4,7 @@
     <Description>A RestClient using RestEase to access the admin interface.</Description>
     <AssemblyTitle>WireMock.Net.RestClient</AssemblyTitle>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>netstandard1.1;netstandard2.0;netstandard2.1;net45</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard1.1;netstandard2.0;netstandard2.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net.RestClient</AssemblyName>
     <PackageId>WireMock.Net.RestClient</PackageId>

src/WireMock.Net.StandAlone/WireMock.Net.StandAlone.csproj

@@ -3,7 +3,7 @@
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
     <PackageId>WireMock.Net.StandAlone</PackageId>

src/WireMock.Net/Http/HttpClientHelper.cs

@@ -13,7 +13,7 @@ namespace WireMock.Http
     {
         public static HttpClient CreateHttpClient(IProxyAndRecordSettings settings)
         {
-#if NETSTANDARD
+#if NETSTANDARD || NETCOREAPP3_1
             var handler = new HttpClientHandler
             {
                 CheckCertificateRevocationList = false,

src/WireMock.Net/IMapping.cs

@@ -51,6 +51,12 @@ namespace WireMock
         [CanBeNull]
         string NextState { get; }
 
+        /// <summary>
+        /// The number of times this match should be matched before the state will be changed to the next state.
+        /// </summary>
+        [CanBeNull]
+        int? StateTimes { get; }
+
         /// <summary>
         /// The Request matcher.
         /// </summary>

src/WireMock.Net/Mapping.cs

@@ -33,6 +33,9 @@ namespace WireMock
         /// <inheritdoc cref="IMapping.NextState" />
         public string NextState { get; }
 
+        /// <inheritdoc cref="IMapping.StateTimes" />
+        public int? StateTimes { get; }
+
         /// <inheritdoc cref="IMapping.RequestMatcher" />
         public IRequestMatcher RequestMatcher { get; }
 
@@ -64,9 +67,10 @@ namespace WireMock
         /// <param name="scenario">The scenario. [Optional]</param>
         /// <param name="executionConditionState">State in which the current mapping can occur. [Optional]</param>
         /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
+        /// <param name="stateTimes">Only when the current state is executed this number, the next state which will occur. [Optional]</param>
         public Mapping(Guid guid, [CanBeNull] string title, [CanBeNull] string path,
             [NotNull] IWireMockServerSettings settings, [NotNull] IRequestMatcher requestMatcher, [NotNull] IResponseProvider provider,
-            int priority, [CanBeNull] string scenario, [CanBeNull] string executionConditionState, [CanBeNull] string nextState)
+            int priority, [CanBeNull] string scenario, [CanBeNull] string executionConditionState, [CanBeNull] string nextState, [CanBeNull] int? stateTimes)
         {
             Guid = guid;
             Title = title;
@@ -78,6 +82,7 @@ namespace WireMock
             Scenario = scenario;
             ExecutionConditionState = executionConditionState;
             NextState = nextState;
+            StateTimes = stateTimes; 
         }
 
         /// <inheritdoc cref="IMapping.ProvideResponseAsync" />

src/WireMock.Net/Matchers/CSharpCodeMatcher.cs

@@ -29,6 +29,9 @@ namespace WireMock.Matchers
 
         public MatchBehaviour MatchBehaviour { get; }
 
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
+
         private readonly string[] _patterns;
 
         /// <summary>
@@ -49,6 +52,7 @@ namespace WireMock.Matchers
             Check.NotNull(patterns, nameof(patterns));
 
             MatchBehaviour = matchBehaviour;
+            ThrowException = false;
             _patterns = patterns;
         }
 
@@ -147,7 +151,7 @@ namespace WireMock.Matchers
                 throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
             }
 
-#elif (NETSTANDARD2_0 || NETSTANDARD2_1)
+#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1)
             dynamic script;
             try
             {
@@ -156,7 +160,7 @@ namespace WireMock.Matchers
 #if NETSTANDARD2_0
                 script = csscript.GenericExtensions.CreateObject(assembly, "*");
 #else
-                script = CSScriptLib.ReflectionExtensions.CreateObject(assembly,"*");
+                script = CSScriptLib.ReflectionExtensions.CreateObject(assembly, "*");
 #endif
             }
             catch (Exception ex)

src/WireMock.Net/Matchers/ContentTypeMatcher.cs

@@ -45,7 +45,9 @@ namespace WireMock.Matchers
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="patterns">The patterns.</param>
         /// <param name="ignoreCase">IgnoreCase (default false)</param>
-        public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, bool ignoreCase = false) : base(matchBehaviour, patterns, ignoreCase)
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, bool ignoreCase = false, bool throwException = false) :
+            base(matchBehaviour, patterns, ignoreCase, throwException)
         {
             _patterns = patterns;
         }

src/WireMock.Net/Matchers/ExactMatcher.cs

@@ -15,11 +15,14 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
         public MatchBehaviour MatchBehaviour { get; }
 
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
         /// </summary>
         /// <param name="values">The values.</param>
-        public ExactMatcher([NotNull] params string[] values) : this(MatchBehaviour.AcceptOnMatch, values)
+        public ExactMatcher([NotNull] params string[] values) : this(MatchBehaviour.AcceptOnMatch, false, values)
         {
         }
 
@@ -27,13 +30,15 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
         /// <param name="values">The values.</param>
-        public ExactMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] values)
+        public ExactMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params string[] values)
         {
             Check.HasNoNulls(values, nameof(values));
 
-            _values = values;
             MatchBehaviour = matchBehaviour;
+            ThrowException = throwException;
+            _values = values;
         }
 
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>

src/WireMock.Net/Matchers/ExactObjectMatcher.cs

@@ -23,6 +23,9 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
         public MatchBehaviour MatchBehaviour { get; }
         
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
         /// </summary>
@@ -56,13 +59,15 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="ExactObjectMatcher"/> class.
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
         /// <param name="value">The value.</param>
-        public ExactObjectMatcher(MatchBehaviour matchBehaviour, [NotNull] byte[] value)
+        public ExactObjectMatcher(MatchBehaviour matchBehaviour, [NotNull] byte[] value, bool throwException = false)
         {
             Check.NotNull(value, nameof(value));
 
-            ValueAsBytes = value;
             MatchBehaviour = matchBehaviour;
+            ThrowException = throwException;
+            ValueAsBytes = value;
         }
 
         /// <inheritdoc cref="IObjectMatcher.IsMatch"/>

src/WireMock.Net/Matchers/IMatcher.cs

@@ -14,5 +14,10 @@
         /// Gets the match behaviour.
         /// </summary>
         MatchBehaviour MatchBehaviour { get; }
+
+        /// <summary>
+        /// Should this matcher throw an exception?
+        /// </summary>
+        bool ThrowException { get; }
     }
 }

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -18,11 +18,14 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
         public MatchBehaviour MatchBehaviour { get; }
 
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
         /// </summary>
         /// <param name="patterns">The patterns.</param>
-        public JsonPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
+        public JsonPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
         {
         }
 
@@ -30,12 +33,14 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
         /// <param name="patterns">The patterns.</param>
-        public JsonPathMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] patterns)
+        public JsonPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params string[] patterns)
         {
             Check.NotNull(patterns, nameof(patterns));
 
             MatchBehaviour = matchBehaviour;
+            ThrowException = throwException;
             _patterns = patterns;
         }
 
@@ -52,7 +57,10 @@ namespace WireMock.Matchers
                 }
                 catch (JsonException)
                 {
-                    // just ignore JsonException
+                    if (ThrowException)
+                    {
+                        throw;
+                    }
                 }
             }
 
@@ -75,7 +83,10 @@ namespace WireMock.Matchers
                 }
                 catch (JsonException)
                 {
-                    // just ignore JsonException
+                    if (ThrowException)
+                    {
+                        throw;
+                    }
                 }
             }
 

src/WireMock.Net/Matchers/JmesPathMatcher.cs

@@ -16,11 +16,23 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
         public MatchBehaviour MatchBehaviour { get; }
 
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
         /// </summary>
         /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
+        public JmesPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
+        /// </summary>
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        /// <param name="patterns">The patterns.</param>
+        public JmesPathMatcher(bool throwException = false, [NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, throwException, patterns)
         {
         }
 
@@ -28,12 +40,14 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
         /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] patterns)
+        public JmesPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params string[] patterns)
         {
             Check.NotNull(patterns, nameof(patterns));
 
             MatchBehaviour = matchBehaviour;
+            ThrowException = throwException;
             _patterns = patterns;
         }
 
@@ -49,7 +63,10 @@ namespace WireMock.Matchers
                 }
                 catch (JsonException)
                 {
-                    // just ignore JsonException
+                    if (ThrowException)
+                    {
+                        throw;
+                    }
                 }
             }
 

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -1,8 +1,8 @@
-using JetBrains.Annotations;
+using System.Collections;
+using System.Linq;
+using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System.Collections;
-using System.Linq;
 using WireMock.Util;
 using WireMock.Validation;
 
@@ -25,12 +25,18 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
         public bool IgnoreCase { get; }
 
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
+
+        private readonly JToken _valueAsJToken;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
         /// </summary>
         /// <param name="value">The string value to check for equality.</param>
         /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-        public JsonMatcher([NotNull] string value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        public JsonMatcher([NotNull] string value, bool ignoreCase = false, bool throwException = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, throwException)
         {
         }
 
@@ -39,7 +45,8 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="value">The object value to check for equality.</param>
         /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-        public JsonMatcher([NotNull] object value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        public JsonMatcher([NotNull] object value, bool ignoreCase = false, bool throwException = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, throwException)
         {
         }
 
@@ -47,30 +54,19 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="value">The string value to check for equality.</param>
+        /// <param name="value">The value to check for equality.</param>
         /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] string value, bool ignoreCase = false)
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] object value, bool ignoreCase = false, bool throwException = false)
         {
             Check.NotNull(value, nameof(value));
 
             MatchBehaviour = matchBehaviour;
-            Value = value;
             IgnoreCase = ignoreCase;
-        }
+            ThrowException = throwException;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="JsonMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="value">The object value to check for equality.</param>
-        /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-        public JsonMatcher(MatchBehaviour matchBehaviour, [NotNull] object value, bool ignoreCase = false)
-        {
-            Check.NotNull(value, nameof(value));
-
-            MatchBehaviour = matchBehaviour;
             Value = value;
-            IgnoreCase = ignoreCase;
+            _valueAsJToken = ConvertValueToJToken(value);
         }
 
         /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
@@ -83,41 +79,41 @@ namespace WireMock.Matchers
             {
                 try
                 {
-                    // Check if JToken or object
+                    var inputAsJToken = ConvertValueToJToken(input);
-                    JToken jtokenInput = input is JToken tokenInput ? tokenInput : JObject.FromObject(input);
 
-                    // Check if JToken, string, IEnumerable or object
+                    match = DeepEquals(_valueAsJToken, inputAsJToken);
-                    JToken jtokenValue;
-                    switch (Value)
-                    {
-                        case JToken tokenValue:
-                            jtokenValue = tokenValue;
-                            break;
-
-                        case string stringValue:
-                            jtokenValue = JsonUtils.Parse(stringValue);
-                            break;
-
-                        case IEnumerable enumerableValue:
-                            jtokenValue = JArray.FromObject(enumerableValue);
-                            break;
-
-                        default:
-                            jtokenValue = JObject.FromObject(Value);
-                            break;
-                    }
-
-                    match = DeepEquals(jtokenValue, jtokenInput);
                 }
                 catch (JsonException)
                 {
-                    // just ignore JsonException
+                    if (ThrowException)
+                    {
+                        throw;
+                    }
                 }
             }
 
             return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
         }
 
+        private static JToken ConvertValueToJToken(object value)
+        {
+            // Check if JToken, string, IEnumerable or object
+            switch (value)
+            {
+                case JToken tokenValue:
+                    return tokenValue;
+
+                case string stringValue:
+                    return JsonUtils.Parse(stringValue);
+
+                case IEnumerable enumerableValue:
+                    return JArray.FromObject(enumerableValue);
+
+                default:
+                    return JObject.FromObject(value);
+            }
+        }
+
         private bool DeepEquals(JToken value, JToken input)
         {
             if (!IgnoreCase)

src/WireMock.Net/Matchers/LinqMatcher.cs

@@ -17,6 +17,8 @@ namespace WireMock.Matchers
 
         /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
         public MatchBehaviour MatchBehaviour { get; }
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
@@ -30,7 +32,7 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
         /// </summary>
         /// <param name="patterns">The patterns.</param>
-        public LinqMatcher([NotNull] string[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
+        public LinqMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
         {
         }
 
@@ -39,7 +41,7 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="pattern">The pattern.</param>
-        public LinqMatcher(MatchBehaviour matchBehaviour, [NotNull] string pattern) : this(matchBehaviour, new[] { pattern })
+        public LinqMatcher(MatchBehaviour matchBehaviour, [NotNull] string pattern) : this(matchBehaviour, false, pattern)
         {
         }
 
@@ -48,9 +50,11 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="patterns">The patterns.</param>
-        public LinqMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns)
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        public LinqMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params string[] patterns)
         {
             MatchBehaviour = matchBehaviour;
+            ThrowException = throwException;
             _patterns = patterns;
         }
 
@@ -71,8 +75,10 @@ namespace WireMock.Matchers
             }
             catch
             {
-                // just ignore exception
+                if (ThrowException)
-                // TODO add logging?
+                {
+                    throw;
+                }
             }
 
             return MatchBehaviourHelper.Convert(MatchBehaviour, match);
@@ -113,8 +119,10 @@ namespace WireMock.Matchers
             }
             catch
             {
-                // just ignore exception
+                if (ThrowException)
-                // TODO add logging?
+                {
+                    throw;
+                }
             }
 
             return MatchBehaviourHelper.Convert(MatchBehaviour, match);

src/WireMock.Net/Matchers/RegexMatcher.cs

@@ -19,6 +19,9 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
         public MatchBehaviour MatchBehaviour { get; }
 
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="RegexMatcher"/> class.
         /// </summary>
@@ -53,13 +56,15 @@ namespace WireMock.Matchers
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="patterns">The patterns.</param>
         /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] string[] patterns, bool ignoreCase = false)
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] string[] patterns, bool ignoreCase = false, bool throwException = false)
         {
             Check.NotNull(patterns, nameof(patterns));
 
             _patterns = patterns;
             IgnoreCase = ignoreCase;
             MatchBehaviour = matchBehaviour;
+            ThrowException = throwException;
 
             RegexOptions options = RegexOptions.Compiled | RegexOptions.Multiline;
 
@@ -83,7 +88,10 @@ namespace WireMock.Matchers
                 }
                 catch (Exception)
                 {
-                    // just ignore exception
+                    if (ThrowException)
+                    {
+                        throw;
+                    }
                 }
             }
 

src/WireMock.Net/Matchers/Request/RequestMessageParamMatcher.cs

@@ -51,7 +51,7 @@ namespace WireMock.Matchers.Request
         /// <param name="key">The key.</param>
         /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
         /// <param name="values">The values.</param>
-        public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, [NotNull] string key, bool ignoreCase, [CanBeNull] string[] values) : this(matchBehaviour, key, ignoreCase, values?.Select(value => new ExactMatcher(matchBehaviour, value)).Cast<IStringMatcher>().ToArray())
+        public RequestMessageParamMatcher(MatchBehaviour matchBehaviour, [NotNull] string key, bool ignoreCase, [CanBeNull] string[] values) : this(matchBehaviour, key, ignoreCase, values?.Select(value => new ExactMatcher(matchBehaviour, false, value)).Cast<IStringMatcher>().ToArray())
         {
         }
 

src/WireMock.Net/Matchers/SimMetricsMatcher.cs

@@ -19,6 +19,9 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
         public MatchBehaviour MatchBehaviour { get; }
 
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
         /// </summary>
@@ -53,11 +56,14 @@ namespace WireMock.Matchers
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="patterns">The patterns.</param>
         /// <param name="simMetricType">The SimMetric Type</param>
-        public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein)
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein, bool throwException = false)
         {
             Check.NotNullOrEmpty(patterns, nameof(patterns));
 
             MatchBehaviour = matchBehaviour;
+            ThrowException = throwException;
+
             _patterns = patterns;
             _simMetricType = simMetricType;
         }

src/WireMock.Net/Matchers/WildcardMatcher.cs

@@ -46,7 +46,9 @@ namespace WireMock.Matchers
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="patterns">The patterns.</param>
         /// <param name="ignoreCase">IgnoreCase</param>
-        public WildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, bool ignoreCase = false) : base(matchBehaviour, patterns.Select(pattern => "^" + Regex.Escape(pattern).Replace(@"\*", ".*").Replace(@"\?", ".") + "$").ToArray(), ignoreCase)
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        public WildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, bool ignoreCase = false, bool throwException = false) : 
+            base(matchBehaviour, patterns.Select(pattern => "^" + Regex.Escape(pattern).Replace(@"\*", ".*").Replace(@"\?", ".") + "$").ToArray(), ignoreCase, throwException)
         {
             _patterns = patterns;
         }

src/WireMock.Net/Matchers/XPathMatcher.cs

@@ -20,11 +20,14 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
         public MatchBehaviour MatchBehaviour { get; }
 
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="XPathMatcher"/> class.
         /// </summary>
         /// <param name="patterns">The patterns.</param>
-        public XPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
+        public XPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
         {
         }
 
@@ -32,12 +35,14 @@ namespace WireMock.Matchers
         /// Initializes a new instance of the <see cref="XPathMatcher"/> class.
         /// </summary>
         /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
         /// <param name="patterns">The patterns.</param>
-        public XPathMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] patterns)
+        public XPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params string[] patterns)
         {
             Check.NotNull(patterns, nameof(patterns));
 
             MatchBehaviour = matchBehaviour;
+            ThrowException = throwException;
             _patterns = patterns;
         }
 
@@ -58,8 +63,10 @@ namespace WireMock.Matchers
                 }
                 catch (Exception)
                 {
-                    // just ignore exception
+                    if (ThrowException)
-                    // TODO add logging?
+                    {
+                        throw;
+                    }
                 }
             }
 

src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs

@@ -4,6 +4,7 @@ using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Util;
+using WireMock.Settings;
 #if !USE_ASPNETCORE
 using Owin;
 #else
@@ -22,6 +23,8 @@ namespace WireMock.Owin
 
         bool? AllowPartialMapping { get; set; }
 
+        IPartialMappingSettings PartialMappingSettings { get; set; }
+
         ConcurrentDictionary<Guid, IMapping> Mappings { get; }
 
         ConcurrentDictionary<string, ScenarioState> Scenarios { get; }
@@ -45,5 +48,7 @@ namespace WireMock.Owin
         bool? DisableJsonBodyParsing { get; set; }
 
         bool? DisableRequestBodyDecompressing { get; set; }
+
+        bool? HandleRequestsSynchronously { get; set; }
     }
 }

src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs

@@ -7,8 +7,6 @@ using System.Threading.Tasks;
 using Newtonsoft.Json;
 using RandomDataGenerator.FieldOptions;
 using RandomDataGenerator.Randomizers;
-using WireMock.Exceptions;
-using WireMock.Handlers;
 using WireMock.Http;
 using WireMock.ResponseBuilders;
 using WireMock.Types;

src/WireMock.Net/Owin/MappingMatcher.cs

@@ -23,12 +23,12 @@ namespace WireMock.Owin
             {
                 try
                 {
-                    string scenario = mapping.Scenario != null && _options.Scenarios.ContainsKey(mapping.Scenario) ? _options.Scenarios[mapping.Scenario].NextState : null;
+                    string nextState = GetNextState(mapping);
 
                     mappings.Add(new MappingMatcherResult
                     {
                         Mapping = mapping,
-                        RequestMatchResult = mapping.GetRequestMatchResult(request, scenario)
+                        RequestMatchResult = mapping.GetRequestMatchResult(request, nextState)
                     });
                 }
                 catch (Exception ex)
@@ -42,6 +42,16 @@ namespace WireMock.Owin
                 .OrderBy(m => m.RequestMatchResult)
                 .ThenBy(m => m.Mapping.Priority)
                 .ToList();
+
+            if (_options.PartialMappingSettings?.EnforceHttpMethod == true)
+            {
+                // Check if any partialMappings contain a HttpMethodMatcher, and check if this returns a 0
+                foreach (var partialMapping in partialMappings)
+                {
+                    
+                }
+            }
+
             var partialMatch = partialMappings.FirstOrDefault(pm => pm.RequestMatchResult.AverageTotalScore > 0.0);
 
             if (_options.AllowPartialMapping == true)
@@ -56,5 +66,18 @@ namespace WireMock.Owin
 
             return (match, partialMatch);
         }
+
+        private string GetNextState(IMapping mapping)
+        {
+            // If the mapping does not have a scenario or _options.Scenarios does not contain this scenario from the mapping,
+            // just return null to indicate that there is no next state.
+            if (mapping.Scenario == null || !_options.Scenarios.ContainsKey(mapping.Scenario))
+            {
+                return null;
+            }
+
+            // Else just return the next state
+            return _options.Scenarios[mapping.Scenario].NextState;
+        }
     }
 }

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -2,9 +2,7 @@ using System;
 using System.Threading.Tasks;
 using WireMock.Logging;
 using System.Linq;
-using System.Text.RegularExpressions;
 using WireMock.Matchers;
-using Newtonsoft.Json;
 using WireMock.Http;
 using WireMock.Owin.Mappers;
 using WireMock.Serialization;
@@ -25,6 +23,7 @@ namespace WireMock.Owin
 {
     internal class WireMockMiddleware : OwinMiddleware
     {
+        private readonly object _lock = new object();
         private static readonly Task CompletedTask = Task.FromResult(false);
         private readonly IWireMockMiddlewareOptions _options;
         private readonly IOwinRequestMapper _requestMapper;
@@ -64,9 +63,19 @@ namespace WireMock.Owin
 #else
         public Task Invoke(IContext ctx)
 #endif
+        {
+            if (_options.HandleRequestsSynchronously.GetValueOrDefault(true))
+            {
+                lock (_lock)
                 {
                     return InvokeInternal(ctx);
                 }
+            }
+            else
+            {
+                return InvokeInternal(ctx);
+            }
+        }
 
         private async Task InvokeInternal(IContext ctx)
         {
@@ -79,7 +88,7 @@ namespace WireMock.Owin
             {
                 foreach (var mapping in _options.Mappings.Values.Where(m => m?.Scenario != null))
                 {
-                    // Set start
+                    // Set scenario start
                     if (!_options.Scenarios.ContainsKey(mapping.Scenario) && mapping.IsStartState)
                     {
                         _options.Scenarios.TryAdd(mapping.Scenario, new ScenarioState
@@ -122,9 +131,7 @@ namespace WireMock.Owin
 
                 if (targetMapping.Scenario != null)
                 {
-                    _options.Scenarios[targetMapping.Scenario].NextState = targetMapping.NextState;
+                    UpdateScenarioState(targetMapping);
-                    _options.Scenarios[targetMapping.Scenario].Started = true;
-                    _options.Scenarios[targetMapping.Scenario].Finished = targetMapping.NextState == null;
                 }
             }
             catch (Exception ex)
@@ -157,6 +164,25 @@ namespace WireMock.Owin
             await CompletedTask;
         }
 
+        private void UpdateScenarioState(IMapping mapping)
+        {
+            var scenario = _options.Scenarios[mapping.Scenario];
+
+            // Increase the number of times this state has been executed
+            scenario.Counter++;
+
+            // Only if the number of times this state is executed equals the required StateTimes, proceed to next state and reset the counter to 0
+            if (scenario.Counter == (mapping.StateTimes ?? 1))
+            {
+                scenario.NextState = mapping.NextState;
+                scenario.Counter = 0;
+            }
+
+            // Else just update Started and Finished
+            scenario.Started = true;
+            scenario.Finished = mapping.NextState == null;
+        }
+
         private void LogRequest(LogEntry entry, bool addRequest)
         {
             _options.Logger.DebugRequestResponse(LogEntryMapper.Map(entry), entry.RequestMessage.Path.StartsWith("/__admin/"));

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Concurrent;
-using System.Collections.ObjectModel;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Util;
+using WireMock.Settings;
 #if !USE_ASPNETCORE
 using Owin;
 #else
@@ -23,6 +23,8 @@ namespace WireMock.Owin
 
         public bool? AllowPartialMapping { get; set; }
 
+        public IPartialMappingSettings PartialMappingSettings { get; set; }
+
         public ConcurrentDictionary<Guid, IMapping> Mappings { get; } = new ConcurrentDictionary<Guid, IMapping>();
 
         public ConcurrentDictionary<string, ScenarioState> Scenarios { get; } = new ConcurrentDictionary<string, ScenarioState>();
@@ -51,5 +53,8 @@ namespace WireMock.Owin
 
         /// <inheritdoc cref="IWireMockMiddlewareOptions.DisableRequestBodyDecompressing"/>
         public bool? DisableRequestBodyDecompressing { get; set; }
+
+        /// <inheritdoc cref="IWireMockMiddlewareOptions.HandleRequestsSynchronously"/>
+        public bool? HandleRequestsSynchronously { get; set; }
     }
 }

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -60,7 +60,7 @@ namespace WireMock.ResponseBuilders
         [PublicAPI]
         public static IResponseBuilder Create([CanBeNull] ResponseMessage responseMessage = null)
         {
-            var message = responseMessage ?? new ResponseMessage(); // { StatusCode = (int)HttpStatusCode.OK };
+            var message = responseMessage ?? new ResponseMessage();
             return new Response(message);
         }
 

src/WireMock.Net/ResponseMessage.cs

@@ -35,21 +35,13 @@ namespace WireMock
         /// <inheritdoc cref="IResponseMessage.FaultPercentage" />
         public double? FaultPercentage { get; set; }
 
-        /// <summary>
+        /// <inheritdoc cref="IResponseMessage.AddHeader(string, string)" />
-        /// Adds the header.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="value">The value.</param>
         public void AddHeader(string name, string value)
         {
             Headers.Add(name, new WireMockList<string>(value));
         }
 
-        /// <summary>
+        /// <inheritdoc cref="IResponseMessage.AddHeader(string, string[])" />
-        /// Adds the header.
-        /// </summary>
-        /// <param name="name">The name.</param>
-        /// <param name="values">The values.</param>
         public void AddHeader(string name, params string[] values)
         {
             Check.NotNullOrEmpty(values, nameof(values));

src/WireMock.Net/ScenarioState.cs

@@ -24,5 +24,10 @@
         /// Gets or sets a value indicating whether this <see cref="ScenarioState"/> is finished.
         /// </summary>
         public bool Finished { get; set; }
+
+        /// <summary>
+        /// Gets or sets the state counter.
+        /// </summary>
+        public int Counter { get; set; }
     }
 }

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -38,6 +38,8 @@ namespace WireMock.Serialization
 
             string[] stringPatterns = matcher.Patterns != null ? matcher.Patterns.OfType<string>().ToArray() : new[] { matcher.Pattern as string };
             MatchBehaviour matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
+            bool ignoreCase = matcher.IgnoreCase == true;
+            bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
 
             switch (matcherName)
             {
@@ -50,34 +52,34 @@ namespace WireMock.Serialization
                     throw new NotSupportedException("It's not allowed to use the 'CSharpCodeMatcher' because IWireMockServerSettings.AllowCSharpCodeMatcher is not set to 'true'.");
 
                 case "LinqMatcher":
-                    return new LinqMatcher(matchBehaviour, stringPatterns);
+                    return new LinqMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
 
                 case "ExactMatcher":
-                    return new ExactMatcher(matchBehaviour, stringPatterns);
+                    return new ExactMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
 
                 case "ExactObjectMatcher":
-                    return CreateExactObjectMatcher(matchBehaviour, stringPatterns[0]);
+                    return CreateExactObjectMatcher(matchBehaviour, stringPatterns[0], throwExceptionWhenMatcherFails);
 
                 case "RegexMatcher":
-                    return new RegexMatcher(matchBehaviour, stringPatterns, matcher.IgnoreCase == true);
+                    return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
 
                 case "JsonMatcher":
-                    return new JsonMatcher(matchBehaviour, matcher.Pattern, matcher.IgnoreCase == true);
+                    return new JsonMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
 
                 case "JsonPathMatcher":
-                    return new JsonPathMatcher(matchBehaviour, stringPatterns);
+                    return new JsonPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
 
                 case "JmesPathMatcher":
-                    return new JmesPathMatcher(matchBehaviour, stringPatterns);
+                    return new JmesPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
 
                 case "XPathMatcher":
-                    return new XPathMatcher(matchBehaviour, stringPatterns);
+                    return new XPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
 
                 case "WildcardMatcher":
-                    return new WildcardMatcher(matchBehaviour, stringPatterns, matcher.IgnoreCase == true);
+                    return new WildcardMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
 
                 case "ContentTypeMatcher":
-                    return new ContentTypeMatcher(matchBehaviour, stringPatterns, matcher.IgnoreCase == true);
+                    return new ContentTypeMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
 
                 case "SimMetricsMatcher":
                     SimMetricType type = SimMetricType.Levenstein;
@@ -86,28 +88,13 @@ namespace WireMock.Serialization
                         throw new NotSupportedException($"Matcher '{matcherName}' with Type '{matcherType}' is not supported.");
                     }
 
-                    return new SimMetricsMatcher(matchBehaviour, stringPatterns, type);
+                    return new SimMetricsMatcher(matchBehaviour, stringPatterns, type, throwExceptionWhenMatcherFails);
 
                 default:
                     throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");
             }
         }
 
-        private ExactObjectMatcher CreateExactObjectMatcher(MatchBehaviour matchBehaviour, string stringPattern)
-        {
-            byte[] bytePattern;
-            try
-            {
-                bytePattern = Convert.FromBase64String(stringPattern);
-            }
-            catch
-            {
-                throw new ArgumentException($"Matcher 'ExactObjectMatcher' has invalid pattern. The pattern value '{stringPattern}' is not a Base64String.", nameof(stringPattern));
-            }
-
-            return new ExactObjectMatcher(matchBehaviour, bytePattern);
-        }
-
         public MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
         {
             return matchers?.Select(Map).Where(m => m != null).ToArray();
@@ -152,5 +139,20 @@ namespace WireMock.Serialization
                 Patterns = patterns.Length > 1 ? patterns : null
             };
         }
+
+        private ExactObjectMatcher CreateExactObjectMatcher(MatchBehaviour matchBehaviour, string stringPattern, bool throwException)
+        {
+            byte[] bytePattern;
+            try
+            {
+                bytePattern = Convert.FromBase64String(stringPattern);
+            }
+            catch
+            {
+                throw new ArgumentException($"Matcher 'ExactObjectMatcher' has invalid pattern. The pattern value '{stringPattern}' is not a Base64String.", nameof(stringPattern));
+            }
+
+            return new ExactObjectMatcher(matchBehaviour, bytePattern, throwException);
+        }
     }
 }

src/WireMock.Net/Server/FluentMockServer.cs

@@ -1,13 +0,0 @@
-using System;
-using WireMock.Settings;
-
-namespace WireMock.Server
-{
-    [Obsolete("Use WireMockServer. This will removed in next version (1.3.x)")]
-    public class FluentMockServer : WireMockServer
-    {
-        public FluentMockServer(IFluentMockServerSettings settings) : base((IWireMockServerSettings) settings)
-        {
-        }
-    }
-}

src/WireMock.Net/Server/IRespondWithAProvider.cs

@@ -86,14 +86,16 @@ namespace WireMock.Server
         /// Once this mapping is executed the state will be changed to specified one.
         /// </summary>
         /// <param name="state">Any object which identifies the new state</param>
+        /// <param name="times">The number of times this match should be matched before the state will be changed to the specified one. Default value is 1.</param>
         /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WillSetStateTo(string state);
+        IRespondWithAProvider WillSetStateTo(string state, int? times = 1);
 
         /// <summary>
         /// Once this mapping is executed the state will be changed to specified one.
         /// </summary>
         /// <param name="state">Any object which identifies the new state</param>
+        /// <param name="times">The number of times this match should be matched before the state will be changed to the specified one. Default value is 1.</param>
         /// <returns>The <see cref="IRespondWithAProvider"/>.</returns>
-        IRespondWithAProvider WillSetStateTo(int state);
+        IRespondWithAProvider WillSetStateTo(int state, int? times = 1);
     }
 }

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -18,6 +18,7 @@ namespace WireMock.Server
         private string _executionConditionState;
         private string _nextState;
         private string _scenario;
+        private int _timesInSameState = 1;
         private readonly RegistrationCallback _registrationCallback;
         private readonly IRequestMatcher _requestMatcher;
         private readonly IWireMockServerSettings _settings;
@@ -46,7 +47,7 @@ namespace WireMock.Server
         /// <param name="provider">The provider.</param>
         public void RespondWith(IResponseProvider provider)
         {
-            _registrationCallback(new Mapping(Guid, _title, _path, _settings, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState), _saveToFile);
+            _registrationCallback(new Mapping(Guid, _title, _path, _settings, _requestMatcher, provider, _priority, _scenario, _executionConditionState, _nextState, _timesInSameState), _saveToFile);
         }
 
         /// <see cref="IRespondWithAProvider.WithGuid(string)"/>
@@ -120,8 +121,8 @@ namespace WireMock.Server
             return WhenStateIs(state.ToString());
         }
 
-        /// <see cref="IRespondWithAProvider.WillSetStateTo(string)"/>
+        /// <see cref="IRespondWithAProvider.WillSetStateTo(string, int?)"/>
-        public IRespondWithAProvider WillSetStateTo(string state)
+        public IRespondWithAProvider WillSetStateTo(string state, int? times = 1)
         {
             if (string.IsNullOrEmpty(_scenario))
             {
@@ -129,14 +130,15 @@ namespace WireMock.Server
             }
 
             _nextState = state;
+            _timesInSameState = times ?? 1;
 
             return this;
         }
 
-        /// <see cref="IRespondWithAProvider.WillSetStateTo(int)"/>
+        /// <see cref="IRespondWithAProvider.WillSetStateTo(int, int?)"/>
-        public IRespondWithAProvider WillSetStateTo(int state)
+        public IRespondWithAProvider WillSetStateTo(int state, int? times = 1)
         {
-            return WillSetStateTo(state.ToString());
+            return WillSetStateTo(state.ToString(), times);
         }
     }
 }

src/WireMock.Net/Server/WireMockServer.Admin.cs

@@ -1,6 +1,3 @@
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -9,6 +6,9 @@ using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Scenarios;
 using WireMock.Admin.Settings;
@@ -274,7 +274,12 @@ namespace WireMock.Server
             if (HttpStatusRangeParser.IsMatch(settings.ProxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) &&
                 (settings.ProxyAndRecordSettings.SaveMapping || settings.ProxyAndRecordSettings.SaveMappingToFile))
             {
-                var mapping = ToMapping(requestMessage, responseMessage, settings.ProxyAndRecordSettings.BlackListedHeaders ?? new string[] { }, settings.ProxyAndRecordSettings.BlackListedCookies ?? new string[] { });
+                var mapping = ToMapping(
+                    requestMessage,
+                    responseMessage,
+                    settings.ProxyAndRecordSettings.ExcludedHeaders ?? new string[] { },
+                    settings.ProxyAndRecordSettings.ExcludedCookies ?? new string[] { }
+                );
 
                 if (settings.ProxyAndRecordSettings.SaveMapping)
                 {
@@ -314,24 +319,25 @@ namespace WireMock.Server
                 }
             });
 
+            bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
             switch (requestMessage.BodyData?.DetectedBodyType)
             {
                 case BodyType.Json:
-                    request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsJson));
+                    request.WithBody(new JsonMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsJson, true, throwExceptionWhenMatcherFails));
                     break;
 
                 case BodyType.String:
-                    request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsString));
+                    request.WithBody(new ExactMatcher(MatchBehaviour.AcceptOnMatch, throwExceptionWhenMatcherFails, requestMessage.BodyData.BodyAsString));
                     break;
 
                 case BodyType.Bytes:
-                    request.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes));
+                    request.WithBody(new ExactObjectMatcher(MatchBehaviour.AcceptOnMatch, requestMessage.BodyData.BodyAsBytes, throwExceptionWhenMatcherFails));
                     break;
             }
 
             var response = Response.Create(responseMessage);
 
-            return new Mapping(Guid.NewGuid(), string.Empty, null, _settings, request, response, 0, null, null, null);
+            return new Mapping(Guid.NewGuid(), string.Empty, null, _settings, request, response, 0, null, null, null, null);
         }
         #endregion
 
@@ -340,11 +346,13 @@ namespace WireMock.Server
         {
             var model = new SettingsModel
             {
-                AllowPartialMapping = _options.AllowPartialMapping,
+                AllowPartialMapping = _settings.AllowPartialMapping,
-                MaxRequestLogCount = _options.MaxRequestLogCount,
+                MaxRequestLogCount = _settings.MaxRequestLogCount,
-                RequestLogExpirationDuration = _options.RequestLogExpirationDuration,
+                RequestLogExpirationDuration = _settings.RequestLogExpirationDuration,
                 GlobalProcessingDelay = (int?)_options.RequestProcessingDelay?.TotalMilliseconds,
-                AllowBodyForAllHttpMethods = _options.AllowBodyForAllHttpMethods
+                AllowBodyForAllHttpMethods = _settings.AllowBodyForAllHttpMethods,
+                HandleRequestsSynchronously = _settings.HandleRequestsSynchronously,
+                ThrowExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails
             };
 
             return ToJson(model);
@@ -359,6 +367,7 @@ namespace WireMock.Server
             if (settings.AllowPartialMapping != null)
             {
                 _options.AllowPartialMapping = settings.AllowPartialMapping.Value;
+                // TODO stef _options.PartialMappingSettings = settings.
             }
 
             if (settings.GlobalProcessingDelay != null)
@@ -371,6 +380,16 @@ namespace WireMock.Server
                 _options.AllowBodyForAllHttpMethods = settings.AllowBodyForAllHttpMethods.Value;
             }
 
+            if (settings.HandleRequestsSynchronously != null)
+            {
+                _options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously.Value;
+            }
+
+            if (settings.ThrowExceptionWhenMatcherFails != null)
+            {
+                _settings.ThrowExceptionWhenMatcherFails = settings.ThrowExceptionWhenMatcherFails.Value;
+            }
+
             return ResponseMessageBuilder.Create("Settings updated");
         }
         #endregion Settings
@@ -706,7 +725,8 @@ namespace WireMock.Server
                 Name = s.Name,
                 NextState = s.NextState,
                 Started = s.Started,
-                Finished = s.Finished
+                Finished = s.Finished,
+                Counter = s.Counter
             });
 
             return ToJson(scenariosStates, true);
@@ -814,9 +834,9 @@ namespace WireMock.Server
 
             if (requestModel.Params != null)
             {
-                foreach (var paramModel in requestModel.Params.Where(c => c.Matchers != null))
+                foreach (var paramModel in requestModel.Params.Where(p => p != null && p.Matchers != null))
                 {
-                    bool ignoreCase = paramModel?.IgnoreCase ?? false;
+                    bool ignoreCase = paramModel.IgnoreCase == true;
                     requestBuilder = requestBuilder.WithParam(paramModel.Name, ignoreCase, paramModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
                 }
             }

src/WireMock.Net/Server/WireMockServer.cs

@@ -184,6 +184,17 @@ namespace WireMock.Server
                 ReadStaticMappings = true
             });
         }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WireMockServer"/> class.
+        /// </summary>
+        /// <param name="settings">The settings.</param>
+        /// <exception cref="WireMockException">
+        /// Service start failed with error: {_httpServer.RunningException.Message}
+        /// or
+        /// Service start failed with error: {startTask.Exception.Message}
+        /// </exception>
+        /// <exception cref="TimeoutException">Service start timed out after {TimeSpan.FromMilliseconds(settings.StartTimeout)}</exception>
         protected WireMockServer(IWireMockServerSettings settings)
         {
             _settings = settings;
@@ -217,6 +228,7 @@ namespace WireMock.Server
             _options.PostWireMockMiddlewareInit = _settings.PostWireMockMiddlewareInit;
             _options.Logger = _settings.Logger;
             _options.DisableJsonBodyParsing = _settings.DisableJsonBodyParsing;
+            _options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
 
             _matcherMapper = new MatcherMapper(_settings);
             _mappingConverter = new MappingConverter(_matcherMapper);
@@ -271,7 +283,7 @@ namespace WireMock.Server
 
             if (settings.AllowPartialMapping == true)
             {
-                AllowPartialMapping();
+                AllowPartialMapping(true, settings.PartialMappingSettings);
             }
 
             if (settings.StartAdminInterface == true)
@@ -377,10 +389,21 @@ namespace WireMock.Server
 
         /// <inheritdoc cref="IWireMockServer.AllowPartialMapping" />
         [PublicAPI]
-        public void AllowPartialMapping(bool allow = true)
+        public void AllowPartialMapping(bool allow = true, bool enforceHttpMethod = false)
+        {
+            AllowPartialMapping(allow, new PartialMappingSettings
+            {
+                EnforceHttpMethod = enforceHttpMethod
+            });
+        }
+
+        /// <inheritdoc cref="IWireMockServer.AllowPartialMapping" />
+        [PublicAPI]
+        public void AllowPartialMapping(bool allow = true, IPartialMappingSettings partialMappingSettings = null)
         {
             _settings.Logger.Info("AllowPartialMapping is set to {0}", allow);
             _options.AllowPartialMapping = allow;
+            _options.PartialMappingSettings = partialMappingSettings;
         }
 
         /// <inheritdoc cref="IWireMockServer.SetBasicAuthentication" />

src/WireMock.Net/Settings/FluentMockServerSettings.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace WireMock.Settings
-{
-    /// <summary>
-    /// FluentMockServerSettings
-    /// </summary>
-    [Obsolete("Use WireMockServerSettings. This will removed in next version (1.3.x)")]
-    public class FluentMockServerSettings : WireMockServerSettings
-    {
-    }
-}

src/WireMock.Net/Settings/IFluentMockServerSettings.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace WireMock.Settings
-{
-    /// <summary>
-    /// IFluentMockServerSettings
-    /// </summary>
-    [Obsolete("Use IWireMockServerSettings. This will removed in next version (1.3.x)")]
-    public interface IFluentMockServerSettings : IWireMockServerSettings
-    {
-    }
-}

src/WireMock.Net/Settings/IPartialMappingSettings.cs

@@ -0,0 +1,13 @@
+namespace WireMock.Settings
+{
+    /// <summary>
+    /// IPartialMappingSettings
+    /// </summary>
+    public interface IPartialMappingSettings
+    {
+        /// <summary>
+        /// ...
+        /// </summary>
+        bool EnforceHttpMethod { get; set; }
+    }
+}

src/WireMock.Net/Settings/IProxyAndRecordSettings.cs

@@ -1,5 +1,4 @@
-using System;
+using JetBrains.Annotations;
-using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
@@ -39,14 +38,12 @@ namespace WireMock.Settings
         /// <summary>
         /// Defines a list from headers which will be excluded from the saved mappings.
         /// </summary>
-        [Obsolete("Will be renamed to ExcludedHeaders in next version (1.3.x)")]
+        string[] ExcludedHeaders { get; set; }
-        string[] BlackListedHeaders { get; set; }
 
         /// <summary>
         /// Defines a list of cookies which will be excluded from the saved mappings.
         /// </summary>
-        [Obsolete("Will be renamed to ExcludedCookies in next version (1.3.x)")]
+        string[] ExcludedCookies { get; set; }
-        string[] BlackListedCookies { get; set; }
 
         /// <summary>
         /// Defines the WebProxySettings.

src/WireMock.Net/Settings/IWebProxySettings.cs

@@ -1,5 +1,8 @@
 namespace WireMock.Settings
 {
+    /// <summary>
+    /// IWebProxySettings
+    /// </summary>
     public interface IWebProxySettings
     {
         /// <summary>

src/WireMock.Net/Settings/IWireMockServerSettings.cs

@@ -3,6 +3,7 @@ using HandlebarsDotNet;
 using JetBrains.Annotations;
 using WireMock.Handlers;
 using WireMock.Logging;
+using WireMock.Matchers;
 
 namespace WireMock.Settings
 {
@@ -72,6 +73,12 @@ namespace WireMock.Settings
         [PublicAPI]
         bool? AllowPartialMapping { get; set; }
 
+        /// <summary>
+        /// Gets or sets the partial mapping settings (optional).
+        /// </summary>
+        [PublicAPI]
+        IPartialMappingSettings PartialMappingSettings { get; set; }
+
         /// <summary>
         /// The username needed for __admin access.
         /// </summary>
@@ -143,7 +150,7 @@ namespace WireMock.Settings
         /// - false : also null, 0, empty or invalid HttpStatus codes are allowed.
         /// - true  : only codes defined in <see cref="System.Net.HttpStatusCode"/> are allowed.
         /// </summary>
-        /// [PublicAPI]
+        [PublicAPI]
         bool? AllowOnlyDefinedHttpStatusCodeInResponse { get; set; }
 
         /// <summary>
@@ -157,5 +164,17 @@ namespace WireMock.Settings
         /// </summary>
         [PublicAPI]
         bool? DisableRequestBodyDecompressing { get; set; }
+
+        /// <summary>
+        /// Handle all requests synchronously. (default set to false).
+        /// </summary>
+        [PublicAPI]
+        bool? HandleRequestsSynchronously { get; set; }
+
+        /// <summary>
+        /// Throw an exception when the <see cref="IMatcher"/> fails because of invalid input. (default set to false).
+        /// </summary>
+        [PublicAPI]
+        bool? ThrowExceptionWhenMatcherFails { get; set; }
     }
 }

src/WireMock.Net/Settings/PartialMappingSettings.cs

@@ -0,0 +1,15 @@
+using JetBrains.Annotations;
+
+namespace WireMock.Settings
+{
+    /// <summary>
+    /// PartialMappingSettings
+    /// </summary>
+    /// <seealso cref="IPartialMappingSettings" />
+    public class PartialMappingSettings : IPartialMappingSettings
+    {
+        /// <inheritdoc cref="IPartialMappingSettings.EnforceHttpMethod"/>
+        [PublicAPI]
+        public bool EnforceHttpMethod { get; set; }
+    }
+}

src/WireMock.Net/Settings/ProxyAndRecordSettings.cs

@@ -1,5 +1,4 @@
-using System;
+using JetBrains.Annotations;
-using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
@@ -40,15 +39,13 @@ namespace WireMock.Settings
         [PublicAPI]
         public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
 
-        /// <inheritdoc cref="IProxyAndRecordSettings.BlackListedHeaders"/>
+        /// <inheritdoc cref="IProxyAndRecordSettings.ExcludedHeaders"/>
         [PublicAPI]
-        [Obsolete("Will be renamed to ExcludedHeaders in next version (1.3.x)")]
+        public string[] ExcludedHeaders { get; set; }
-        public string[] BlackListedHeaders { get; set; }
 
-        /// <inheritdoc cref="IProxyAndRecordSettings.BlackListedCookies"/>
+        /// <inheritdoc cref="IProxyAndRecordSettings.ExcludedCookies"/>
         [PublicAPI]
-        [Obsolete("Will be renamed to ExcludedCookies in next version (1.3.x)")]
+        public string[] ExcludedCookies { get; set; }
-        public string[] BlackListedCookies { get; set; }
 
         /// <inheritdoc cref="IProxyAndRecordSettings.WebProxySettings"/>
         [PublicAPI]

src/WireMock.Net/Settings/WebProxySettings.cs

@@ -2,6 +2,7 @@
 
 namespace WireMock.Settings
 {
+    /// <seealso cref="IWebProxySettings" />
     public class WebProxySettings : IWebProxySettings
     {
         /// <inheritdoc cref="IWebProxySettings.Address"/>

src/WireMock.Net/Settings/WireMockServerSettings.cs

@@ -53,6 +53,10 @@ namespace WireMock.Settings
         [PublicAPI]
         public bool? AllowPartialMapping { get; set; }
 
+        /// <inheritdoc cref="IWireMockServerSettings.PartialMappingSettings"/>
+        [PublicAPI]
+        public IPartialMappingSettings PartialMappingSettings { get; set; }
+
         /// <inheritdoc cref="IWireMockServerSettings.AdminUsername"/>
         [PublicAPI]
         public string AdminUsername { get; set; }
@@ -113,5 +117,13 @@ namespace WireMock.Settings
         /// <inheritdoc cref="IWireMockServerSettings.DisableRequestBodyDecompressing"/>
         [PublicAPI]
         public bool? DisableRequestBodyDecompressing { get; set; }
+
+        /// <inheritdoc cref="IWireMockServerSettings.HandleRequestsSynchronously"/>
+        [PublicAPI]
+        public bool? HandleRequestsSynchronously { get; set; }
+
+        /// <inheritdoc cref="IWireMockServerSettings.ThrowExceptionWhenMatcherFails"/>
+        [PublicAPI]
+        public bool? ThrowExceptionWhenMatcherFails { get; set; }
     }
 }

src/WireMock.Net/Settings/WireMockServerSettingsParser.cs

@@ -36,7 +36,9 @@ namespace WireMock.Settings
                 AllowCSharpCodeMatcher = parser.GetBoolValue("AllowCSharpCodeMatcher"),
                 AllowBodyForAllHttpMethods = parser.GetBoolValue("AllowBodyForAllHttpMethods"),
                 AllowOnlyDefinedHttpStatusCodeInResponse = parser.GetBoolValue("AllowOnlyDefinedHttpStatusCodeInResponse"),
-                DisableJsonBodyParsing = parser.GetBoolValue("DisableJsonBodyParsing")
+                DisableJsonBodyParsing = parser.GetBoolValue("DisableJsonBodyParsing"),
+                HandleRequestsSynchronously = parser.GetBoolValue("HandleRequestsSynchronously"),
+                ThrowExceptionWhenMatcherFails = parser.GetBoolValue("ThrowExceptionWhenMatcherFails")
             };
 
             if (logger != null)
@@ -68,8 +70,8 @@ namespace WireMock.Settings
                     SaveMappingToFile = parser.GetBoolValue("SaveMappingToFile"),
                     SaveMappingForStatusCodePattern = parser.GetStringValue("SaveMappingForStatusCodePattern"),
                     ClientX509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("ClientX509Certificate2ThumbprintOrSubjectName"),
-                    BlackListedHeaders = parser.GetValues("BlackListedHeaders"),
+                    ExcludedHeaders = parser.GetValues("ExcludedHeaders"),
-                    BlackListedCookies = parser.GetValues("BlackListedCookies"),
+                    ExcludedCookies = parser.GetValues("ExcludedCookies"),
                     AllowAutoRedirect = parser.GetBoolValue("AllowAutoRedirect")
                 };
 

src/WireMock.Net/Transformers/HandlebarsContextFactory.cs

@@ -1,5 +1,5 @@
-using HandlebarsDotNet;
+using System;
-using System;
+using HandlebarsDotNet;
 using WireMock.Handlers;
 
 namespace WireMock.Transformers

src/WireMock.Net/Transformers/IHandlebarsContextFactory.cs

@@ -1,6 +1,4 @@
-using HandlebarsDotNet;
+namespace WireMock.Transformers
-
-namespace WireMock.Transformers
 {
     interface IHandlebarsContextFactory
     {

src/WireMock.Net/Transformers/ResponseMessageTransformer.cs

@@ -1,11 +1,10 @@
-using HandlebarsDotNet;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using HandlebarsDotNet;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using WireMock.Types;
 using WireMock.Util;
 using WireMock.Validation;

src/WireMock.Net/Validation/Check.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Reflection;
 using JetBrains.Annotations;
 
 // Copied from https://github.com/aspnet/EntityFramework/blob/dev/src/Shared/Check.cs
@@ -96,19 +95,6 @@ namespace WireMock.Validation
             return value;
         }
 
-        //public static string NullButNotEmpty(string value, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName)
-        //{
-        //    if (!ReferenceEquals(value, null)
-        //        && (value.Length == 0))
-        //    {
-        //        NotNullOrEmpty(parameterName, nameof(parameterName));
-
-        //        throw new ArgumentException(CoreStrings.ArgumentIsEmpty(parameterName));
-        //    }
-
-        //    return value;
-        //}
-
         public static IList<T> HasNoNulls<T>(IList<T> value, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName)
             where T : class
         {
@@ -123,17 +109,5 @@ namespace WireMock.Validation
 
             return value;
         }
-
-        //public static Type ValidEntityType(Type value, [InvokerParameterName, ValidatedNotNull, NotNull] string parameterName)
-        //{
-        //    if (!value.GetTypeInfo().IsClass)
-        //    {
-        //        NotNullOrEmpty(parameterName, nameof(parameterName));
-
-        //        throw new ArgumentException(CoreStrings.InvalidEntityType(value, parameterName));
-        //    }
-
-        //    return value;
-        //}
     }
 }

src/WireMock.Net/WireMock.Net.csproj

@@ -3,7 +3,7 @@
     <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
     <AssemblyTitle>WireMock.Net</AssemblyTitle>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net</AssemblyName>
     <PackageId>WireMock.Net</PackageId>
@@ -42,7 +42,7 @@
     <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2'">
+  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1'">
     <DefineConstants>USE_ASPNETCORE</DefineConstants>
   </PropertyGroup>
 
@@ -56,7 +56,7 @@
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
-    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.10" />
+    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.12" />
     <PackageReference Include="JmesPath.Net" Version="1.0.125" />
     <PackageReference Include="Handlebars.Net.Helpers" Version="1.0.0" />
   </ItemGroup>
@@ -69,7 +69,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-    <PackageReference Include="XPath2.Extensions" Version="1.0.6.1" />
+    <PackageReference Include="XPath2.Extensions" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
@@ -101,7 +101,11 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+
+    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
+    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
+
     <PackageReference Include="CS-Script" Version="3.29.0" />
   </ItemGroup>
 
@@ -114,17 +118,29 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+
+    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
+    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
     <PackageReference Include="CS-Script.Core" Version="1.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+
+    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
+    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
 
     <!-- https://github.com/WireMock-Net/WireMock.Net/issues/448 -->
     <PackageReference Include="CS-Script.Core" Version="1.3.1" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1'">
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/448 -->
+    <PackageReference Include="CS-Script.Core" Version="1.4.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
   </ItemGroup>