1.4.30

Add .ConfigureAwait(false); to the await Task calls

CHANGELOG.md

@@ -1,3 +1,30 @@
+# 1.4.30 (25 December 2021)
+- [#703](https://github.com/WireMock-Net/WireMock.Net/pull/703) - SaveUnmatchedRequests [feature] contributed by [StefH](https://github.com/StefH)
+- [#704](https://github.com/WireMock-Net/WireMock.Net/pull/704) - Add .ConfigureAwait(false); to the await Task calls [bug] contributed by [StefH](https://github.com/StefH)
+- [#534](https://github.com/WireMock-Net/WireMock.Net/issues/534) - Mock server not answer if integrated in Xamarin UITest project [bug]
+- [#567](https://github.com/WireMock-Net/WireMock.Net/issues/567) - Can't start WireMock.Net server in Xamarin.UITest project (.NET Framework 4.7.2) on MacOS [bug]
+- [#685](https://github.com/WireMock-Net/WireMock.Net/issues/685) - GuidWildcardMatcher to match on GUIDs [feature]
+
+# 1.4.29 (12 December 2021)
+- [#699](https://github.com/WireMock-Net/WireMock.Net/pull/699) - GUID Pattern support in RegexMatcher contributed by [brogdogg](https://github.com/brogdogg)
+- [#700](https://github.com/WireMock-Net/WireMock.Net/pull/700) - RegexExtended in settings [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.4.28 (01 December 2021)
+- [#686](https://github.com/WireMock-Net/WireMock.Net/pull/686) - [Snyk] Security upgrade Microsoft.Owin from 4.0.0 to 4.1.1 [dependencies] contributed by [snyk-bot](https://github.com/snyk-bot)
+- [#688](https://github.com/WireMock-Net/WireMock.Net/pull/688) - Bump System.Text.Encodings.Web from 4.5.0 to 4.5.1 in /examples/WireMock.Net.Console.Net472.Classic [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#689](https://github.com/WireMock-Net/WireMock.Net/pull/689) - Upgrade some NuGet's (Codecov, coverlet, Moq and NFluent) [dependencies] contributed by [StefH](https://github.com/StefH)
+- [#691](https://github.com/WireMock-Net/WireMock.Net/pull/691) - Update the OpenApiPathsMapper to handle Value/Wildcard [feature] contributed by [StefH](https://github.com/StefH)
+- [#694](https://github.com/WireMock-Net/WireMock.Net/pull/694) - RamlToOpenAPI updated to 0.5.0 [feature] contributed by [mcheguini](https://github.com/mcheguini)
+- [#695](https://github.com/WireMock-Net/WireMock.Net/pull/695) - Allow configure IgnoreCase in settings [feature] contributed by [leolplex](https://github.com/leolplex)
+- [#696](https://github.com/WireMock-Net/WireMock.Net/pull/696) - Filter required property in headers, query params, request body [feature] contributed by [leolplex](https://github.com/leolplex)
+- [#666](https://github.com/WireMock-Net/WireMock.Net/issues/666) - Example is not working as expected [bug]
+- [#692](https://github.com/WireMock-Net/WireMock.Net/issues/692) - Case insensitive and ignoring optional path and header parameters in OpenApiPathsMapper [feature]
+
+# 1.4.27 (17 November 2021)
+- [#678](https://github.com/WireMock-Net/WireMock.Net/pull/678) - Support RequestBody [feature] contributed by [leolplex](https://github.com/leolplex)
+- [#680](https://github.com/WireMock-Net/WireMock.Net/pull/680) - Support examples in properties [feature] contributed by [leolplex](https://github.com/leolplex)
+- [#681](https://github.com/WireMock-Net/WireMock.Net/pull/681) - Support enums in properties [feature] contributed by [leolplex](https://github.com/leolplex)
+
 # 1.4.26 (04 November 2021)
 - [#670](https://github.com/WireMock-Net/WireMock.Net/pull/670) - Improve method MapSchemaToObject to support array and object [feature] contributed by [leolplex](https://github.com/leolplex)
 - [#673](https://github.com/WireMock-Net/WireMock.Net/pull/673) - Support examples random data generation contributed by [leolplex](https://github.com/leolplex)
@@ -131,6 +158,7 @@
 - [#549](https://github.com/WireMock-Net/WireMock.Net/issues/549) - WithProxy(...) does not save the mappings to file [bug]
 
 # 1.3.8 (03 December 2020)
+- [#539](https://github.com/WireMock-Net/WireMock.Net/pull/539) - Support for partial JSON matching contributed by [gleb-osokin](https://github.com/gleb-osokin)
 - [#542](https://github.com/WireMock-Net/WireMock.Net/pull/542) - Create dotnet-wiremock tool [feature] contributed by [StefH](https://github.com/StefH)
 - [#543](https://github.com/WireMock-Net/WireMock.Net/pull/543) - Add support for .NET 5 [feature] contributed by [StefH](https://github.com/StefH)
 - [#544](https://github.com/WireMock-Net/WireMock.Net/pull/544) - Use Java 11 in Azure Pipelines (needed for SonarCloud) [feature] contributed by [StefH](https://github.com/StefH)
@@ -138,9 +166,6 @@
 - [#547](https://github.com/WireMock-Net/WireMock.Net/pull/547) - Fix Proxying with SSL and NetCoreApp3.1 [bug] contributed by [StefH](https://github.com/StefH)
 - [#524](https://github.com/WireMock-Net/WireMock.Net/issues/524) - Proxying with SSL Not Working in .NET Core 3.1 [bug]
 
-# 1.3.7 (17 November 2020)
-- [#539](https://github.com/WireMock-Net/WireMock.Net/pull/539) - Support for partial JSON matching contributed by [gleb-osokin](https://github.com/gleb-osokin)
-
 # 1.3.6 (10 November 2020)
 - [#529](https://github.com/WireMock-Net/WireMock.Net/pull/529) - Add assertions for ClientIP, Url and ProxyUrl [feature] contributed by [akamud](https://github.com/akamud)
 - [#535](https://github.com/WireMock-Net/WireMock.Net/pull/535) - WithCallback should use also use enum HttpStatusCode [bug] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.4.26</VersionPrefix>
+        <VersionPrefix>1.4.30</VersionPrefix>
         <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>

Generate-ReleaseNotes.cmd

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

PackageReleaseNotes.txt

@@ -1,7 +1,8 @@
-# 1.4.26 (04 November 2021)
-- #670 Improve method MapSchemaToObject to support array and object [feature]
-- #673 Support examples random data generation
-- #675 Support basepath from servers
-- #676 Fix random generate data in url no spaces [feature]
+# 1.4.30 (25 December 2021)
+- #703 SaveUnmatchedRequests [feature]
+- #704 Add .ConfigureAwait(false); to the await Task calls [bug]
+- #534 Mock server not answer if integrated in Xamarin UITest project [bug]
+- #567 Can't start WireMock.Net server in Xamarin.UITest project (.NET Framework 4.7.2) on MacOS [bug]
+- #685 GuidWildcardMatcher to match on GUIDs [feature]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

WireMock.Net Solution.sln.DotSettings

@@ -1,4 +1,5 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AD/@EntryIndexedValue">AD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CS/@EntryIndexedValue">CS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
@@ -11,11 +12,15 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XUA/@EntryIndexedValue">XUA</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Flurl/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=funcs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=guidb/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Raml/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=randomizer/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Scriban/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sigil/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stef/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Victoor/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhook/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhooks/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>

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

@@ -7,6 +7,7 @@ namespace WireMock.Net.ConsoleApplication
     internal class CustomFileSystemFileHandler : IFileSystemHandler
     {
         private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
+        private static readonly string UnmatchedRequestsFolder = Path.Combine("requests", "unmatched");
 
         /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
         public bool FolderExists(string path)
@@ -86,6 +87,21 @@ namespace WireMock.Net.ConsoleApplication
             return File.ReadAllText(path);
         }
 
+        /// <inheritdoc cref="IFileSystemHandler.GetUnmatchedRequestsFolder"/>
+        public string GetUnmatchedRequestsFolder()
+        {
+            return Path.Combine(@"c:\temp-wiremock", UnmatchedRequestsFolder);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.WriteUnmatchedRequest"/>
+        public void WriteUnmatchedRequest(string filename, string text)
+        {
+            var folder = GetUnmatchedRequestsFolder();
+            Directory.CreateDirectory(folder);
+
+            File.WriteAllText(Path.Combine(folder, filename), text);
+        }
+
         /// <summary>
         /// Adjusts the path to the MappingFolder.
         /// </summary>

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

@@ -556,7 +556,7 @@ namespace WireMock.Net.ConsoleApplication
                 .Given(Request.Create().WithPath("/random200or505async").UsingGet())
                 .RespondWith(Response.Create().WithCallback(async request =>
                 {
-                    await Task.Delay(1);
+                    await Task.Delay(1).ConfigureAwait(false);
 
                     int code = new Random().Next(1, 2) == 1 ? 505 : 200;
 

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

@@ -74,7 +74,7 @@
   <package id="System.Runtime.CompilerServices.Unsafe" version="5.0.0" targetFramework="net472" />
   <package id="System.Security.Cryptography.Cng" version="4.5.0" targetFramework="net472" />
   <package id="System.Security.Principal.Windows" version="4.5.0" targetFramework="net472" />
-  <package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net472" />
+  <package id="System.Text.Encodings.Web" version="4.5.1" targetFramework="net472" />
   <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="WireMock.Net" version="1.4.2" targetFramework="net472" />

examples/WireMock.Net.OpenApiParser.ConsoleApp/Program.cs

@@ -8,11 +8,11 @@ namespace WireMock.Net.OpenApiParser.ConsoleApp
         private const string Folder = "OpenApiFiles";
         static void Main(string[] args)
         {
-            var serverOpenAPIExamples = Run.RunServer(Path.Combine(Folder, "openAPIExamples.yaml"), "http://localhost:9091/");
-            var serverPetstore_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.json"), "http://localhost:9092/");
-            var serverPetstore_V2_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.yaml"), "http://localhost:9093/");
-            var serverPetstore_V300_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.0.yaml"), "http://localhost:9094/");
-            var serverPetstore_V302_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.2.json"), "http://localhost:9095/");
+            var serverOpenAPIExamples = Run.RunServer(Path.Combine(Folder, "openAPIExamples.yaml"), "https://localhost:9091/");
+            var serverPetstore_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.json"), "https://localhost:9092/");
+            var serverPetstore_V2_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.yaml"), "https://localhost:9093/");
+            var serverPetstore_V300_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.0.yaml"), "https://localhost:9094/");
+            var serverPetstore_V302_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.2.json"), "https://localhost:9095/");
 
             Console.WriteLine("Press any key to stop the servers");
             Console.ReadKey();

examples/WireMock.Net.OpenApiParser.ConsoleApp/Run.cs

@@ -13,7 +13,7 @@ namespace WireMock.Net.OpenApiParser.ConsoleApp
 {
     public static class Run
     {
-        public static WireMockServer RunServer(string path, string url)
+        public static WireMockServer RunServer(string path, string url, bool dynamicExamples = true)
         {
             var server = WireMockServer.Start(new WireMockServerSettings
             {
@@ -23,7 +23,8 @@ namespace WireMock.Net.OpenApiParser.ConsoleApp
                 ReadStaticMappings = false,
                 WatchStaticMappings = false,
                 WatchStaticMappingsInSubdirectories = false,
-                Logger = new WireMockConsoleLogger()
+                Logger = new WireMockConsoleLogger(),
+                SaveUnmatchedRequests = true
             });
             Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
 
@@ -31,7 +32,9 @@ namespace WireMock.Net.OpenApiParser.ConsoleApp
 
             var settings = new WireMockOpenApiParserSettings
             {
-                PathPatternToUse = ExampleValueType.Wildcard
+                DynamicExamples = dynamicExamples,
+                PathPatternToUse = ExampleValueType.Wildcard,
+                HeaderPatternToUse = ExampleValueType.Wildcard
             };
 
             server.WithMappingFromOpenApiFile(path, settings, out var diag);

examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

nuget.config

@@ -2,6 +2,5 @@
 <configuration>
   <packageSources>
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
-    <add key="coverlet" value="https://f.feedz.io/marcorossignoli/coverletunofficial/nuget/index.json" />
   </packageSources>
 </configuration>

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

@@ -1,4 +1,7 @@
-namespace WireMock.Admin.Settings
+using System.Text.RegularExpressions;
+using WireMock.Handlers;
+
+namespace WireMock.Admin.Settings
 {
     /// <summary>
     /// Settings
@@ -40,5 +43,15 @@
         /// Throw an exception when the Matcher fails because of invalid input. (default set to false).
         /// </summary>
         public bool? ThrowExceptionWhenMatcherFails { get; set; }
+
+        /// <summary>
+        /// Use the RegexExtended instead of the default <see cref="Regex"/>.  (default set to true).
+        /// </summary>
+        public bool? UseRegexExtended { get; set; }
+
+        /// <summary>
+        /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to false).
+        /// </summary>
+        public bool? SaveUnmatchedRequests { get; set; }
     }
 }

src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs

@@ -96,5 +96,18 @@ namespace WireMock.Handlers
         /// <param name="filename">The filename.</param>
         /// <returns>The file content as a string.</returns>
         string ReadFileAsString([NotNull] string filename);
+
+        /// <summary>
+        /// Gets the folder where the unmatched requests should be stored. For local file system, this would be `{CurrentFolder}/requests/unmatched`.
+        /// </summary>
+        /// <returns>The folder name.</returns>
+        string GetUnmatchedRequestsFolder();
+
+        /// <summary>
+        /// Write a unmatched request to the Unmatched RequestsFolder.
+        /// </summary>
+        /// <param name="filename">The filename.</param>
+        /// <param name="text">The text.</param>
+        void WriteUnmatchedRequest([NotNull] string filename, [NotNull] string text);
     }
 }

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

@@ -33,7 +33,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
 
         <!-- See also https://mstack.nl/blog/20210801-source-generators -->

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

@@ -29,7 +29,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
+		<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
 	</ItemGroup>
 

src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj

@@ -31,7 +31,7 @@
   <Target Name="CheckIfShouldKillVBCSCompiler" />
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
 
     <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />

src/WireMock.Net.OpenApiParser/Extensions/DictionaryExtensions.cs

@@ -0,0 +1,21 @@
+#if NET46 || NETSTANDARD2_0
+using System.Collections.Generic;
+
+namespace WireMock.Net.OpenApiParser.Extensions
+{
+    internal static class DictionaryExtensions
+    {
+        public static bool TryAdd<TKey, TValue>(this Dictionary<TKey, TValue> dictionary, TKey key, TValue value)
+        {
+            if (dictionary is null || dictionary.ContainsKey(key))
+            {
+                return false;
+            }
+
+            dictionary[key] = value;
+
+            return true;
+        }
+    }
+}
+#endif

src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -6,7 +6,9 @@ using Microsoft.OpenApi;
 using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Writers;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Net.OpenApiParser.Extensions;
 using WireMock.Net.OpenApiParser.Settings;
@@ -17,12 +19,14 @@ namespace WireMock.Net.OpenApiParser.Mappers
 {
     internal class OpenApiPathsMapper
     {
+        private const string HeaderContentType = "Content-Type";
+
         private readonly WireMockOpenApiParserSettings _settings;
         private readonly ExampleValueGenerator _exampleValueGenerator;
 
         public OpenApiPathsMapper(WireMockOpenApiParserSettings settings)
         {
-            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            _settings = Guard.NotNull(settings, nameof(settings));
             _exampleValueGenerator = new ExampleValueGenerator(settings);
         }
 
@@ -58,6 +62,23 @@ namespace WireMock.Net.OpenApiParser.Mappers
                                    responseSchemaExample != null ? MapOpenApiAnyToJToken(responseSchemaExample) :
                                    MapSchemaToObject(responseSchema);
 
+            var requestBodyModel = new BodyModel();
+            if (operation.RequestBody != null && operation.RequestBody.Content != null && operation.RequestBody.Required)
+            {
+                var request = operation.RequestBody.Content;
+                TryGetContent(request, out OpenApiMediaType requestContent, out string requestContentType);
+
+                var requestBodySchema = operation.RequestBody.Content.First().Value?.Schema;
+                var requestBodyExample = requestContent.Example;
+                var requestBodySchemaExample = requestContent.Schema?.Example;
+
+                var requestBodyMapped = requestBodyExample != null ? MapOpenApiAnyToJToken(requestBodyExample) :
+                                   requestBodySchemaExample != null ? MapOpenApiAnyToJToken(requestBodySchemaExample) :
+                                   MapSchemaToObject(requestBodySchema);
+
+                requestBodyModel = MapRequestBody(requestBodyMapped);
+            }
+
             if (!int.TryParse(response.Key, out var httpStatusCode))
             {
                 httpStatusCode = 200;
@@ -71,7 +92,8 @@ namespace WireMock.Net.OpenApiParser.Mappers
                     Methods = new[] { httpMethod },
                     Path = MapBasePath(servers) + MapPathWithParameters(path, pathParameters),
                     Params = MapQueryParameters(queryParameters),
-                    Headers = MapRequestHeaders(headers)
+                    Headers = MapRequestHeaders(headers),
+                    Body = requestBodyModel
                 },
                 Response = new ResponseModel
                 {
@@ -82,6 +104,24 @@ namespace WireMock.Net.OpenApiParser.Mappers
             };
         }
 
+        private BodyModel MapRequestBody(object requestBody)
+        {
+            if (requestBody == null)
+            {
+                return null;
+            }
+
+            return new BodyModel
+            {
+                Matcher = new MatcherModel
+                {
+                    Name = "JsonMatcher",
+                    Pattern = JsonConvert.SerializeObject(requestBody, Formatting.Indented),
+                    IgnoreCase = _settings.RequestBodyIgnoreCase
+                }
+            };
+        }
+
         private bool TryGetContent(IDictionary<string, OpenApiMediaType> contents, out OpenApiMediaType openApiMediaType, out string contentType)
         {
             openApiMediaType = null;
@@ -210,10 +250,11 @@ namespace WireMock.Net.OpenApiParser.Mappers
             }
             else
             {
-                bool propertyIsNullable = openApiSchema.Nullable || (openApiSchema.TryGetXNullable(out bool x) && x);
+                // bool propertyIsNullable = openApiSchema.Nullable || (openApiSchema.TryGetXNullable(out bool x) && x);
                 return new JProperty(key, _exampleValueGenerator.GetExampleValue(openApiSchema));
             }
         }
+
         private string MapPathWithParameters(string path, IEnumerable<OpenApiParameter> parameters)
         {
             if (parameters == null)
@@ -224,7 +265,8 @@ namespace WireMock.Net.OpenApiParser.Mappers
             string newPath = path;
             foreach (var parameter in parameters)
             {
-                newPath = newPath.Replace($"{{{parameter.Name}}}", GetExampleValue(parameter.Schema, _settings.PathPatternToUse));
+                var exampleMatcherModel = GetExampleMatcherModel(parameter.Schema, _settings.PathPatternToUse);
+                newPath = newPath.Replace($"{{{parameter.Name}}}", exampleMatcherModel.Pattern as string);
             }
 
             return newPath;
@@ -238,11 +280,11 @@ namespace WireMock.Net.OpenApiParser.Mappers
             }
 
             OpenApiServer server = servers.First();
-            Uri uriResult;
-            if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out uriResult))
+            if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out Uri uriResult))
             {
                 return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString();
             }
+
             return string.Empty;
         }
 
@@ -271,19 +313,12 @@ namespace WireMock.Net.OpenApiParser.Mappers
         {
             var mappedHeaders = headers.ToDictionary(
                 item => item.Key,
-                item => GetExampleValue(null, _settings.HeaderPatternToUse) as object
+                item => GetExampleMatcherModel(null, _settings.HeaderPatternToUse).Pattern
             );
 
             if (!string.IsNullOrEmpty(responseContentType))
             {
-                if (!mappedHeaders.ContainsKey("Content-Type"))
-                {
-                    mappedHeaders.Add("Content-Type", responseContentType);
-                }
-                else
-                {
-                    mappedHeaders["Content-Type"] = responseContentType;
-                }
+                mappedHeaders.TryAdd(HeaderContentType, responseContentType);
             }
 
             return mappedHeaders.Keys.Any() ? mappedHeaders : null;
@@ -292,16 +327,14 @@ namespace WireMock.Net.OpenApiParser.Mappers
         private IList<ParamModel> MapQueryParameters(IEnumerable<OpenApiParameter> queryParameters)
         {
             var list = queryParameters
+                .Where(req => req.Required)
                 .Select(qp => new ParamModel
                 {
                     Name = qp.Name,
+                    IgnoreCase = _settings.QueryParameterPatternIgnoreCase,
                     Matchers = new[]
                     {
-                        new MatcherModel
-                        {
-                            Name = "ExactMatcher",
-                            Pattern = GetDefaultValueAsStringForSchemaType(qp.Schema)
-                        }
+                        GetExampleMatcherModel(qp.Schema, _settings.QueryParameterPatternToUse)
                     }
                 })
                 .ToList();
@@ -312,16 +345,14 @@ namespace WireMock.Net.OpenApiParser.Mappers
         private IList<HeaderModel> MapRequestHeaders(IEnumerable<OpenApiParameter> headers)
         {
             var list = headers
+                .Where(req => req.Required)
                 .Select(qp => new HeaderModel
                 {
                     Name = qp.Name,
+                    IgnoreCase = _settings.HeaderPatternIgnoreCase,
                     Matchers = new[]
                     {
-                        new MatcherModel
-                        {
-                            Name = "ExactMatcher",
-                            Pattern = GetDefaultValueAsStringForSchemaType(qp.Schema)
-                        }
+                        GetExampleMatcherModel(qp.Schema, _settings.HeaderPatternToUse)
                     }
                 })
                 .ToList();
@@ -329,30 +360,26 @@ namespace WireMock.Net.OpenApiParser.Mappers
             return list.Any() ? list : null;
         }
 
-        private string GetDefaultValueAsStringForSchemaType(OpenApiSchema schema)
+        private MatcherModel GetExampleMatcherModel(OpenApiSchema schema, ExampleValueType type)
+        {
+            return type switch
+            {
+                ExampleValueType.Value => new MatcherModel { Name = "ExactMatcher", Pattern = GetExampleValueAsStringForSchemaType(schema), IgnoreCase = _settings.IgnoreCaseExampleValues },
+
+                _ => new MatcherModel { Name = "WildcardMatcher", Pattern = "*" }
+            };
+        }
+
+        private string GetExampleValueAsStringForSchemaType(OpenApiSchema schema)
         {
             var value = _exampleValueGenerator.GetExampleValue(schema);
 
-            switch (value)
+            return value switch
             {
-                case string valueAsString:
-                    return valueAsString;
+                string valueAsString => valueAsString,
 
-                default:
-                    return value.ToString();
-            }
-        }
-
-        private string GetExampleValue(OpenApiSchema schema, ExampleValueType type)
-        {
-            switch (type)
-            {
-                case ExampleValueType.Value:
-                    return GetDefaultValueAsStringForSchemaType(schema);
-
-                default:
-                    return "*";
-            }
+                _ => value.ToString(),
+            };
         }
     }
 }

src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserSettings.cs

@@ -1,4 +1,4 @@
-using WireMock.Net.OpenApiParser.Types;
+using WireMock.Net.OpenApiParser.Types;
 
 namespace WireMock.Net.OpenApiParser.Settings
 {
@@ -23,12 +23,41 @@ namespace WireMock.Net.OpenApiParser.Settings
         public ExampleValueType HeaderPatternToUse { get; set; } = ExampleValueType.Value;
 
         /// <summary>
-        /// The example values to use
+        /// The example value type to use when generating a Query Parameter
         /// </summary>
-        public IWireMockOpenApiParserExampleValues ExampleValues { get; set; } = new WireMockOpenApiParserExampleValues();
+        public ExampleValueType QueryParameterPatternToUse { get; set; } = ExampleValueType.Value;
 
         /// <summary>
-        /// Are examples generated dynamically?
+        /// The example values to use.
+        ///
+        /// Default implementations are:
+        /// - <see cref="WireMockOpenApiParserExampleValues"/>
+        /// - <see cref="WireMockOpenApiParserDynamicExampleValues"/>
+        /// </summary>
+        public IWireMockOpenApiParserExampleValues ExampleValues { get; set; }
+
+        /// <summary>
+        /// Is a Header match case insensitive? (default is true).
+        /// </summary>
+        public bool HeaderPatternIgnoreCase { get; set; } = true;
+
+        /// <summary>
+        /// Is a Query Parameter match case insensitive? (default is true).
+        /// </summary>
+        public bool QueryParameterPatternIgnoreCase { get; set; } = true;
+
+        /// <summary>
+        /// Is a Request Body match case insensitive? (default is true).
+        /// </summary>
+        public bool RequestBodyIgnoreCase { get; set; } = true;
+
+        /// <summary>
+        /// Is a ExampleValue match case insensitive? (default is true).
+        /// </summary>
+        public bool IgnoreCaseExampleValues { get; set; } = true;
+
+        /// <summary>
+        /// Are examples generated dynamically? (default is false).
         /// </summary>
         public bool DynamicExamples { get; set; } = false;
     }

src/WireMock.Net.OpenApiParser/Types/ExampleValueType.cs

@@ -1,4 +1,4 @@
-namespace WireMock.Net.OpenApiParser.Types
+namespace WireMock.Net.OpenApiParser.Types
 {
     /// <summary>
     /// The example value to use
@@ -6,7 +6,9 @@
     public enum ExampleValueType
     {
         /// <summary>
-        /// Use a generated example value based on the SchemaType (default).
+        /// 1. Use a generated example value based on the SchemaType (default).
+        /// 2. If there is no example value defined in the schema,
+        ///    then the <see cref="Settings.IWireMockOpenApiParserExampleValues"/> will be used (custom, fixed or dynamic).
         /// </summary>
         Value,
 

src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs

@@ -1,5 +1,8 @@
-using System;
+using System;
+using System.Collections.Generic;
+using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
+using Stef.Validation;
 using WireMock.Net.OpenApiParser.Extensions;
 using WireMock.Net.OpenApiParser.Settings;
 using WireMock.Net.OpenApiParser.Types;
@@ -12,56 +15,111 @@ namespace WireMock.Net.OpenApiParser.Utils
 
         public ExampleValueGenerator(WireMockOpenApiParserSettings settings)
         {
-            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
-            if (_settings.DynamicExamples)
+            _settings = Guard.NotNull(settings, nameof(settings));
+
+            // Check if user provided an own implementation
+            if (settings.ExampleValues is null)
             {
-                _settings.ExampleValues = new WireMockOpenApiParserDynamicExampleValues();
-            }
-            else
-            {
-                _settings.ExampleValues = new WireMockOpenApiParserExampleValues();
+                if (_settings.DynamicExamples)
+                {
+                    _settings.ExampleValues = new WireMockOpenApiParserDynamicExampleValues();
+                }
+                else
+                {
+                    _settings.ExampleValues = new WireMockOpenApiParserExampleValues();
+                }
             }
         }
 
         public object GetExampleValue(OpenApiSchema schema)
         {
+            var schemaExample = schema?.Example;
+            var schemaEnum = GetRandomEnumValue(schema?.Enum);
+
             switch (schema?.GetSchemaType())
             {
                 case SchemaType.Boolean:
-                    return _settings.ExampleValues.Boolean;
+                    var exampleBoolean = (OpenApiBoolean)schemaExample;
+                    return exampleBoolean is null ? _settings.ExampleValues.Boolean : exampleBoolean.Value;
 
                 case SchemaType.Integer:
-                    return _settings.ExampleValues.Integer;
+                    switch (schema?.GetSchemaFormat())
+                    {
+                        case SchemaFormat.Int64:
+                            var exampleLong = (OpenApiLong)schemaExample;
+                            var enumLong = (OpenApiLong)schemaEnum;
+                            var valueLongEnumOrExample = enumLong is null ? exampleLong?.Value : enumLong?.Value;
+                            return valueLongEnumOrExample ?? _settings.ExampleValues.Integer;
+
+                        default:
+                            var exampleInteger = (OpenApiInteger)schemaExample;
+                            var enumInteger = (OpenApiInteger)schemaEnum;
+                            var valueIntegerEnumOrExample = enumInteger is null ? exampleInteger?.Value : enumInteger?.Value;
+                            return valueIntegerEnumOrExample ?? _settings.ExampleValues.Integer;
+                    }
 
                 case SchemaType.Number:
                     switch (schema?.GetSchemaFormat())
                     {
                         case SchemaFormat.Float:
-                            return _settings.ExampleValues.Float;
+                            var exampleFloat = (OpenApiFloat)schemaExample;
+                            var enumFloat = (OpenApiFloat)schemaEnum;
+                            var valueFloatEnumOrExample = enumFloat is null ? exampleFloat?.Value : enumFloat?.Value;
+                            return valueFloatEnumOrExample ?? _settings.ExampleValues.Float;
 
                         default:
-                            return _settings.ExampleValues.Double;
+                            var exampleDouble = (OpenApiDouble)schemaExample;
+                            var enumDouble = (OpenApiDouble)schemaEnum;
+                            var valueDoubleEnumOrExample = enumDouble is null ? exampleDouble?.Value : enumDouble?.Value;
+                            return valueDoubleEnumOrExample ?? _settings.ExampleValues.Double;
                     }
 
                 default:
                     switch (schema?.GetSchemaFormat())
                     {
                         case SchemaFormat.Date:
-                            return DateTimeUtils.ToRfc3339Date(_settings.ExampleValues.Date());
+                            var exampleDate = (OpenApiDate)schemaExample;
+                            var enumDate = (OpenApiDate)schemaEnum;
+                            var valueDateEnumOrExample = enumDate is null ? exampleDate?.Value : enumDate?.Value;
+                            return DateTimeUtils.ToRfc3339Date(valueDateEnumOrExample ?? _settings.ExampleValues.Date());
 
                         case SchemaFormat.DateTime:
-                            return DateTimeUtils.ToRfc3339DateTime(_settings.ExampleValues.DateTime());
+                            var exampleDateTime = (OpenApiDateTime)schemaExample;
+                            var enumDateTime = (OpenApiDateTime)schemaEnum;
+                            var valueDateTimeEnumOrExample = enumDateTime is null ? exampleDateTime?.Value : enumDateTime?.Value;
+                            return DateTimeUtils.ToRfc3339DateTime(valueDateTimeEnumOrExample?.DateTime ?? _settings.ExampleValues.DateTime());
 
                         case SchemaFormat.Byte:
-                            return _settings.ExampleValues.Bytes;
+                            var exampleByte = (OpenApiByte)schemaExample;
+                            var enumByte = (OpenApiByte)schemaEnum;
+                            var valueByteEnumOrExample = enumByte is null ? exampleByte?.Value : enumByte?.Value;
+                            return valueByteEnumOrExample ?? _settings.ExampleValues.Bytes;
 
                         case SchemaFormat.Binary:
-                            return _settings.ExampleValues.Object;
+                            var exampleBinary = (OpenApiBinary)schemaExample;
+                            var enumBinary = (OpenApiBinary)schemaEnum;
+                            var valueBinaryEnumOrExample = enumBinary is null ? exampleBinary?.Value : enumBinary?.Value;
+                            return valueBinaryEnumOrExample ?? _settings.ExampleValues.Object;
 
                         default:
-                            return _settings.ExampleValues.String;
+                            var exampleString = (OpenApiString)schemaExample;
+                            var enumString = (OpenApiString)schemaEnum;
+                            var valueStringEnumOrExample = enumString is null ? exampleString?.Value : enumString?.Value;
+                            return valueStringEnumOrExample ?? _settings.ExampleValues.String;
                     }
             }
         }
+
+        private static IOpenApiAny GetRandomEnumValue(IList<IOpenApiAny> schemaEnum)
+        {
+            if (schemaEnum?.Count > 0)
+            {
+                int maxValue = schemaEnum.Count - 1;
+                int randomEnum = new Random().Next(0, maxValue);
+                return schemaEnum[randomEnum];
+            }
+
+            return null;
+        }
     }
 }

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

@@ -22,11 +22,11 @@
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
 		<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="RamlToOpenApiConverter" Version="0.6.0" />
+		<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
 		<PackageReference Include="RandomDataGenerator.Net" Version="1.0.13" />
-		<PackageReference Include="Stef.Validation" Version="0.0.3" />
+		<PackageReference Include="Stef.Validation" Version="0.0.4" />
 	</ItemGroup>
 
 	<ItemGroup>

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

@@ -36,7 +36,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
       <PrivateAssets>all</PrivateAssets>

src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs

@@ -46,7 +46,7 @@ namespace WireMock.Authentication
             try
             {
                 var configManager = new ConfigurationManager<OpenIdConnectConfiguration>(_stsDiscoveryEndpoint, new OpenIdConnectConfigurationRetriever());
-                var config = configManager.GetConfigurationAsync().GetAwaiter().GetResult();
+                var config = configManager.GetConfigurationAsync().ConfigureAwait(false).GetAwaiter().GetResult();
 
                 var validationParameters = new TokenValidationParameters
                 {

src/WireMock.Net/Handlers/LocalFileSystemHandler.cs

@@ -11,6 +11,7 @@ namespace WireMock.Handlers
     public class LocalFileSystemHandler : IFileSystemHandler
     {
         private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
+        private static readonly string UnmatchedRequestsFolder = Path.Combine("requests", "unmatched");
 
         private readonly string _rootFolder;
 
@@ -31,7 +32,7 @@ namespace WireMock.Handlers
         }
 
         /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
-        public bool FolderExists(string path)
+        public virtual bool FolderExists(string path)
         {
             Check.NotNullOrEmpty(path, nameof(path));
 
@@ -39,7 +40,7 @@ namespace WireMock.Handlers
         }
 
         /// <inheritdoc cref="IFileSystemHandler.CreateFolder"/>
-        public void CreateFolder(string path)
+        public virtual void CreateFolder(string path)
         {
             Check.NotNullOrEmpty(path, nameof(path));
 
@@ -47,7 +48,7 @@ namespace WireMock.Handlers
         }
 
         /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
-        public IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
+        public virtual IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
         {
             Check.NotNullOrEmpty(path, nameof(path));
 
@@ -55,13 +56,13 @@ namespace WireMock.Handlers
         }
 
         /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
-        public string GetMappingFolder()
+        public virtual string GetMappingFolder()
         {
             return Path.Combine(_rootFolder, AdminMappingsFolder);
         }
 
         /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
-        public string ReadMappingFile(string path)
+        public virtual string ReadMappingFile(string path)
         {
             Check.NotNullOrEmpty(path, nameof(path));
 
@@ -69,7 +70,7 @@ namespace WireMock.Handlers
         }
 
         /// <inheritdoc cref="IFileSystemHandler.WriteMappingFile(string, string)"/>
-        public void WriteMappingFile(string path, string text)
+        public virtual void WriteMappingFile(string path, string text)
         {
             Check.NotNullOrEmpty(path, nameof(path));
             Check.NotNull(text, nameof(text));
@@ -78,7 +79,7 @@ namespace WireMock.Handlers
         }
 
         /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
-        public byte[] ReadResponseBodyAsFile(string path)
+        public virtual byte[] ReadResponseBodyAsFile(string path)
         {
             Check.NotNullOrEmpty(path, nameof(path));
             path = PathUtils.CleanPath(path);
@@ -88,7 +89,7 @@ namespace WireMock.Handlers
         }
 
         /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsString"/>
-        public string ReadResponseBodyAsString(string path)
+        public virtual string ReadResponseBodyAsString(string path)
         {
             Check.NotNullOrEmpty(path, nameof(path));
             path = PathUtils.CleanPath(path);
@@ -98,42 +99,63 @@ namespace WireMock.Handlers
         }
 
         /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
-        public bool FileExists(string filename)
+        public virtual bool FileExists(string filename)
         {
             Check.NotNullOrEmpty(filename, nameof(filename));
 
-            return File.Exists(AdjustPath(filename));
+            return File.Exists(AdjustPathForMappingFolder(filename));
         }
 
         /// <inheritdoc cref="IFileSystemHandler.WriteFile(string, byte[])"/>
-        public void WriteFile(string filename, byte[] bytes)
+        public virtual void WriteFile(string filename, byte[] bytes)
         {
             Check.NotNullOrEmpty(filename, nameof(filename));
             Check.NotNull(bytes, nameof(bytes));
 
-            File.WriteAllBytes(AdjustPath(filename), bytes);
+            File.WriteAllBytes(AdjustPathForMappingFolder(filename), bytes);
         }
 
         /// <inheritdoc cref="IFileSystemHandler.DeleteFile"/>
-        public void DeleteFile(string filename)
+        public virtual void DeleteFile(string filename)
         {
             Check.NotNullOrEmpty(filename, nameof(filename));
 
-            File.Delete(AdjustPath(filename));
+            File.Delete(AdjustPathForMappingFolder(filename));
         }
 
         /// <inheritdoc cref="IFileSystemHandler.ReadFile"/>
-        public byte[] ReadFile(string filename)
+        public virtual byte[] ReadFile(string filename)
         {
             Check.NotNullOrEmpty(filename, nameof(filename));
 
-            return File.ReadAllBytes(AdjustPath(filename));
+            return File.ReadAllBytes(AdjustPathForMappingFolder(filename));
         }
 
         /// <inheritdoc cref="IFileSystemHandler.ReadFileAsString"/>
-        public string ReadFileAsString(string filename)
+        public virtual string ReadFileAsString(string filename)
         {
-            return File.ReadAllText(AdjustPath(Check.NotNullOrEmpty(filename, nameof(filename))));
+            return File.ReadAllText(AdjustPathForMappingFolder(Check.NotNullOrEmpty(filename, nameof(filename))));
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.GetUnmatchedRequestsFolder"/>
+        public virtual string GetUnmatchedRequestsFolder()
+        {
+            return Path.Combine(_rootFolder, UnmatchedRequestsFolder);
+        }
+
+        /// <inheritdoc cref="IFileSystemHandler.WriteUnmatchedRequest"/>
+        public virtual void WriteUnmatchedRequest(string filename, string text)
+        {
+            Check.NotNullOrEmpty(filename, nameof(filename));
+            Check.NotNull(text, nameof(text));
+
+            var folder = GetUnmatchedRequestsFolder();
+            if (!FolderExists(folder))
+            {
+                CreateFolder(folder);
+            }
+
+            File.WriteAllText(Path.Combine(folder, filename), text);
         }
 
         /// <summary>
@@ -141,7 +163,7 @@ namespace WireMock.Handlers
         /// </summary>
         /// <param name="filename">The path.</param>
         /// <returns>Adjusted path</returns>
-        private string AdjustPath(string filename)
+        private string AdjustPathForMappingFolder(string filename)
         {
             return Path.Combine(GetMappingFolder(), filename);
         }

src/WireMock.Net/Http/HttpResponseMessageHelper.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
@@ -17,7 +17,7 @@ namespace WireMock.Http
             var headers = (httpResponseMessage.Content?.Headers.Union(httpResponseMessage.Headers) ?? Enumerable.Empty<KeyValuePair<string, IEnumerable<string>>>()).ToArray();
             if (httpResponseMessage.Content != null)
             {
-                var stream = await httpResponseMessage.Content.ReadAsStreamAsync();
+                var stream = await httpResponseMessage.Content.ReadAsStreamAsync().ConfigureAwait(false);
                 IEnumerable<string> contentTypeHeader = null;
                 if (headers.Any(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)))
                 {
@@ -38,7 +38,7 @@ namespace WireMock.Http
                     ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
                     DecompressGZipAndDeflate = decompressGzipAndDeflate
                 };
-                responseMessage.BodyData = await BodyParser.Parse(bodyParserSettings);
+                responseMessage.BodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
             }
 
             foreach (var header in headers)

src/WireMock.Net/Mapping.cs

@@ -108,9 +108,9 @@ namespace WireMock
         }
 
         /// <inheritdoc cref="IMapping.ProvideResponseAsync" />
-        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage)
+        public Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage)
         {
-            return await Provider.ProvideResponseAsync(requestMessage, Settings);
+            return Provider.ProvideResponseAsync(requestMessage, Settings);
         }
 
         /// <inheritdoc cref="IMapping.GetRequestMatchResult" />

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -63,8 +63,8 @@ namespace WireMock.Matchers
             {
                 try
                 {
-                    var jtoken = JToken.Parse(input);
-                    match = IsMatch(jtoken);
+                    var jToken = JToken.Parse(input);
+                    match = IsMatch(jToken);
                 }
                 catch (JsonException)
                 {
@@ -89,8 +89,8 @@ namespace WireMock.Matchers
                 try
                 {
                     // Check if JToken or object
-                    JToken jtoken = input is JToken token ? token : JObject.FromObject(input);
-                    match = IsMatch(jtoken);
+                    JToken jToken = input is JToken token ? token : JObject.FromObject(input);
+                    match = IsMatch(jToken);
                 }
                 catch (JsonException)
                 {
@@ -113,9 +113,9 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IMatcher.Name"/>
         public string Name => "JsonPathMatcher";
 
-        private double IsMatch(JToken jtoken)
+        private double IsMatch(JToken jToken)
         {
-            return MatchScores.ToScore(_patterns.Select(pattern => jtoken.SelectToken(pattern.GetPattern()) != null));
+            return MatchScores.ToScore(_patterns.Select(pattern => jToken.SelectToken(pattern.GetPattern()) != null));
         }
     }
 }

src/WireMock.Net/Matchers/RegexMatcher.cs

@@ -5,6 +5,7 @@ using AnyOfTypes;
 using JetBrains.Annotations;
 using WireMock.Extensions;
 using WireMock.Models;
+using WireMock.RegularExpressions;
 using WireMock.Validation;
 
 namespace WireMock.Matchers
@@ -30,7 +31,10 @@ namespace WireMock.Matchers
         /// </summary>
         /// <param name="pattern">The pattern.</param>
         /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        public RegexMatcher([NotNull, RegexPattern] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        /// <param name="useRegexExtended">Use RegexExtended (default = true).</param>
+        public RegexMatcher([NotNull, RegexPattern] AnyOf<string, StringPattern> pattern, bool ignoreCase = false, bool throwException = false, bool useRegexExtended = true) :
+            this(MatchBehaviour.AcceptOnMatch, new[] { pattern }, ignoreCase, throwException, useRegexExtended)
         {
         }
 
@@ -40,16 +44,10 @@ namespace WireMock.Matchers
         /// <param name="matchBehaviour">The match behaviour.</param>
         /// <param name="pattern">The pattern.</param>
         /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RegexMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        public RegexMatcher([NotNull, RegexPattern] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
+        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
+        /// <param name="useRegexExtended">Use RegexExtended (default = true).</param>
+        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] AnyOf<string, StringPattern> pattern, bool ignoreCase = false, bool throwException = false, bool useRegexExtended = true) :
+            this(matchBehaviour, new[] { pattern }, ignoreCase, throwException, useRegexExtended)
         {
         }
 
@@ -60,7 +58,8 @@ namespace WireMock.Matchers
         /// <param name="patterns">The patterns.</param>
         /// <param name="ignoreCase">Ignore the case from the pattern.</param>
         /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false, bool throwException = false)
+        /// <param name="useRegexExtended">Use RegexExtended (default = true).</param>
+        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false, bool throwException = false, bool useRegexExtended = true)
         {
             Check.NotNull(patterns, nameof(patterns));
 
@@ -76,7 +75,7 @@ namespace WireMock.Matchers
                 options |= RegexOptions.IgnoreCase;
             }
 
-            _expressions = patterns.Select(p => new Regex(p.GetPattern(), options)).ToArray();
+            _expressions = patterns.Select(p => useRegexExtended ? new RegexExtended(p.GetPattern(), options) : new Regex(p.GetPattern(), options)).ToArray();
         }
 
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>

src/WireMock.Net/Matchers/SimMetricsMatcher.cs

@@ -83,9 +83,9 @@ namespace WireMock.Matchers
         /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
-            IStringMetric stringmetricType = GetStringMetricType();
+            IStringMetric stringMetricType = GetStringMetricType();
 
-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_patterns.Select(p => stringmetricType.GetSimilarity(p.GetPattern(), input))));
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_patterns.Select(p => stringMetricType.GetSimilarity(p.GetPattern(), input))));
         }
 
         private IStringMetric GetStringMetricType()

src/WireMock.Net/Owin/GlobalExceptionMiddleware.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 #if !USE_ASPNETCORE
@@ -52,19 +52,22 @@ namespace WireMock.Owin
         public Task Invoke(IContext ctx)
 #endif
         {
-            return InvokeInternal(ctx);
+            return InvokeInternalAsync(ctx);
         }
 
-        private async Task InvokeInternal(IContext ctx)
+        private async Task InvokeInternalAsync(IContext ctx)
         {
             try
             {
-                await Next?.Invoke(ctx);
+                if (Next != null)
+                {
+                    await Next.Invoke(ctx).ConfigureAwait(false);
+                }
             }
             catch (Exception ex)
             {
                 _options.Logger.Error("HttpStatusCode set to 500 {0}", ex);
-                await _responseMapper.MapAsync(ResponseMessageBuilder.Create(JsonConvert.SerializeObject(ex), 500), ctx.Response);
+                await _responseMapper.MapAsync(ResponseMessageBuilder.Create(JsonConvert.SerializeObject(ex), 500), ctx.Response).ConfigureAwait(false);
             }
         }
     }

src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs

@@ -64,5 +64,7 @@ namespace WireMock.Owin
         string X509CertificatePassword { get; set; }
 
         bool CustomCertificateDefined { get; }
+
+        bool? SaveUnmatchedRequests { get; set; }
     }
 }

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
@@ -23,7 +23,7 @@ namespace WireMock.Owin.Mappers
         /// <inheritdoc cref="IOwinRequestMapper.MapAsync"/>
         public async Task<RequestMessage> MapAsync(IRequest request, IWireMockMiddlewareOptions options)
         {
-            (UrlDetails urldetails, string clientIP) = ParseRequest(request);
+            var (urlDetails, clientIP) = ParseRequest(request);
 
             string method = request.Method;
 
@@ -65,25 +65,25 @@ namespace WireMock.Owin.Mappers
                     DecompressGZipAndDeflate = !options.DisableRequestBodyDecompressing.GetValueOrDefault(false)
                 };
 
-                body = await BodyParser.Parse(bodyParserSettings);
+                body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
             }
 
-            return new RequestMessage(urldetails, method, clientIP, body, headers, cookies) { DateTime = DateTime.UtcNow };
+            return new RequestMessage(urlDetails, method, clientIP, body, headers, cookies) { DateTime = DateTime.UtcNow };
         }
 
-        private (UrlDetails UrlDetails, string ClientIP) ParseRequest(IRequest request)
+        private static (UrlDetails UrlDetails, string ClientIP) ParseRequest(IRequest request)
         {
 #if !USE_ASPNETCORE
-            var urldetails = UrlUtils.Parse(request.Uri, request.PathBase);
+            var urlDetails = UrlUtils.Parse(request.Uri, request.PathBase);
             string clientIP = request.RemoteIpAddress;
 #else
-            var urldetails = UrlUtils.Parse(new Uri(request.GetEncodedUrl()), request.PathBase);
+            var urlDetails = UrlUtils.Parse(new Uri(request.GetEncodedUrl()), request.PathBase);
             var connection = request.HttpContext.Connection;
             string clientIP = connection.RemoteIpAddress.IsIPv4MappedToIPv6
                 ? connection.RemoteIpAddress.MapToIPv4().ToString()
                 : connection.RemoteIpAddress.ToString();
 #endif
-            return (urldetails, clientIP);
+            return (urlDetails, clientIP);
         }
     }
 }

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -103,7 +103,7 @@ namespace WireMock.Owin.Mappers
 
             if (bytes != null)
             {
-                await response.Body.WriteAsync(bytes, 0, bytes.Length);
+                await response.Body.WriteAsync(bytes, 0, bytes.Length).ConfigureAwait(false);
             }
         }
 

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -35,28 +35,18 @@ namespace WireMock.Owin
 #if !USE_ASPNETCORE
         public WireMockMiddleware(Next next, IWireMockMiddlewareOptions options, IOwinRequestMapper requestMapper, IOwinResponseMapper responseMapper, IMappingMatcher mappingMatcher) : base(next)
         {
-            Check.NotNull(options, nameof(options));
-            Check.NotNull(requestMapper, nameof(requestMapper));
-            Check.NotNull(responseMapper, nameof(responseMapper));
-            Check.NotNull(mappingMatcher, nameof(mappingMatcher));
-
-            _options = options;
-            _requestMapper = requestMapper;
-            _responseMapper = responseMapper;
-            _mappingMatcher = mappingMatcher;
+            _options = Check.NotNull(options, nameof(options));
+            _requestMapper = Check.NotNull(requestMapper, nameof(requestMapper));
+            _responseMapper = Check.NotNull(responseMapper, nameof(responseMapper));
+            _mappingMatcher = Check.NotNull(mappingMatcher, nameof(mappingMatcher));
         }
 #else
         public WireMockMiddleware(Next next, IWireMockMiddlewareOptions options, IOwinRequestMapper requestMapper, IOwinResponseMapper responseMapper, IMappingMatcher mappingMatcher)
         {
-            Check.NotNull(options, nameof(options));
-            Check.NotNull(requestMapper, nameof(requestMapper));
-            Check.NotNull(responseMapper, nameof(responseMapper));
-            Check.NotNull(mappingMatcher, nameof(mappingMatcher));
-
-            _options = options;
-            _requestMapper = requestMapper;
-            _responseMapper = responseMapper;
-            _mappingMatcher = mappingMatcher;
+            _options = Check.NotNull(options, nameof(options));
+            _requestMapper = Check.NotNull(requestMapper, nameof(requestMapper));
+            _responseMapper = Check.NotNull(responseMapper, nameof(responseMapper));
+            _mappingMatcher = Check.NotNull(mappingMatcher, nameof(mappingMatcher));
         }
 #endif
 
@@ -70,20 +60,18 @@ namespace WireMock.Owin
             {
                 lock (_lock)
                 {
-                    return InvokeInternal(ctx);
+                    return InvokeInternalAsync(ctx);
                 }
             }
-            else
-            {
-                return InvokeInternal(ctx);
-            }
+
+            return InvokeInternalAsync(ctx);
         }
 
-        private async Task InvokeInternal(IContext ctx)
+        private async Task InvokeInternalAsync(IContext ctx)
         {
-            var request = await _requestMapper.MapAsync(ctx.Request, _options);
+            var request = await _requestMapper.MapAsync(ctx.Request, _options).ConfigureAwait(false);
 
-            bool logRequest = false;
+            var logRequest = false;
             ResponseMessage response = null;
             (MappingMatcherResult Match, MappingMatcherResult Partial) result = (null, null);
             try
@@ -126,22 +114,22 @@ namespace WireMock.Owin
 
                 if (!targetMapping.IsAdminInterface && _options.RequestProcessingDelay > TimeSpan.Zero)
                 {
-                    await Task.Delay(_options.RequestProcessingDelay.Value);
+                    await Task.Delay(_options.RequestProcessingDelay.Value).ConfigureAwait(false);
                 }
 
-                var (theResponse, theOptionalNewMapping) = await targetMapping.ProvideResponseAsync(request);
+                var (theResponse, theOptionalNewMapping) = await targetMapping.ProvideResponseAsync(request).ConfigureAwait(false);
                 response = theResponse;
 
                 var responseBuilder = targetMapping.Provider as Response;
 
                 if (!targetMapping.IsAdminInterface && theOptionalNewMapping != null)
                 {
-                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMapping == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMapping == true)
+                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMapping == true || targetMapping.Settings?.ProxyAndRecordSettings?.SaveMapping == true)
                     {
                         _options.Mappings.TryAdd(theOptionalNewMapping.Guid, theOptionalNewMapping);
                     }
 
-                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMappingToFile == true || targetMapping?.Settings?.ProxyAndRecordSettings?.SaveMappingToFile == true)
+                    if (responseBuilder?.ProxyAndRecordSettings?.SaveMappingToFile == true || targetMapping.Settings?.ProxyAndRecordSettings?.SaveMappingToFile == true)
                     {
                         var matcherMapper = new MatcherMapper(targetMapping.Settings);
                         var mappingConverter = new MappingConverter(matcherMapper);
@@ -185,10 +173,23 @@ namespace WireMock.Owin
 
                 LogRequest(log, logRequest);
 
-                await _responseMapper.MapAsync(response, ctx.Response);
+                try
+                {
+                    if (_options.SaveUnmatchedRequests == true && result.Match?.RequestMatchResult.IsPerfectMatch != true)
+                    {
+                        var filename = $"{log.Guid}.LogEntry.json";
+                        _options.FileSystemHandler?.WriteUnmatchedRequest(filename, Util.JsonUtils.Serialize(log));
+                    }
+                }
+                catch
+                {
+                    // Empty catch
+                }
+
+                await _responseMapper.MapAsync(response, ctx.Response).ConfigureAwait(false);
             }
 
-            await CompletedTask;
+            await CompletedTask.ConfigureAwait(false);
         }
 
         private async Task SendToWebhooksAsync(IMapping mapping, RequestMessage request, ResponseMessage response)

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using WireMock.Handlers;
 using WireMock.Logging;
@@ -78,5 +78,8 @@ namespace WireMock.Owin
         public bool CustomCertificateDefined =>
             !string.IsNullOrEmpty(X509StoreName) && !string.IsNullOrEmpty(X509StoreLocation) ||
             !string.IsNullOrEmpty(X509CertificateFilePath) && !string.IsNullOrEmpty(X509CertificatePassword);
+
+        /// <inheritdoc cref="IWireMockMiddlewareOptions.SaveUnmatchedRequests"/>
+        public bool? SaveUnmatchedRequests { get; set; }
     }
 }

src/WireMock.Net/Proxy/ProxyHelper.cs

@@ -41,13 +41,13 @@ namespace WireMock.Proxy
             var httpRequestMessage = HttpRequestMessageHelper.Create(requestMessage, url);
 
             // Call the URL
-            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);
+            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead).ConfigureAwait(false);
 
             // Create ResponseMessage
             bool deserializeJson = !_settings.DisableJsonBodyParsing.GetValueOrDefault(false);
             bool decompressGzipAndDeflate = !_settings.DisableRequestBodyDecompressing.GetValueOrDefault(false);
 
-            var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate);
+            var responseMessage = await HttpResponseMessageHelper.CreateAsync(httpResponseMessage, requiredUri, originalUri, deserializeJson, decompressGzipAndDeflate).ConfigureAwait(false);
 
             IMapping mapping = null;
             if (HttpStatusRangeParser.IsMatch(proxyAndRecordSettings.SaveMappingForStatusCodePattern, responseMessage.StatusCode) &&

src/WireMock.Net/RegularExpressions/RegexExtended.cs

@@ -0,0 +1,90 @@
+using System;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+using WireMock.Validation;
+
+namespace WireMock.RegularExpressions
+{
+    /// <summary>
+    /// Extension to the <see cref="Regex"/> object, adding support for GUID tokens for matching on.
+    /// </summary>
+#if !NETSTANDARD1_3
+    [Serializable]
+#endif
+    internal class RegexExtended : Regex
+    {
+        /// <inheritdoc cref="Regex"/>
+        public RegexExtended(string pattern) : this(pattern, RegexOptions.None)
+        {
+        }
+
+        /// <inheritdoc cref="Regex"/>
+        public RegexExtended(string pattern, RegexOptions options) :
+            this(pattern, options, Regex.InfiniteMatchTimeout)
+        {
+        }
+
+        /// <inheritdoc cref="Regex"/>
+        public RegexExtended(string pattern, RegexOptions options, TimeSpan matchTimeout) :
+            base(ReplaceGuidPattern(pattern), options, matchTimeout)
+        {
+        }
+
+#if !NETSTANDARD1_3
+        /// <inheritdoc cref="Regex"/>
+        protected RegexExtended(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) :
+            base(info, context)
+        {
+        }
+#endif
+        // Dictionary of various Guid tokens with a corresponding regular expression pattern to use instead.
+        private static readonly Dictionary<string, string> GuidTokenPatterns = new Dictionary<string, string>
+        {
+            // Lower case format `B` Guid pattern
+            { @"\guidb", @"(\{[a-z0-9]{8}-([a-z0-9]{4}-){3}[a-z0-9]{12}\})" },
+
+            // Upper case format `B` Guid pattern
+            { @"\GUIDB", @"(\{[A-Z0-9]{8}-([A-Z0-9]{4}-){3}[A-Z0-9]{12}\})" },
+
+            // Lower case format `D` Guid pattern
+            { @"\guidd", "([a-z0-9]{8}-([a-z0-9]{4}-){3}[a-z0-9]{12})" },
+
+            // Upper case format `D` Guid pattern
+            { @"\GUIDD", "([A-Z0-9]{8}-([A-Z0-9]{4}-){3}[A-Z0-9]{12})" },
+
+            // Lower case format `N` Guid pattern
+            { @"\guidn", "([a-z0-9]{32})" },
+
+            // Upper case format `N` Guid pattern
+            { @"\GUIDN", "([A-Z0-9]{32})" },
+
+            // Lower case format `P` Guid pattern
+            { @"\guidp", @"(\([a-z0-9]{8}-([a-z0-9]{4}-){3}[a-z0-9]{12}\))" },
+
+            // Upper case format `P` Guid pattern
+            { @"\GUIDP", @"(\([A-Z0-9]{8}-([A-Z0-9]{4}-){3}[A-Z0-9]{12}\))" },
+
+            // Lower case format `X` Guid pattern
+            { @"\guidx", @"(\{0x[a-f0-9]{8},0x[a-f0-9]{4},0x[a-f0-9]{4},\{(0x[a-f0-9]{2},){7}(0x[a-f0-9]{2})\}\})" },
+
+            // Upper case format `X` Guid pattern
+            { @"\GUIDX", @"(\{0x[A-F0-9]{8},0x[A-F0-9]{4},0x[A-F0-9]{4},\{(0x[A-F0-9]{2},){7}(0x[A-F0-9]{2})\}\})" },
+        };
+
+        /// <summary>
+        /// Replaces all instances of valid GUID tokens with the correct regular expression to match.
+        /// </summary>
+        /// <param name="pattern">Pattern to replace token for.</param>
+        private static string ReplaceGuidPattern(string pattern)
+        {
+            Check.NotNull(pattern, nameof(pattern));
+
+            foreach (var tokenPattern in GuidTokenPatterns)
+            {
+                pattern = pattern.Replace(tokenPattern.Key, tokenPattern.Value);
+            }
+
+            return pattern;
+        }
+    }
+}

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -54,10 +54,7 @@ namespace WireMock.ResponseBuilders
                 return _delay;
             }
 
-            private set
-            {
-                _delay = value;
-            }
+            private set => _delay = value;
         }
 
         /// <summary>
@@ -219,7 +216,7 @@ namespace WireMock.ResponseBuilders
                 BodyData = new BodyData
                 {
                     DetectedBodyType = BodyType.String,
-                    BodyAsString = await bodyFactory(req),
+                    BodyAsString = await bodyFactory(req).ConfigureAwait(false),
                     Encoding = encoding ?? Encoding.UTF8
                 }
             });
@@ -385,7 +382,7 @@ namespace WireMock.ResponseBuilders
 
             if (Delay != null)
             {
-                await Task.Delay(Delay.Value);
+                await Task.Delay(Delay.Value).ConfigureAwait(false);
             }
 
             if (ProxyAndRecordSettings != null && _httpClientForProxy != null)
@@ -409,7 +406,7 @@ namespace WireMock.ResponseBuilders
                     _httpClientForProxy,
                     requestMessage,
                     requestMessage.ProxyUrl
-                );
+                ).ConfigureAwait(false);
             }
 
             ResponseMessage responseMessage;
