1.3.5

* Allow kestrel options to be overriden with values of config files and environment variables (see https://docs.microsoft.com/en-us/aspnet/core/fundamentals/servers/kestrel?view=aspnetcore-3.1#kestrel-options)

* Make appsettings.json optional

* Move changes to AspNetCoreSelfHost.Framework files.

* Implement ConfigureKestrelServerOptions for .NET Standard 1.3.

CHANGELOG.md

@@ -1,3 +1,21 @@
+# 1.3.5 (04 November 2020)
+- [#530](https://github.com/WireMock-Net/WireMock.Net/pull/530) - Fix dotnet-sonarscanner [bug] contributed by [StefH](https://github.com/StefH)
+- [#531](https://github.com/WireMock-Net/WireMock.Net/pull/531) - Add WithCallback-Async [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.3.4 (17 October 2020)
+- [#522](https://github.com/WireMock-Net/WireMock.Net/pull/522) - Add ContinuousIntegrationBuild property [feature] contributed by [StefH](https://github.com/StefH)
+- [#525](https://github.com/WireMock-Net/WireMock.Net/pull/525) - Handlebars.Net.Helpers Version="1.1.0" [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.3.3 (15 October 2020)
+- [#520](https://github.com/WireMock-Net/WireMock.Net/pull/520) - Make kestrel limits configurable contributed by [eduherminio](https://github.com/eduherminio)
+- [#521](https://github.com/WireMock-Net/WireMock.Net/issues/521) - Make Kestrel limits configurable [feature]
+
+# 1.3.2 (14 October 2020)
+- [#505](https://github.com/WireMock-Net/WireMock.Net/pull/505) - Fix reading JsonMatcher-mapping with object as pattern [bug] contributed by [StefH](https://github.com/StefH)
+- [#514](https://github.com/WireMock-Net/WireMock.Net/pull/514) - Update .NET Core 3.1 example contributed by [Crossbow78](https://github.com/Crossbow78)
+- [#504](https://github.com/WireMock-Net/WireMock.Net/issues/504) - Loading mapping models with `JsonMatcher`  is not working correctly [bug]
+- [#513](https://github.com/WireMock-Net/WireMock.Net/issues/513) - Static mapping break from 1.2.17 to 1.2.18 and higher [bug]
+
 # 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)
 

Directory.Build.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VersionPrefix>1.3.1</VersionPrefix>
+    <VersionPrefix>1.3.4</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>
@@ -14,6 +14,10 @@
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
   <Choose>
     <!-- The environment variable `Prerelease` is set in the azure-pipelines.yml file. -->
     <When Condition=" '$(Prerelease)' != '' ">

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.3.1
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc --version 1.3.5

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}"
@@ -69,6 +67,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.OpenApiParser.
 EndProject
 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
 		Debug|Any CPU = Debug|Any CPU
@@ -123,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
@@ -167,6 +165,14 @@ Global
 		{B6269AAC-170A-4346-8B9A-579DED3D9A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{B6269AAC-170A-4346-8B9A-579DED3D9A95}.Release|Any CPU.ActiveCfg = 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
@@ -184,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}
@@ -195,6 +200,8 @@ Global
 		{D3804228-91F4-4502-9595-39584E5AADAD} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{B6269AAC-170A-4346-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{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.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj

@@ -28,7 +28,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="1.0.0" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="1.1.0" />
     <PackageReference Include="log4net" Version="2.0.8" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <!--<PackageReference Include="Microsoft.CodeAnalysis.Scripting.Common" Version="3.4.0" />-->

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

@@ -12,6 +12,7 @@ using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
 using WireMock.Util;
+using System.Threading.Tasks;
 
 namespace WireMock.Net.ConsoleApplication
 {
@@ -521,9 +522,29 @@ namespace WireMock.Net.ConsoleApplication
                     .WithBodyAsJson(new { Id = "5bdf076c-5654-4b3e-842c-7caf1fabf8c9" }));
             server
                 .Given(Request.Create().WithPath("/random200or505").UsingGet())
-                .RespondWith(Response.Create().WithCallback(request => new ResponseMessage
+                .RespondWith(Response.Create().WithCallback(request =>
                 {
-                    StatusCode = new Random().Next(1, 100) == 1 ? 504 : 200
+                    int code = new Random().Next(1, 2) == 1 ? 505 : 200;
+                    return new ResponseMessage
+                    {
+                        BodyData = new BodyData { BodyAsString = "random200or505:" + code, DetectedBodyType = Types.BodyType.String },
+                        StatusCode = code
+                    };
+                }));
+
+            server
+                .Given(Request.Create().WithPath("/random200or505async").UsingGet())
+                .RespondWith(Response.Create().WithCallback(async request =>
+                {
+                    await Task.Delay(1);
+
+                    int code = new Random().Next(1, 2) == 1 ? 505 : 200;
+
+                    return new ResponseMessage
+                    {
+                        BodyData = new BodyData { BodyAsString = "random200or505async:" + code, DetectedBodyType = Types.BodyType.String },
+                        StatusCode = code
+                    };
                 }));
 
             System.Console.WriteLine(JsonConvert.SerializeObject(server.MappingModels, Formatting.Indented));

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

@@ -1,22 +1,22 @@
-using Microsoft.Extensions.Logging;
-
-namespace WireMock.Net.WebApplication
-{
-    public class App
-    {
-        private readonly IWireMockService _service;
-        private readonly ILogger _logger;
-        
-        public App(IWireMockService service, ILogger logger)
-        {
-            _service = service;
-            _logger = logger;
-        }
-
-        public void Run()
-        {
-            _logger.LogInformation("WireMock.Net App running");
-            _service.Run();
-        }
-    }
+using Microsoft.Extensions.Logging;
+
+namespace WireMock.Net.WebApplication
+{
+    public class App
+    {
+        private readonly IWireMockService _service;
+        private readonly ILogger _logger;
+        
+        public App(IWireMockService service, ILogger logger)
+        {
+            _service = service;
+            _logger = logger;
+        }
+
+        public void Run()
+        {
+            _logger.LogInformation("WireMock.Net App running");
+            _service.Run();
+        }
+    }
 }

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

@@ -1,7 +1,7 @@
-namespace WireMock.Net.WebApplication
-{
-    public interface IWireMockService
-    {
-        void Run();
-    }
+namespace WireMock.Net.WebApplication
+{
+    public interface IWireMockService
+    {
+        void Run();
+    }
 }

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

@@ -1,38 +1,38 @@
-{
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iis": {
-      "applicationUrl": "http://localhost//wiremock",
-      "sslPort": 0
-    },
-    "iisExpress": {
-      "applicationUrl": "http://localhost:56513/",
-      "sslPort": 0
-    }
-  },
-  "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"
-      }
-    }
-  }
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iis": {
+      "applicationUrl": "http://localhost//wiremock",
+      "sslPort": 0
+    },
+    "iisExpress": {
+      "applicationUrl": "http://localhost:56513/",
+      "sslPort": 0
+    }
+  },
+  "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.NETCore2/libman.json

@@ -1,5 +1,5 @@
-{
-  "version": "1.0",
-  "defaultProvider": "cdnjs",
-  "libraries": []
+{
+  "version": "1.0",
+  "defaultProvider": "cdnjs",
+  "libraries": []
 }

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

@@ -1,21 +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)
+# 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.NETCore2/web.config

@@ -1,12 +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="AspNetCoreModule" resourceType="Unspecified" />
-    </handlers>
-    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
-  </system.webServer>
+<?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.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/Owin/AspNetCoreSelfHost.NETStandard.cs

@@ -3,6 +3,8 @@ using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace WireMock.Owin
 {
@@ -34,5 +36,24 @@ namespace WireMock.Owin
             }
         }
     }
+
+    internal static class IWebHostBuilderExtensions
+    {
+        internal static IWebHostBuilder ConfigureAppConfigurationUsingEnvironmentVariables(this IWebHostBuilder builder)
+        {
+            return builder.ConfigureAppConfiguration(config =>
+            {
+                config.AddEnvironmentVariables();
+            });
+        }
+
+        internal static IWebHostBuilder ConfigureKestrelServerOptions(this IWebHostBuilder builder)
+        {
+            return builder.ConfigureServices((context, services) =>
+            {
+                services.Configure<KestrelServerOptions>(context.Configuration.GetSection("Kestrel"));
+            });
+        }
+    }
 }
 #endif

src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard13.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using WireMock.HttpsCertificate;
 
 namespace WireMock.Owin
@@ -26,5 +28,22 @@ namespace WireMock.Owin
             }
         }
     }
+
+    internal static class IWebHostBuilderExtensions
+    {
+        internal static IWebHostBuilder ConfigureAppConfigurationUsingEnvironmentVariables(this IWebHostBuilder builder) => builder;
+
+        internal static IWebHostBuilder ConfigureKestrelServerOptions(this IWebHostBuilder builder)
+        {
+            var configuration = new ConfigurationBuilder()
+                .AddEnvironmentVariables()
+                .Build();
+
+            return builder.ConfigureServices(services =>
+            {
+                services.Configure<KestrelServerOptions>(configuration.GetSection("Kestrel"));
+            });
+        }
+    }
 }
 #endif

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -58,6 +58,7 @@ namespace WireMock.Owin
             }
 
             _host = builder
+                .ConfigureAppConfigurationUsingEnvironmentVariables()
                 .ConfigureServices(services =>
                 {
                     services.AddSingleton(_options);
@@ -81,6 +82,7 @@ namespace WireMock.Owin
 
                     SetHttpsAndUrls(options, _urlOptions.GetDetails());
                 })
+                .ConfigureKestrelServerOptions()
 
 #if NETSTANDARD1_3
                 .UseUrls(_urlOptions.GetDetails().Select(u => u.Url).ToArray())
@@ -118,8 +120,10 @@ namespace WireMock.Owin
                 _logger.Info("WireMock.Net server using netstandard2.0");
 #elif NETSTANDARD2_1
                 _logger.Info("WireMock.Net server using netstandard2.1");
+#elif NETCOREAPP3_1
+                _logger.Info("WireMock.Net server using .NET Core 3.1");
 #elif NET46
-                _logger.Info("WireMock.Net server using .net 4.6.1 or higher");
+                _logger.Info("WireMock.Net server using .NET Framework 4.6.1 or higher");
 #endif
 
 #if NETSTANDARD1_3

src/WireMock.Net/ResponseBuilders/ICallbackResponseBuilder.cs

@@ -1,19 +1,27 @@
-using System;
-using JetBrains.Annotations;
-using WireMock.ResponseProviders;
-
-namespace WireMock.ResponseBuilders
-{
-    /// <summary>
-    /// The CallbackResponseBuilder interface.
-    /// </summary>
-    public interface ICallbackResponseBuilder : IResponseProvider
-    {
-        /// <summary>
-        /// The callback builder
-        /// </summary>
-        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
-        [PublicAPI]
-        IResponseBuilder WithCallback([NotNull] Func<RequestMessage, ResponseMessage> callbackHandler);
-    }
+using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using WireMock.ResponseProviders;
+
+namespace WireMock.ResponseBuilders
+{
+    /// <summary>
+    /// The CallbackResponseBuilder interface.
+    /// </summary>
+    public interface ICallbackResponseBuilder : IResponseProvider
+    {
+        /// <summary>
+        /// The callback builder
+        /// </summary>
+        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        [PublicAPI]
+        IResponseBuilder WithCallback([NotNull] Func<RequestMessage, ResponseMessage> callbackHandler);
+
+        /// <summary>
+        /// The async callback builder
+        /// </summary>
+        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        [PublicAPI]
+        IResponseBuilder WithCallback([NotNull] Func<RequestMessage, Task<ResponseMessage>> callbackHandler);
+    }
 }

src/WireMock.Net/ResponseBuilders/Response.WithCallback.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Threading.Tasks;
+using WireMock.Validation;
+
+namespace WireMock.ResponseBuilders
+{
+    public partial class Response
+    {
+        /// <summary>
+        /// A delegate to execute to generate the response.
+        /// </summary>
+        public Func<RequestMessage, ResponseMessage> Callback { get; private set; }
+
+        /// <summary>
+        /// A delegate to execute to generate the response async.
+        /// </summary>
+        public Func<RequestMessage, Task<ResponseMessage>> CallbackAsync { get; private set; }
+
+        /// <summary>
+        /// Defines if the method WithCallback(...) is used.
+        /// </summary>
+        public bool WithCallbackUsed { get; private set; }
+
+        /// <inheritdoc cref="ICallbackResponseBuilder.WithCallback(Func{RequestMessage, ResponseMessage})"/>
+        public IResponseBuilder WithCallback(Func<RequestMessage, ResponseMessage> callbackHandler)
+        {
+            Check.NotNull(callbackHandler, nameof(callbackHandler));
+
+            return WithCallbackInternal(true, callbackHandler);
+        }
+
+        /// <inheritdoc cref="ICallbackResponseBuilder.WithCallback(Func{RequestMessage, Task{ResponseMessage}})"/>
+        public IResponseBuilder WithCallback(Func<RequestMessage, Task<ResponseMessage>> callbackHandler)
+        {
+            Check.NotNull(callbackHandler, nameof(callbackHandler));
+
+            return WithCallbackInternal(true, callbackHandler);
+        }
+
+        private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<RequestMessage, ResponseMessage> callbackHandler)
+        {
+            Check.NotNull(callbackHandler, nameof(callbackHandler));
+
+            WithCallbackUsed = withCallbackUsed;
+            Callback = callbackHandler;
+
+            return this;
+        }
+
+        private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<RequestMessage, Task<ResponseMessage>> callbackHandler)
+        {
+            Check.NotNull(callbackHandler, nameof(callbackHandler));
+
+            WithCallbackUsed = withCallbackUsed;
+            CallbackAsync = callbackHandler;
+
+            return this;
+        }
+    }
+}

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -42,16 +42,6 @@ namespace WireMock.ResponseBuilders
         /// </summary>
         public ResponseMessage ResponseMessage { get; }
 
-        /// <summary>
-        /// A delegate to execute to generate the response.
-        /// </summary>
-        public Func<RequestMessage, ResponseMessage> Callback { get; private set; }
-
-        /// <summary>
-        /// Defines if the method WithCallback(...) is used.
-        /// </summary>
-        public bool WithCallbackUsed { get; private set; }
-
         /// <summary>
         /// Creates this instance.
         /// </summary>
@@ -311,25 +301,6 @@ namespace WireMock.ResponseBuilders
             return WithDelay(TimeSpan.FromMilliseconds(milliseconds));
         }
 