@@ -425,7 +422,7 @@ namespace WireMock.ResponseBuilders
                 }
                 else
                 {
-                    responseMessage = await CallbackAsync(requestMessage);
+                    responseMessage = await CallbackAsync(requestMessage).ConfigureAwait(false);
                 }
 
                 // Copy StatusCode from ResponseMessage (if defined)

src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using WireMock.Settings;
 
@@ -15,7 +15,7 @@ namespace WireMock.ResponseProviders
 
         public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
         {
-            return (await _responseMessageFunc(requestMessage), null);
+            return (await _responseMessageFunc(requestMessage).ConfigureAwait(false), null);
         }
     }
 }

src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using WireMock.Settings;
 
@@ -17,7 +17,7 @@ namespace WireMock.ResponseProviders
 
         public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
         {
-            return (await _responseMessageFunc(requestMessage, _settings), null);
+            return (await _responseMessageFunc(requestMessage, _settings).ConfigureAwait(false), null);
         }
     }
 }

src/WireMock.Net/Serialization/JsonSerializationConstants.cs

@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 
 namespace WireMock.Serialization
 {
@@ -15,5 +15,10 @@ namespace WireMock.Serialization
             Formatting = Formatting.Indented,
             NullValueHandling = NullValueHandling.Include
         };
+
+        public static readonly JsonSerializerSettings JsonDeserializerSettingsWithDateParsingNone = new JsonSerializerSettings
+        {
+            DateParseHandling = DateParseHandling.None
+        };
     }
 }

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using WireMock.Admin.Mappings;
 using WireMock.Matchers.Request;
-using WireMock.Models;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Settings;

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -41,6 +41,7 @@ namespace WireMock.Serialization
             var matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
             bool ignoreCase = matcher.IgnoreCase == true;
             bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
+            bool useRegexExtended = _settings.UseRegexExtended == true;
 
             switch (matcherName)
             {
@@ -65,7 +66,7 @@ namespace WireMock.Serialization
                     return CreateExactObjectMatcher(matchBehaviour, stringPatterns[0], throwExceptionWhenMatcherFails);
 
                 case nameof(RegexMatcher):
-                    return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
+                    return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails, useRegexExtended);
 
                 case nameof(JsonMatcher):
                     object valueForJsonMatcher = matcher.Pattern ?? matcher.Patterns;
@@ -76,8 +77,8 @@ namespace WireMock.Serialization
                     return new JsonPartialMatcher(matchBehaviour, valueForJsonPartialMatcher, ignoreCase, throwExceptionWhenMatcherFails);
 
                 case nameof(JsonPartialWildcardMatcher):
-                    object valueForJsonPartialWilcardMatcher = matcher.Pattern ?? matcher.Patterns;
-                    return new JsonPartialWildcardMatcher(matchBehaviour, valueForJsonPartialWilcardMatcher, ignoreCase, throwExceptionWhenMatcherFails);
+                    object valueForJsonPartialWildcardMatcher = matcher.Pattern ?? matcher.Patterns;
+                    return new JsonPartialWildcardMatcher(matchBehaviour, valueForJsonPartialWildcardMatcher, ignoreCase, throwExceptionWhenMatcherFails);
 
                 case nameof(JsonPathMatcher):
                     return new JsonPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);

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