-        /// <inheritdoc cref="ICallbackResponseBuilder.WithCallback"/>
-        public IResponseBuilder WithCallback(Func<RequestMessage, ResponseMessage> callbackHandler)
-        {
-            Check.NotNull(callbackHandler, nameof(callbackHandler));
-
-            return WithCallbackInternal(true, callbackHandler);
-        }
-
-        /// <inheritdoc cref="ICallbackResponseBuilder.WithCallback"/>
-        private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<RequestMessage, ResponseMessage> callbackHandler)
-        {
-            Check.NotNull(callbackHandler, nameof(callbackHandler));
-
-            WithCallbackUsed = withCallbackUsed;
-            Callback = callbackHandler;
-
-            return this;
-        }
-
         /// <inheritdoc cref="IResponseProvider.ProvideResponseAsync(RequestMessage, IWireMockServerSettings)"/>
         public async Task<ResponseMessage> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
         {
@@ -365,13 +336,20 @@ namespace WireMock.ResponseBuilders
             }
 
             ResponseMessage responseMessage;
-            if (Callback == null)
+            if (Callback == null && CallbackAsync == null)
             {
                 responseMessage = ResponseMessage;
             }
             else
             {
-                responseMessage = Callback(requestMessage);
+                if (Callback != null)
+                {
+                    responseMessage = Callback(requestMessage);
+                }
+                else
+                {
+                    responseMessage = await CallbackAsync(requestMessage);
+                }
 
                 if (!WithCallbackUsed)
                 {

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -36,7 +36,7 @@ namespace WireMock.Serialization
             string matcherName = parts[0];
             string matcherType = parts.Length > 1 ? parts[1] : null;
 
-            string[] stringPatterns = matcher.Patterns != null ? matcher.Patterns.OfType<string>().ToArray() : new[] { matcher.Pattern as string };
+            string[] stringPatterns = (matcher.Patterns != null ? matcher.Patterns : new[] { matcher.Pattern }).OfType<string>().ToArray();
             MatchBehaviour matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
             bool ignoreCase = matcher.IgnoreCase == true;
             bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
@@ -64,7 +64,8 @@ namespace WireMock.Serialization
                     return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
 
                 case "JsonMatcher":
-                    return new JsonMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
+                    object value = matcher.Pattern ?? matcher.Patterns;
+                    return new JsonMatcher(matchBehaviour, value, ignoreCase, throwExceptionWhenMatcherFails);
 
                 case "JsonPathMatcher":
                     return new JsonPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);

src/WireMock.Net/WireMock.Net.csproj

@@ -58,7 +58,7 @@
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
     <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" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="1.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Debug - Sonar'">

test/WireMock.Net.Tests/ResponseBuilders/ResponseWithCallbackTests.cs

@@ -13,6 +13,35 @@ namespace WireMock.Net.Tests.ResponseBuilders
     {
         private readonly WireMockServerSettings _settings = new WireMockServerSettings();
 
+        [Fact]
+        public async Task Response_WithCallbackAsync()
+        {
+            // Assign
+            var requestMessage = new RequestMessage(new UrlDetails("http://localhost/foo"), "GET", "::1");
+            var response = Response.Create()
+                .WithCallback(async request =>
+                {
+                    await Task.Delay(1);
+
+                    return new ResponseMessage
+                    {
+                        BodyData = new BodyData
+                        {
+                            DetectedBodyType = BodyType.String,
+                            BodyAsString = request.Path + "Bar"
+                        },
+                        StatusCode = 302
+                    };
+                });
+
+            // Act
+            var responseMessage = await response.ProvideResponseAsync(requestMessage, _settings);
+
+            // Assert
+            responseMessage.BodyData.BodyAsString.Should().Be("/fooBar");
+            responseMessage.StatusCode.Should().Be(302);
+        }
+
         [Fact]
         public async Task Response_WithCallback()
         {

test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs

@@ -1,6 +1,7 @@
-using Moq;
+using System;
+using FluentAssertions;
+using Moq;
 using NFluent;
-using System;
 using WireMock.Admin.Mappings;
 using WireMock.Matchers;
 using WireMock.Serialization;
@@ -26,7 +27,7 @@ namespace WireMock.Net.Tests.Serialization
             var model = _sut.Map((IMatcher)null);
 
             // Assert
-            Check.That(model).IsNull();
+            model.Should().BeNull();
         }
 
         [Fact]
@@ -36,7 +37,7 @@ namespace WireMock.Net.Tests.Serialization
             var model = _sut.Map((IMatcher[])null);
 
             // Assert
-            Check.That(model).IsNull();
+            model.Should().BeNull();
         }
 
         [Fact]
@@ -50,7 +51,7 @@ namespace WireMock.Net.Tests.Serialization
             var models = _sut.Map(new[] { matcherMock1.Object, matcherMock2.Object });
 
             // Assert
-            Check.That(models).HasSize(2);
+            models.Should().HaveCount(2);
         }
 
         [Fact]
@@ -65,10 +66,10 @@ namespace WireMock.Net.Tests.Serialization
             var model = _sut.Map(matcherMock.Object);
 
             // Assert
-            Check.That(model.IgnoreCase).IsNull();
-            Check.That(model.Name).Equals("test");
-            Check.That(model.Pattern).IsNull();
-            Check.That(model.Patterns).ContainsExactly("p1", "p2");
+            model.IgnoreCase.Should().BeNull();
+            model.Name.Should().Be("test");
+            model.Pattern.Should().BeNull();
+            model.Patterns.Should().Contain("p1", "p2");
         }
 
         [Fact]
@@ -82,7 +83,7 @@ namespace WireMock.Net.Tests.Serialization
             var model = _sut.Map(matcherMock.Object);
 
             // Assert
-            Check.That(model.IgnoreCase).Equals(true);
+            model.IgnoreCase.Should().BeTrue();
         }
 
         [Fact]
@@ -92,7 +93,7 @@ namespace WireMock.Net.Tests.Serialization
             var result = _sut.Map((MatcherModel)null);
 
             // Assert
-            Check.That(result).IsNull();
+            result.Should().BeNull();
         }
 
         [Fact]
@@ -119,8 +120,8 @@ namespace WireMock.Net.Tests.Serialization
             var matcher = (LinqMatcher)_sut.Map(model);
 
             // Assert