@@ -261,7 +261,7 @@ namespace WireMock.Server
                 _httpClientForProxy,
                 requestMessage,
                 proxyUriWithRequestPathAndQuery.AbsoluteUri
-            );
+            ).ConfigureAwait(false);
 
             if (mapping != null)
             {
@@ -291,7 +291,9 @@ namespace WireMock.Server
                 GlobalProcessingDelay = (int?)_options.RequestProcessingDelay?.TotalMilliseconds,
                 AllowBodyForAllHttpMethods = _settings.AllowBodyForAllHttpMethods,
                 HandleRequestsSynchronously = _settings.HandleRequestsSynchronously,
-                ThrowExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails
+                ThrowExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails,
+                UseRegexExtended = _settings.UseRegexExtended,
+                SaveUnmatchedRequests = _settings.SaveUnmatchedRequests
             };
 
             return ToJson(model);
@@ -302,31 +304,16 @@ namespace WireMock.Server
             var settings = DeserializeObject<SettingsModel>(requestMessage);
             _options.MaxRequestLogCount = settings.MaxRequestLogCount;
             _options.RequestLogExpirationDuration = settings.RequestLogExpirationDuration;
-
-            if (settings.AllowPartialMapping != null)
-            {
-                _options.AllowPartialMapping = settings.AllowPartialMapping.Value;
-            }
-
+            _options.AllowPartialMapping = settings.AllowPartialMapping;
             if (settings.GlobalProcessingDelay != null)
             {
                 _options.RequestProcessingDelay = TimeSpan.FromMilliseconds(settings.GlobalProcessingDelay.Value);
             }
-
-            if (settings.AllowBodyForAllHttpMethods != null)
-            {
-                _options.AllowBodyForAllHttpMethods = settings.AllowBodyForAllHttpMethods.Value;
-            }
-
-            if (settings.HandleRequestsSynchronously != null)
-            {
-                _options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously.Value;
-            }
-
-            if (settings.ThrowExceptionWhenMatcherFails != null)
-            {
-                _settings.ThrowExceptionWhenMatcherFails = settings.ThrowExceptionWhenMatcherFails.Value;
-            }
+            _options.AllowBodyForAllHttpMethods = settings.AllowBodyForAllHttpMethods;
+            _options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
+            _settings.ThrowExceptionWhenMatcherFails = settings.ThrowExceptionWhenMatcherFails;
+            _settings.UseRegexExtended = settings.UseRegexExtended;
+            _settings.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;
 
             return ResponseMessageBuilder.Create("Settings updated");
         }
@@ -686,13 +673,13 @@ namespace WireMock.Server
                 }
             }
 
-            bool pathOrUrlmatchersValid = false;
+            bool pathOrUrlMatchersValid = false;
             if (requestModel.Path != null)
             {
                 if (requestModel.Path is string path)
                 {
                     requestBuilder = requestBuilder.WithPath(path);
-                    pathOrUrlmatchersValid = true;
+                    pathOrUrlMatchersValid = true;
                 }
                 else
                 {
@@ -700,7 +687,7 @@ namespace WireMock.Server
                     if (pathModel?.Matchers != null)
                     {
                         requestBuilder = requestBuilder.WithPath(pathModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-                        pathOrUrlmatchersValid = true;
+                        pathOrUrlMatchersValid = true;
                     }
                 }
             }
@@ -709,7 +696,7 @@ namespace WireMock.Server
                 if (requestModel.Url is string url)
                 {
                     requestBuilder = requestBuilder.WithUrl(url);
-                    pathOrUrlmatchersValid = true;
+                    pathOrUrlMatchersValid = true;
                 }
                 else
                 {
@@ -717,12 +704,12 @@ namespace WireMock.Server
                     if (urlModel?.Matchers != null)
                     {
                         requestBuilder = requestBuilder.WithUrl(urlModel.Matchers.Select(_matcherMapper.Map).OfType<IStringMatcher>().ToArray());
-                        pathOrUrlmatchersValid = true;
+                        pathOrUrlMatchersValid = true;
                     }
                 }
             }
 
-            if (pathOrUrlRequired && !pathOrUrlmatchersValid)
+            if (pathOrUrlRequired && !pathOrUrlMatchersValid)
             {
                 _settings.Logger.Error("Path or Url matcher is missing for this mapping, this mapping will not be added.");
                 return null;

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

@@ -1,4 +1,4 @@
-using System.IO;
+using System.IO;
 using System.Linq;
 using System.Text;
 using WireMock.Matchers;
@@ -9,7 +9,7 @@ namespace WireMock.Server
 {
     public partial class WireMockServer
     {
-        private readonly RegexMatcher _adminFilesFilenamePathMatcher = new RegexMatcher(MatchBehaviour.AcceptOnMatch, @"^\/__admin\/files\/.*$");
+        private readonly RegexMatcher _adminFilesFilenamePathMatcher = new RegexMatcher(@"^\/__admin\/files\/.*$");
         private static readonly Encoding[] FileBodyIsString = { Encoding.UTF8, Encoding.ASCII };
 
         #region Files/{filename}

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

@@ -114,7 +114,7 @@ namespace WireMock.Server
                 {
                     ProcessWireMockOrgJObjectAndUseStringMatcher(headers, (key, match) =>
                     {
-                        requestBuilder = requestBuilder.WithHeader(key, match as IStringMatcher);
+                        requestBuilder = requestBuilder.WithHeader(key, match);
                     });
                 }
 
@@ -122,7 +122,7 @@ namespace WireMock.Server
                 {
                     ProcessWireMockOrgJObjectAndUseStringMatcher(cookies, (key, match) =>
                     {
-                        requestBuilder = requestBuilder.WithCookie(key, match as IStringMatcher);
+                        requestBuilder = requestBuilder.WithCookie(key, match);
                     });
                 }
 

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -77,7 +77,7 @@ namespace WireMock.Server
         [PublicAPI]
         public bool DeleteLogEntry(Guid guid)
         {
-            // Check a logentry exists with the same GUID, if so, remove it.
+            // Check a LogEntry exists with the same GUID, if so, remove it.
             var existing = _options.LogEntries.ToList().FirstOrDefault(m => m.Guid == guid);
             if (existing != null)
             {

src/WireMock.Net/Server/WireMockServer.cs

@@ -226,6 +226,7 @@ namespace WireMock.Server
             _options.Logger = _settings.Logger;
             _options.DisableJsonBodyParsing = _settings.DisableJsonBodyParsing;
             _options.HandleRequestsSynchronously = settings.HandleRequestsSynchronously;
+            _options.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;
 
             if (settings.CustomCertificateDefined)
             {

src/WireMock.Net/Settings/IWireMockServerSettings.cs

@@ -1,9 +1,11 @@
 using System;
+using System.Text.RegularExpressions;
 using HandlebarsDotNet;
 using JetBrains.Annotations;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.RegularExpressions;
 #if USE_ASPNETCORE
 using Microsoft.Extensions.DependencyInjection;
 #endif
@@ -211,9 +213,21 @@ namespace WireMock.Settings
         bool CustomCertificateDefined { get; }
 
         /// <summary>
-        /// Defines the global IWebhookSettingsto use
+        /// Defines the global IWebhookSettings to use.
         /// </summary>
         [PublicAPI]
         IWebhookSettings WebhookSettings { get; set; }
+
+        /// <summary>
+        /// Use the <see cref="RegexExtended"/> instead of the default <see cref="Regex"/> (default set to true).
+        /// </summary>
+        [PublicAPI]
+        bool? UseRegexExtended { get; set; }
+
+        /// <summary>
+        /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/> (default set to false).
+        /// </summary>
+        [PublicAPI]
+        bool? SaveUnmatchedRequests { get; set; }
     }
 }

src/WireMock.Net/Settings/WireMockServerSettings.cs

@@ -20,7 +20,6 @@ namespace WireMock.Settings
         public int? Port { get; set; }
 
         /// <inheritdoc cref="IWireMockServerSettings.UseSSL"/>
-        // ReSharper disable once InconsistentNaming
         [PublicAPI]
         public bool? UseSSL { get; set; }
 
@@ -151,5 +150,13 @@ namespace WireMock.Settings
         /// <inheritdoc cref="IWireMockServerSettings.WebhookSettings"/>
         [PublicAPI]
         public IWebhookSettings WebhookSettings { get; set; }
+
+        /// <inheritdoc cref="IWireMockServerSettings.UseRegexExtended"/>
+        [PublicAPI]
+        public bool? UseRegexExtended { get; set; } = true;
+
+        /// <inheritdoc cref="IWireMockServerSettings.SaveUnmatchedRequests"/>
+        [PublicAPI]
+        public bool? SaveUnmatchedRequests { get; set; }
     }
 }

src/WireMock.Net/Settings/WireMockServerSettingsParser.cs

@@ -48,7 +48,9 @@ namespace WireMock.Settings
                 AllowOnlyDefinedHttpStatusCodeInResponse = parser.GetBoolValue("AllowOnlyDefinedHttpStatusCodeInResponse"),
                 DisableJsonBodyParsing = parser.GetBoolValue("DisableJsonBodyParsing"),
                 HandleRequestsSynchronously = parser.GetBoolValue("HandleRequestsSynchronously"),
-                ThrowExceptionWhenMatcherFails = parser.GetBoolValue("ThrowExceptionWhenMatcherFails")
+                ThrowExceptionWhenMatcherFails = parser.GetBoolValue("ThrowExceptionWhenMatcherFails"),
+                UseRegexExtended = parser.GetBoolValue(nameof(IWireMockServerSettings.UseRegexExtended), true),
+                SaveUnmatchedRequests = parser.GetBoolValue(nameof(IWireMockServerSettings.SaveUnmatchedRequests))
             };
 
             if (logger != null)

src/WireMock.Net/Transformers/Transformer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using JetBrains.Annotations;
@@ -7,7 +7,7 @@ using Newtonsoft.Json.Linq;
 using WireMock.Types;
 using WireMock.Util;
 
-namespace WireMock.Transformers.Handlebars
+namespace WireMock.Transformers
 {
     internal class Transformer : ITransformer
     {

src/WireMock.Net/Util/BodyParser.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Net.Http.Headers;
@@ -107,15 +107,15 @@ namespace WireMock.Util
             return BodyType.Bytes;
         }
 
-        public static async Task<BodyData> Parse([NotNull] BodyParserSettings settings)
+        public static async Task<BodyData> ParseAsync([NotNull] BodyParserSettings settings)
         {
             Check.NotNull(settings, nameof(settings));
 
-            var bodyWithContentEncoding = await ReadBytesAsync(settings.Stream, settings.ContentEncoding, settings.DecompressGZipAndDeflate);
+            var bodyWithContentEncoding = await ReadBytesAsync(settings.Stream, settings.ContentEncoding, settings.DecompressGZipAndDeflate).ConfigureAwait(false);
             var data = new BodyData
             {
-                BodyAsBytes = bodyWithContentEncoding.Value,
-                DetectedCompression = bodyWithContentEncoding.Key,
+                BodyAsBytes = bodyWithContentEncoding.Bytes,
+                DetectedCompression = bodyWithContentEncoding.ContentType,
                 DetectedBodyType = BodyType.Bytes,
                 DetectedBodyTypeFromContentType = DetectBodyTypeFromContentType(settings.ContentType)
             };
@@ -163,20 +163,20 @@ namespace WireMock.Util
             return data;
         }
 
-        private static async Task<KeyValuePair<string, byte[]>> ReadBytesAsync(Stream stream, string contentEncoding = null, bool decompressGZipAndDeflate = true)
+        private static async Task<(string ContentType, byte[] Bytes)> ReadBytesAsync(Stream stream, string contentEncoding = null, bool decompressGZipAndDeflate = true)
         {
             using (var memoryStream = new MemoryStream())
             {
-                await stream.CopyToAsync(memoryStream);
+                await stream.CopyToAsync(memoryStream).ConfigureAwait(false);
                 byte[] data = memoryStream.ToArray();
 
                 string type = contentEncoding?.ToLowerInvariant();
                 if (decompressGZipAndDeflate && (type == "gzip" || type == "deflate"))
                 {
-                    return new KeyValuePair<string, byte[]>(type, CompressionUtils.Decompress(type, data));
+                    return (type, CompressionUtils.Decompress(type, data));
                 }
 
-                return new KeyValuePair<string, byte[]>(null, data);
+                return (null, data);
             }
         }
     }

src/WireMock.Net/Util/EnhancedFileSystemWatcher.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.IO;
 using JetBrains.Annotations;
@@ -16,7 +16,7 @@ namespace WireMock.Util
         // Default Watch Interval in Milliseconds
         private const int DefaultWatchInterval = 100;
 
-        // This Dictionary keeps the track of when an event occured last for a particular file
+        // This Dictionary keeps the track of when an event occurred last for a particular file
         private ConcurrentDictionary<string, DateTime> _lastFileEvent;
 
         // Watch Interval in Milliseconds
@@ -176,13 +176,13 @@ namespace WireMock.Util
         }
 
         /// <summary>
-        /// This method searches the dictionary to find out when the last event occured 
-        /// for a particular file. If that event occured within the specified timespan
+        /// This method searches the dictionary to find out when the last event occurred 
+        /// for a particular file. If that event occurred within the specified timespan
         /// it returns true, else false
         /// </summary>
         /// <param name="fileName">The filename to be checked</param>
-        /// <returns>True if an event has occured within the specified interval, False otherwise</returns>
-        private bool HasAnotherFileEventOccuredRecently(string fileName)
+        /// <returns>True if an event has occurred within the specified interval, False otherwise</returns>
+        private bool HasAnotherFileEventOccurredRecently(string fileName)
         {
             // Check dictionary only if user wants to filter recent events otherwise return value stays false.
             if (!FilterRecentEvents)
@@ -194,7 +194,7 @@ namespace WireMock.Util
             if (_lastFileEvent.ContainsKey(fileName))
             {
                 // If dictionary contains the filename, check how much time has elapsed
-                // since the last event occured. If the timespan is less that the 
+                // since the last event occurred. If the timespan is less that the 
                 // specified interval, set return value to true 
                 // and store current datetime in dictionary for this file
                 DateTime lastEventTime = _lastFileEvent[fileName];
@@ -206,7 +206,7 @@ namespace WireMock.Util
             else
             {
                 // If dictionary does not contain the filename, 
-                // no event has occured in past for this file, so set return value to false
+                // no event has occurred in past for this file, so set return value to false
                 // and append filename along with current datetime to the dictionary
                 _lastFileEvent.TryAdd(fileName, DateTime.Now);
             }
@@ -215,11 +215,11 @@ namespace WireMock.Util
         }
 
         #region FileSystemWatcher EventHandlers
-        // Base class Event Handlers. Check if an event has occured recently and call method
+        // Base class Event Handlers. Check if an event has occurred recently and call method
         // to raise appropriate event only if no recent event is detected
         private void OnChanged(object sender, FileSystemEventArgs e)
         {
-            if (!HasAnotherFileEventOccuredRecently(e.FullPath))
+            if (!HasAnotherFileEventOccurredRecently(e.FullPath))
             {
                 OnChanged(e);
             }
@@ -227,7 +227,7 @@ namespace WireMock.Util
 
         private void OnCreated(object sender, FileSystemEventArgs e)
         {
-            if (!HasAnotherFileEventOccuredRecently(e.FullPath))
+            if (!HasAnotherFileEventOccurredRecently(e.FullPath))
             {
                 OnCreated(e);
             }
@@ -235,7 +235,7 @@ namespace WireMock.Util
 
         private void OnDeleted(object sender, FileSystemEventArgs e)
         {
-            if (!HasAnotherFileEventOccuredRecently(e.FullPath))
+            if (!HasAnotherFileEventOccurredRecently(e.FullPath))
             {
                 OnDeleted(e);
             }
@@ -243,7 +243,7 @@ namespace WireMock.Util
 
         private void OnRenamed(object sender, RenamedEventArgs e)
         {
-            if (!HasAnotherFileEventOccuredRecently(e.OldFullPath))
+            if (!HasAnotherFileEventOccurredRecently(e.OldFullPath))
             {
                 OnRenamed(e);
             }

src/WireMock.Net/Util/JsonUtils.cs

@@ -1,18 +1,19 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using WireMock.Serialization;
 
 namespace WireMock.Util
 {
     internal static class JsonUtils
     {
-        private static readonly JsonSerializerSettings JsonSerializerSettings = new JsonSerializerSettings
+        public static string Serialize<T>(T value)
         {
-            DateParseHandling = DateParseHandling.None
-        };
+            return JsonConvert.SerializeObject(value, JsonSerializationConstants.JsonSerializerSettingsIncludeNullValues);
+        }
 
         /// <summary>
         /// Load a Newtonsoft.Json.Linq.JObject from a string that contains JSON.
@@ -22,7 +23,7 @@ namespace WireMock.Util
         /// <returns>A Newtonsoft.Json.Linq.JToken populated from the string that contains JSON.</returns>
         public static JToken Parse(string json)
         {
-            return JsonConvert.DeserializeObject<JToken>(json, JsonSerializerSettings);
+            return JsonConvert.DeserializeObject<JToken>(json, JsonSerializationConstants.JsonDeserializerSettingsWithDateParsingNone);
         }
 
         /// <summary>
@@ -33,7 +34,7 @@ namespace WireMock.Util
         /// <returns>The deserialized object from the JSON string.</returns>
         public static object DeserializeObject(string json)
         {
-            return JsonConvert.DeserializeObject(json, JsonSerializerSettings);
+            return JsonConvert.DeserializeObject(json, JsonSerializationConstants.JsonDeserializerSettingsWithDateParsingNone);
         }
 
         /// <summary>
@@ -44,7 +45,7 @@ namespace WireMock.Util
         /// <returns>The deserialized object from the JSON string.</returns>
         public static T DeserializeObject<T>(string json)
         {
-            return JsonConvert.DeserializeObject<T>(json, JsonSerializerSettings);
+            return JsonConvert.DeserializeObject<T>(json, JsonSerializationConstants.JsonDeserializerSettingsWithDateParsingNone);
         }
 
         public static T ParseJTokenToObject<T>(object value)

src/WireMock.Net/WireMock.Net.csproj

@@ -51,7 +51,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
         <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
         <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
@@ -88,7 +88,7 @@
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
         <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
-        <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
+        <PackageReference Include="Microsoft.Owin" Version="4.1.1" />
         <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
         <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
         <PackageReference Include="System.Net.Http" Version="4.3.4" />

src/WireMock.Org.Abstractions/WireMock.Org.Abstractions.csproj

@@ -34,7 +34,7 @@
 
     <ItemGroup>
         <!--<PackageReference Include="AnyOf" Version="0.1.0" />-->
-        <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
         <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     </ItemGroup>
 

src/dotnet-WireMock.Net/Program.cs

@@ -46,7 +46,7 @@ namespace WireMock.Net
             while (true)
             {
                 Logger.Info("Server running : {IsStarted}", Server.IsStarted);
-                await Task.Delay(SleepTime);
+                await Task.Delay(SleepTime).ConfigureAwait(false);
             }
         }
 

test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs

@@ -33,7 +33,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         [Fact]
         public async Task AtAbsoluteUrl_WhenACallWasMadeToAbsoluteUrl_Should_BeOK()
         {
-            await _httpClient.GetAsync("anyurl");
+            await _httpClient.GetAsync("anyurl").ConfigureAwait(false);
 
             _server.Should()
                 .HaveReceivedACall()
@@ -56,7 +56,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         [Fact]
         public async Task AtAbsoluteUrl_Should_ThrowWhenNoCallsMatchingTheAbsoluteUrlWereMade()
         {
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
 
             Action act = () => _server.Should()
                 .HaveReceivedACall()
@@ -72,7 +72,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         public async Task WithHeader_WhenACallWasMadeWithExpectedHeader_Should_BeOK()
         {
             _httpClient.DefaultRequestHeaders.Add("Authorization", "Bearer a");
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
 
             _server.Should()
                 .HaveReceivedACall()
@@ -84,7 +84,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         {
             _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
             _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
 
             _server.Should()
                 .HaveReceivedACall()
@@ -94,7 +94,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         [Fact]
         public async Task WithHeader_Should_ThrowWhenNoCallsMatchingTheHeaderNameWereMade()
         {
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
 
             Action act = () => _server.Should()
                 .HaveReceivedACall()
@@ -110,7 +110,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         {
             _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
             _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
 
             Action act = () => _server.Should()
                 .HaveReceivedACall()
@@ -134,7 +134,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         {
             _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/xml"));
             _httpClient.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
 
             Action act = () => _server.Should()
                 .HaveReceivedACall()
@@ -153,7 +153,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         [Fact]
         public async Task AtUrl_WhenACallWasMadeToUrl_Should_BeOK()
         {
-            await _httpClient.GetAsync("anyurl");
+            await _httpClient.GetAsync("anyurl").ConfigureAwait(false);
 
             _server.Should()
                 .HaveReceivedACall()
@@ -176,7 +176,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         [Fact]
         public async Task AtUrl_Should_ThrowWhenNoCallsMatchingTheUrlWereMade()
         {
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
 
             Action act = () => _server.Should()
                 .HaveReceivedACall()
@@ -195,7 +195,7 @@ namespace WireMock.Net.Tests.FluentAssertions
             _server.Given(Request.Create().UsingAnyMethod())
                 .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" }));
 
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
 
             _server.Should()
                 .HaveReceivedACall()
@@ -226,7 +226,7 @@ namespace WireMock.Net.Tests.FluentAssertions
             _server.Given(Request.Create().UsingAnyMethod())
                 .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" }));
 
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
 
             Action act = () => _server.Should()
                 .HaveReceivedACall()
@@ -241,7 +241,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         [Fact]
         public async Task FromClientIP_whenACallWasMadeFromClientIP_Should_BeOK()
         {
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
             var clientIP = _server.LogEntries.Last().RequestMessage.ClientIP;
 
             _server.Should()
@@ -265,7 +265,7 @@ namespace WireMock.Net.Tests.FluentAssertions
         [Fact]
         public async Task FromClientIP_Should_ThrowWhenNoCallsFromClientIPWereMade()
         {
-            await _httpClient.GetAsync("");
+            await _httpClient.GetAsync("").ConfigureAwait(false);
             var clientIP = _server.LogEntries.Last().RequestMessage.ClientIP;
 
             Action act = () => _server.Should()

test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs

@@ -85,5 +85,22 @@ namespace WireMock.Net.Tests.Handlers
             // Act
             Check.ThatCode(() => _sut.DeleteFile(null)).Throws<ArgumentNullException>();
         }
+
+        [Fact]
+        public void LocalFileSystemHandler_GetUnmatchedRequestsFolder()
+        {
+            // Act
+            string result = _sut.GetUnmatchedRequestsFolder();
+
+            // Assert
+            Check.That(result).EndsWith(Path.Combine("requests", "unmatched"));
+        }
+
+        [Fact]
+        public void LocalFileSystemHandler_WriteUnmatchedRequest()
+        {
+            // Act
+            Check.ThatCode(() => _sut.WriteUnmatchedRequest(null, null)).Throws<ArgumentNullException>();
+        }
     }
 }

test/WireMock.Net.Tests/Http/ByteArrayContentHelperTests.cs

@@ -1,4 +1,4 @@
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
 using FluentAssertions;
@@ -20,7 +20,7 @@ namespace WireMock.Net.Tests.Http
 
             // Assert
             result.Headers.ContentType.Should().BeNull();
-            (await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content);
+            (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content);
         }
 
         [Theory]
@@ -38,7 +38,7 @@ namespace WireMock.Net.Tests.Http
 
             // Assert
             result.Headers.ContentType.ToString().Should().Be(expected);
-            (await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content);
+            (await result.ReadAsByteArrayAsync().ConfigureAwait(false)).Should().BeEquivalentTo(content);
         }
     }
 }

test/WireMock.Net.Tests/Http/HttpRequestMessageHelperTests.cs

@@ -1,4 +1,4 @@
-using NFluent;
+using NFluent;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
@@ -43,7 +43,7 @@ namespace WireMock.Net.Tests.Http
             var message = HttpRequestMessageHelper.Create(request, "http://url");
 
             // Assert
-            Check.That(await message.Content.ReadAsByteArrayAsync()).ContainsExactly(Encoding.UTF8.GetBytes("hi"));
+            Check.That(await message.Content.ReadAsByteArrayAsync().ConfigureAwait(false)).ContainsExactly(Encoding.UTF8.GetBytes("hi"));
         }
 
         [Fact]
@@ -61,7 +61,7 @@ namespace WireMock.Net.Tests.Http
             var message = HttpRequestMessageHelper.Create(request, "http://url");
 
             // Assert
-            Check.That(await message.Content.ReadAsStringAsync()).Equals("{\"x\":42}");
+            Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
         }
 
         [Fact]
@@ -80,7 +80,7 @@ namespace WireMock.Net.Tests.Http
             var message = HttpRequestMessageHelper.Create(request, "http://url");
 
             // Assert
-            Check.That(await message.Content.ReadAsStringAsync()).Equals("{\"x\":42}");
+            Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
             Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json");
         }
 
@@ -100,7 +100,7 @@ namespace WireMock.Net.Tests.Http
             var message = HttpRequestMessageHelper.Create(request, "http://url");
 
             // Assert
-            Check.That(await message.Content.ReadAsStringAsync()).Equals("{\"x\":42}");
+            Check.That(await message.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals("{\"x\":42}");
             Check.That(message.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8");
         }
 

test/WireMock.Net.Tests/Matchers/RegexMatcherTests.cs

@@ -1,3 +1,5 @@
+using System;
+using FluentAssertions;
 using NFluent;
 using WireMock.Matchers;
 using Xunit;
@@ -70,6 +72,32 @@ namespace WireMock.Net.Tests.Matchers
             Check.That(result).IsEqualTo(0.0d);
         }
 
+        [Fact]
+        public void RegexMatcher_IsMatch_RegexExtended_Guid()
+        {
+            // Assign
+            var matcher = new RegexMatcher(@"\GUIDB", true);
+
+            // Act
+            double result = matcher.IsMatch(Guid.NewGuid().ToString("B"));
+
+            // Assert
+            result.Should().Be(1.0);
+        }
+
+        [Fact]
+        public void RegexMatcher_IsMatch_Regex_Guid()
+        {
+            // Assign
+            var matcher = new RegexMatcher(@"\GUIDB", true, false, false);
+
+            // Act
+            double result = matcher.IsMatch(Guid.NewGuid().ToString("B"));
+
+            // Assert
+            result.Should().Be(0);
+        }
+
         [Fact]
         public void RegexMatcher_IsMatch_IgnoreCase()
         {

test/WireMock.Net.Tests/ObservableLogEntriesTest.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
@@ -41,7 +41,7 @@ namespace WireMock.Net.Tests
             server.LogEntriesChanged += (sender, args) => throw new Exception();
 
             // Act
-            await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}");
+            await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false);
 
             // Assert
             loggerMock.Verify(l => l.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
@@ -65,7 +65,7 @@ namespace WireMock.Net.Tests
             server.LogEntriesChanged += (sender, args) => count++;
 
             // Act
-            await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}");
+            await new HttpClient().GetAsync($"http://localhost:{server.Ports[0]}{path}").ConfigureAwait(false);
 
             // Assert
             Check.That(count).Equals(1);
@@ -101,7 +101,7 @@ namespace WireMock.Net.Tests
                 Thread.Sleep(50);
                 listOfTasks.Add(http.GetAsync($"{server.Urls[0]}{path}"));
             }
-            var responses = await Task.WhenAll(listOfTasks);
+            var responses = await Task.WhenAll(listOfTasks).ConfigureAwait(false);
             var countResponsesWithStatusNotOk = responses.Count(r => r.StatusCode != HttpStatusCode.OK);
 
             // Assert

test/WireMock.Net.Tests/Owin/Mappers/OwinResponseMapperTests.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using Xunit;
 using Moq;
@@ -66,7 +66,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
         public async Task OwinResponseMapper_MapAsync_Null()
         {
             // Act
-            await _sut.MapAsync(null, _responseMock.Object);
+            await _sut.MapAsync(null, _responseMock.Object).ConfigureAwait(false);
         }
 
         [Theory]
@@ -81,7 +81,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
             _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
@@ -102,7 +102,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
             _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
@@ -118,7 +118,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
             _responseMock.VerifySet(r => r.StatusCode = It.IsAny<int>(), Times.Never);
@@ -138,7 +138,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
             _responseMock.VerifySet(r => r.StatusCode = expected, Times.Once);
@@ -154,7 +154,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
             _stream.Verify(s => s.WriteAsync(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>(), It.IsAny<CancellationToken>()), Times.Never);
@@ -172,7 +172,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
             _stream.Verify(s => s.WriteAsync(new byte[] { 97, 98, 99, 100 }, 0, 4, It.IsAny<CancellationToken>()), Times.Once);
@@ -190,7 +190,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
             _stream.Verify(s => s.WriteAsync(bytes, 0, bytes.Length, It.IsAny<CancellationToken>()), Times.Once);
@@ -208,7 +208,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
             _stream.Verify(s => s.WriteAsync(new byte[] { 123, 34, 116, 34, 58, 34, 120, 34, 125 }, 0, 9, It.IsAny<CancellationToken>()), Times.Once);
@@ -224,7 +224,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
 #if NET452
@@ -248,7 +248,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
             _stream.Verify(s => s.WriteAsync(new byte[0], 0, 0, It.IsAny<CancellationToken>()), Times.Once);
@@ -270,7 +270,7 @@ namespace WireMock.Net.Tests.Owin.Mappers
             };
 
             // Act
-            await _sut.MapAsync(responseMessage, _responseMock.Object);
+            await _sut.MapAsync(responseMessage, _responseMock.Object).ConfigureAwait(false);
 
             // Assert
             _responseMock.VerifySet(r => r.StatusCode = 100, Times.Once);

test/WireMock.Net.Tests/Owin/WireMockMiddlewareTests.cs

@@ -80,7 +80,7 @@ namespace WireMock.Net.Tests.Owin
         public async Task WireMockMiddleware_Invoke_NoMatch()
         {
             // Act
-            await _sut.Invoke(_contextMock.Object);
+            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
 
             // Assert and Verify
             _optionsMock.Verify(o => o.Logger.Warn(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
@@ -103,7 +103,7 @@ namespace WireMock.Net.Tests.Owin
             _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
 
             // Act
-            await _sut.Invoke(_contextMock.Object);
+            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
 
             // Assert and Verify
             _optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
@@ -126,7 +126,7 @@ namespace WireMock.Net.Tests.Owin
             _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
 
             // Act
-            await _sut.Invoke(_contextMock.Object);
+            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
 
             // Assert and Verify
             _optionsMock.Verify(o => o.Logger.Error(It.IsAny<string>(), It.IsAny<object[]>()), Times.Once);
@@ -142,7 +142,7 @@ namespace WireMock.Net.Tests.Owin
             _optionsMock.SetupGet(o => o.RequestLogExpirationDuration).Returns(1);
 
             // Act
-            await _sut.Invoke(_contextMock.Object);
+            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
         }
 
         [Fact]
@@ -186,7 +186,7 @@ namespace WireMock.Net.Tests.Owin
             _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
 
             // Act
-            await _sut.Invoke(_contextMock.Object);
+            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
 
             // Assert and Verify
             fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);
@@ -240,7 +240,7 @@ namespace WireMock.Net.Tests.Owin
             _matcherMock.Setup(m => m.FindBestMatch(It.IsAny<RequestMessage>())).Returns((result, result));
 
             // Act
-            await _sut.Invoke(_contextMock.Object);
+            await _sut.Invoke(_contextMock.Object).ConfigureAwait(false);
 
             // Assert and Verify
             fileSystemHandlerMock.Verify(f => f.WriteMappingFile(It.IsAny<string>(), It.IsAny<string>()), Times.Once);

test/WireMock.Net.Tests/RegularExpressions/RegexExtendedTests.cs

@@ -0,0 +1,100 @@
+using System;
+using NFluent;
+using WireMock.RegularExpressions;
+using Xunit;
+
+namespace WireMock.Net.Tests.RegularExpressions
+{
+    public class RegexExtendedTests
+    {
+        /// <summary>
+        /// Input guid used for testing
+        /// </summary>
+        public Guid InputGuid => Guid.NewGuid();
+
+        [Fact]
+        public void RegexExtended_GuidB_Pattern()
+        {
+            var guidbUpper = @".*\GUIDB.*";
+            var guidbLower = @".*\guidb.*";
+
+            var inputLower = InputGuid.ToString("B");
+            var inputUpper = InputGuid.ToString("B").ToUpper();
+            var regexLower = new RegexExtended(guidbLower);
+            var regexUpper = new RegexExtended(guidbUpper);
+
+            Check.That(regexLower.IsMatch(inputLower)).Equals(true);
+            Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
+            Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
+            Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+        }
+
+        [Fact]
+        public void RegexExtended_GuidD_Pattern()
+        {
+            var guiddUpper = @".*\GUIDD.*";
+            var guiddLower = @".*\guidd.*";
+
+            var inputLower = InputGuid.ToString("D");
+            var inputUpper = InputGuid.ToString("D").ToUpper();
+            var regexLower = new RegexExtended(guiddLower);
+            var regexUpper = new RegexExtended(guiddUpper);
+
+            Check.That(regexLower.IsMatch(inputLower)).Equals(true);
+            Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
+            Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
+            Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+        }
+
+        [Fact]
+        public void RegexExtended_GuidN_Pattern()
+        {
+            var guidnUpper = @".*\GUIDN.*";
+            var guidnLower = @".*\guidn.*";
+
+            var inputLower = InputGuid.ToString("N");
+            var inputUpper = InputGuid.ToString("N").ToUpper();
+            var regexLower = new RegexExtended(guidnLower);
+            var regexUpper = new RegexExtended(guidnUpper);
+
+            Check.That(regexLower.IsMatch(inputLower)).Equals(true);
+            Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
+            Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
+            Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+        }
+
+        [Fact]
+        public void RegexExtended_GuidP_Pattern()
+        {
+            var guidpUpper = @".*\GUIDP.*";
+            var guidpLower = @".*\guidp.*";
+
+            var inputLower = InputGuid.ToString("P");
+            var inputUpper = InputGuid.ToString("P").ToUpper();
+            var regexLower = new RegexExtended(guidpLower);
+            var regexUpper = new RegexExtended(guidpUpper);
+
+            Check.That(regexLower.IsMatch(inputLower)).Equals(true);
+            Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
+            Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
+            Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+        }
+
+        [Fact]
+        public void RegexExtended_GuidX_Pattern()
+        {
+            var guidxUpper = @".*\GUIDX.*";
+            var guidxLower = @".*\guidx.*";
+
+            var inputLower = InputGuid.ToString("X");
+            var inputUpper = InputGuid.ToString("X").ToUpper().Replace("X", "x");
+            var regexLower = new RegexExtended(guidxLower);
+            var regexUpper = new RegexExtended(guidxUpper);
+
+            Check.That(regexLower.IsMatch(inputLower)).Equals(true);
+            Check.That(regexLower.IsMatch(inputUpper)).Equals(false);
+            Check.That(regexUpper.IsMatch(inputUpper)).Equals(true);
+            Check.That(regexUpper.IsMatch(inputLower)).Equals(false);
+        }
+    }
+}

test/WireMock.Net.Tests/RequestMatchers/RequestMessageBodyMatcherTests.cs

@@ -301,7 +301,7 @@ namespace WireMock.Net.Tests.RequestMatchers
                     ContentType = null,
                     DeserializeJson = true
                 };
-                bodyData = await BodyParser.Parse(bodyParserSettings);
+                bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
             }
             else if (body is string s)
             {
@@ -311,7 +311,7 @@ namespace WireMock.Net.Tests.RequestMatchers
                     ContentType = null,
                     DeserializeJson = true
                 };
-                bodyData = await BodyParser.Parse(bodyParserSettings);
+                bodyData = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
             }
             else
             {

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

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using NFluent;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
@@ -21,7 +21,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create(() => responseMessage);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message).Equals(responseMessage);

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

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -37,7 +37,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 );
 
             // Act