-            Check.That(matcher.MatchBehaviour).IsEqualTo(MatchBehaviour.AcceptOnMatch);
-            Check.That(matcher.GetPatterns()).ContainsExactly("p");
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.GetPatterns().Should().Contain("p");
         }
 
         [Fact]
@@ -137,8 +138,88 @@ namespace WireMock.Net.Tests.Serialization
             var matcher = (LinqMatcher)_sut.Map(model);
 
             // Assert
-            Check.That(matcher.MatchBehaviour).IsEqualTo(MatchBehaviour.AcceptOnMatch);
-            Check.That(matcher.GetPatterns()).ContainsExactly("p1", "p2");
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.GetPatterns().Should().Contain("p1", "p2");
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Pattern_As_String()
+        {
+            // Assign
+            var pattern = "{ \"AccountIds\": [ 1, 2, 3 ] }";
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Pattern = pattern
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(pattern);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_As_String()
+        {
+            // Assign
+            var pattern1 = "{ \"AccountIds\": [ 1, 2, 3 ] }";
+            var pattern2 = "{ \"X\": \"x\" }";
+            var patterns = new[] { pattern1, pattern2 };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Pattern = patterns
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(patterns);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Pattern_As_Object()
+        {
+            // Assign
+            var pattern = new { AccountIds = new[] { 1, 2, 3 } };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Pattern = pattern
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(pattern);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_As_Object()
+        {
+            // Assign
+            object pattern1 = new { AccountIds = new[] { 1, 2, 3 } };
+            object pattern2 = new { X = "x" };
+            var patterns = new[] { pattern1, pattern2 };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Patterns = patterns
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(patterns);
         }
     }
 }

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -80,6 +80,9 @@
     <None Update="__admin\mappings\00000002-ee28-4f29-ae63-1ac9b0802d87.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="__admin\mappings\351f0240-bba0-4bcb-93c6-1feba0fe8799.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Update="__admin\mappings\array.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

test/WireMock.Net.Tests/WireMockServer.Admin.cs

@@ -48,8 +48,8 @@ namespace WireMock.Net.Tests
             string folder = Path.Combine(GetCurrentFolder(), "__admin", "mappings");
             server.ReadStaticMappings(folder);
 
-            Check.That(server.Mappings).HasSize(5);
-            Check.That(server.MappingModels).HasSize(5);
+            Check.That(server.Mappings).HasSize(6);
+            Check.That(server.MappingModels).HasSize(6);
 
             // Act
             server.ResetMappings();
@@ -218,7 +218,7 @@ namespace WireMock.Net.Tests
             server.ReadStaticMappings(folder);
 
             var mappings = server.Mappings.ToArray();
-            Check.That(mappings).HasSize(5);
+            Check.That(mappings).HasSize(6);
         }
 
         [Fact]

test/WireMock.Net.Tests/__admin/mappings/351f0240-bba0-4bcb-93c6-1feba0fe8799.json

@@ -0,0 +1,75 @@
+{
+  "Guid": "351f0240-bba0-4bcb-93c6-1feba0fe8799",
+  "Title": "Playground",
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "WildcardMatcher",
+          "Pattern": "/playground",
+          "IgnoreCase": false
+        }
+      ]
+    },
+    "Methods": [
+      "POST"
+    ],
+    "Headers": [
+      {
+        "Name": "Content-Type",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "application/json; charset=utf-8",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Accept",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "application/json",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Authorization",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "Bearer 4d911614-fa48-484f-b8e6-98674fd73964",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Content-Length",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "*",
+            "IgnoreCase": true
+          }
+        ]
+      }
+    ],
+    "Body": {
+      "Matcher": {
+        "Name": "JsonMatcher",
+        "Pattern": {},
+        "IgnoreCase": false
+      }
+    }
+  },
+  "Response": {
+    "StatusCode": 201,
+    "BodyAsJson": {},
+    "Headers": {
+      "Content-Type": "application/json",
+      "Connection": "keep-alive"
+    }
+  }
+}