-            var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content");
+            var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content").ConfigureAwait(false);
 
             // Assert
             response.Should().Contain("<hello>world</hello>");
@@ -68,7 +68,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 );
 
             // Act
-            var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content");
+            var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content").ConfigureAwait(false);
 
             // Assert
             response.Should().Contain("<hello>world</hello>");
@@ -99,7 +99,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 );
 
             // Act
-            var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content");
+            var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/v1/content").ConfigureAwait(false);
 
             // Assert
             response.Should().Contain("<hello>world</hello>");

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Threading.Tasks;
 using Moq;
@@ -43,7 +43,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.String, Encoding.ASCII);
 
             // act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // then
             Check.That(response.Message.BodyData.BodyAsString).Equals("01");
@@ -65,7 +65,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithBody(new byte[] { 48, 49 }, BodyDestinationFormat.SameAsSource, Encoding.ASCII);
 
             // act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // then
             Check.That(response.Message.BodyData.BodyAsBytes).ContainsExactly(new byte[] { 48, 49 });
@@ -87,7 +87,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithBody("test", null, Encoding.ASCII);
 
             // act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // then
             Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -109,7 +109,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithBodyAsJson(x, Encoding.ASCII);
 
             // act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // then
             Check.That(response.Message.BodyData.BodyAsJson).Equals(x);
@@ -131,7 +131,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithBodyAsJson(x, true);
 
             // act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // then
             Check.That(response.Message.BodyData.BodyAsJson).Equals(x);
@@ -147,7 +147,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.SameAsSource, Encoding.ASCII);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsBytes).IsNull();
@@ -165,7 +165,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithBody("r", BodyDestinationFormat.Bytes, Encoding.ASCII);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).IsNull();
@@ -183,7 +183,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithBody("{ \"value\": 42 }", BodyDestinationFormat.Json, Encoding.ASCII);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).IsNull();
@@ -205,7 +205,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithBody(req => $"path: {req.Path}");
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test");
@@ -229,12 +229,12 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithHeader("H2", "X2")
                 .WithBody(async req =>
                 {
-                    await Task.Delay(1);
+                    await Task.Delay(1).ConfigureAwait(false);
                     return $"path: {req.Path}";
                 });
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("path: /test");
@@ -262,8 +262,8 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response1 = await responseBuilder.ProvideResponseAsync(request1, _settings);
-            var response2 = await responseBuilder.ProvideResponseAsync(request2, _settings);
+            var response1 = await responseBuilder.ProvideResponseAsync(request1, _settings).ConfigureAwait(false);
+            var response2 = await responseBuilder.ProvideResponseAsync(request2, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(((JToken)response1.Message.BodyData.BodyAsJson).SelectToken("id")?.Value<int>()).IsEqualTo(request1Id);
@@ -287,7 +287,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
 
             var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents);
 
-            var response = await responseBuilder.ProvideResponseAsync(request1, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request1, _settings).ConfigureAwait(false);
 
             Check.That(response.Message.StatusCode).IsEqualTo(200);
             Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents);
@@ -303,7 +303,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
 
             var responseBuilder = Response.Create().WithStatusCode(200).WithBody(fileContents);
 
-            var response = await responseBuilder.ProvideResponseAsync(request1, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request1, _settings).ConfigureAwait(false);
 
             Check.That(response.Message.StatusCode).IsEqualTo(200);
             Check.That(response.Message.BodyData.BodyAsString).Contains(fileContents);
@@ -319,7 +319,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
 
             var responseBuilder = Response.Create().WithStatusCode(200).WithBody("File deleted.");
 
-            var response = await responseBuilder.ProvideResponseAsync(request1, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request1, _settings).ConfigureAwait(false);
 
             Check.That(response.Message.StatusCode).IsEqualTo(200);
             Check.That(response.Message.BodyData.BodyAsString).Contains("File deleted.");

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

@@ -50,7 +50,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 });
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
@@ -74,7 +74,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 });
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
@@ -103,7 +103,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 });
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
@@ -135,7 +135,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithHeader(header, "Stef");
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.BodyData.BodyAsString.Should().Be("/fooBar");
@@ -161,7 +161,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(requestMessage, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.BodyData.BodyAsString.Should().Be("/fooBar");

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

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using FluentAssertions;
 using WireMock.Models;
 using WireMock.ResponseBuilders;
@@ -22,7 +22,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
 
             // Act
             var responseBuilder = Response.Create().WithFault(faultType);
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.FaultType.Should().Be(faultType);
@@ -38,7 +38,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
 
             // Act
             var responseBuilder = Response.Create().WithFault(faultType, percentage);
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.FaultType.Should().Be(faultType);

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

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using HandlebarsDotNet;
 using Moq;
 using Newtonsoft.Json.Linq;
@@ -39,7 +39,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -64,7 +64,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);

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

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using Moq;
 using NFluent;
 using WireMock.Handlers;
@@ -39,7 +39,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("ABC");

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Moq;
 using Newtonsoft.Json.Linq;
@@ -35,16 +35,16 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create()
                 .WithBodyAsJson(new
                 {
-                    DateTime = string.Format("{{{{[Humanizer.Humanize] \"{0}\" }}}}", DateTime.UtcNow.AddHours(-30).ToString("O"))
+                    Text = string.Format("{{{{[Humanizer.Humanize] \"{0}\" }}}}", "PascalCaseInputStringIsTurnedIntoSentence")
                 })
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
-            Check.That(j["DateTime"].Value<string>()).IsEqualTo("yesterday");
+            Check.That(j["Text"].Value<string>()).IsEqualTo("Pascal case input string is turned into sentence");
         }
     }
 }

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Text;
 using System.Threading.Tasks;
 using Moq;
@@ -77,7 +77,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -103,7 +103,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -157,7 +157,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
@@ -210,7 +210,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals($"{{{Environment.NewLine}  \"Name\": \"Acme Co\",{Environment.NewLine}  \"Products\": [{Environment.NewLine}    {{{Environment.NewLine}      \"Name\": \"Anvil\",{Environment.NewLine}      \"Price\": 50{Environment.NewLine}    }}{Environment.NewLine}  ]{Environment.NewLine}}}");
@@ -263,7 +263,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
@@ -316,7 +316,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("%0:Anvil%%1:Elbow Grease%");
@@ -369,7 +369,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithBodyFromFile(@"c:\\{{JsonPath.SelectToken request.body " + jsonPath + "}}\\test.json"); // why use a \\ here ?
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.json");

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

@@ -42,7 +42,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -72,7 +72,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -102,7 +102,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -132,7 +132,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -213,7 +213,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings);
+            Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             a.Should().ThrowAsync<HandlebarsException>();
@@ -240,7 +240,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings);
+            Func<Task> a = async () => await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             a.Should().ThrowAsync<HandlebarsException>();

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

@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Threading.Tasks;
 using Moq;
 using Newtonsoft.Json.Linq;
@@ -43,7 +43,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -66,7 +66,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -88,7 +88,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -112,7 +112,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);
@@ -134,7 +134,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             JObject j = JObject.FromObject(response.Message.BodyData.BodyAsJson);

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using Moq;
 using NFluent;
@@ -40,7 +40,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("abc");
@@ -59,7 +59,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("");
@@ -78,7 +78,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("5000-https");
@@ -97,7 +97,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("");

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

@@ -1,4 +1,4 @@
-using System.Threading.Tasks;
+using System.Threading.Tasks;
 using System.Xml;
 using NFluent;
 using WireMock.Models;
@@ -53,7 +53,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator();
@@ -84,7 +84,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("abc");
@@ -112,7 +112,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             var nav = new XmlDocument { InnerXml = response.Message.BodyData.BodyAsString }.CreateNavigator();
@@ -170,7 +170,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.BodyData.BodyAsString.Should().Contain("TokenIdLijst").And.Contain("0000083256").And.Contain("0000083259");
@@ -198,7 +198,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).IsEqualIgnoringCase("True");
@@ -226,7 +226,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).IsEqualTo("a1");

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

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using NFluent;
 using WireMock.Models;
@@ -25,7 +25,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValue);
 
             // Act
-            var response = await builder.ProvideResponseAsync(requestMock, _settings);
+            var response = await builder.ProvideResponseAsync(requestMock, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.Headers[headerName].ToString()).Equals(headerValue);
@@ -41,7 +41,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             IResponseBuilder builder = Response.Create().WithHeader(headerName, headerValues);
 
             // Act
-            var response = await builder.ProvideResponseAsync(requestMock, _settings);
+            var response = await builder.ProvideResponseAsync(requestMock, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.Headers[headerName].ToArray()).Equals(headerValues);
@@ -56,7 +56,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithHeaders(headers);
 
             // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(responseMessage.Message.Headers["h"]).ContainsExactly("x");
@@ -71,7 +71,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithHeaders(headers);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.Headers["h"]).ContainsExactly("x");
@@ -86,7 +86,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var builder = Response.Create().WithHeaders(headers);
 
             // Act
-            var response = await builder.ProvideResponseAsync(request, _settings);
+            var response = await builder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.Headers["h"]).ContainsExactly("x");

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
@@ -49,7 +49,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithProxy(_server.Urls[0]);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(request.ProxyUrl).IsNotNull();

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using FluentAssertions;
 using NFluent;
@@ -43,7 +43,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithTransformer(TransformerType.ScribanDotLiquid);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.BodyData.Should().BeNull();
@@ -65,7 +65,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(TransformerType.Scriban);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");

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

@@ -1,4 +1,4 @@
-using FluentAssertions;
+using FluentAssertions;
 using Moq;
 using System.Net;
 using System.Threading.Tasks;
@@ -40,7 +40,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                     break;
             }
 
-            var response = await responseBuilder.ProvideResponseAsync(request, _settingsMock.Object);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settingsMock.Object).ConfigureAwait(false);
 
             // Assert
             response.Message.StatusCode.Should().Be(expectedStatusCode);

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
@@ -49,7 +49,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.BodyData.Should().BeNull();
@@ -74,7 +74,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");
@@ -98,7 +98,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("url=http://localhost/a/b absoluteurl=http://localhost/wiremock/a/b path=/a/b absolutepath=/wiremock/a/b");
@@ -116,7 +116,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock");
@@ -136,7 +136,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("a wiremock");
@@ -158,7 +158,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1,2 idx=1 idx=2 keyb=5");
@@ -182,7 +182,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5");
@@ -205,7 +205,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -231,7 +231,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -257,7 +257,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -278,7 +278,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -300,7 +300,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -325,7 +325,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var responseBuilder = Response.Create().WithHeader("x", "{{request.Headers[\"Content-Type\"]}}", "{{request.Url}}").WithBody("test").WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test");
@@ -353,7 +353,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsString).Equals("test http://localhost:1234 1234 http localhost");
@@ -380,7 +380,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
@@ -407,7 +407,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]");
@@ -424,7 +424,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
@@ -443,7 +443,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
@@ -468,7 +468,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Message.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
@@ -497,7 +497,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("\"test\"");
@@ -521,7 +521,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer();
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
@@ -547,7 +547,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
@@ -575,7 +575,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
                 .WithTransformer(transformerType);
 
             // Act
-            var response = await responseBuilder.ProvideResponseAsync(request, _settings);
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
 
             // Assert
             response.Message.BodyData.BodyAsString.Should().Be(text);

test/WireMock.Net.Tests/StatefulBehaviorTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -28,7 +28,7 @@ namespace WireMock.Net.Tests
                 .RespondWith(Response.Create());
 
             // when
-            var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path);
+            var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
 
             // then
             Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound);
@@ -56,8 +56,8 @@ namespace WireMock.Net.Tests
                 .RespondWith(Response.Create().WithBody("Test state msg"));
 
             // when
-            var responseNoState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path);
-            var responseWithState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path);
+            var responseNoState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+            var responseWithState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
 
             // then
             Check.That(responseNoState).Equals("No state msg");
@@ -90,9 +90,9 @@ namespace WireMock.Net.Tests
 
             // when
             var client = new HttpClient();
-            var responseScenario1 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path);
-            var responseScenario2 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path);
-            var responseWithState = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path);
+            var responseScenario1 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+            var responseScenario2 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+            var responseWithState = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
 
             // then
             responseScenario1.Should().Be(body1);
@@ -137,11 +137,11 @@ namespace WireMock.Net.Tests
 
             // when
             var client = new HttpClient();
-            var t1a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1);
-            var t1b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1);
-            var t2a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2);
-            var t2b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2);
-            var t3 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path3);
+            var t1a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1).ConfigureAwait(false);
+            var t1b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1).ConfigureAwait(false);
+            var t2a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2).ConfigureAwait(false);
+            var t2b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2).ConfigureAwait(false);
+            var t3 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path3).ConfigureAwait(false);
 
             // then
             t1a.Should().Be(body1);
@@ -173,8 +173,8 @@ namespace WireMock.Net.Tests
                 .RespondWith(Response.Create().WithBody("Scenario 1, State 2"));
 
             // when
-            var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path);
-            var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path);
+            var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+            var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
 
             // then
             Check.That(responseIntScenario).Equals("Scenario 1, Setting State 2");
@@ -203,8 +203,8 @@ namespace WireMock.Net.Tests
                 .RespondWith(Response.Create().WithBody("string state, State 2"));
 
             // when
-            var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path);
-            var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path);
+            var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+            var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
 
             // then
             Check.That(responseIntScenario).Equals("string state, Setting State 2");
@@ -233,8 +233,8 @@ namespace WireMock.Net.Tests
                 .RespondWith(Response.Create().WithBody("string state, State 2"));
 
             // when
-            var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path);
-            var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path);
+            var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+            var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
 
             // then
             Check.That(responseIntScenario).Equals("int state, Setting State 2");
@@ -280,7 +280,7 @@ namespace WireMock.Net.Tests
             Check.That(server.Scenarios["To do list"].Started).IsTrue();
             Check.That(server.Scenarios["To do list"].Finished).IsFalse();
 
-            var postResponse = await new HttpClient().PostAsync(url + "/todo/items", new StringContent("Cancel newspaper subscription"));
+            var postResponse = await new HttpClient().PostAsync(url + "/todo/items", new StringContent("Cancel newspaper subscription")).ConfigureAwait(false);
             Check.That(postResponse.StatusCode).Equals(HttpStatusCode.Created);
 
             Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list");
@@ -288,7 +288,7 @@ namespace WireMock.Net.Tests
             Check.That(server.Scenarios["To do list"].Started).IsTrue();
             Check.That(server.Scenarios["To do list"].Finished).IsFalse();
 
-            string getResponse2 = await new HttpClient().GetStringAsync(url + "/todo/items");
+            string getResponse2 = await new HttpClient().GetStringAsync(url + "/todo/items").ConfigureAwait(false);
             Check.That(getResponse2).Equals("Buy milk;Cancel newspaper subscription");
 
             Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list");
@@ -331,16 +331,16 @@ namespace WireMock.Net.Tests
 
             // Act and Assert
             string url = "http://localhost:" + server.Ports[0];
-            var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1");
+            var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1").ConfigureAwait(false);
             Check.That(responseNoState1).Equals("No state msg 1");
 
-            var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2");
+            var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2").ConfigureAwait(false);
             Check.That(responseNoState2).Equals("No state msg 2");
 
-            var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X");
+            var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X").ConfigureAwait(false);
             Check.That(responseWithState1).Equals("Test state msg 1");
 
-            var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X");
+            var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X").ConfigureAwait(false);
             Check.That(responseWithState2).Equals("Test state msg 2");
 
             server.Stop();

test/WireMock.Net.Tests/Transformers/Handlebars/HandlebarsContextFactoryTests.cs

@@ -1,7 +1,7 @@
-using FluentAssertions;
+using System;
+using FluentAssertions;
 using HandlebarsDotNet;
 using Moq;
-using System;
 using WireMock.Handlers;
 using WireMock.Transformers.Handlebars;
 using Xunit;

test/WireMock.Net.Tests/Util/BodyParserTests.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using NFluent;
 using System.IO;
 using System.IO.Compression;
@@ -30,7 +30,7 @@ namespace WireMock.Net.Tests.Util
             };
 
             // Act
-            var body = await BodyParser.Parse(bodyParserSettings);
+            var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
             // Assert
             Check.That(body.BodyAsBytes).IsNotNull();
@@ -54,7 +54,7 @@ namespace WireMock.Net.Tests.Util
             };
 
             // Act
-            var body = await BodyParser.Parse(bodyParserSettings);
+            var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
             // Assert
             Check.That(body.BodyAsBytes).IsNotNull();
@@ -79,7 +79,7 @@ namespace WireMock.Net.Tests.Util
             };
 
             // act
-            var body = await BodyParser.Parse(bodyParserSettings);
+            var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
             // assert
             Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
@@ -100,7 +100,7 @@ namespace WireMock.Net.Tests.Util
             };
 
             // act
-            var body = await BodyParser.Parse(bodyParserSettings);
+            var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
             // assert
             Check.That(body.DetectedBodyType).IsEqualTo(detectedBodyType);
@@ -139,7 +139,7 @@ Content-Type: text/html
             };
 
             // Act
-            var result = await BodyParser.Parse(bodyParserSettings);
+            var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
             // Assert
             Check.That(result.DetectedBodyType).IsEqualTo(BodyType.String);
@@ -163,7 +163,7 @@ Content-Type: text/html
             };
 
             // Act
-            var result = await BodyParser.Parse(bodyParserSettings);
+            var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
             // Assert
             Check.That(result.DetectedBodyType).IsEqualTo(BodyType.Bytes);
@@ -186,7 +186,7 @@ Content-Type: text/html
             };
 
             // Act
-            var body = await BodyParser.Parse(bodyParserSettings);
+            var body = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
             // Assert
             Check.That(body.BodyAsBytes).IsNotNull();
@@ -214,7 +214,7 @@ Content-Type: text/html
             };
 
             // Act
-            var result = await BodyParser.Parse(bodyParserSettings);
+            var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
             // Assert
             result.DetectedBodyType.Should().Be(BodyType.String);
@@ -243,7 +243,7 @@ Content-Type: text/html
             };
 
             // Act
-            var result = await BodyParser.Parse(bodyParserSettings);
+            var result = await BodyParser.ParseAsync(bodyParserSettings).ConfigureAwait(false);
 
             // Assert
             result.BodyAsBytes.Should().BeEquivalentTo(compressed);

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

@@ -32,8 +32,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Codecov" Version="1.10.0" />
-        <PackageReference Include="coverlet.msbuild" Version="3.0.2">
+        <PackageReference Include="Codecov" Version="1.13.0" />
+        <PackageReference Include="coverlet.msbuild" Version="3.1.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -44,18 +44,18 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.0.2">
+        <PackageReference Include="coverlet.collector" Version="3.1.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
 
-        <PackageReference Include="Moq" Version="4.16.0" />
+        <PackageReference Include="Moq" Version="4.16.1" />
         <PackageReference Include="System.Threading" Version="4.3.0" />
         <PackageReference Include="RestEase" Version="1.5.5" />
         <PackageReference Include="RandomDataGenerator.Net" Version="1.0.13" />
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
         <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-        <PackageReference Include="NFluent" Version="2.7.1" />
+        <PackageReference Include="NFluent" Version="2.7.2" />
         <!--<PackageReference Include="OpenCover" Version="4.7.922" />-->
         <!--<PackageReference Include="ReportGenerator" Version="4.8.1" />-->
         <PackageReference Include="SimMetrics.Net" Version="1.0.5" />

test/WireMock.Net.Tests/WireMockAdminApiTests.cs

@@ -1,4 +1,4 @@
-#if !NET452 && !NET461
+#if !NET452 && !NET461
 using System;
 using System.Linq;
 using System.Net.Http;
@@ -31,7 +31,7 @@ namespace WireMock.Net.Tests
             var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
 
             // Act
-            var settings = await api.GetSettingsAsync();
+            var settings = await api.GetSettingsAsync().ConfigureAwait(false);
             Check.That(settings).IsNotNull();
         }
 
@@ -44,7 +44,7 @@ namespace WireMock.Net.Tests
 
             // Act
             var settings = new SettingsModel();
-            var status = await api.PostSettingsAsync(settings);
+            var status = await api.PostSettingsAsync(settings).ConfigureAwait(false);
             Check.That(status.Status).Equals("Settings updated");
         }
 
@@ -57,7 +57,7 @@ namespace WireMock.Net.Tests
 
             // Act
             var settings = new SettingsModel();
-            var status = await api.PutSettingsAsync(settings);
+            var status = await api.PutSettingsAsync(settings).ConfigureAwait(false);
             Check.That(status.Status).Equals("Settings updated");
         }
 
@@ -77,7 +77,7 @@ namespace WireMock.Net.Tests
                 Priority = 500,
                 Title = "test"
             };
-            var result = await api.PutMappingAsync(new Guid("a0000000-0000-0000-0000-000000000000"), model);
+            var result = await api.PutMappingAsync(new Guid("a0000000-0000-0000-0000-000000000000"), model).ConfigureAwait(false);
 
             // Assert
             Check.That(result).IsNotNull();
@@ -111,7 +111,7 @@ namespace WireMock.Net.Tests
                 Priority = 500,
                 Title = "test"
             };
-            var result = await api.PostMappingAsync(model);
+            var result = await api.PostMappingAsync(model).ConfigureAwait(false);
 
             // Assert
             Check.That(result).IsNotNull();
@@ -122,7 +122,7 @@ namespace WireMock.Net.Tests
             Check.That(mapping).IsNotNull();
             Check.That(mapping.Title).Equals("test");
 
-            var response = await mapping.ProvideResponseAsync(new RequestMessage(new UrlDetails("http://localhost/1"), "GET", ""));
+            var response = await mapping.ProvideResponseAsync(new RequestMessage(new UrlDetails("http://localhost/1"), "GET", "")).ConfigureAwait(false);
             Check.That(response.Message.StatusCode).Equals(expectedStatusCode);
 
             server.Stop();
@@ -148,7 +148,7 @@ namespace WireMock.Net.Tests
                 Response = new ResponseModel { Body = "txt 2" },
                 Title = "test 2"
             };
-            var result = await api.PostMappingsAsync(new[] { model1, model2 });
+            var result = await api.PostMappingsAsync(new[] { model1, model2 }).ConfigureAwait(false);
 
             // Assert
             Check.That(result).IsNotNull();
@@ -169,11 +169,11 @@ namespace WireMock.Net.Tests
                 Logger = new WireMockNullLogger()
             });
             var serverUrl = "http://localhost:" + server.Ports[0];
-            await new HttpClient().GetAsync(serverUrl + "/foo");
+            await new HttpClient().GetAsync(serverUrl + "/foo").ConfigureAwait(false);
             var api = RestClient.For<IWireMockAdminApi>(serverUrl);
 
             // Act
-            var requests = await api.FindRequestsAsync(new RequestModel { Methods = new[] { "GET" } });
+            var requests = await api.FindRequestsAsync(new RequestModel { Methods = new[] { "GET" } }).ConfigureAwait(false);
 
             // Assert
             Check.That(requests).HasSize(1);
@@ -193,11 +193,11 @@ namespace WireMock.Net.Tests
                 Logger = new WireMockNullLogger()
             });
             var serverUrl = "http://localhost:" + server.Ports[0];
-            await new HttpClient().GetAsync(serverUrl + "/foo");
+            await new HttpClient().GetAsync(serverUrl + "/foo").ConfigureAwait(false);
             var api = RestClient.For<IWireMockAdminApi>(serverUrl);
 
             // Act
-            var requests = await api.GetRequestsAsync();
+            var requests = await api.GetRequestsAsync().ConfigureAwait(false);
 
             // Assert
             Check.That(requests).HasSize(1);
@@ -233,7 +233,7 @@ namespace WireMock.Net.Tests
             var api = RestClient.For<IWireMockAdminApi>(serverUrl);
 
             // Act
-            var requests = await api.GetRequestsAsync();
+            var requests = await api.GetRequestsAsync().ConfigureAwait(false);
 
             // Assert
             Check.That(requests).HasSize(1);
@@ -270,7 +270,7 @@ namespace WireMock.Net.Tests
                 },
                 Response = new ResponseModel { Body = "world" }
             };
-            var postMappingResult = await api.PostMappingAsync(model);
+            var postMappingResult = await api.PostMappingAsync(model).ConfigureAwait(false);
 
             // Assert
             postMappingResult.Should().NotBeNull();
@@ -278,7 +278,7 @@ namespace WireMock.Net.Tests
             var mapping = server.Mappings.FirstOrDefault(m => m.Guid == guid);
             mapping.Should().NotBeNull();
 
-            var getMappingResult = await api.GetMappingAsync(guid);
+            var getMappingResult = await api.GetMappingAsync(guid).ConfigureAwait(false);
             getMappingResult.Should().NotBeNull();
 
             getMappingResult.Request.Body.Should().BeEquivalentTo(model.Request.Body);
@@ -311,7 +311,7 @@ namespace WireMock.Net.Tests
             var api = RestClient.For<IWireMockAdminApi>(serverUrl);
 
             // Act
-            var requests = await api.GetRequestsAsync();
+            var requests = await api.GetRequestsAsync().ConfigureAwait(false);
 
             // Assert
             Check.That(requests).HasSize(1);
@@ -340,7 +340,7 @@ namespace WireMock.Net.Tests
             var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
 
             // Act
-            var request = await api.PostFileAsync("filename.txt", "abc");
+            var request = await api.PostFileAsync("filename.txt", "abc").ConfigureAwait(false);
 
             // Assert
             Check.That(request.Guid).IsNull();
@@ -373,7 +373,7 @@ namespace WireMock.Net.Tests
             var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
 
             // Act
-            var request = await api.PutFileAsync("filename.txt", "abc-abc");
+            var request = await api.PutFileAsync("filename.txt", "abc-abc").ConfigureAwait(false);
 
             // Assert
             Check.That(request.Guid).IsNull();
@@ -459,7 +459,7 @@ namespace WireMock.Net.Tests
             var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
 
             // Act
-            string file = await api.GetFileAsync("filename.txt");
+            string file = await api.GetFileAsync("filename.txt").ConfigureAwait(false);
 
             // Assert
             Check.That(file).Equals(data);
@@ -490,7 +490,7 @@ namespace WireMock.Net.Tests
             var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
 
             // Act
-            await api.DeleteFileAsync("filename.txt");
+            await api.DeleteFileAsync("filename.txt").ConfigureAwait(false);
 
             // Verify
             filesystemHandlerMock.Verify(fs => fs.FileExists(It.Is<string>(p => p == "filename.txt")), Times.Once);

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -324,7 +324,7 @@ namespace WireMock.Net.Tests
             Check.That(mappings).HasSize(2);
 
             // when
-            var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/1");
+            var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/1").ConfigureAwait(false);
 
             // then
             Check.That((int)response.StatusCode).IsEqualTo(400);
@@ -339,7 +339,7 @@ namespace WireMock.Net.Tests
             var server = WireMockServer.Start();
 
             // when
-            await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo");
+            await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false);
 
             // then
             Check.That(server.LogEntries).HasSize(1);
@@ -359,9 +359,9 @@ namespace WireMock.Net.Tests
             var server = WireMockServer.Start();
             server.SetMaxRequestLogCount(2);
 
-            await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo1");
-            await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo2");
-            await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo3");
+            await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo1").ConfigureAwait(false);
+            await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo2").ConfigureAwait(false);
+            await client.GetAsync("http://localhost:" + server.Ports[0] + "/foo3").ConfigureAwait(false);
 
             // Assert
             Check.That(server.LogEntries).HasSize(2);
@@ -469,7 +469,7 @@ namespace WireMock.Net.Tests
                 Content = new StringContent(guidsJsonBody, Encoding.UTF8, "application/json")
             };
 
-            var response = await new HttpClient().SendAsync(request);
+            var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
 
             // Assert
             IEnumerable<Guid> guids = server.MappingModels.Select(mapping => mapping.Guid.Value);
@@ -477,7 +477,7 @@ namespace WireMock.Net.Tests
             Check.That(guids.Contains(guid2.Value)).IsFalse();
             Check.That(guids.Contains(guid3.Value)).IsTrue();
             Check.That(response.StatusCode).Equals(HttpStatusCode.OK);
-            Check.That(await response.Content.ReadAsStringAsync()).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}");
+            Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}");
         }
     }
 }

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

@@ -1,4 +1,4 @@
-using Moq;
+using Moq;
 using NFluent;
 using System.IO;
 using System.Linq;
@@ -39,7 +39,7 @@ namespace WireMock.Net.Tests
             multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string."))));
 
             // Act
-            var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent);
+            var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent).ConfigureAwait(false);
 
             // Assert
             Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.OK);
@@ -74,7 +74,7 @@ namespace WireMock.Net.Tests
             multipartFormDataContent.Add(new StreamContent(new MemoryStream(Encoding.ASCII.GetBytes("Here's a string."))));
 
             // Act
-            var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent);
+            var httpResponseMessage = await _client.PostAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt", multipartFormDataContent).ConfigureAwait(false);
 
             // Assert
             Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.OK);
@@ -107,7 +107,7 @@ namespace WireMock.Net.Tests
             multipartFormDataContent.Add(new StreamContent(new MemoryStream()));
 
             // Act
-            var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt");
+            var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt").ConfigureAwait(false);
 
             // Assert
             Check.That(httpResponseMessageGet.StatusCode).Equals(HttpStatusCode.OK);
@@ -143,7 +143,7 @@ namespace WireMock.Net.Tests
             multipartFormDataContent.Add(new StreamContent(new MemoryStream()));
 
             // Act
-            var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.bin");
+            var httpResponseMessageGet = await _client.GetAsync("http://localhost:" + server.Ports[0] + "/__admin/files/filename.bin").ConfigureAwait(false);
 
             // Assert
             Check.That(httpResponseMessageGet.StatusCode).Equals(HttpStatusCode.OK);
@@ -173,7 +173,7 @@ namespace WireMock.Net.Tests
             // Act
             var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt";
             var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri);
-            var httpResponseMessage = await _client.SendAsync(httpRequestMessage);
+            var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false);
 
             // Assert
             Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.NoContent);
@@ -201,7 +201,7 @@ namespace WireMock.Net.Tests
             // Act
             var requestUri = "http://localhost:" + server.Ports[0] + "/__admin/files/filename.txt";
             var httpRequestMessage = new HttpRequestMessage(HttpMethod.Head, requestUri);
-            var httpResponseMessage = await _client.SendAsync(httpRequestMessage);
+            var httpResponseMessage = await _client.SendAsync(httpRequestMessage).ConfigureAwait(false);
 
             // Assert
             Check.That(httpResponseMessage.StatusCode).Equals(HttpStatusCode.NotFound);

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

@@ -46,7 +46,7 @@ namespace WireMock.Net.Tests
                 RequestUri = new Uri(server.Urls[0])
             };
             var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
-            await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+            await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             Check.That(server.Mappings).HasSize(2);
@@ -75,7 +75,7 @@ namespace WireMock.Net.Tests
                 RequestUri = new Uri(server.Urls[0])
             };
             var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
-            await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+            await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             server.Mappings.Should().HaveCount(2);
@@ -107,7 +107,7 @@ namespace WireMock.Net.Tests
                 RequestUri = new Uri(server.Urls[0])
             };
             var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
-            await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+            await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             server.Mappings.Should().HaveCount(1);
@@ -143,7 +143,7 @@ namespace WireMock.Net.Tests
                 RequestUri = new Uri(server.Urls[0])
             };
             var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
-            await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+            await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             server.Mappings.Should().HaveCount(1);
@@ -174,7 +174,7 @@ namespace WireMock.Net.Tests
                 RequestUri = new Uri(server.Urls[0])
             };
             var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
-            await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+            await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             server.Mappings.Should().HaveCount(2);
@@ -198,8 +198,8 @@ namespace WireMock.Net.Tests
                 RequestUri = new Uri($"{server.Urls[0]}{path}")
             };
             var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
-            var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage);
-            string content = await response.Content.ReadAsStringAsync();
+            var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
+            string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
             // Assert
             Check.That(server.Mappings).HasSize(1);
@@ -239,7 +239,7 @@ namespace WireMock.Net.Tests
             };
             requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
             requestMessage.Content.Headers.Add("bbb", "test");
-            await new HttpClient().SendAsync(requestMessage);
+            await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
@@ -288,10 +288,10 @@ namespace WireMock.Net.Tests
                 Content = new StringContent("stringContent", Encoding.ASCII)
             };
             requestMessage.Headers.Authorization = new AuthenticationHeaderValue("BASIC", "test-A");
-            var result = await new HttpClient().SendAsync(requestMessage);
+            var result = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
-            (await result.Content.ReadAsStringAsync()).Should().Be("BASIC test-A");
+            (await result.Content.ReadAsStringAsync().ConfigureAwait(false)).Should().Be("BASIC test-A");
 
             var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
             var authorizationHeader = receivedRequest.Headers["Authorization"].ToString().Should().Be("BASIC test-A");
@@ -334,7 +334,7 @@ namespace WireMock.Net.Tests
             };
             requestMessage.Headers.Add("foobar", "exact_match");
             requestMessage.Headers.Add("ok", "ok-value");
-            await new HttpClient().SendAsync(requestMessage);
+            await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid);
@@ -381,7 +381,7 @@ namespace WireMock.Net.Tests
             cookieContainer.Add(new Uri("http://localhost"), new Cookie("GoodCookie", "I_should_pass"));
 
             var handler = new HttpClientHandler { CookieContainer = cookieContainer };
-            await new HttpClient(handler).SendAsync(requestMessage);
+            await new HttpClient(handler).SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             var mapping = server.Mappings.FirstOrDefault(m => m.Guid != defaultMapping.Guid);
@@ -416,7 +416,7 @@ namespace WireMock.Net.Tests
                 Content = new StringContent("")
             };
             requestMessage.Content.Headers.ContentType = new MediaTypeHeaderValue("text/plain");
-            await new HttpClient().SendAsync(requestMessage);
+            await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
@@ -448,10 +448,10 @@ namespace WireMock.Net.Tests
                 Method = HttpMethod.Get,
                 RequestUri = new Uri($"{server.Urls[0]}{path}")
             };
-            var response = await new HttpClient().SendAsync(requestMessage);
+            var response = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
-            Check.That(await response.Content.ReadAsStringAsync()).IsEqualTo("body");
+            Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).IsEqualTo("body");
             Check.That(response.Content.Headers.Contains("Content-Type")).IsTrue();
             Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("text/plain");
         }
@@ -482,7 +482,7 @@ namespace WireMock.Net.Tests
                 RequestUri = new Uri($"{server.Urls[0]}{path}")
             };
             var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
-            var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+            var response = await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             Check.That(response.Headers.Contains("Location")).IsTrue();
@@ -513,7 +513,7 @@ namespace WireMock.Net.Tests
             };
             var clientHandler = new HttpClientHandler();
             clientHandler.CookieContainer.Add(requestUri, new Cookie("name", "value"));
-            await new HttpClient(clientHandler).SendAsync(requestMessage);
+            await new HttpClient(clientHandler).SendAsync(requestMessage).ConfigureAwait(false);
 
             // then
             var receivedRequest = serverForProxyForwarding.LogEntries.First().RequestMessage;
@@ -552,7 +552,7 @@ namespace WireMock.Net.Tests
                 .RespondWith(Response.Create().WithProxy(serverForProxyForwarding.Urls[0]));
 
             // act
-            var response = await new HttpClient().PostAsync(server.Urls[0], new ByteArrayContent(jpegHeader));
+            var response = await new HttpClient().PostAsync(server.Urls[0], new ByteArrayContent(jpegHeader)).ConfigureAwait(false);
 
             // assert
             Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.OK);
@@ -581,10 +581,10 @@ namespace WireMock.Net.Tests
                 Method = HttpMethod.Get,
                 RequestUri = new Uri($"{server.Urls[0]}{path}")
             };
-            var response = await new HttpClient().SendAsync(requestMessage);
+            var response = await new HttpClient().SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
-            string content = await response.Content.ReadAsStringAsync();
+            string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
             Check.That(content).IsEqualTo("{\"i\":42}");
             Check.That(response.Content.Headers.GetValues("Content-Type")).ContainsExactly("application/json; charset=utf-8");
         }
@@ -612,10 +612,10 @@ namespace WireMock.Net.Tests
             {
                 { new StringContent("data"), "test", "test.txt" }
             };
-            var response = await new HttpClient().PostAsync(uri, form);
+            var response = await new HttpClient().PostAsync(uri, form).ConfigureAwait(false);
 
             // Assert
-            string content = await response.Content.ReadAsStringAsync();
+            string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
             Check.That(content).IsEqualTo("{\"i\":42}");
         }
 
@@ -647,10 +647,10 @@ namespace WireMock.Net.Tests
                 Method = HttpMethod.Get,
                 RequestUri = new Uri($"{server.Urls[0]}{path}")
             };
-            var response1 = await new HttpClient().SendAsync(requestMessage1);
+            var response1 = await new HttpClient().SendAsync(requestMessage1).ConfigureAwait(false);
 
             // Assert 1
-            string content1 = await response1.Content.ReadAsStringAsync();
+            string content1 = await response1.Content.ReadAsStringAsync().ConfigureAwait(false);
             Check.That(content1).IsEqualTo("ok");
 
             // Act 2
@@ -659,10 +659,10 @@ namespace WireMock.Net.Tests
                 Method = HttpMethod.Get,
                 RequestUri = new Uri($"{server.Urls[0]}/__admin/mappings")
             };
-            var response2 = await new HttpClient().SendAsync(requestMessage2);
+            var response2 = await new HttpClient().SendAsync(requestMessage2).ConfigureAwait(false);
 
             // Assert 2
-            string content2 = await response2.Content.ReadAsStringAsync();
+            string content2 = await response2.Content.ReadAsStringAsync().ConfigureAwait(false);
             Check.That(content2).IsEqualTo("[]");
         }
 
@@ -688,12 +688,12 @@ namespace WireMock.Net.Tests
                 RequestUri = new Uri(server.Urls[0])
             };
             var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
-            var result = await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+            var result = await new HttpClient(httpClientHandler).SendAsync(requestMessage).ConfigureAwait(false);
 
             // Assert
             result.StatusCode.Should().Be(HttpStatusCode.InternalServerError);
 
-            var content = await result.Content.ReadAsStringAsync();
+            var content = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
             content.Should().NotBeEmpty();
 
             server.LogEntries.Should().HaveCount(1);

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

@@ -1,4 +1,4 @@
-using NFluent;
+using NFluent;
 using System;
 using System.Linq;
 using System.Net;
@@ -35,8 +35,8 @@ namespace WireMock.Net.Tests
             request.Headers.Add("prx", "1");
 
             // Assert
-            var response = await new HttpClient().SendAsync(request);
-            string content = await response.Content.ReadAsStringAsync();
+            var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
+            string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
             Check.That(content).IsEqualTo("{\"p\":42}");
             Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.Created);

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

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -70,8 +70,8 @@ namespace WireMock.Net.Tests
             };
 
             // Assert
-            var response = await new HttpClient().SendAsync(request);
-            string content = await response.Content.ReadAsStringAsync();
+            var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
+            string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
             response.StatusCode.Should().Be(HttpStatusCode.OK);
             content.Should().Be("a-response");
@@ -118,8 +118,8 @@ namespace WireMock.Net.Tests
             };
 
             // Assert
-            var response = await new HttpClient().SendAsync(request);
-            string content = await response.Content.ReadAsStringAsync();
+            var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
+            string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
             response.StatusCode.Should().Be(HttpStatusCode.OK);
             content.Should().Be("a-response");
@@ -151,8 +151,8 @@ namespace WireMock.Net.Tests
             };
 
             // Assert
-            var response = await new HttpClient().SendAsync(request);
-            string content = await response.Content.ReadAsStringAsync();
+            var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
+            string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
             response.StatusCode.Should().Be(HttpStatusCode.OK);
             content.Should().Be("a-response");
@@ -185,8 +185,8 @@ namespace WireMock.Net.Tests
             };
 
             // Assert
-            var response = await new HttpClient().SendAsync(request);
-            string content = await response.Content.ReadAsStringAsync();
+            var response = await new HttpClient().SendAsync(request).ConfigureAwait(false);
+            string content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
 
             response.StatusCode.Should().Be(HttpStatusCode.OK);
             content.Should().Be("a-response");

test/WireMock.Net.Tests/WireMockServerTests.WithBody.cs

@@ -37,7 +37,7 @@ namespace WireMock.Net.Tests
             };
 
             // Act
-            var response = await new HttpClient().PostAsJsonAsync("http://localhost:" + server.Ports[0] + "/foo", jsonObject);
+            var response = await new HttpClient().PostAsJsonAsync("http://localhost:" + server.Ports[0] + "/foo", jsonObject).ConfigureAwait(false);
 
             // Assert
             response.StatusCode.Should().Be(HttpStatusCode.OK);
@@ -58,7 +58,7 @@ namespace WireMock.Net.Tests
                 );
 
             // Act
-            var response = await new HttpClient().PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("{ Hi = \"Hello World\" }"));
+            var response = await new HttpClient().PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("{ Hi = \"Hello World\" }")).ConfigureAwait(false);
 
             // Assert
             response.StatusCode.Should().Be(HttpStatusCode.OK);

test/WireMock.Net.Tests/WireMockServerTests.WithCallback.cs

@@ -28,7 +28,7 @@ namespace WireMock.Net.Tests
 
 			// Act
 			var httpClient = new HttpClient();
-			var response = await httpClient.PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("dummy"));
+			var response = await httpClient.PostAsync("http://localhost:" + server.Ports[0] + "/foo", new StringContent("dummy")).ConfigureAwait(false);
 
 			// Assert
 			response.StatusCode.Should().Be(HttpStatusCode.Conflict);