1.5.39

* Support for xml namespaces in XPathMatcher

* Review findings of Stef implemented.

* Fix of build error

* New review findings by Stef

---------

Co-authored-by: Carsten Alder <carsten.alder@schleupen.de>

.github/FUNDING.yml

@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # [StefH]
+github: [StefH]
 patreon: # Replace with a single Patreon username
 open_collective: # wiremocknet
 ko_fi: # Replace with a single Ko-fi username
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: https://www.paypal.me/stefheyenrath
+custom: https://www.paypal.me/stefheyenrath

.gitignore

@@ -255,3 +255,5 @@ paket-files/
 /test/WireMock.Net.Tests/coverage.opencover.xml
 /test/WireMock.Net.Tests/coverage.netcoreapp3.1.opencover.xml
 /test/WireMock.Net.Tests/coverage.net5.0.opencover.xml
+
+*.received.*

CHANGELOG.md

@@ -1,3 +1,191 @@
+# 1.5.39 (09 October 2023)
+- [#1006](https://github.com/WireMock-Net/WireMock.Net/pull/1006) - Fix RequestMessageParamMatcher : RejectOnMatch [bug] contributed by [StefH](https://github.com/StefH)
+- [#997](https://github.com/WireMock-Net/WireMock.Net/issues/997) - JmesPathMatcher or and MatchOperator working in version 1.5.34 but not 1.5.35 [bug]
+
+# 1.5.38 (02 October 2023)
+- [#1005](https://github.com/WireMock-Net/WireMock.Net/pull/1005) - Support for xml namespaces in XPathMatcher [feature] contributed by [cal-schleupen](https://github.com/cal-schleupen)
+
+# 1.5.37 (27 September 2023)
+- [#998](https://github.com/WireMock-Net/WireMock.Net/pull/998) - Add JmesPathMatcher UnitTests [test] contributed by [StefH](https://github.com/StefH)
+- [#1004](https://github.com/WireMock-Net/WireMock.Net/pull/1004) - Fix MappingModel to map IgnoreCase and RejectOnMatch for Headers, Cookies and Parameters [bug] contributed by [StefH](https://github.com/StefH)
+- [#1003](https://github.com/WireMock-Net/WireMock.Net/issues/1003) - Store Mapping per POST request ignores "IgnoreCase" property of HeaderModel [bug]
+
+# 1.5.36 (21 September 2023)
+- [#986](https://github.com/WireMock-Net/WireMock.Net/pull/986) - Write logging in case a Matcher throws an exception [feature] contributed by [StefH](https://github.com/StefH)
+- [#996](https://github.com/WireMock-Net/WireMock.Net/pull/996) - Remove dependency on Microsoft.AspNet.WebApi.Client [feature] contributed by [StefH](https://github.com/StefH)
+- [#1002](https://github.com/WireMock-Net/WireMock.Net/pull/1002) - Fixed logic for SaveUnmatchedRequests [bug] contributed by [StefH](https://github.com/StefH)
+- [#974](https://github.com/WireMock-Net/WireMock.Net/issues/974) - HttpClient extension methods causes ambiguous invocations in .NET 7 [bug]
+- [#1001](https://github.com/WireMock-Net/WireMock.Net/issues/1001) - SaveUnmatchedRequests stopped working [bug]
+
+# 1.5.35 (19 August 2023)
+- [#992](https://github.com/WireMock-Net/WireMock.Net/pull/992) - Add extra unit test for WithParam multiple values comma [test] contributed by [StefH](https://github.com/StefH)
+- [#993](https://github.com/WireMock-Net/WireMock.Net/pull/993) - Update JSONPathMatcher.cs to cover the string path selection to a child contributed by [DayLightDancer](https://github.com/DayLightDancer)
+
+# 1.5.34 (04 August 2023)
+- [#989](https://github.com/WireMock-Net/WireMock.Net/pull/989) - Fix MimeKitLite NuGet include [bug] contributed by [StefH](https://github.com/StefH)
+- [#988](https://github.com/WireMock-Net/WireMock.Net/issues/988) - v1.5.33  Returns always StatusCode 500 [bug]
+
+# 1.5.33 (03 August 2023)
+- [#972](https://github.com/WireMock-Net/WireMock.Net/pull/972) - JsonPartialMatcher - match guid and string contributed by [timurnes](https://github.com/timurnes)
+- [#976](https://github.com/WireMock-Net/WireMock.Net/pull/976) - Upgrade to Handlebars.Net.Helpers 2.4.0 to update XPath.SelectTokens and XPath.EvaluateToString [feature] contributed by [StefH](https://github.com/StefH)
+- [#981](https://github.com/WireMock-Net/WireMock.Net/pull/981) - Add MultiPart/MimePart Request Matcher [feature] contributed by [StefH](https://github.com/StefH)
+- [#968](https://github.com/WireMock-Net/WireMock.Net/issues/968) - Using request multipart in response template [feature]
+- [#969](https://github.com/WireMock-Net/WireMock.Net/issues/969) - Multipart validation [feature]
+- [#970](https://github.com/WireMock-Net/WireMock.Net/issues/970) - Loop through xml elements in handlebars template [feature]
+- [#971](https://github.com/WireMock-Net/WireMock.Net/issues/971) - JsonPartialMatcher - match guid and string [feature]
+
+# 1.5.32 (15 July 2023)
+- [#966](https://github.com/WireMock-Net/WireMock.Net/pull/966) - Fixed JsonPathMatcher to match nested objects [bug] contributed by [StefH](https://github.com/StefH)
+- [#965](https://github.com/WireMock-Net/WireMock.Net/issues/965) - JsonPathMatcher does not match json body nested objects [bug]
+- [#967](https://github.com/WireMock-Net/WireMock.Net/issues/967) - ⭐10 million downloads ! ⭐ [feature]
+
+# 1.5.31 (08 July 2023)
+- [#964](https://github.com/WireMock-Net/WireMock.Net/pull/964) - Add GraphQL Schema matching [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.30 (28 June 2023)
+- [#959](https://github.com/WireMock-Net/WireMock.Net/pull/959) - Fixed logic for FluentAssertions WithHeader [bug] contributed by [StefH](https://github.com/StefH)
+- [#961](https://github.com/WireMock-Net/WireMock.Net/pull/961) - Add unit-test for Param MatcherModel LinqMatcher [test] contributed by [StefH](https://github.com/StefH)
+- [#962](https://github.com/WireMock-Net/WireMock.Net/pull/962) - Bump System.Linq.Dynamic.Core from 1.2.23 to 1.3.0 in /examples/WireMock.Net.Console.Net472.Classic [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#963](https://github.com/WireMock-Net/WireMock.Net/pull/963) - Bump System.Linq.Dynamic.Core from 1.2.23 to 1.3.0 in /examples/WireMock.Net.StandAlone.Net461 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#958](https://github.com/WireMock-Net/WireMock.Net/issues/958) - [FluentAssertions] Should().HaveReceivedACall().WithHeader() only checks the first header with the matching key. [bug]
+
+# 1.5.29 (22 June 2023)
+- [#954](https://github.com/WireMock-Net/WireMock.Net/pull/954) - Support setting WireMockServerSettings via Environment [feature] contributed by [StefH](https://github.com/StefH)
+- [#955](https://github.com/WireMock-Net/WireMock.Net/pull/955) - Fix some SonarCloud issues [refactor] contributed by [StefH](https://github.com/StefH)
+- [#953](https://github.com/WireMock-Net/WireMock.Net/issues/953) - How to use environment variable [feature]
+
+# 1.5.28 (11 June 2023)
+- [#948](https://github.com/WireMock-Net/WireMock.Net/pull/948) - WireMock.Net.Testcontainers [feature] contributed by [StefH](https://github.com/StefH)
+- [#951](https://github.com/WireMock-Net/WireMock.Net/pull/951) - Allow setting the Content-Length header for a HTTP method HEAD [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.27 (03 June 2023)
+- [#946](https://github.com/WireMock-Net/WireMock.Net/pull/946) - Add warning logging when sending a request to a Webhook does not return status 200 [feature] contributed by [StefH](https://github.com/StefH)
+- [#949](https://github.com/WireMock-Net/WireMock.Net/pull/949) - Add ".NET Framework 4.7" to WireMock.Net.FluentAssertions [feature] contributed by [StefH](https://github.com/StefH)
+- [#928](https://github.com/WireMock-Net/WireMock.Net/issues/928) - TypeLoadException when using WithHeader method. [bug]
+- [#945](https://github.com/WireMock-Net/WireMock.Net/issues/945) - Webhook logging [feature]
+
+# 1.5.26 (25 May 2023)
+- [#938](https://github.com/WireMock-Net/WireMock.Net/pull/938) - Add more unitests for CSharpFormatter utils [test] contributed by [StefH](https://github.com/StefH)
+- [#939](https://github.com/WireMock-Net/WireMock.Net/pull/939) - WireMockMiddleware should use HandleRequestsSynchronously correctly [bug] contributed by [StefH](https://github.com/StefH)
+- [#940](https://github.com/WireMock-Net/WireMock.Net/pull/940) - Code generator improvements contributed by [cezarypiatek](https://github.com/cezarypiatek)
+- [#942](https://github.com/WireMock-Net/WireMock.Net/pull/942) - Add GetParameter method to IRequestMessage [feature] contributed by [StefH](https://github.com/StefH)
+- [#941](https://github.com/WireMock-Net/WireMock.Net/issues/941) - RequestMessage.GetParameter method missing from IRequestMessage interface [feature]
+
+# 1.5.25 (13 May 2023)
+- [#934](https://github.com/WireMock-Net/WireMock.Net/pull/934) - Code generator improvements [feature] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+
+# 1.5.24 (07 May 2023)
+- [#926](https://github.com/WireMock-Net/WireMock.Net/pull/926) - Fix C# mapping code generator for header names [bug] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+- [#927](https://github.com/WireMock-Net/WireMock.Net/pull/927) - Enrich generated code with status code [feature] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+- [#930](https://github.com/WireMock-Net/WireMock.Net/pull/930) - Update C# mapping code generator for WithStatusCode [feature] contributed by [StefH](https://github.com/StefH)
+- [#931](https://github.com/WireMock-Net/WireMock.Net/pull/931) - Add property 'IsStartedWithAdminInterface' to 'IWireMockServer' [feature] contributed by [StefH](https://github.com/StefH)
+- [#933](https://github.com/WireMock-Net/WireMock.Net/pull/933) - C# code generator improvements [feature] contributed by [cezarypiatek](https://github.com/cezarypiatek)
+
+# 1.5.23 (23 April 2023)
+- [#922](https://github.com/WireMock-Net/WireMock.Net/pull/922) - Add WithProbability [feature] contributed by [StefH](https://github.com/StefH)
+- [#924](https://github.com/WireMock-Net/WireMock.Net/pull/924) - Allow removal of prefix when proxying to another server (#630) [feature] contributed by [nudejustin](https://github.com/nudejustin)
+- [#925](https://github.com/WireMock-Net/WireMock.Net/pull/925) - Add IgnoreCase option to ProxyUrlReplaceSettings [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.22 (08 April 2023)
+- [#914](https://github.com/WireMock-Net/WireMock.Net/pull/914) - #912 add excluded params to proxy mapping [feature] contributed by [walidhaidarii](https://github.com/walidhaidarii)
+- [#916](https://github.com/WireMock-Net/WireMock.Net/pull/916) - Include WireMockOpenApiParser project [feature] contributed by [StefH](https://github.com/StefH)
+- [#912](https://github.com/WireMock-Net/WireMock.Net/issues/912) - Feature: adding excluded params to proxy and records settings [feature]
+
+# 1.5.21 (22 March 2023)
+- [#908](https://github.com/WireMock-Net/WireMock.Net/pull/908) - RequestBuilder : add WithBodyAsJson and WithBody (with IJsonConverter) [feature] contributed by [StefH](https://github.com/StefH)
+- [#911](https://github.com/WireMock-Net/WireMock.Net/pull/911) - Fixed QueryStringParser for UrlEncoded values [bug] contributed by [StefH](https://github.com/StefH)
+- [#901](https://github.com/WireMock-Net/WireMock.Net/issues/901) - Matching one form-urlencoded value [feature]
+
+# 1.5.20 (19 March 2023)
+- [#905](https://github.com/WireMock-Net/WireMock.Net/pull/905) - Add DeserializeFormUrl Encoded to the settings [feature] contributed by [StefH](https://github.com/StefH)
+- [#907](https://github.com/WireMock-Net/WireMock.Net/pull/907) - Fix issue with application/x-www-form-urlencoded and ExactMatcher [bug] contributed by [StefH](https://github.com/StefH)
+- [#906](https://github.com/WireMock-Net/WireMock.Net/issues/906) - Upgrade to 1.5.19 breaks a form data test [bug]
+
+# 1.5.19 (17 March 2023)
+- [#903](https://github.com/WireMock-Net/WireMock.Net/pull/903) - Add WithBody with IDictionary (form-urlencoded values) [feature] contributed by [StefH](https://github.com/StefH)
+- [#904](https://github.com/WireMock-Net/WireMock.Net/pull/904) - Update Handlebars.Net.Helpers to 2.3.15 [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.18 (09 March 2023)
+- [#893](https://github.com/WireMock-Net/WireMock.Net/pull/893) - Add 'Data' to response which can be used during transforming the response [feature] contributed by [StefH](https://github.com/StefH)
+- [#896](https://github.com/WireMock-Net/WireMock.Net/pull/896) - Bump Microsoft.Owin from 2.0.2 to 4.2.2 in /examples/WireMock.Net.Service [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#900](https://github.com/WireMock-Net/WireMock.Net/pull/900) - ProxySettings : Add logic to not save some requests depending on HttpMethods  [feature] contributed by [StefH](https://github.com/StefH)
+- [#897](https://github.com/WireMock-Net/WireMock.Net/issues/897) - WebHostBuilder.ConfigureServices method not found when using nunit3testadapter 4.4.0 [bug]
+- [#899](https://github.com/WireMock-Net/WireMock.Net/issues/899) - Ignore OPTIONS request when using proxyandrecord [feature]
+
+# 1.5.17 (25 February 2023)
+- [#881](https://github.com/WireMock-Net/WireMock.Net/pull/881) - Add WithBodyAsJson builder method with accepts a Func [feature] contributed by [StefH](https://github.com/StefH)
+- [#882](https://github.com/WireMock-Net/WireMock.Net/pull/882) - Add example code to test HTTP Status 400 and 500 [test] contributed by [StefH](https://github.com/StefH)
+- [#890](https://github.com/WireMock-Net/WireMock.Net/pull/890) - AdminApiMappingBuilder [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.16 (01 February 2023)
+- [#880](https://github.com/WireMock-Net/WireMock.Net/pull/880) - Add `WithProxy(string proxyUrl, X509Certificate2 certificate)` [feature] contributed by [StefH](https://github.com/StefH)
+- [#879](https://github.com/WireMock-Net/WireMock.Net/issues/879) - Possibility to pass a X509Certificate2 to WithProxy() or specifiy certificate loading options [feature]
+
+# 1.5.15 (29 January 2023)
+- [#878](https://github.com/WireMock-Net/WireMock.Net/pull/878) - Update REST Admin interface to support "Get Mapping(s) as C# Code" [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.14 (24 January 2023)
+- [#842](https://github.com/WireMock-Net/WireMock.Net/pull/842) - Generate C# code from Mapping [feature] contributed by [StefH](https://github.com/StefH)
+- [#869](https://github.com/WireMock-Net/WireMock.Net/pull/869) - Add MappingBuilder to build mappings in code and export to Models or JSON [feature] contributed by [StefH](https://github.com/StefH)
+- [#871](https://github.com/WireMock-Net/WireMock.Net/pull/871) - Add UseWebhooksFireAndForget to Server ConvertMapping [bug] contributed by [ggradnig](https://github.com/ggradnig)
+- [#872](https://github.com/WireMock-Net/WireMock.Net/pull/872) - Fix unsubscribe from LogEntriesChanged event handler [bug] contributed by [StefH](https://github.com/StefH)
+- [#875](https://github.com/WireMock-Net/WireMock.Net/pull/875) - Fix Self referencing loop detected for property [bug] contributed by [eseneckiy](https://github.com/eseneckiy)
+- [#877](https://github.com/WireMock-Net/WireMock.Net/pull/877) - Add unit test example for Transformer Handlebars String.Append String.Join [test] contributed by [StefH](https://github.com/StefH)
+- [#701](https://github.com/WireMock-Net/WireMock.Net/issues/701) - Allow to create MappingModel from c# to be able to configure local and remote mocks similarly [feature]
+- [#867](https://github.com/WireMock-Net/WireMock.Net/issues/867) - Can I build mappings with code and save them to JSON-file without starting server [feature]
+- [#870](https://github.com/WireMock-Net/WireMock.Net/issues/870) - Can not unsubscribe from LogEntriesChanged event. [bug]
+
+# 1.5.13 (11 December 2022)
+- [#858](https://github.com/WireMock-Net/WireMock.Net/pull/858) - Update Transformer functionality to return value instead of string [feature] contributed by [StefH](https://github.com/StefH)
+- [#859](https://github.com/WireMock-Net/WireMock.Net/pull/859) - Add UpdatedAt property to Mapping [feature] contributed by [StefH](https://github.com/StefH)
+- [#861](https://github.com/WireMock-Net/WireMock.Net/pull/861) - Add extra functionality for issue 55 contributed by [StefH](https://github.com/StefH)
+- [#862](https://github.com/WireMock-Net/WireMock.Net/pull/862) - Add client certificate support [feature] contributed by [billybraga](https://github.com/billybraga)
+- [#863](https://github.com/WireMock-Net/WireMock.Net/pull/863) - Update WireMockServer.CreateClient/CreateClients to include handlers [feature] contributed by [StefH](https://github.com/StefH)
+- [#856](https://github.com/WireMock-Net/WireMock.Net/issues/856) - Inconsistent result with overlapping (duplicate) request [bug]
+
+# 1.5.12 (03 December 2022)
+- [#851](https://github.com/WireMock-Net/WireMock.Net/pull/851) - Fix Linux CI build + Fix opencover [feature] contributed by [StefH](https://github.com/StefH)
+- [#853](https://github.com/WireMock-Net/WireMock.Net/pull/853) - Add .Net 7 [feature] contributed by [StefH](https://github.com/StefH)
+- [#854](https://github.com/WireMock-Net/WireMock.Net/pull/854) - Fix logic for QueryParameterMultipleValueSupport [bug] contributed by [StefH](https://github.com/StefH)
+- [#857](https://github.com/WireMock-Net/WireMock.Net/pull/857) - Update some dependencies [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.11 (24 November 2022)
+- [#836](https://github.com/WireMock-Net/WireMock.Net/pull/836) - Add Settings.QueryParameterMultipleValueSupport [feature] contributed by [StefH](https://github.com/StefH)
+- [#848](https://github.com/WireMock-Net/WireMock.Net/pull/848) - Use try-catch when adding or removing logEntry [bug] contributed by [StefH](https://github.com/StefH)
+- [#846](https://github.com/WireMock-Net/WireMock.Net/issues/846) - Exception ArgumentOutOfRangeException [bug]
+
+# 1.5.10 (06 November 2022)
+- [#843](https://github.com/WireMock-Net/WireMock.Net/pull/843) - Webhook Templating: Use the transformed URL to create the HttpRequestMessage contributed by [ggradnig](https://github.com/ggradnig)
+- [#845](https://github.com/WireMock-Net/WireMock.Net/pull/845) - Add WireMockNullLogger as valid commandline logger option [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.9 (29 October 2022)
+- [#828](https://github.com/WireMock-Net/WireMock.Net/pull/828) - Add setting to skip saving the string-response in the logging when using WithBody(Func...) [feature] contributed by [StefH](https://github.com/StefH)
+- [#832](https://github.com/WireMock-Net/WireMock.Net/pull/832) - Fixes for WireMock.Net.FluentAssertions (callcount behaviour) [feature] contributed by [StefH](https://github.com/StefH)
+- [#834](https://github.com/WireMock-Net/WireMock.Net/pull/834) - Support deleting / resetting a single scenario [feature] contributed by [StefH](https://github.com/StefH)
+- [#837](https://github.com/WireMock-Net/WireMock.Net/pull/837) - Bump Microsoft.AspNetCore.Server.Kestrel.Core from 2.1.7 to 2.1.25 in /examples/WireMock.Net.StandAlone.Net461 [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
+- [#838](https://github.com/WireMock-Net/WireMock.Net/pull/838) - Add option to ProxySettings to append guid to mapping file contributed by [StefH](https://github.com/StefH)
+- [#826](https://github.com/WireMock-Net/WireMock.Net/issues/826) - Dynamic Body not to be cached when a Func is used to created the body [feature]
+
+# 1.5.8 (16 October 2022)
+- [#816](https://github.com/WireMock-Net/WireMock.Net/pull/816) - Some fixes to WireMock.Net.Assertions [feature] contributed by [StefH](https://github.com/StefH)
+- [#817](https://github.com/WireMock-Net/WireMock.Net/pull/817) - ExactMatcher : IgnoreCase [feature] contributed by [StefH](https://github.com/StefH)
+- [#824](https://github.com/WireMock-Net/WireMock.Net/pull/824) - WebHook - Transform Url [feature] contributed by [StefH](https://github.com/StefH)
+- [#814](https://github.com/WireMock-Net/WireMock.Net/issues/814) - WithHeader cannot handle multiple requests with the same header key values [bug]
+- [#815](https://github.com/WireMock-Net/WireMock.Net/issues/815) - Why does UsingMethod check _callscount? [bug]
+- [#822](https://github.com/WireMock-Net/WireMock.Net/issues/822) - Webhook with generic url, body and custom header values [feature]
+
+# 1.5.7 (11 October 2022)
+- [#818](https://github.com/WireMock-Net/WireMock.Net/pull/818) - Add option to run the server on http & https [feature] contributed by [StefH](https://github.com/StefH)
+- [#821](https://github.com/WireMock-Net/WireMock.Net/pull/821) - Add UseDefinedRequestMatchers to ProxyAndRecordSettings [feature] contributed by [StefH](https://github.com/StefH)
+- [#823](https://github.com/WireMock-Net/WireMock.Net/pull/823) - Add implicit operators to WireMockList contributed by [StefH](https://github.com/StefH)
+- [#819](https://github.com/WireMock-Net/WireMock.Net/issues/819) - Can I preserve Mapping title and matchers for proxy response? [feature]
+
+# 1.5.6 (12 September 2022)
+- [#803](https://github.com/WireMock-Net/WireMock.Net/pull/803) - WebHook : UseFireAndForget + Delay [feature] contributed by [StefH](https://github.com/StefH)
+- [#804](https://github.com/WireMock-Net/WireMock.Net/pull/804) - Change nuget to package reference for WireMock.Net.Console.Net472.Cla… [feature] contributed by [mattisking](https://github.com/mattisking)
+- [#806](https://github.com/WireMock-Net/WireMock.Net/pull/806) - Tweak middleware and fix bug in example [feature] contributed by [mattisking](https://github.com/mattisking)
+- [#801](https://github.com/WireMock-Net/WireMock.Net/issues/801) - Webhook Delays [feature]
+
 # 1.5.5 (03 September 2022)
 - [#798](https://github.com/WireMock-Net/WireMock.Net/pull/798) - Add support to use 'mapping' object in in reponse templating [feature] contributed by [StefH](https://github.com/StefH)
 - [#800](https://github.com/WireMock-Net/WireMock.Net/pull/800) - Bump Microsoft.Owin from 4.1.1 to 4.2.2 in /src/WireMock.Net (net46) [dependencies] contributed by [dependabot[bot]](https://github.com/apps/dependabot)
@@ -582,8 +770,8 @@
 - [#263](https://github.com/WireMock-Net/WireMock.Net/issues/263) - Content-Type multipart/form-data is not serialized in proxy and recording mode [bug]
 
 # 1.0.11.0 (30 March 2019)
-- [#261](https://github.com/WireMock-Net/WireMock.Net/pull/261) - Fix BodyAsJson transform bug in ResponseMessageTransformer contributed by [psypilat](https://github.com/psypilat)
-- [#262](https://github.com/WireMock-Net/WireMock.Net/pull/262) - Add ProvideResponse_WithJsonBodyAndTransform test contributed by [psypilat](https://github.com/psypilat)
+- [#261](https://github.com/WireMock-Net/WireMock.Net/pull/261) - Fix BodyAsJson transform bug in ResponseMessageTransformer contributed by [ghost](https://github.com/ghost)
+- [#262](https://github.com/WireMock-Net/WireMock.Net/pull/262) - Add ProvideResponse_WithJsonBodyAndTransform test contributed by [ghost](https://github.com/ghost)
 
 # 1.0.10.0 (27 March 2019)
 - [#260](https://github.com/WireMock-Net/WireMock.Net/pull/260) - Fix Response.Delay property serialization [bug] contributed by [StefH](https://github.com/StefH)
@@ -818,7 +1006,7 @@
 - [#86](https://github.com/WireMock-Net/WireMock.Net/issues/86) - Feature : Add FileSystemWatcher logic for watching static mapping files [feature]
 
 # 1.0.2.13 (23 January 2018)
-- [#79](https://github.com/WireMock-Net/WireMock.Net/pull/79) - Fix missed content headers contributed by [vladimir-fed](https://github.com/vladimir-fed)
+- [#79](https://github.com/WireMock-Net/WireMock.Net/pull/79) - Fix missed content headers contributed by [volodymyr-fed](https://github.com/volodymyr-fed)
 - [#57](https://github.com/WireMock-Net/WireMock.Net/issues/57) - ProxyAndRecord does not save query-parameters, headers and body [bug]
 - [#78](https://github.com/WireMock-Net/WireMock.Net/issues/78) - WireMock not working when attempting to access from anything other than localhost.
 
@@ -845,7 +1033,7 @@
 
 # 1.0.2.7 (18 November 2017)
 - [#62](https://github.com/WireMock-Net/WireMock.Net/pull/62) - Add the Host, Protocol, Port and Origin to the Request message so they can be used in templating contributed by [alastairtree](https://github.com/alastairtree)
-- [#63](https://github.com/WireMock-Net/WireMock.Net/pull/63) - Fix issue with concurrent logging contributed by [vladimir-fed](https://github.com/vladimir-fed)
+- [#63](https://github.com/WireMock-Net/WireMock.Net/pull/63) - Fix issue with concurrent logging contributed by [volodymyr-fed](https://github.com/volodymyr-fed)
 - [#27](https://github.com/WireMock-Net/WireMock.Net/issues/27) - New feature: Record and Save
 - [#42](https://github.com/WireMock-Net/WireMock.Net/issues/42) - Enhancement - Save/load request logs to/from disk [feature]
 - [#53](https://github.com/WireMock-Net/WireMock.Net/issues/53) - New feature request: Access to Owin pipeline
@@ -872,6 +1060,7 @@
 - [#45](https://github.com/WireMock-Net/WireMock.Net/pull/45) - Add RequestLogExpirationDuration and MaxRequestLogCount (#43) contributed by [StefH](https://github.com/StefH)
 - [#51](https://github.com/WireMock-Net/WireMock.Net/pull/51) - Observable logs contributed by [dmtrrk](https://github.com/dmtrrk)
 - [#15](https://github.com/WireMock-Net/WireMock.Net/issues/15) - New feature: Proxying [feature]
+- [#20](https://github.com/WireMock-Net/WireMock.Net/issues/20) - Add client certificate authentication [feature]
 - [#31](https://github.com/WireMock-Net/WireMock.Net/issues/31) - Feature request: Nuget package for standalone version [feature]
 - [#33](https://github.com/WireMock-Net/WireMock.Net/issues/33) - Issue with launching sample code (StandAlone server) [bug]
 - [#38](https://github.com/WireMock-Net/WireMock.Net/issues/38) - Bug: support also listening on *:{port}

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.5.5</VersionPrefix>
+        <VersionPrefix>1.5.39</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -12,6 +12,7 @@
         <RepositoryType>git</RepositoryType>
         <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
         <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
+        <PackageReadmeFile>PackageReadme.md</PackageReadmeFile>
         <LangVersion>Latest</LangVersion>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -20,9 +21,16 @@
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     </PropertyGroup>
 
+    <!-- https://github.com/coverlet-coverage/coverlet/issues/1391 -->
+    <PropertyGroup Condition="$(MSBuildProjectName.Contains('.Tests'))">
+        <CollectCoverage>true</CollectCoverage>
+        <ExcludeByAttribute>GeneratedCodeAttribute</ExcludeByAttribute>
+        <CoverletOutputFormat>opencover</CoverletOutputFormat>
+    </PropertyGroup>
+
     <ItemGroup>
         <None Include="../../resources/WireMock.Net-Logo.png" Pack="true" PackagePath="" />
-        <!--<None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>-->
+        <None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>
     </ItemGroup>
 
     <Choose>

Generate-ReleaseNotes.cmd

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

PackageReadme.md

@@ -0,0 +1,55 @@
+## WireMock.Net
+Lightweight Http Mocking Server for .NET, inspired by [WireMock(http://WireMock.org) from the Java landscape.
+
+### :star: Key Features
+* HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
+* Library can be used in unit tests and integration tests
+* Runs as a standalone process, as windows service, as Azure/IIS or as docker
+* Configurable via a fluent C# .NET API, JSON files and JSON over HTTP
+* Record/playback of stubs (proxying)
+* Per-request conditional proxying
+* Stateful behaviour simulation
+* Response templating / transformation using Handlebars and extensions
+* Can be used locally or in CI/CD scenarios
+
+### :star: Stubbing
+A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
+See [Wiki : Stubbing](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing).
+
+### :star: Request Matching
+WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Request-Matching).
+
+### :star: Response Templating
+The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/WireMock-Net/WireMock.Net/wiki/Response-Templating).
+
+### :star: Admin API Reference
+The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
+
+### :star: Using
+WireMock.Net can be used in several ways:
+
+#### UnitTesting
+You can use your favorite test framework and use WireMock within your tests, see
+[Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
+
+#### As a dotnet tool
+It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).
+
+#### As standalone process / console application
+This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
+
+#### As a Windows Service
+You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
+
+#### As a Web Job in Azure or application in IIS
+See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)
+
+#### In a docker container
+There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
+For more details see also [Docker](https://github.com/WireMock-Net/WireMock.Net-docker).
+
+#### HTTPS / SSL
+More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-HTTPS-(SSL))
+
+## :books: Documentation
+For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/WireMock-Net/WireMock.Net/wiki/What-Is-WireMock.Net).

PackageReleaseNotes.txt

@@ -1,7 +1,5 @@
-# 1.5.5 (03 September 2022)
-- #798 Add support to use 'mapping' object in in reponse templating [feature]
-- #800 Bump Microsoft.Owin from 4.1.1 to 4.2.2 in /src/WireMock.Net (net46) [dependencies]
-- #802 Add assertions for request methods
-- #772 How to get matched mapping by HttpRequest or HttpRequestMessage [feature]
+# 1.5.39 (09 October 2023)
+- #1006 Fix RequestMessageParamMatcher : RejectOnMatch [bug]
+- #997 JmesPathMatcher or and MatchOperator working in version 1.5.34 but not 1.5.35 [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

README.md

@@ -1,24 +1,28 @@
 # WireMock.Net
-A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock.org](http://WireMock.org).
+A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock](http://WireMock.org).
 
 For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/WireMock-Net/WireMock.Net/wiki/What-Is-WireMock.Net).
 
-## Key Features
+## :star: Key Features
 * HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
 * Library can be used in unit tests and integration tests
 * Runs as a standalone process, as windows service, as Azure/IIS or as docker
-* Configurable via a fluent DotNet API, JSON files and JSON over HTTP
+* Configurable via a fluent C# .NET API, JSON files and JSON over HTTP
 * Record/playback of stubs (proxying)
 * Per-request conditional proxying
 * Stateful behaviour simulation
 * Response templating / transformation using Handlebars and extensions
 * Can be used locally or in CI/CD scenarios
 
-## Info
+## :memo: Blogs
+- [mStack.nl : Generate C# Code from Mapping(s)](https://mstack.nl/blog/20230201-wiremock.net-tocode/)
+
+
+## :computer: Project Info
 | | |
 | --- | --- |
 | ***Project*** |   |
-|   **Chat** | [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
+|   **Chat** | [![Slack](https://badgen.net/badge/icon/slack?icon=slack&label)](https://slack.wiremock.org/) [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
 |   **Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues) |
 | | |
 | ***Quality*** |   |
@@ -27,7 +31,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 |   **Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=bugs)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=BUG) [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=code_smells)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=CODE_SMELL) |
 |   **Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=coverage)](https://sonarcloud.io/component_measures?id=WireMock-Net_WireMock.Net&metric=coverage) [![codecov](https://codecov.io/gh/WireMock-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/WireMock.Net)|
 
-### NuGet packages
+### :package: NuGet packages
 
 | | Official | Preview [:information_source:](https://github.com/WireMock-Net/WireMock.Net/wiki/MyGet-preview-versions) |
 | - | - | - |
@@ -38,39 +42,42 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 |   **WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/nuget/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/myget/wiremock-net/WireMock.Net.OpenApiParser?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
 |   **WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
 |   **WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://buildstats.info/nuget/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://buildstats.info/myget/wiremock-net/WireMock.Net.xUnit?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
+|   **WireMock.Net.Testcontainers** | [![NuGet Badge WireMock.Net.Testcontainers](https://buildstats.info/nuget/WireMock.Net.Testcontainers)](https://www.nuget.org/packages/WireMock.Net.Testcontainers) | [![MyGet Badge WireMock.Net.Testcontainers](https://buildstats.info/myget/wiremock-net/WireMock.Net.Testcontainers?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Testcontainers)
 |   **WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://buildstats.info/nuget/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Org.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)
 
 
-## Development
+## :memo: Development
 For the supported frameworks and build information, see [this](https://github.com/WireMock-Net/WireMock.Net/wiki/Development-Information) page.
 
-## Stubbing
+## :star: Stubbing
 A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
 See [Wiki : Stubbing](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing).
 
-## Request Matching
+## :star: Request Matching
 WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Request-Matching).
 
-## Response Templating
+## :star: Response Templating
 The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/WireMock-Net/WireMock.Net/wiki/Response-Templating).
 
-## Admin API Reference
+## :star: Admin API Reference
 The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).
 
-## Using
+## :star: Using
 WireMock.Net can be used in several ways:
 
 ### UnitTesting
 You can use your favorite test framework and use WireMock within your tests, see
 [Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).
 
+### Unit/Integration Testing using Testcontainers.DotNet
+You can use [Wiki : WireMock.Net.Testcontainers](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-WireMock.Net.Testcontainers) to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
+
 ### As a dotnet tool
 It's simple to install WireMock.Net as (global) dotnet tool, see [Wiki : dotnet tool](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-dotnet-tool).
 
 ### As standalone process / console application
 This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).
 
-
 ### As a Windows Service
 You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-Windows-Service).
 

WireMock.Net Solution.sln

@@ -25,8 +25,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.gitignore = .gitignore
 		CHANGELOG.md = CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
+		.github\FUNDING.yml = .github\FUNDING.yml
 		Generate-ReleaseNotes.cmd = Generate-ReleaseNotes.cmd
 		nuget.config = nuget.config
+		PackageReadme.md = PackageReadme.md
 		PackageReleaseNotes.template = PackageReleaseNotes.template
 		PackageReleaseNotes.txt = PackageReleaseNotes.txt
 		README.md = README.md
@@ -105,6 +107,20 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.xUnit", "src\W
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NET6.WithCertificate", "examples\WireMock.Net.Console.NET6.WithCertificate\WireMock.Net.Console.NET6.WithCertificate.csproj", "{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueExample", "examples\WireMockAzureQueueExample\WireMockAzureQueueExample.csproj", "{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueProxy", "examples\WireMockAzureQueueProxy\WireMockAzureQueueProxy.csproj", "{ADB557D8-D66B-4387-912B-3F73E290B478}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Testcontainers", "src\WireMock.Net.Testcontainers\WireMock.Net.Testcontainers.csproj", "{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.TestcontainersExample", "examples\WireMock.Net.TestcontainersExample\WireMock.Net.TestcontainersExample.csproj", "{56A38798-C48B-4A4A-B805-071E05C02CE1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{0147029F-FA4A-44B3-B79A-3C3574054EE4}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultipartUploader", "tools\MultipartUploader\MultipartUploader.csproj", "{07C30227-ADEC-4BDE-8CDC-849D85A690BB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NET7.UsingNuGet", "examples\WireMock.Net.Console.NET7.UsingNuGet\WireMock.Net.Console.NET7.UsingNuGet.csproj", "{941229D6-191B-4B5E-AC81-0905EBF4F19D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -251,6 +267,30 @@ Global
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADB557D8-D66B-4387-912B-3F73E290B478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADB557D8-D66B-4387-912B-3F73E290B478}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADB557D8-D66B-4387-912B-3F73E290B478}.Release|Any CPU.Build.0 = Release|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{56A38798-C48B-4A4A-B805-071E05C02CE1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07C30227-ADEC-4BDE-8CDC-849D85A690BB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{941229D6-191B-4B5E-AC81-0905EBF4F19D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{941229D6-191B-4B5E-AC81-0905EBF4F19D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{941229D6-191B-4B5E-AC81-0905EBF4F19D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{941229D6-191B-4B5E-AC81-0905EBF4F19D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -293,6 +333,12 @@ Global
 		{670C7562-C154-442E-A249-7D26849BCD13} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{0DE0954F-8C00-4E8D-B94A-4361FC1CBE44} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{7C2A9DE8-C89F-4841-9058-6B9BF81E5E34} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{BAA9EC2A-874B-45CE-8E51-A73622DC7F3D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{ADB557D8-D66B-4387-912B-3F73E290B478} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{12B016A5-9D8B-4EFE-96C2-CA51BE43367D} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{56A38798-C48B-4A4A-B805-071E05C02CE1} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{07C30227-ADEC-4BDE-8CDC-849D85A690BB} = {0147029F-FA4A-44B3-B79A-3C3574054EE4}
+		{941229D6-191B-4B5E-AC81-0905EBF4F19D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

WireMock.Net Solution.sln.DotSettings

@@ -1,10 +1,20 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AD/@EntryIndexedValue">AD</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CONNECT/@EntryIndexedValue">CONNECT</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CS/@EntryIndexedValue">CS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DELETE/@EntryIndexedValue">DELETE</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EC/@EntryIndexedValue">EC</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GET/@EntryIndexedValue">GET</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HEAD/@EntryIndexedValue">HEAD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OPTIONS/@EntryIndexedValue">OPTIONS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PATCH/@EntryIndexedValue">PATCH</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=POST/@EntryIndexedValue">POST</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PUT/@EntryIndexedValue">PUT</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QL/@EntryIndexedValue">QL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RSA/@EntryIndexedValue">RSA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSL/@EntryIndexedValue">SSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TE/@EntryIndexedValue">TE</s:String>
@@ -19,12 +29,15 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Guids/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=openapi/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pacticipant/@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/=sheyenrath/@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/=templated/@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>

azure-pipelines-ci-linux.yml

@@ -5,8 +5,16 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
+- task: UseDotNet@2
+  displayName: 'Use .NET 7'
+  inputs:
+    packageType: sdk
+    version: 7.0.x
+
 - script: |
-    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework net6.0 --logger trx
+    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework net7.0 --logger trx
+  displayName: 'Test'
+
 - task: PublishTestResults@2
   inputs:
     testRunner: VSTest

azure-pipelines-ci.yml

@@ -14,6 +14,12 @@ jobs:
       echo "BuildId = $(buildId)"
     displayName: 'Print buildId'
 
+  - task: UseDotNet@2
+    displayName: Use .NET 7.0
+    inputs:
+      packageType: 'sdk'
+      version: '7.0.x'    
+
   - task: PowerShell@2
     displayName: "Use JDK11 by default"
     inputs:
@@ -35,22 +41,20 @@ jobs:
       projectKey: 'WireMock-Net_WireMock.Net'
       projectName: 'WireMock.Net'
       extraProperties: |
-        sonar.cs.opencover.reportsPaths=**/coverage.net6.0.opencover.xml
+        sonar.cs.opencover.reportsPaths=**/coverage.net7.0.opencover.xml
   
   - task: DotNetCoreCLI@2
     displayName: 'Build Unit tests'
     inputs:
       command: 'build'
       projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--configuration Debug --framework net6.0'
-  
-  - task: DotNetCoreCLI@2
-    displayName: 'Execute Unit tests'
+      arguments: '--configuration Debug --framework net7.0'
+
+  - task: CmdLine@2
     inputs:
-      command: 'test'
-      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--no-build --configuration Debug --framework net6.0 --collect:"XPlat Code Coverage" --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
-  
+      script: 'dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --no-build --configuration Debug --framework net7.0'
+    displayName: 'Execute Unit Tests with Coverage'
+   
   - task: SonarCloudAnalyze@1
     displayName: 'SonarCloud: Run Code Analysis'
     condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
@@ -64,7 +68,7 @@ jobs:
     condition: and(succeeded(), eq(variables['RUN_WHITESOURCE'], 'yes'))
  
   - script: |
-      bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) -f ./test/WireMock.Net.Tests/coverage.net6.0.opencover.xml
+      bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) -f ./test/WireMock.Net.Tests/coverage.7.0.opencover.xml
     displayName: 'codecov'
   
   - task: PublishTestResults@2
@@ -76,7 +80,7 @@ jobs:
   - task: PublishBuildArtifacts@1
     displayName: Publish coverage file
     inputs:
-      PathtoPublish: '/home/vsts/work/1/s/test/WireMock.Net.Tests/coverage.net6.0.opencover.xml'
+      PathtoPublish: './test/WireMock.Net.Tests/coverage.net7.0.opencover.xml'
 
 - job: Windows_Build_Test
 
@@ -85,24 +89,24 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: Use .NET 6.0
+    displayName: Use .NET 7.0
     inputs:
       packageType: 'sdk'
-      version: '6.0.x'
+      version: '7.0.x'
 
   - task: DotNetCoreCLI@2
     displayName: 'Build Unit tests'
     inputs:
       command: 'build'
       projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--configuration Debug --framework net6.0'
+      arguments: '--configuration Debug --framework net7.0'
   
   - task: DotNetCoreCLI@2
-    displayName: 'Execute Unit tests'
+    displayName: 'Execute Unit Tests with Coverage'
     inputs:
       command: 'test'
       projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--no-build --configuration Debug --framework net6.0 --collect:"XPlat Code Coverage" --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
+      arguments: '--no-build --configuration Debug --framework net7.0 --collect:"XPlat Code Coverage" --logger trx'
   
 - job: Windows_Release_to_MyGet
   dependsOn: Windows_Build_Test
@@ -112,10 +116,10 @@ jobs:
 
   steps:
   - task: UseDotNet@2
-    displayName: Use .NET 6.0
+    displayName: Use .NET 7.0
     inputs:
       packageType: 'sdk'
-      version: '6.0.x'
+      version: '7.0.x'
 
   - task: DotNetCoreCLI@2
     displayName: Build Release

azure-pipelines-linux.yml

@@ -9,6 +9,12 @@ variables:
   buildConfiguration: 'Release'
 
 steps:
+- task: UseDotNet@2
+  displayName: 'Use .NET 7'
+  inputs:
+    packageType: sdk
+    version: 7.0.x
+
 - task: DotNetCoreCLI@2
   displayName: Build Release
   inputs:

azure-pipelines-nuget.yml

@@ -12,6 +12,12 @@ steps:
     echo "BuildId = $(buildId)"
   displayName: 'Print buildId'
 
+- task: UseDotNet@2
+  displayName: 'Use .NET 7'
+  inputs:
+    packageType: sdk
+    version: 7.0.x
+
 # Based on https://whereslou.com/2018/09/versioning-and-publishing-nuget-packages-automatically-using-azure-devops-pipelines/
 - task: DotNetCoreCLI@2
   displayName: Build Release

examples/WireMock.Net.Client/Program.cs

@@ -1,78 +1,124 @@
-using Newtonsoft.Json;
-using RestEase;
 using System;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
+using Newtonsoft.Json;
+using RestEase;
 using WireMock.Admin.Settings;
 using WireMock.Client;
+using WireMock.Client.Extensions;
 
-namespace WireMock.Net.Client
+namespace WireMock.Net.Client;
+
+class Program
 {
-    class Program
+    static async Task Main(string[] args)
     {
-        static async Task Main(string[] args)
+        // Create an implementation of the IWireMockAdminApi and pass in the base URL for the API.
+        var api = RestClient.For<IWireMockAdminApi>("http://localhost:9091");
+
+        // await api.ResetMappingsAsync().ConfigureAwait(false);
+
+        var mappingBuilder = api.GetMappingBuilder();
+        mappingBuilder.Given(m => m
+            .WithTitle("This is my title 1")
+            .WithRequest(req => req
+                .UsingGet()
+                .WithPath("/bla1")
+            )
+            .WithResponse(rsp => rsp
+                .WithBody("x1")
+                .WithHeaders(h => h.Add("h1", "v1"))
+            )
+        );
+
+        mappingBuilder.Given(m => m
+            .WithTitle("This is my title 2")
+            .WithRequest(req => req
+                .UsingGet()
+                .WithPath("/bla2")
+            )
+            .WithResponse(rsp => rsp
+                .WithBody("x2")
+                .WithHeaders(h => h.Add("h2", "v2"))
+            )
+        );
+
+        mappingBuilder.Given(m => m
+            .WithTitle("This is my title 3")
+            .WithRequest(req => req
+                .UsingGet()
+                .WithPath("/bla3")
+            )
+            .WithResponse(rsp => rsp
+                .WithBodyAsJson(new 
+                {
+                    x = "test"
+                }, true)
+            )
+        );
+
+        var result = await mappingBuilder.BuildAndPostAsync().ConfigureAwait(false);
+        Console.WriteLine($"result = {JsonConvert.SerializeObject(result)}");
+
+        var mappings = await api.GetMappingsAsync();
+        Console.WriteLine($"mappings = {JsonConvert.SerializeObject(mappings)}");
+
+        // Set BASIC Auth
+        var value = Convert.ToBase64String(Encoding.ASCII.GetBytes("a:b"));
+        api.Authorization = new AuthenticationHeaderValue("Basic", value);
+
+        var settings1 = await api.GetSettingsAsync();
+        Console.WriteLine($"settings1 = {JsonConvert.SerializeObject(settings1)}");
+
+        var settingsViaBuilder = new SettingsModelBuilder()
+            .WithGlobalProcessingDelay(1077)
+            .Build();
+
+        settings1.GlobalProcessingDelay = 1077;
+        api.PostSettingsAsync(settings1).Wait();
+
+        var settings2 = await api.GetSettingsAsync();
+        Console.WriteLine($"settings2 = {JsonConvert.SerializeObject(settings2)}");
+
+        mappings = await api.GetMappingsAsync();
+        Console.WriteLine($"mappings = {JsonConvert.SerializeObject(mappings)}");
+
+        try
         {
-            // Create an implementation of the IWireMockAdminApi and pass in the base URL for the API.
-            var api = RestClient.For<IWireMockAdminApi>("http://localhost:9091");
-
-            // Set BASIC Auth
-            var value = Convert.ToBase64String(Encoding.ASCII.GetBytes("a:b"));
-            api.Authorization = new AuthenticationHeaderValue("Basic", value);
-
-            var settings1 = await api.GetSettingsAsync();
-            Console.WriteLine($"settings1 = {JsonConvert.SerializeObject(settings1)}");
-
-            var settingsViaBuilder = new SettingsModelBuilder()
-                .WithGlobalProcessingDelay(1077)
-                .WithoutGlobalProcessingDelay()
-                .Build();
-
-            settings1.GlobalProcessingDelay = 1077;
-            api.PostSettingsAsync(settings1).Wait();
-
-            var settings2 = await api.GetSettingsAsync();
-            Console.WriteLine($"settings2 = {JsonConvert.SerializeObject(settings2)}");
-
-            var mappings = await api.GetMappingsAsync();
-            Console.WriteLine($"mappings = {JsonConvert.SerializeObject(mappings)}");
-
-            try
-            {
-                var guid = Guid.Parse("11111110-a633-40e8-a244-5cb80bc0ab66");
-                var mapping = await api.GetMappingAsync(guid);
-                Console.WriteLine($"mapping = {JsonConvert.SerializeObject(mapping)}");
-            }
-            catch (Exception e)
-            {
-            }
-
-            var request = await api.GetRequestsAsync();
-            Console.WriteLine($"request = {JsonConvert.SerializeObject(request)}");
-
-            //var deleteRequestsAsync = api.DeleteRequestsAsync().Result;
-            //Console.WriteLine($"DeleteRequestsAsync = {deleteRequestsAsync.Status}");
-
-            //var resetRequestsAsync = api.ResetRequestsAsync().Result;
-            //Console.WriteLine($"ResetRequestsAsync = {resetRequestsAsync.Status}");
-
-            var scenarioStates = await api.GetScenariosAsync();
-            Console.WriteLine($"GetScenariosAsync = {JsonConvert.SerializeObject(scenarioStates)}");
-
-            var postFileResult = await api.PostFileAsync("1.cs", "C# Hello");
-            Console.WriteLine($"postFileResult = {JsonConvert.SerializeObject(postFileResult)}");
-
-            var getFileResult = await api.GetFileAsync("1.cs");
-            Console.WriteLine($"getFileResult = {getFileResult}");
-
-            var resetMappingsAsync = await api.ResetMappingsAsync();
-            Console.WriteLine($"resetMappingsAsync = {resetMappingsAsync.Status}");
-
-            var resetMappingsAndReloadStaticMappingsAsync = await api.ResetMappingsAsync(true);
-            Console.WriteLine($"resetMappingsAndReloadStaticMappingsAsync = {resetMappingsAndReloadStaticMappingsAsync.Status}");
-
-            Console.WriteLine("Press any key to quit");
-            Console.ReadKey();
+            var guid = Guid.Parse("11111110-a633-40e8-a244-5cb80bc0ab66");
+            var mapping = await api.GetMappingAsync(guid);
+            Console.WriteLine($"mapping = {JsonConvert.SerializeObject(mapping)}");
         }
+        catch (Exception e)
+        {
+        }
+
+        var request = await api.GetRequestsAsync();
+        Console.WriteLine($"request = {JsonConvert.SerializeObject(request)}");
+
+        //var deleteRequestsAsync = api.DeleteRequestsAsync().Result;
+        //Console.WriteLine($"DeleteRequestsAsync = {deleteRequestsAsync.Status}");
+
+        //var resetRequestsAsync = api.ResetRequestsAsync().Result;
+        //Console.WriteLine($"ResetRequestsAsync = {resetRequestsAsync.Status}");
+
+        var scenarioStates = await api.GetScenariosAsync();
+        Console.WriteLine($"GetScenariosAsync = {JsonConvert.SerializeObject(scenarioStates)}");
+
+        var postFileResult = await api.PostFileAsync("1.cs", "C# Hello");
+        Console.WriteLine($"postFileResult = {JsonConvert.SerializeObject(postFileResult)}");
+
+        var getFileResult = await api.GetFileAsync("1.cs");
+        Console.WriteLine($"getFileResult = {getFileResult}");
+
+        var resetMappingsAsync = await api.ResetMappingsAsync();
+        Console.WriteLine($"resetMappingsAsync = {resetMappingsAsync.Status}");
+
+        var resetMappingsAndReloadStaticMappingsAsync = await api.ResetMappingsAsync(true);
+        Console.WriteLine($"resetMappingsAndReloadStaticMappingsAsync = {resetMappingsAndReloadStaticMappingsAsync.Status}");
+
+        Console.WriteLine("Press any key to quit");
+        Console.ReadKey();
     }
 }

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

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

examples/WireMock.Net.Client/WireMock.Net.Client.csproj

@@ -1,19 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
-    <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
-  </PropertyGroup>
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net7.0</TargetFramework>
+        <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
+    </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="RestEase" Version="1.5.7" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-    <ProjectReference Include="..\..\src\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
+    </ItemGroup>
 
 </Project>

examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj

@@ -28,10 +28,10 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.0" />
+    <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
+      <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
@@ -21,16 +22,10 @@
     <Compile Remove="__admin\mappings\1.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Remove="__admin\mappings\array.json" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="log4net" Version="2.0.15" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
   </ItemGroup>
 
   <ItemGroup>
@@ -40,15 +35,6 @@
     <None Update="nlog.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
-      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
-    </None>
-    <None Update="__admin\mappings\MyXmlResponse.xml">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
   </ItemGroup>
 
 </Project>

examples/WireMock.Net.Console.NET6/__admin/mappings/issue-1001.json

@@ -0,0 +1,48 @@
+[
+    {
+        "Guid": "12343f31-6946-4ce7-8e6f-0237c7001000",
+        "Title": "1",
+        "Request": {
+            "Path": {
+                "Matchers": [
+                    {
+                        "Name": "WildcardMatcher",
+                        "Pattern": "/mappings_static_1"
+                    }
+                ]
+            },
+            "Methods": [
+                "get"
+            ]
+        },
+        "Response": {
+            "BodyAsJson": { "result": "mappings static_1" },
+            "Headers": {
+                "Content-Type": "application/json"
+            }
+        }
+    },
+    {
+        "Guid": "12343f31-6946-4ce7-8e6f-0237c7002000",
+        "Title": "2",
+        "Request": {
+            "Path": {
+                "Matchers": [
+                    {
+                        "Name": "WildcardMatcher",
+                        "Pattern": "/mappings_static_2"
+                    }
+                ]
+            },
+            "Methods": [
+                "get"
+            ]
+        },
+        "Response": {
+            "BodyAsJson": { "result": "mappings static_2" },
+            "Headers": {
+                "Content-Type": "application/json"
+            }
+        }
+    }
+]

examples/WireMock.Net.Console.NET7.UsingNuGet/Program.cs

@@ -0,0 +1,34 @@
+using System.Net;
+using System.Text;
+using FluentAssertions;
+using WireMock.Logging;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.NET7.UsingNuGet;
+
+internal class Program
+{
+    private static async Task Main(string[] args)
+    {
+        var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            Logger = new WireMockConsoleLogger(),
+        });
+
+        server.Given(Request.Create().UsingPost().WithPath("/some/endpoint"))
+            .RespondWith(Response.Create().WithStatusCode(HttpStatusCode.Created));
+
+        var httpClient = new HttpClient { BaseAddress = new Uri(server.Url!) };
+        var requestUri = new Uri(httpClient.BaseAddress!, "some/endpoint");
+        var content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
+
+        // Act
+        var actual = await httpClient.PostAsync(requestUri, content);
+
+        // Assert
+        actual.StatusCode.Should().Be(HttpStatusCode.Created);
+    }
+}

examples/WireMock.Net.Console.NET7.UsingNuGet/WireMock.Net.Console.NET7.UsingNuGet.csproj

@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net7.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="FluentAssertions" Version="6.11.0" />
+    <PackageReference Include="WireMock.Net" Version="1.5.32" />
+  </ItemGroup>
+
+</Project>

examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -19,14 +19,14 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.14" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.4.0" />
+    <PackageReference Include="log4net" Version="2.0.15" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -31,14 +31,14 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.14" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.4.0" />
+    <PackageReference Include="log4net" Version="2.0.15" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
@@ -28,14 +28,14 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
-    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.14" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.4.0" />
+    <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.4.0" />
+    <PackageReference Include="log4net" Version="2.0.15" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -1,11 +1,14 @@
 using System;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
+using System.Linq;
 using System.Net;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Models;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
@@ -32,23 +35,109 @@ namespace WireMock.Net.ConsoleApplication
         }
     }
 
+    public class Todo
+    {
+        public int Id { get; set; }
+    }
+
     public static class MainApp
     {
+        private const string TestSchema = @"
+  input MessageInput {
+    content: String
+    author: String
+  }
+
+  type Message {
+    id: ID!
+    content: String
+    author: String
+  }
+
+  type Mutation {
+    createMessage(input: MessageInput): Message
+    updateMessage(id: ID!, input: MessageInput): Message
+  }
+
+  type Query {
+   greeting:String
+   students:[Student]
+   studentById(id:ID!):Student
+  }
+
+  type Student {
+   id:ID!
+   firstName:String
+   lastName:String
+   fullName:String 
+  }";
+
         public static void Run()
         {
-            var s = WireMockServer.Start();
-            s.Stop();
+            var mappingBuilder = new MappingBuilder();
+            mappingBuilder
+                .Given(Request
+                    .Create()
+                    .WithPath(new WildcardMatcher("/param2", true))
+                    .WithParam("key", "test")
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { result = "param2" }));
+
+            var json = mappingBuilder.ToJson();
+            System.Console.WriteLine("mappingBuilder : Json = {0}", json);
+
+            var todos = new Dictionary<int, Todo>();
+
+            var server = WireMockServer.Start();
+
+            server
+                .Given(Request.Create()
+                    .WithPath("todos")
+                    .UsingGet()
+                )
+                .RespondWith(Response.Create()
+                    .WithBodyAsJson(todos.Values)
+                );
+
+            server
+                .Given(Request.Create()
+                    .UsingGet()
+                    .WithPath("todos")
+                    .WithParam("id")
+                )
+                .RespondWith(Response.Create()
+                    .WithBodyAsJson(rm => todos[int.Parse(rm.Query!["id"].ToString())])
+                );
+
+            var httpClient = server.CreateClient();
+            //server.Stop();
+
+            var httpAndHttpsWithPort = WireMockServer.Start(new WireMockServerSettings
+            {
+                HostingScheme = HostingScheme.HttpAndHttps,
+                Port = 12399
+            });
+            httpAndHttpsWithPort.Stop();
+
+            var httpAndHttpsFree = WireMockServer.Start(new WireMockServerSettings
+            {
+                HostingScheme = HostingScheme.HttpAndHttps
+            });
+            httpAndHttpsFree.Stop();
 
             string url1 = "http://localhost:9091/";
             string url2 = "http://localhost:9092/";
             string url3 = "https://localhost:9443/";
 
-            var server = WireMockServer.Start(new WireMockServerSettings
+            server = WireMockServer.Start(new WireMockServerSettings
             {
                 AllowCSharpCodeMatcher = true,
                 Urls = new[] { url1, url2, url3 },
                 StartAdminInterface = true,
                 ReadStaticMappings = true,
+                SaveUnmatchedRequests = true,
                 WatchStaticMappings = true,
                 WatchStaticMappingsInSubdirectories = true,
                 //ProxyAndRecordSettings = new ProxyAndRecordSettings
@@ -78,8 +167,88 @@ namespace WireMock.Net.ConsoleApplication
             //server.SetAzureADAuthentication("6c2a4722-f3b9-4970-b8fc-fac41e29stef", "8587fde1-7824-42c7-8592-faf92b04stef");
 
             // server.AllowPartialMapping();
+#if GRAPHQL
+            server
+                .Given(Request.Create()
+                    .WithPath("/graphql")
+                    .UsingPost()
+                    .WithGraphQLSchema(TestSchema)
+                )
+                .RespondWith(Response.Create()
+                    .WithBody("GraphQL is ok")
+                );
+#endif
+
+#if MIMEKIT
+            var textPlainContentTypeMatcher = new ContentTypeMatcher("text/plain");
+            var textPlainContentMatcher = new ExactMatcher("This is some plain text");
+            var textPlainMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textPlainContentTypeMatcher, null, null, textPlainContentMatcher);
+
+            var textJsonContentTypeMatcher = new ContentTypeMatcher("text/json");
+            var textJsonContentMatcher = new JsonMatcher(new { Key = "Value" }, true);
+            var textJsonMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textJsonContentTypeMatcher, null, null, textJsonContentMatcher);
+
+            var imagePngContentTypeMatcher = new ContentTypeMatcher("image/png");
+            var imagePngContentDispositionMatcher = new ExactMatcher("attachment; filename=\"image.png\"");
+            var imagePngContentTransferEncodingMatcher = new ExactMatcher("base64");
+            var imagePngContentMatcher = new ExactObjectMatcher(Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC"));
+            var imagePngMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, imagePngContentTypeMatcher, imagePngContentDispositionMatcher, imagePngContentTransferEncodingMatcher, imagePngContentMatcher);
+
+            var matchers = new IMatcher[]
+            {
+                textPlainMatcher,
+                textJsonMatcher,
+                imagePngMatcher
+            };
+
+            server
+                .Given(Request.Create()
+                    .WithPath("/multipart")
+                    .UsingPost()
+                    .WithMultiPart(matchers)
+                )
+                .WithGuid("b9c82182-e469-41da-bcaf-b6e3157fefdb")
+                .RespondWith(Response.Create()
+                    .WithBody("MultiPart is ok")
+                );
+#endif
+            // 400 ms
+            server
+                .Given(Request.Create()
+                    .WithPath("/slow/400")
+                    .UsingPost())
+                .RespondWith(
+                    Response.Create()
+                        .WithStatusCode(400)
+                        .WithBody("return 400")
+                        .WithHeader("Content-Type", "text/plain")
+                );
+            // 4 sec
+            server
+                .Given(Request.Create()
+                    .WithPath("/slow/500")
+                    .UsingPost())
+                .RespondWith(
+                    Response.Create()
+                        .WithStatusCode(500)
+                        .WithBody("return 500")
+                        .WithHeader("Content-Type", "text/plain")
+                );
+
+
+            server
+                .Given(Request.Create()
+                    .UsingMethod("GET")
+                    .WithPath("/foo1")
+                    .WithParam("p1", "xyz")
+                )
+                .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
+                .RespondWith(Response.Create()
+                    .WithBody("Hello World")
+                );
 
             server.Given(Request.Create().WithPath(MatchOperator.Or, "/mypath", "/mypath1", "/mypath2").UsingPost())
+                .WithGuid("86984b0e-2516-4935-a2ef-b45bf4820d7d")
                 .RespondWith(Response.Create()
                         .WithHeader("Content-Type", "application/json")
                         .WithBodyAsJson("{{JsonPath.SelectToken request.body \"..name\"}}")
@@ -352,14 +521,14 @@ namespace WireMock.Net.ConsoleApplication
             // http://localhost:9091/trans?start=1000&stop=1&stop=2
             server
                 .Given(Request.Create().WithPath("/trans").UsingGet())
-                .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
+                .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f06")
                 .RespondWith(Response.Create()
                     .WithStatusCode(200)
                     .WithHeader("Content-Type", "application/json")
                     .WithHeader("Transformed-Postman-Token", "token is {{request.headers.Postman-Token}}")
                     .WithHeader("xyz_{{request.headers.Postman-Token}}", "token is {{request.headers.Postman-Token}}")
                     .WithBody(@"{""msg"": ""Hello world CATCH-ALL on /*, {{request.path}}, add={{Math.Add request.query.start.[0] 42}} bykey={{request.query.start}}, bykey={{request.query.stop}}, byidx0={{request.query.stop.[0]}}, byidx1={{request.query.stop.[1]}}"" }")
-                    .WithTransformer(TransformerType.Handlebars, true, ReplaceNodeOptions.None)
+                    .WithTransformer(TransformerType.Handlebars, true, ReplaceNodeOptions.EvaluateAndTryToConvert)
                     .WithDelay(TimeSpan.FromMilliseconds(100))
                 );
 
@@ -549,6 +718,7 @@ namespace WireMock.Net.ConsoleApplication
                     .WithStatusCode(200)
                     .WithHeader("Content-Type", "application/json")
                     .WithBodyAsJson(new { Id = "5bdf076c-5654-4b3e-842c-7caf1fabf8c9" }));
+
             server
                 .Given(Request.Create().WithPath("/random200or505").UsingGet())
                 .RespondWith(Response.Create().WithCallback(request =>
@@ -556,7 +726,11 @@ namespace WireMock.Net.ConsoleApplication
                     int code = new Random().Next(1, 2) == 1 ? 505 : 200;
                     return new ResponseMessage
                     {
-                        BodyData = new BodyData { BodyAsString = "random200or505:" + code, DetectedBodyType = Types.BodyType.String },
+                        BodyData = new BodyData
+                        {
+                            BodyAsString = "random200or505:" + code + ", HeadersFromRequest = " + string.Join(",", request.Headers),
+                            DetectedBodyType = Types.BodyType.String,
+                        },
                         StatusCode = code
                     };
                 }));
@@ -576,6 +750,42 @@ namespace WireMock.Net.ConsoleApplication
                     };
                 }));
 
+            server.Given(Request.Create().WithPath(new WildcardMatcher("/multi-webhook", true)).UsingPost())
+                .WithWebhook
+                (
+                    new Webhook
+                    {
+                        Request = new WebhookRequest
+                        {
+                            Url = "http://localhost:12345/foo1",
+                            Method = "post",
+                            BodyData = new BodyData
+                            {
+                                BodyAsString = "OK 1!",
+                                DetectedBodyType = BodyType.String
+                            },
+                            Delay = 1000
+                        }
+                    },
+                    new Webhook
+                    {
+                        Request = new WebhookRequest
+                        {
+                            Url = "http://localhost:12345/foo2",
+                            Method = "post",
+                            BodyData = new BodyData
+                            {
+                                BodyAsString = "OK 2!",
+                                DetectedBodyType = BodyType.String
+                            },
+                            MinimumRandomDelay = 3000,
+                            MaximumRandomDelay = 7000
+                        }
+                    }
+                )
+                .WithWebhookFireAndForget(true)
+                .RespondWith(Response.Create().WithBody("a-response"));
+
             System.Console.WriteLine(JsonConvert.SerializeObject(server.MappingModels, Formatting.Indented));
 
             System.Console.WriteLine("Press any key to stop the server");

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

@@ -39,31 +39,35 @@
     <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
       <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net452\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net452\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.5\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.0\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.0\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
     </Reference>
+    <Reference Include="Stef.Validation, Version=0.1.1.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Stef.Validation.0.1.1\lib\net40\Stef.Validation.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
     </Reference>

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net452" />
-  <package id="Handlebars.Net" version="2.1.2" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers" version="2.3.5" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.5" targetFramework="net452" />
-  <package id="log4net" version="2.0.14" targetFramework="net452" />
+  <package id="Handlebars.Net" version="2.1.4" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers" version="2.4.0" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.4.0" targetFramework="net452" />
+  <package id="log4net" version="2.0.15" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
+  <package id="Stef.Validation" version="0.1.1" targetFramework="net452" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
 </packages>

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

@@ -38,27 +38,30 @@
     <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
       <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net46\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.5\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.0\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
     </Reference>
+    <Reference Include="Stef.Validation, Version=0.1.1.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Stef.Validation.0.1.1\lib\net40\Stef.Validation.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />

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

@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net461" />
-  <package id="Handlebars.Net" version="2.1.2" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers" version="2.3.5" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.5" targetFramework="net461" />
-  <package id="log4net" version="2.0.14" targetFramework="net461" />
+  <package id="Handlebars.Net" version="2.1.4" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers" version="2.4.0" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.4.0" targetFramework="net461" />
+  <package id="log4net" version="2.0.15" targetFramework="net461" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
+  <package id="Stef.Validation" version="0.1.1" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>

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

@@ -55,7 +55,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="HandlebarsDotNet.Helpers.Core" publicKeyToken="00d131fae0c250bc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.3.5.0" newVersion="2.3.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.10.0" newVersion="2.3.10.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="XPath2" publicKeyToken="463c6d7fb740c7e5" culture="neutral" />
@@ -67,16 +67,44 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Handlebars.Net.Helpers" publicKeyToken="00d131fae0c250bc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.3.5.0" newVersion="2.3.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.10.0" newVersion="2.3.10.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.18.0" newVersion="1.2.18.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.23.0" newVersion="1.2.23.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Fare" publicKeyToken="ea68d375bf33a7c8" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Stef.Validation" publicKeyToken="8f3400880c321038" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-0.1.1.0" newVersion="0.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="HandlebarsDotNet.Helpers.Json" publicKeyToken="00d131fae0c250bc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.10.0" newVersion="2.3.10.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Logging" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.25.0.0" newVersion="6.25.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.IdentityModel.Tokens" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.25.0.0" newVersion="6.25.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IdentityModel.Tokens.Jwt" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.25.0.0" newVersion="6.25.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NJsonSchema" publicKeyToken="c2f9c3bdfae56102" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.7.2.0" newVersion="10.7.2.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\Nullable.1.3.1\build\Nullable.props" Condition="Exists('..\..\packages\Nullable.1.3.1\build\Nullable.props')" />
   <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -45,32 +46,32 @@
     <Reference Include="Fare, Version=2.2.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Fare.2.2.1\lib\net35\Fare.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net46\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.5\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.0\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.3.5\lib\net452\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.4.0\lib\net46\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Json.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Json.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Random.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Random.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.3.5\lib\net452\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.3.5.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.3.5\lib\net452\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.4.0\lib\net46\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
     </Reference>
     <Reference Include="Humanizer, Version=2.14.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Humanizer.Core.2.14.1\lib\netstandard2.0\Humanizer.dll</HintPath>
@@ -78,8 +79,8 @@
     <Reference Include="JmesPath.Net, Version=1.0.125.0, Culture=neutral, PublicKeyToken=b29d616b7f4faff0, processorArchitecture=MSIL">
       <HintPath>..\..\packages\JmesPath.Net.1.0.125\lib\net45\JmesPath.Net.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.AspNetCore, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNetCore.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.dll</HintPath>
@@ -156,6 +157,9 @@
     <Reference Include="Microsoft.AspNetCore.WebUtilities, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNetCore.WebUtilities.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Extensions.Configuration, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Extensions.Configuration.5.0.0\lib\net461\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
@@ -228,11 +232,14 @@
     <Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.JsonWebTokens.6.12.2\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.25.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Abstractions.6.25.0\lib\net472\Microsoft.IdentityModel.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Logging, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.6.12.2\lib\net472\Microsoft.IdentityModel.Logging.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.JsonWebTokens, Version=6.25.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.IdentityModel.JsonWebTokens.6.25.0\lib\net472\Microsoft.IdentityModel.JsonWebTokens.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Logging, Version=6.25.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Logging.6.25.0\lib\net472\Microsoft.IdentityModel.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.IdentityModel.Protocols, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.6.12.2\lib\net472\Microsoft.IdentityModel.Protocols.dll</HintPath>
@@ -240,8 +247,8 @@
     <Reference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.IdentityModel.Protocols.OpenIdConnect.6.12.2\lib\net472\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.IdentityModel.Tokens, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.6.12.2\lib\net472\Microsoft.IdentityModel.Tokens.dll</HintPath>
+    <Reference Include="Microsoft.IdentityModel.Tokens, Version=6.25.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.IdentityModel.Tokens.6.25.0\lib\net472\Microsoft.IdentityModel.Tokens.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
@@ -250,19 +257,19 @@
       <HintPath>..\..\packages\Namotion.Reflection.2.0.10\lib\net45\Namotion.Reflection.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NJsonSchema, Version=10.6.10.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NJsonSchema.10.6.10\lib\net45\NJsonSchema.dll</HintPath>
+    <Reference Include="NJsonSchema, Version=10.7.2.0, Culture=neutral, PublicKeyToken=c2f9c3bdfae56102, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NJsonSchema.10.7.2\lib\net45\NJsonSchema.dll</HintPath>
     </Reference>
     <Reference Include="NJsonSchema.Extensions, Version=0.1.0.0, Culture=neutral, PublicKeyToken=e52fadf300daf456, processorArchitecture=MSIL">
       <HintPath>..\..\packages\NJsonSchema.Extensions.0.1.0\lib\net45\NJsonSchema.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="NSwag.Core, Version=13.15.10.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\NSwag.Core.13.15.10\lib\net45\NSwag.Core.dll</HintPath>
+    <Reference Include="NSwag.Core, Version=13.16.1.0, Culture=neutral, PublicKeyToken=c2d88086e098d109, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\NSwag.Core.13.16.1\lib\net45\NSwag.Core.dll</HintPath>
     </Reference>
-    <Reference Include="RandomDataGenerator, Version=1.0.15.0, Culture=neutral, PublicKeyToken=ae5c571d29a3b8d9, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RandomDataGenerator.Net.1.0.16\lib\net45\RandomDataGenerator.dll</HintPath>
+    <Reference Include="RandomDataGenerator, Version=1.0.16.0, Culture=neutral, PublicKeyToken=ae5c571d29a3b8d9, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RandomDataGenerator.Net.1.0.17\lib\net45\RandomDataGenerator.dll</HintPath>
     </Reference>
     <Reference Include="Scriban.Signed, Version=2.1.4.0, Culture=neutral, PublicKeyToken=5675fb69b15f2433, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Scriban.Signed.2.1.4\lib\net45\Scriban.Signed.dll</HintPath>
@@ -270,8 +277,8 @@
     <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
       <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
     </Reference>
-    <Reference Include="Stef.Validation, Version=0.1.0.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Stef.Validation.0.1.0\lib\net40\Stef.Validation.dll</HintPath>
+    <Reference Include="Stef.Validation, Version=0.1.1.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Stef.Validation.0.1.1\lib\net40\Stef.Validation.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
@@ -289,14 +296,14 @@
     <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
-    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=6.12.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.6.12.2\lib\net472\System.IdentityModel.Tokens.Jwt.dll</HintPath>
+    <Reference Include="System.IdentityModel.Tokens.Jwt, Version=6.25.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.IdentityModel.Tokens.Jwt.6.25.0\lib\net472\System.IdentityModel.Tokens.Jwt.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
     </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.18.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.18\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.3.1.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.3.1\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
@@ -326,8 +333,11 @@
     <Reference Include="System.Text.Encodings.Web, Version=4.0.5.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Text.Json.4.7.2\lib\net461\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
@@ -342,15 +352,6 @@
     <Reference Include="TinyMapper, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\TinyMapper.3.0.3\lib\net40\TinyMapper.dll</HintPath>
     </Reference>
-    <Reference Include="WireMock.Net, Version=1.5.3.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Net.1.5.3\lib\net461\WireMock.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="WireMock.Net.Abstractions, Version=1.5.3.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Net.Abstractions.1.5.3\lib\net451\WireMock.Net.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="WireMock.Org.Abstractions, Version=1.5.3.0, Culture=neutral, PublicKeyToken=c8d65537854e1f03, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\WireMock.Org.Abstractions.1.5.3\lib\net45\WireMock.Org.Abstractions.dll</HintPath>
-    </Reference>
     <Reference Include="XPath2, Version=1.1.3.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\XPath2.1.1.3\lib\net452\XPath2.dll</HintPath>
     </Reference>
@@ -388,6 +389,16 @@
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
+      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
+      <Name>WireMock.Net.Abstractions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
+      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
+      <Name>WireMock.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
@@ -397,6 +408,7 @@
     <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets'))" />
     <Error Condition="!Exists('..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.0\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Nullable.1.3.1\build\Nullable.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nullable.1.3.1\build\Nullable.props'))" />
   </Target>
   <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" />
   <Import Project="..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets" Condition="Exists('..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets')" />

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

@@ -2,15 +2,15 @@
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net472" />
   <package id="Fare" version="2.2.1" targetFramework="net472" />
-  <package id="Handlebars.Net" version="2.1.2" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Humanizer" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Json" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Random" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Xeger" version="2.3.5" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.XPath" version="2.3.5" targetFramework="net472" />
+  <package id="Handlebars.Net" version="2.1.4" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Humanizer" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Json" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Random" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Xeger" version="2.4.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.XPath" version="2.4.0" targetFramework="net472" />
   <package id="Humanizer" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core.af" version="2.14.1" targetFramework="net472" />
@@ -62,7 +62,7 @@
   <package id="Humanizer.Core.zh-Hans" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core.zh-Hant" version="2.14.1" targetFramework="net472" />
   <package id="JmesPath.Net" version="1.0.125" targetFramework="net472" />
-  <package id="log4net" version="2.0.14" targetFramework="net472" />
+  <package id="log4net" version="2.0.15" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.8" targetFramework="net472" />
   <package id="Microsoft.AspNetCore" version="2.2.0" targetFramework="net472" />
   <package id="Microsoft.AspNetCore.Authentication.Abstractions" version="2.2.0" targetFramework="net472" />
@@ -89,6 +89,7 @@
   <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" version="2.2.0" targetFramework="net472" />
   <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" version="2.2.0" targetFramework="net472" />
   <package id="Microsoft.AspNetCore.WebUtilities" version="2.2.0" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.0" targetFramework="net472" />
   <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.Configuration" version="5.0.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.Configuration.Abstractions" version="5.0.0" targetFramework="net472" />
@@ -114,42 +115,42 @@
   <package id="Microsoft.Extensions.Options" version="2.2.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.2.0" targetFramework="net472" />
   <package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net472" />
-  <package id="Microsoft.IdentityModel.JsonWebTokens" version="6.12.2" targetFramework="net472" />
-  <package id="Microsoft.IdentityModel.Logging" version="6.12.2" targetFramework="net472" />
+  <package id="Microsoft.IdentityModel.Abstractions" version="6.25.0" targetFramework="net472" />
+  <package id="Microsoft.IdentityModel.JsonWebTokens" version="6.25.0" targetFramework="net472" />
+  <package id="Microsoft.IdentityModel.Logging" version="6.25.0" targetFramework="net472" />
   <package id="Microsoft.IdentityModel.Protocols" version="6.12.2" targetFramework="net472" />
   <package id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.12.2" targetFramework="net472" />
-  <package id="Microsoft.IdentityModel.Tokens" version="6.12.2" targetFramework="net472" />
+  <package id="Microsoft.IdentityModel.Tokens" version="6.25.0" targetFramework="net472" />
   <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net472" />
   <package id="Namotion.Reflection" version="2.0.10" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
-  <package id="NJsonSchema" version="10.6.10" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
+  <package id="NJsonSchema" version="10.7.2" targetFramework="net472" />
   <package id="NJsonSchema.Extensions" version="0.1.0" targetFramework="net472" />
-  <package id="NSwag.Core" version="13.15.10" targetFramework="net472" />
-  <package id="Nullable" version="1.3.0" targetFramework="net472" developmentDependency="true" />
-  <package id="RandomDataGenerator.Net" version="1.0.16" targetFramework="net472" />
+  <package id="NSwag.Core" version="13.16.1" targetFramework="net472" />
+  <package id="Nullable" version="1.3.1" targetFramework="net472" developmentDependency="true" />
+  <package id="RandomDataGenerator.Net" version="1.0.17" targetFramework="net472" />
   <package id="Scriban.Signed" version="2.1.4" targetFramework="net472" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
-  <package id="Stef.Validation" version="0.1.0" targetFramework="net472" />
+  <package id="Stef.Validation" version="0.1.1" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net472" />
   <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net472" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net472" />
-  <package id="System.IdentityModel.Tokens.Jwt" version="6.12.2" targetFramework="net472" />
+  <package id="System.IdentityModel.Tokens.Jwt" version="6.25.0" targetFramework="net472" />
   <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net472" />
-  <package id="System.Linq.Dynamic.Core" version="1.2.18" targetFramework="net472" />
+  <package id="System.Linq.Dynamic.Core" version="1.3.1" targetFramework="net472" />
   <package id="System.Memory" version="4.5.4" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />
   <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.Encoding" version="4.3.0" targetFramework="net472" />
   <package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net472" />
+  <package id="System.Text.Json" version="4.7.2" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="TinyMapper" version="3.0.3" targetFramework="net472" />
-  <package id="WireMock.Net" version="1.5.3" targetFramework="net472" />
-  <package id="WireMock.Net.Abstractions" version="1.5.3" targetFramework="net472" />
-  <package id="WireMock.Org.Abstractions" version="1.5.3" targetFramework="net472" />
   <package id="XPath2" version="1.1.3" targetFramework="net472" />
   <package id="XPath2.Extensions" version="1.1.3" targetFramework="net472" />
 </packages>

examples/WireMock.Net.Console.Proxy.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj

@@ -9,7 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -1,6 +1,6 @@
-using System;
+using System;
+using System.Collections.Specialized;
 using System.Net.Http;
-using Newtonsoft.Json;
 using WireMock.Server;
 using WireMock.Settings;
 
@@ -26,10 +26,8 @@ namespace WireMock.Net.Console.Proxy.Net452
                 }
             });
 
-            server.LogEntriesChanged += (sender, eventRecordArgs) =>
-            {
-                System.Console.WriteLine(JsonConvert.SerializeObject(eventRecordArgs.NewItems, Formatting.Indented));
-            };
+            System.Console.WriteLine("Subscribing to LogEntriesChanged");
+            server.LogEntriesChanged += Server_LogEntriesChanged;
 
             var uri = new Uri(urls[0]);
             var form = new MultipartFormDataContent
@@ -38,9 +36,23 @@ namespace WireMock.Net.Console.Proxy.Net452
             };
             new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
 
+            System.Console.WriteLine("Unsubscribing to LogEntriesChanged");
+            server.LogEntriesChanged -= Server_LogEntriesChanged;
+
+            form = new MultipartFormDataContent
+            {
+                { new StringContent("data2"), "test2", "test2.txt" }
+            };
+            new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
+
             System.Console.WriteLine("Press any key to stop the server");
             System.Console.ReadKey();
             server.Stop();
         }
+
+        private static void Server_LogEntriesChanged(object sender, NotifyCollectionChangedEventArgs eventRecordArgs)
+        {
+            System.Console.WriteLine("Server_LogEntriesChanged : {0}", eventRecordArgs.NewItems.Count);
+        }
     }
 }

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

@@ -72,7 +72,7 @@
       <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

examples/WireMock.Net.Console.Proxy.Net452/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
 </packages>

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

@@ -11,7 +11,7 @@ public class DynamicDataGeneration : WireMockOpenApiParserDynamicExampleValues
         get
         {
             // Since you have your Schema, you can get if max-length is set. You can generate accurate examples with this settings
-            var maxLength = Schema.MaxLength ?? 9;
+            var maxLength = Schema?.MaxLength ?? 9;
 
             return RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex
             {

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

@@ -17,7 +17,7 @@ class Program
 
     private static void RunMockServerWithDynamicExampleGeneration()
     {
-        //Run your mocking framework specifieing youur Example Values generator class.
+        // Run your mocking framework specifying your Example Values generator class.
         var serverCustomer_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Customer_V2.0.json"), "http://localhost:8090/", true, new DynamicDataGeneration(), Types.ExampleValueType.Value, Types.ExampleValueType.Value);
         Console.WriteLine("Press any key to stop the servers");
 
@@ -27,15 +27,15 @@ class Program
 
     private static void RunOthersOpenApiParserExample()
     {
-        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/");
-        var testopenapifile_json = Run.RunServer(Path.Combine(Folder, "testopenapifile.json"), "https://localhost:9096/");
-        var file_errorYaml = Run.RunServer(Path.Combine(Folder, "file_error.yaml"), "https://localhost:9097/");
-        var file_petJson = Run.RunServer(Path.Combine(Folder, "pet.json"), "https://localhost:9098/");
-        var refsYaml = Run.RunServer(Path.Combine(Folder, "refs.yaml"), "https://localhost:9099/");
+        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 testopenapifile_json = Run.RunServer(Path.Combine(Folder, "testopenapifile.json"), "http://localhost:9096/");
+        var file_errorYaml = Run.RunServer(Path.Combine(Folder, "file_error.yaml"), "http://localhost:9097/");
+        var file_petJson = Run.RunServer(Path.Combine(Folder, "pet.json"), "http://localhost:9098/");
+        var refsYaml = Run.RunServer(Path.Combine(Folder, "refs.yaml"), "http://localhost:9099/");
 
         testopenapifile_json
             .Given(Request.Create().WithPath("/x").UsingGet())

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

@@ -9,64 +9,70 @@ using WireMock.Net.OpenApiParser.Types;
 using WireMock.Server;
 using WireMock.Settings;
 
-namespace WireMock.Net.OpenApiParser.ConsoleApp
+namespace WireMock.Net.OpenApiParser.ConsoleApp;
+
+public static class Run
 {
-    public static class Run
+    public static WireMockServer RunServer(
+        string path,
+        string url,
+        bool dynamicExamples = true,
+        IWireMockOpenApiParserExampleValues? examplesValuesGenerator = null,
+        ExampleValueType pathPatternToUse = ExampleValueType.Wildcard,
+        ExampleValueType headerPatternToUse = ExampleValueType.Wildcard
+    )
     {
-        public static WireMockServer RunServer(string path, string url, bool dynamicExamples = true, IWireMockOpenApiParserExampleValues examplesValuesGenerator =  null, ExampleValueType pathPatternToUse = ExampleValueType.Wildcard, ExampleValueType headerPatternToUse = ExampleValueType.Wildcard)
+        var server = WireMockServer.Start(new WireMockServerSettings
         {
-            var server = WireMockServer.Start(new WireMockServerSettings
-            {
-                AllowCSharpCodeMatcher = true,
-                Urls = new[] { url },
-                StartAdminInterface = true,
-                ReadStaticMappings = true,
-                WatchStaticMappings = false,
-                WatchStaticMappingsInSubdirectories = false,
-                Logger = new WireMockConsoleLogger(),
-                SaveUnmatchedRequests = true
-            });
+            AllowCSharpCodeMatcher = true,
+            Urls = new[] { url },
+            StartAdminInterface = true,
+            ReadStaticMappings = true,
+            WatchStaticMappings = false,
+            WatchStaticMappingsInSubdirectories = false,
+            Logger = new WireMockConsoleLogger(),
+            SaveUnmatchedRequests = true
+        });
 
-            Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
+        Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
 
-            //server.SetBasicAuthentication("a", "b");
+        //server.SetBasicAuthentication("a", "b");
 
-            var settings = new WireMockOpenApiParserSettings
-            {
-                DynamicExamples = dynamicExamples,
-                ExampleValues = examplesValuesGenerator,
-                PathPatternToUse = pathPatternToUse,
-                HeaderPatternToUse = headerPatternToUse,
-            };
-
-            server.WithMappingFromOpenApiFile(path, settings, out var diag);
-
-            return server;
-        }
-
-        public static void RunServer(IEnumerable<MappingModel> mappings)
+        var settings = new WireMockOpenApiParserSettings
         {
-            string url1 = "http://localhost:9091/";
+            DynamicExamples = dynamicExamples,
+            ExampleValues = examplesValuesGenerator,
+            PathPatternToUse = pathPatternToUse,
+            HeaderPatternToUse = headerPatternToUse,
+        };
 
-            var server = WireMockServer.Start(new WireMockServerSettings
-            {
-                AllowCSharpCodeMatcher = true,
-                Urls = new[] { url1 },
-                StartAdminInterface = true,
-                ReadStaticMappings = false,
-                WatchStaticMappings = false,
-                WatchStaticMappingsInSubdirectories = false,
-                Logger = new WireMockConsoleLogger(),
-            });
-            Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
+        server.WithMappingFromOpenApiFile(path, settings, out var diag);
 
-            server.SetBasicAuthentication("a", "b");
+        return server;
+    }
 
-            server.WithMapping(mappings.ToArray());
+    public static void RunServer(IEnumerable<MappingModel> mappings)
+    {
+        string url1 = "http://localhost:9091/";
 
-            Console.WriteLine("Press any key to stop the server");
-            System.Console.ReadKey();
-            server.Stop();
-        }
+        var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            AllowCSharpCodeMatcher = true,
+            Urls = new[] { url1 },
+            StartAdminInterface = true,
+            ReadStaticMappings = false,
+            WatchStaticMappings = false,
+            WatchStaticMappingsInSubdirectories = false,
+            Logger = new WireMockConsoleLogger(),
+        });
+        Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
+
+        server.SetBasicAuthentication("a", "b");
+
+        server.WithMapping(mappings.ToArray());
+
+        Console.WriteLine("Press any key to stop the server");
+        System.Console.ReadKey();
+        server.Stop();
     }
 }

examples/WireMock.Net.Service/App.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -11,4 +11,4 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>

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

@@ -8,9 +8,10 @@
     <OutputType>Exe</OutputType>
     <RootNamespace>WireMock.Net.Service</RootNamespace>
     <AssemblyName>WireMock.Net.Service</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -32,8 +33,8 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -45,7 +46,7 @@
       <HintPath>..\..\packages\Microsoft.Owin.Hosting.2.0.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>

examples/WireMock.Net.Service/packages.config

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net452" />
+  <package id="log4net" version="2.0.15" targetFramework="net48" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.3" targetFramework="net452" />
-  <package id="Microsoft.Owin" version="2.0.2" targetFramework="net452" />
+  <package id="Microsoft.Owin" version="4.2.2" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="2.0.2" targetFramework="net452" />
   <package id="Microsoft.Owin.Hosting" version="2.0.2" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net48" />
   <package id="Owin" version="1.0" targetFramework="net452" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
-  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" requireReinstallation="true" />
   <package id="XPath2" version="1.1.3" targetFramework="net452" />
 </packages>

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

@@ -3,6 +3,7 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Threading;
+using System.Threading.Tasks;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
@@ -10,71 +11,112 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
-using WireMock.Util;
 
-namespace WireMock.Net.StandAlone.NETCoreApp
+namespace WireMock.Net.StandAlone.NETCoreApp;
+
+static class Program
 {
-    static class Program
+    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+    // private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+    private static int sleepTime = 30000;
+    private static WireMockServer _server;
+
+    static async Task Main(string[] args)
     {
-        private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
-        // private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+        //await TestAsync().ConfigureAwait(false);
+        //return;
 
-        private static int sleepTime = 30000;
-        private static WireMockServer _server;
+        XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
 
-        static void Main(string[] args)
+        if (!WireMockServerSettingsParser.TryParseArguments(args, Environment.GetEnvironmentVariables(), out var settings, new WireMockLog4NetLogger()))
         {
-            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
-
-            if (!WireMockServerSettingsParser.TryParseArguments(args, out var settings, new WireMockLog4NetLogger()))
-            {
-                return;
-            }
-
-            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
-
-            _server = WireMockServer.Start(settings);
-
-            //_server.Given(Request.Create().WithPath("/api/sap")
-            //    .UsingPost()
-            //    .WithBody((IBodyData xmlData) =>
-            //    {
-            //        //xmlData is always null
-            //        return true;
-            //    }))
-            //    .RespondWith(Response.Create().WithStatusCode(System.Net.HttpStatusCode.OK));
-
-            //_server
-            //    .Given(Request.Create()
-            //        .UsingAnyMethod())
-            //    .RespondWith(Response.Create()
-            //        .WithTransformer()
-            //        .WithBody("{{Random Type=\"Integer\" Min=100 Max=999999}} {{DateTime.Now}} {{DateTime.Now \"yyyy-MMM\"}} {{String.Format (DateTime.Now) \"MMM-dd\"}}"));
-
-            Console.WriteLine($"{DateTime.UtcNow} Press Ctrl+C to shut down");
-
-            Console.CancelKeyPress += (s, e) =>
-            {
-                Stop("CancelKeyPress");
-            };
-
-            System.Runtime.Loader.AssemblyLoadContext.Default.Unloading += ctx =>
-            {
-                Stop("AssemblyLoadContext.Default.Unloading");
-            };
-
-            while (true)
-            {
-                Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running : {_server.IsStarted}");
-                Thread.Sleep(sleepTime);
-            }
+            return;
         }
 
-        private static void Stop(string why)
+        settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+        _server = WireMockServer.Start(settings);
+
+        //_server.Given(Request.Create().WithPath("/api/sap")
+        //    .UsingPost()
+        //    .WithBody((IBodyData xmlData) =>
+        //    {
+        //        //xmlData is always null
+        //        return true;
+        //    }))
+        //    .RespondWith(Response.Create().WithStatusCode(System.Net.HttpStatusCode.OK));
+
+        //_server
+        //    .Given(Request.Create()
+        //        .UsingAnyMethod())
+        //    .RespondWith(Response.Create()
+        //        .WithTransformer()
+        //        .WithBody("{{Random Type=\"Integer\" Min=100 Max=999999}} {{DateTime.Now}} {{DateTime.Now \"yyyy-MMM\"}} {{String.Format (DateTime.Now) \"MMM-dd\"}}"));
+
+        Console.WriteLine($"{DateTime.UtcNow} Press Ctrl+C to shut down");
+
+        Console.CancelKeyPress += (s, e) =>
         {
-            Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server stopping because '{why}'");
-            _server.Stop();
-            Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server stopped");
+            Stop("CancelKeyPress");
+        };
+
+        System.Runtime.Loader.AssemblyLoadContext.Default.Unloading += ctx =>
+        {
+            Stop("AssemblyLoadContext.Default.Unloading");
+        };
+
+        while (true)
+        {
+            Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server running : {_server.IsStarted}");
+            Thread.Sleep(sleepTime);
         }
     }
-}
+
+    private static void Stop(string why)
+    {
+        Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server stopping because '{why}'");
+        _server.Stop();
+        Console.WriteLine($"{DateTime.UtcNow} WireMock.Net server stopped");
+    }
+
+    private static async Task TestAsync()
+    {
+        for (var i = 0; i < 20; i++)
+        {
+            var server = WireMockServer.Start();
+
+            server
+                .Given(
+                    Request.Create().WithPath("/some/thing").UsingGet()
+                )
+                .RespondWith(
+                    Response.Create()
+                        .WithStatusCode(200)
+                        .WithHeader("Content-Type", "text/plain")
+                        .WithBody("Hello world! : " + i)
+                );
+
+            server
+                .Given(
+                    Request.Create().WithPath("/some/thing").UsingGet()
+                )
+                .RespondWith(
+                    Response.Create()
+                        .WithStatusCode(200)
+                        .WithHeader("Content-Type", "text/plain")
+                        .WithBody("Hello world duplicate! : " + i)
+                );
+
+            var client = server.CreateClient();
+
+            var response = await client.GetAsync($"{server.Url}/some/thing").ConfigureAwait(false);
+            var content = await response.Content.ReadAsStringAsync().ConfigureAwait(false);
+            Console.WriteLine($"counter {i} value:{content}");
+
+            server.Reset();
+            server.Dispose();
+            server.Stop();
+        }
+    }
+}

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

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

examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="log4net" Version="2.0.15" />
   </ItemGroup>
 
   <ItemGroup>

examples/WireMock.Net.StandAlone.NETCoreApp/WireMockLog4NetLogger.cs

@@ -1,44 +1,43 @@
-using System;
+using System;
 using log4net;
 using Newtonsoft.Json;
 using WireMock.Admin.Requests;
 using WireMock.Logging;
 
-namespace WireMock.Net.StandAlone.NETCoreApp
+namespace WireMock.Net.StandAlone.NETCoreApp;
+
+internal class WireMockLog4NetLogger : IWireMockLogger
 {
-    internal class WireMockLog4NetLogger : IWireMockLogger
+    private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+    public void Debug(string formatString, params object[] args)
     {
-        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+        Log.DebugFormat(formatString, args);
+    }
 
-        public void Debug(string formatString, params object[] args)
-        {
-            Log.DebugFormat(formatString, args);
-        }
+    public void Info(string formatString, params object[] args)
+    {
+        Log.InfoFormat(formatString, args);
+    }
 
-        public void Info(string formatString, params object[] args)
-        {
-            Log.InfoFormat(formatString, args);
-        }
+    public void Warn(string formatString, params object[] args)
+    {
+        Log.WarnFormat(formatString, args);
+    }
 
-        public void Warn(string formatString, params object[] args)
-        {
-            Log.WarnFormat(formatString, args);
-        }
+    public void Error(string formatString, params object[] args)
+    {
+        Log.ErrorFormat(formatString, args);
+    }
 
-        public void Error(string formatString, params object[] args)
-        {
-            Log.ErrorFormat(formatString, args);
-        }
+    public void Error(string message, Exception exception)
+    {
+        Log.Error(message, exception);
+    }
 
-        public void Error(string message, Exception exception)
-        {
-            Log.Error(message, exception);
-        }
-
-        public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
-        {
-            string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
-            Log.DebugFormat("Admin[{0}] {1}", isAdminRequest, message);
-        }
+    public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest)
+    {
+        string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+        Log.DebugFormat("Admin[{0}] {1}", isAdminRequest, message);
     }
 }

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

@@ -13,7 +13,7 @@ public class Program
     {
         XmlConfigurator.Configure(new FileInfo("log4net.config"));
 
-        if (WireMockServerSettingsParser.TryParseArguments(args, out var settings))
+        if (WireMockServerSettingsParser.TryParseArguments(args, Environment.GetEnvironmentVariables(), out var settings))
         {
             Console.WriteLine("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
 

examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj

@@ -39,14 +39,14 @@
     <StartupObject>WireMock.Net.StandAlone.Net452.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.14" targetFramework="net452" />
+  <package id="log4net" version="2.0.15" targetFramework="net452" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net452" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
 </packages>

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

@@ -11,7 +11,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -20,7 +20,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.1" newVersion="4.0.3.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -40,7 +40,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.Cng" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.3.1.0" newVersion="4.3.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.3.1.1" newVersion="4.3.1.1" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Linq.Dynamic.Core" publicKeyToken="0f07ec44de6ac832" culture="neutral" />
@@ -66,6 +66,50 @@
         <assemblyIdentity name="System.Security.Principal.Windows" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.1.1.1" newVersion="4.1.1.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.1" newVersion="4.2.0.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Extensions.Configuration.Binder" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.10.0" newVersion="2.1.10.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.9.0" newVersion="5.2.9.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Hosting" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.7.0" newVersion="2.2.7.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Http" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.2.0" newVersion="2.2.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Routing" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.2.0" newVersion="2.2.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.1.0" newVersion="2.2.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Server.IIS" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.6.0" newVersion="2.2.6.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.AspNetCore.Server.IISIntegration" publicKeyToken="adb9793829ddae60" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.2.1.0" newVersion="2.2.1.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

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

@@ -9,7 +9,7 @@ static class Program
 {
     static void Main(string[] args)
     {
-        if (WireMockServerSettingsParser.TryParseArguments(args, out var settings))
+        if (WireMockServerSettingsParser.TryParseArguments(args, Environment.GetEnvironmentVariables(), out var settings))
         {
             Console.WriteLine("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
 

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" />
+  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -39,167 +39,173 @@
     <StartupObject>WireMock.Net.StandAlone.Net461.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Handlebars, Version=2.1.2.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.2\lib\net46\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net46\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore, Version=2.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.2.1.4\lib\netstandard2.0\Microsoft.AspNetCore.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Authentication.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Authentication.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Authentication.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Authentication.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Authentication.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Authentication.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Authentication.Core.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Authentication.Core.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Authentication.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Authentication.Core.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Authentication.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Connections.Abstractions, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Connections.Abstractions.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Connections.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Connections.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Connections.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Connections.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Diagnostics, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Diagnostics.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Diagnostics.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Diagnostics, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Diagnostics.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Diagnostics.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Diagnostics.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Diagnostics.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Diagnostics.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Diagnostics.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Diagnostics.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Diagnostics.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.HostFiltering, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.HostFiltering.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.HostFiltering.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.HostFiltering, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.HostFiltering.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.HostFiltering.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Hosting, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Hosting, Version=2.2.7.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.2.2.7\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Server.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Server.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Hosting.Server.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Hosting.Server.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Hosting.Server.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Http, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Http.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Http, Version=2.2.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.2.2.2\lib\netstandard2.0\Microsoft.AspNetCore.Http.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Http.Extensions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Extensions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Http.Extensions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Http.Extensions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Extensions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Features.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Http.Features, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Http.Features.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Features.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.HttpOverrides, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.HttpOverrides.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.HttpOverrides.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.HttpOverrides, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.HttpOverrides.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.HttpOverrides.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Routing, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Routing.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Routing.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Routing, Version=2.2.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Routing.2.2.2\lib\netstandard2.0\Microsoft.AspNetCore.Routing.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Routing.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Routing.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.Routing.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Routing.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Routing.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Routing.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration, Version=2.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.1.2\lib\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.IIS, Version=2.2.6.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\lib\netstandard2.0\Microsoft.AspNetCore.Server.IIS.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.IISIntegration, Version=2.2.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.1\lib\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Core.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Core.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Https.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Https.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Core.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Https, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Https.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Https.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets, Version=2.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.2.1.3\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.AspNetCore.WebUtilities, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNetCore.WebUtilities.2.1.1\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets, Version=2.2.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.2.2.1\lib\netstandard2.0\Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.AspNetCore.WebUtilities, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNetCore.WebUtilities.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.WebUtilities.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Binder.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.CommandLine, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.CommandLine.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.CommandLine.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.Binder, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Binder.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Binder.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.CommandLine, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.CommandLine.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.CommandLine.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.FileExtensions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.EnvironmentVariables.2.2.4\lib\netstandard2.0\Microsoft.Extensions.Configuration.EnvironmentVariables.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.Json, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Json.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.Json.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.FileExtensions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.FileExtensions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.FileExtensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.Json, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Json.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.Json.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.UserSecrets, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.2.2.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.FileProviders.Physical, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Physical.2.1.1\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.FileProviders.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.FileSystemGlobbing, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.FileSystemGlobbing.2.1.1\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.FileProviders.Physical, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.FileProviders.Physical.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileProviders.Physical.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Hosting.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Hosting.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Hosting.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.FileSystemGlobbing, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.FileSystemGlobbing.2.2.0\lib\netstandard2.0\Microsoft.Extensions.FileSystemGlobbing.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Hosting.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Hosting.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Hosting.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Configuration, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Configuration.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Console, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Console.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Console.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Configuration, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Configuration.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Configuration.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Debug, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Debug.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Debug.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Console, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Console.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Console.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.ObjectPool, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.ObjectPool.2.1.1\lib\netstandard2.0\Microsoft.Extensions.ObjectPool.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.Debug, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.Debug.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.Debug.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Options, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Options.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Logging.EventSource, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Logging.EventSource.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Logging.EventSource.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.ObjectPool, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.ObjectPool.2.2.0\lib\netstandard2.0\Microsoft.Extensions.ObjectPool.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Options, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Options.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Net.Http.Headers, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Net.Http.Headers.2.1.1\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Options.ConfigurationExtensions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Options.ConfigurationExtensions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Options.ConfigurationExtensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    <Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Owin.Hosting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Hosting.4.0.0\lib\net451\Microsoft.Owin.Hosting.dll</HintPath>
+    <Reference Include="Microsoft.Owin, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.2.2\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Owin.Hosting, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Owin.Hosting.4.2.2\lib\net45\Microsoft.Owin.Hosting.dll</HintPath>
     </Reference>
     <Reference Include="MimeKitLite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=bede1c8a46c66814, processorArchitecture=MSIL">
       <HintPath>..\..\packages\MimeKitLite.2.0.7\lib\net45\MimeKitLite.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
@@ -212,28 +218,32 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
+      <HintPath>..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Collections.Immutable.1.5.0\lib\netstandard2.0\System.Collections.Immutable.dll</HintPath>
     </Reference>
+    <Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ComponentModel.Annotations.4.5.0\lib\net461\System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.5.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.3.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Diagnostics.DiagnosticSource.4.5.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.IO.Pipelines.4.5.2\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
+      <HintPath>..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
     </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.18.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.18\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.3.1.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.3.1\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
     </Reference>
-    <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
-    <Reference Include="System.Net.Http.Formatting, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.4\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    <Reference Include="System.Net.Http.Formatting, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Numerics" />
@@ -244,14 +254,14 @@
       <HintPath>..\..\packages\System.Reflection.Metadata.1.6.0\lib\netstandard2.0\System.Reflection.Metadata.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.2\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+      <HintPath>..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Security" />
     <Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
     </Reference>
-    <Reference Include="System.Security.Cryptography.Cng, Version=4.3.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Security.Cryptography.Cng.4.5.0\lib\net461\System.Security.Cryptography.Cng.dll</HintPath>
+    <Reference Include="System.Security.Cryptography.Cng, Version=4.3.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Cng.4.5.2\lib\net461\System.Security.Cryptography.Cng.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
@@ -268,18 +278,18 @@
     <Reference Include="System.Text.Encodings.Web, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.1\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Http, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.4\lib\net45\System.Web.Http.dll</HintPath>
+    <Reference Include="System.Web.Http, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
-    <Reference Include="System.Web.Http.Owin, Version=5.2.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.4\lib\net45\System.Web.Http.Owin.dll</HintPath>
+    <Reference Include="System.Web.Http.Owin, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Owin.5.2.9\lib\net45\System.Web.Http.Owin.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml" />
     <Reference Include="System.Xml.Linq" />
@@ -314,8 +324,12 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props'))" />
-    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.props'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets'))" />
+    <Error Condition="!Exists('..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.1\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.1\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets'))" />
   </Target>
-  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.1.1\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" />
+  <Import Project="..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets" Condition="Exists('..\..\packages\Microsoft.Extensions.Configuration.UserSecrets.2.2.0\build\netstandard2.0\Microsoft.Extensions.Configuration.UserSecrets.targets')" />
+  <Import Project="..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets" Condition="Exists('..\..\packages\Microsoft.AspNetCore.Server.IIS.2.2.6\build\netstandard2.0\Microsoft.AspNetCore.Server.IIS.targets')" />
+  <Import Project="..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.1\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets" Condition="Exists('..\..\packages\Microsoft.AspNetCore.Server.IISIntegration.2.2.1\build\netstandard2.0\Microsoft.AspNetCore.Server.IISIntegration.targets')" />
 </Project>

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

@@ -1,83 +1,86 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Handlebars.Net" version="2.1.2" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.4" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore" version="2.1.4" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authentication.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Authentication.Core" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Connections.Abstractions" version="2.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Diagnostics" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Diagnostics.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.HostFiltering" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http" version="2.1.22" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Extensions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Http.Features" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.HttpOverrides" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Routing" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Routing.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.IISIntegration" version="2.1.2" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel" version="2.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel.Core" version="2.1.7" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel.Https" version="2.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" version="2.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" version="2.1.3" targetFramework="net461" />
-  <package id="Microsoft.AspNetCore.WebUtilities" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Binder" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.CommandLine" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.EnvironmentVariables" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.FileExtensions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.Json" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Configuration.UserSecrets" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.FileProviders.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.FileProviders.Physical" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.FileSystemGlobbing" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Hosting.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Configuration" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Console" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Logging.Debug" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.ObjectPool" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Net.Http.Headers" version="2.1.1" targetFramework="net461" />
-  <package id="Microsoft.Owin" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net461" />
-  <package id="Microsoft.Owin.Hosting" version="4.0.0" targetFramework="net461" />
+  <package id="Handlebars.Net" version="2.1.4" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.9" targetFramework="net461" />
+  <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.2.9" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Authentication.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Authentication.Core" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Connections.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Diagnostics" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Diagnostics.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.HostFiltering" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Hosting" version="2.2.7" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Hosting.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Hosting.Server.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http" version="2.2.2" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http.Extensions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Http.Features" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.HttpOverrides" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Routing" version="2.2.2" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Routing.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.IIS" version="2.2.6" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.IISIntegration" version="2.2.1" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Core" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Https" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" version="2.2.1" targetFramework="net461" />
+  <package id="Microsoft.AspNetCore.WebUtilities" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.Binder" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.CommandLine" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.EnvironmentVariables" version="2.2.4" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.FileExtensions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.Json" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.UserSecrets" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.FileProviders.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.FileProviders.Physical" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.FileSystemGlobbing" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Hosting.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Abstractions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Configuration" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Console" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.Debug" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Logging.EventSource" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.ObjectPool" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Options.ConfigurationExtensions" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Primitives" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net461" />
+  <package id="Microsoft.Owin" version="4.2.2" targetFramework="net461" />
+  <package id="Microsoft.Owin.Host.HttpListener" version="4.2.2" targetFramework="net461" />
+  <package id="Microsoft.Owin.Hosting" version="4.2.2" targetFramework="net461" />
   <package id="MimeKitLite" version="2.0.7" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
   <package id="Owin" version="1.0" targetFramework="net461" />
   <package id="RestEase" version="1.5.7" targetFramework="net461" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
-  <package id="System.Buffers" version="4.5.0" targetFramework="net461" />
+  <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
   <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
-  <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net461" />
-  <package id="System.IO.Pipelines" version="4.5.2" targetFramework="net461" />
-  <package id="System.Linq.Dynamic.Core" version="1.2.18" targetFramework="net461" />
-  <package id="System.Memory" version="4.5.1" targetFramework="net461" />
+  <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net461" />
+  <package id="System.Diagnostics.DiagnosticSource" version="4.5.1" targetFramework="net461" />
+  <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net461" />
+  <package id="System.Linq.Dynamic.Core" version="1.3.1" targetFramework="net461" />
+  <package id="System.Memory" version="4.5.4" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
   <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.2" targetFramework="net461" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="4.5.3" targetFramework="net461" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net461" />
-  <package id="System.Security.Cryptography.Cng" version="4.5.0" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Cng" version="4.5.2" targetFramework="net461" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
   <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net461" />
   <package id="System.Text.Encodings.Web" version="4.5.1" targetFramework="net461" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net461" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
   <package id="XPath2" version="1.1.3" targetFramework="net461" />
 </packages>

examples/WireMock.Net.TestcontainersExample/Program.cs

@@ -0,0 +1,43 @@
+using Newtonsoft.Json;
+using Testcontainers.MsSql;
+using WireMock.Net.Testcontainers;
+
+namespace WireMock.Net.TestcontainersExample;
+
+internal class Program
+{
+    private static async Task Main(string[] args)
+    {
+        var container = new WireMockContainerBuilder()
+            .WithAdminUserNameAndPassword("x", "y")
+            .WithMappings(@"C:\Dev\GitHub\WireMock.Net\examples\WireMock.Net.Console.NET6\__admin\mappings")
+            .WithWatchStaticMappings(true)
+            .WithAutoRemove(true)
+            .WithCleanUp(true)
+            .Build();
+
+        await container.StartAsync().ConfigureAwait(false);
+
+        var logs = await container.GetLogsAsync(DateTime.Now.AddDays(-1)).ConfigureAwait(false);
+        Console.WriteLine("logs = " + logs.Stdout);
+
+        var restEaseApiClient = container.CreateWireMockAdminClient();
+
+        var settings = await restEaseApiClient.GetSettingsAsync();
+        Console.WriteLine("settings = " + JsonConvert.SerializeObject(settings, Formatting.Indented));
+
+        var mappings = await restEaseApiClient.GetMappingsAsync();
+        Console.WriteLine("mappings = " + JsonConvert.SerializeObject(mappings, Formatting.Indented));
+
+        var client = container.CreateClient();
+        var result = await client.GetStringAsync("/static/mapping");
+        Console.WriteLine("result = " + result);
+
+        await container.StopAsync();
+
+        var sql = new MsSqlBuilder()
+            .WithAutoRemove(true)
+            .WithCleanUp(true)
+            .Build();
+    }
+}

examples/WireMock.Net.TestcontainersExample/WireMock.Net.TestcontainersExample.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Testcontainers.MsSql" Version="3.2.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.Testcontainers\WireMock.Net.Testcontainers.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

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

@@ -0,0 +1,173 @@
+{
+  "$schema": "https://schema.management.azure.com/schemas/2018-05-01/subscriptionDeploymentTemplate.json#",
+  "contentVersion": "1.0.0.0",
+  "metadata": {
+    "_dependencyType": "compute.function.linux.appService"
+  },
+  "parameters": {
+    "resourceGroupName": {
+      "type": "string",
+      "defaultValue": "linux-app-service",
+      "metadata": {
+        "description": "Name of the resource group for the resource. It is recommended to put resources under same resource group for better tracking."
+      }
+    },
+    "resourceGroupLocation": {
+      "type": "string",
+      "defaultValue": "westeurope",
+      "metadata": {
+        "description": "Location of the resource group. Resource groups could have different location than resources, however by default we use API versions from latest hybrid profile which support all locations for resource types we support."
+      }
+    },
+    "resourceName": {
+      "type": "string",
+      "defaultValue": "WireMockNetWebApplicationNET6Linux",
+      "metadata": {
+        "description": "Name of the main resource to be created by this template."
+      }
+    },
+    "resourceLocation": {
+      "type": "string",
+      "defaultValue": "[parameters('resourceGroupLocation')]",
+      "metadata": {
+        "description": "Location of the resource. By default use resource group's location, unless the resource provider is not supported there."
+      }
+    }
+  },
+  "resources": [
+    {
+      "type": "Microsoft.Resources/resourceGroups",
+      "name": "[parameters('resourceGroupName')]",
+      "location": "[parameters('resourceGroupLocation')]",
+      "apiVersion": "2019-10-01"
+    },
+    {
+      "type": "Microsoft.Resources/deployments",
+      "name": "[concat(parameters('resourceGroupName'), 'Deployment', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId)))]",
+      "resourceGroup": "[parameters('resourceGroupName')]",
+      "apiVersion": "2019-10-01",
+      "dependsOn": [
+        "[parameters('resourceGroupName')]"
+      ],
+      "properties": {
+        "mode": "Incremental",
+        "expressionEvaluationOptions": {
+          "scope": "inner"
+        },
+        "parameters": {
+          "resourceGroupName": {
+            "value": "[parameters('resourceGroupName')]"
+          },
+          "resourceGroupLocation": {
+            "value": "[parameters('resourceGroupLocation')]"
+          },
+          "resourceName": {
+            "value": "[parameters('resourceName')]"
+          },
+          "resourceLocation": {
+            "value": "[parameters('resourceLocation')]"
+          }
+        },
+        "template": {
+          "$schema": "http://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#",
+          "contentVersion": "1.0.0.0",
+          "parameters": {
+            "resourceGroupName": {
+              "type": "string"
+            },
+            "resourceGroupLocation": {
+              "type": "string"
+            },
+            "resourceName": {
+              "type": "string"
+            },
+            "resourceLocation": {
+              "type": "string"
+            }
+          },
+          "variables": {
+            "storage_name": "[toLower(concat('storage', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId))))]",
+            "appServicePlan_name": "[concat('Plan', uniqueString(concat(parameters('resourceName'), subscription().subscriptionId)))]",
+            "storage_ResourceId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', parameters('resourceGroupName'), '/providers/Microsoft.Storage/storageAccounts/', variables('storage_name'))]",
+            "appServicePlan_ResourceId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', parameters('resourceGroupName'), '/providers/Microsoft.Web/serverFarms/', variables('appServicePlan_name'))]",
+            "function_ResourceId": "[concat('/subscriptions/', subscription().subscriptionId, '/resourceGroups/', parameters('resourceGroupName'), '/providers/Microsoft.Web/sites/', parameters('resourceName'))]"
+          },
+          "resources": [
+            {
+              "location": "[parameters('resourceLocation')]",
+              "name": "[parameters('resourceName')]",
+              "type": "Microsoft.Web/sites",
+              "apiVersion": "2015-08-01",
+              "tags": {
+                "[concat('hidden-related:', variables('appServicePlan_ResourceId'))]": "empty"
+              },
+              "dependsOn": [
+                "[variables('appServicePlan_ResourceId')]",
+                "[variables('storage_ResourceId')]"
+              ],
+              "kind": "functionapp",
+              "properties": {
+                "name": "[parameters('resourceName')]",
+                "kind": "functionapp",
+                "httpsOnly": true,
+                "reserved": false,
+                "serverFarmId": "[variables('appServicePlan_ResourceId')]",
+                "siteConfig": {
+                  "alwaysOn": true,
+                  "linuxFxVersion": "dotnet|3.1"
+                }
+              },
+              "identity": {
+                "type": "SystemAssigned"
+              },
+              "resources": [
+                {
+                  "name": "appsettings",
+                  "type": "config",
+                  "apiVersion": "2015-08-01",
+                  "dependsOn": [
+                    "[variables('function_ResourceId')]"
+                  ],
+                  "properties": {
+                    "AzureWebJobsStorage": "[concat('DefaultEndpointsProtocol=https;AccountName=', variables('storage_name'), ';AccountKey=', listKeys(variables('storage_ResourceId'), '2017-10-01').keys[0].value, ';EndpointSuffix=', 'core.windows.net')]",
+                    "FUNCTIONS_EXTENSION_VERSION": "~3",
+                    "FUNCTIONS_WORKER_RUNTIME": "dotnet"
+                  }
+                }
+              ]
+            },
+            {
+              "location": "[parameters('resourceGroupLocation')]",
+              "name": "[variables('storage_name')]",
+              "type": "Microsoft.Storage/storageAccounts",
+              "apiVersion": "2017-10-01",
+              "tags": {
+                "[concat('hidden-related:', concat('/providers/Microsoft.Web/sites/', parameters('resourceName')))]": "empty"
+              },
+              "properties": {
+                "supportsHttpsTrafficOnly": true
+              },
+              "sku": {
+                "name": "Standard_LRS"
+              },
+              "kind": "Storage"
+            },
+            {
+              "location": "[parameters('resourceGroupLocation')]",
+              "name": "[variables('appServicePlan_name')]",
+              "type": "Microsoft.Web/serverFarms",
+              "apiVersion": "2015-02-01",
+              "kind": "linux",
+              "properties": {
+                "name": "[variables('appServicePlan_name')]",
+                "sku": "Standard",
+                "workerSizeId": "0",
+                "reserved": true
+              }
+            }
+          ]
+        }
+      }
+    }
+  ]
+}

examples/WireMock.Net.WebApplication.NET6/WireMock.Net.WebApplication.NET6.csproj

@@ -1,33 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
-	<PropertyGroup>
-		<TargetFramework>net6</TargetFramework>
-		<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
-		<StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
-		<AssemblyName>WireMock.Net.WebApplication</AssemblyName>
-		<RootNamespace>WireMock.Net.WebApplication</RootNamespace>
-		<UserSecretsId>efcf4a18-fd7c-4622-1111-336d65290599</UserSecretsId>
-		<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
-	</PropertyGroup>
+    <PropertyGroup>
+        <TargetFramework>net6</TargetFramework>
+        <!--<RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>-->
+        <StartupObject>WireMock.Net.WebApplication.Program</StartupObject>
+        <AssemblyName>WireMock.Net.WebApplication</AssemblyName>
+        <RootNamespace>WireMock.Net.WebApplication</RootNamespace>
+        <UserSecretsId>efcf4a18-fd7c-4622-1111-336d65290599</UserSecretsId>
+        <AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
+    </PropertyGroup>
 
-	<ItemGroup>
-	  <Content Remove="Properties\1.launchSettings.json" />
-	</ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    </ItemGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-	</ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+        <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    </ItemGroup>
 
-	<ItemGroup>
-		<ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-		<ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Content Update="appsettings.json">
-			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-		</Content>
-	</ItemGroup>
+    <ItemGroup>
+        <Content Update="appsettings.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </Content>
+    </ItemGroup>
 
 </Project>

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

@@ -15,15 +15,7 @@
     "WireMockServerSettings": {
         "StartAdminInterface": true,
         "Urls": [
-            "https://localhost:8081/"
-        ],
-        "AllowPartialMapping": false,
-        "HandleRequestsSynchronously": true,
-        "ThrowExceptionWhenMatcherFails": true,
-        "ProxyAndRecordSettings": {
-            "Url": "http://postman-echo.com/post",
-            "SaveMapping": true,
-            "SaveMappingToFile": true
-        }
+            "http://localhost"
+        ]
     }
 }

examples/WireMock.Net.WebApplication.NETCore2/WireMock.Net.WebApplication.NETCore2.csproj

@@ -12,13 +12,13 @@
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0'">
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
     <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.9" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.1'">
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
     <PackageReference Include="Microsoft.AspNetCore.All" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -12,7 +12,7 @@
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.1.8" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
 	</ItemGroup>
 
 	<ItemGroup>

examples/WireMockAzureQueueExample/.gitignore

@@ -0,0 +1,264 @@
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# Azure Functions localsettings file
+local.settings.json
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+project.fragment.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+*.VC.db
+*.VC.VC.opendb
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings
+# but database connection strings (with potential passwords) will be unencrypted
+#*.pubxml
+*.publishproj
+
+# Microsoft Azure Web App publish settings. Comment the next line if you want to
+# checkin your Azure Web App publish settings, but sensitive information contained
+# in these scripts will be unencrypted
+PublishScripts/
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.jfm
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# Since there are multiple workflows, uncomment next line to ignore bower_components
+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+#bower_components/
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+paket-files/
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.iml
+
+# CodeRush
+.cr/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc

examples/WireMockAzureQueueExample/Function1.cs

@@ -0,0 +1,13 @@
+using Microsoft.Azure.WebJobs;
+using Microsoft.Extensions.Logging;
+
+namespace WireMockAzureQueueExample;
+
+public class Function1
+{
+    [FunctionName("Function1")]
+    public void Run([QueueTrigger("myqueue-items", Connection = "ConnectionStringToWireMock")]string myQueueItem, ILogger log)
+    {
+        log.LogWarning($"C# Queue trigger function processed: {myQueueItem}");
+    }
+}

examples/WireMockAzureQueueExample/Properties/launchSettings.json

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

examples/WireMockAzureQueueExample/Properties/serviceDependencies.json

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

examples/WireMockAzureQueueExample/Properties/serviceDependencies.local.json

@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "appInsights1": {
+      "type": "appInsights.sdk"
+    },
+    "secrets1": {
+      "type": "secrets.user"
+    },
+    "storage1": {
+      "secretStore": null,
+      "resourceId": null,
+      "type": "storage.emulator",
+      "connectionId": "AzureWebJobsStorage"
+    }
+  }
+}

examples/WireMockAzureQueueExample/WireMockAzureQueueExample.csproj

@@ -0,0 +1,25 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+    <AzureFunctionsVersion>v4</AzureFunctionsVersion>
+    <UserSecretsId>bb7d8355-68c4-4f81-8c2d-6cdd80cd7602</UserSecretsId>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Azure.Storage.Blobs" Version="12.14.1" />
+    <PackageReference Include="Azure.Storage.Files.Shares" Version="12.12.1" />
+    <PackageReference Include="Azure.Storage.Queues" Version="12.12.0" />
+    <PackageReference Include="Microsoft.Azure.WebJobs.Extensions.Storage" Version="4.0.5" />
+    <PackageReference Include="Microsoft.Extensions.Azure" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
+    <PackageReference Include="Microsoft.NET.Sdk.Functions" Version="4.1.3" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Update="host.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="local.settings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToPublishDirectory>Never</CopyToPublishDirectory>
+    </None>
+  </ItemGroup>
+</Project>

examples/WireMockAzureQueueExample/host.json

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

examples/WireMockAzureQueueExample/local.settings.json

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

examples/WireMockAzureQueueProxy/Program.cs

@@ -0,0 +1,40 @@
+using Newtonsoft.Json;
+using WireMock.Logging;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMockAzureQueueProxy;
+
+static class Program
+{
+    static void Main(params string[] args)
+    {
+        var server = WireMockServer.Start(new WireMockServerSettings
+        {
+            Logger = new WireMockConsoleLogger(),
+            Urls = new[] { "http://localhost:20001/" },
+            StartAdminInterface = false,
+            ReadStaticMappings = true,
+            WatchStaticMappings = true,
+            WatchStaticMappingsInSubdirectories = true,
+            //ProxyAndRecordSettings = new ProxyAndRecordSettings
+            //{
+            //    Url = "http://127.0.0.1:10001",
+            //    SaveMapping = true,
+            //    SaveMappingToFile = true,
+            //    AppendGuidToSavedMappingFile = true
+            //}
+        });
+
+        System.Console.WriteLine("Press any key to stop the server");
+        System.Console.ReadKey();
+        server.Stop();
+
+        System.Console.WriteLine("Displaying all requests");
+        var allRequests = server.LogEntries;
+        System.Console.WriteLine(JsonConvert.SerializeObject(allRequests, Formatting.Indented));
+
+        System.Console.WriteLine("Press any key to quit");
+        System.Console.ReadKey();
+    }
+}

examples/WireMockAzureQueueProxy/WireMockAzureQueueProxy.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net6.0</TargetFramework>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+        <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <None Update="__admin\mappings\*.json">
+            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        </None>
+    </ItemGroup>
+
+</Project>

examples/WireMockAzureQueueProxy/__admin/mappings/DELETE _devstoreaccount1_myqueue-items_messages_41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88.json

@@ -0,0 +1,44 @@
+{
+    "Guid": "b4a2ff02-fb7f-4496-8c04-9aafc4f5f8f7",
+    "Title": "Proxy Mapping for DELETE /devstoreaccount1/myqueue-items/messages/41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88",
+    "Description": "Proxy Mapping for DELETE /devstoreaccount1/myqueue-items/messages/41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88",
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/devstoreaccount1/myqueue-items/messages/41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88",
+                    "IgnoreCase": false
+                }
+            ]
+        },
+        "Methods": [
+            "DELETE"
+        ],
+        "Params": [
+            {
+                "Name": "popreceipt",
+                "Matchers": [
+                    {
+                        "Name": "WildcardMatcher",
+                        "Pattern": "*",
+                        "IgnoreCase": false
+                    }
+                ]
+            }
+        ]
+    },
+    "Response": {
+        "StatusCode": 204,
+        "Headers": {
+            "Server": "Azurite-Queue/3.19.0",
+            "x-ms-client-request-id": "{{request.headers.x-ms-client-request-id}}",
+            "x-ms-request-id": "{{Random Type=\"Guid\"}}",
+            "x-ms-version": "2021-10-04",
+            "Date": "{{DateTime.Now \"ddd, dd MMM yyy HH’:’mm’:’ss ‘GMT’\"}}",
+            "Connection": "keep-alive",
+            "Keep-Alive": "timeout=5"
+        },
+        "UseTransformer": true
+    }
+}

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

@@ -0,0 +1,60 @@
+{
+    "Scenario": "AzureQueue Get Messages",
+    "WhenStateIs": "No more messages",
+    "SetStateTo": "No more messages",
+    "Guid": "4c871968-29ee-472b-a548-170444d4cc3e",
+    "Title": "Proxy Mapping for GET NO MSG /devstoreaccount1/myqueue-items/messages",
+    "Description": "Proxy Mapping for GET NO MSG /devstoreaccount1/myqueue-items/messages",
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/devstoreaccount1/myqueue-items/messages",
+                    "IgnoreCase": false
+                }
+            ]
+        },
+        "Methods": [
+            "GET"
+        ],
+        "Params": [
+            {
+                "Name": "numofmessages",
+                "Matchers": [
+                    {
+                        "Name": "ExactMatcher",
+                        "Pattern": "16",
+                        "IgnoreCase": false
+                    }
+                ]
+            },
+            {
+                "Name": "visibilitytimeout",
+                "Matchers": [
+                    {
+                        "Name": "ExactMatcher",
+                        "Pattern": "600",
+                        "IgnoreCase": false
+                    }
+                ]
+            }
+        ]
+    },
+    "Response": {
+        "StatusCode": 200,
+        "Body": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><QueueMessagesList/>",
+        "Headers": {
+            "Content-Type": "application/xml",
+            "Server": "Azurite-Queue/3.19.0",
+            "x-ms-client-request-id": "{{request.headers.x-ms-client-request-id}}",
+            "x-ms-request-id": "{{Random Type=\"Guid\"}}",
+            "x-ms-version": "2021-10-04",
+            "Date": "{{DateTime.Now \"ddd, dd MMM yyy HH’:’mm’:’ss ‘GMT’\"}}",
+            "Connection": "keep-alive",
+            "Keep-Alive": "timeout=5",
+            "Transfer-Encoding": "chunked"
+        },
+        "UseTransformer": true
+    }
+}

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

@@ -0,0 +1,59 @@
+{
+    "Scenario": "AzureQueue Get Messages",
+    "SetStateTo": "No more messages",
+    "Guid": "da9c6799-fbf8-41b6-8933-0df50f821ebb",
+    "Title": "Proxy Mapping for GET /devstoreaccount1/myqueue-items/messages",
+    "Description": "Proxy Mapping for GET /devstoreaccount1/myqueue-items/messages",
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/devstoreaccount1/myqueue-items/messages",
+                    "IgnoreCase": false
+                }
+            ]
+        },
+        "Methods": [
+            "GET"
+        ],
+        "Params": [
+            {
+                "Name": "numofmessages",
+                "Matchers": [
+                    {
+                        "Name": "WildcardMatcher",
+                        "Pattern": "*",
+                        "IgnoreCase": true
+                    }
+                ]
+            },
+            {
+                "Name": "visibilitytimeout",
+                "Matchers": [
+                    {
+                        "Name": "WildcardMatcher",
+                        "Pattern": "*",
+                        "IgnoreCase": false
+                    }
+                ]
+            }
+        ]
+    },
+    "Response": {
+        "StatusCode": 200,
+        "Body": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><QueueMessagesList><QueueMessage><MessageId>41b2aadc-d6ea-4c3c-ae20-2ae72eb08d88</MessageId><InsertionTime>Sat, 29 Oct 2022 07:11:40 GMT</InsertionTime><ExpirationTime>Sat, 31 Dec 2022 07:11:40 GMT</ExpirationTime><PopReceipt>MjlPY3QyMDIyMDc6MTE6NDAyMjU2</PopReceipt><TimeNextVisible>Sat, 29 Oct 2022 07:21:40 GMT</TimeNextVisible><DequeueCount>1</DequeueCount><MessageText>c3RlZg==</MessageText></QueueMessage></QueueMessagesList>",
+        "Headers": {
+            "Content-Type": "application/xml",
+            "Server": "Azurite-Queue/3.19.0",
+            "x-ms-client-request-id": "{{request.headers.x-ms-client-request-id}}",
+            "x-ms-request-id": "{{Random Type=\"Guid\"}}",
+            "x-ms-version": "2021-10-04",
+            "Date": "{{DateTime.Now \"ddd, dd MMM yyy HH’:’mm’:’ss ‘GMT’\"}}",
+            "Connection": "keep-alive",
+            "Keep-Alive": "timeout=5",
+            "Transfer-Encoding": "chunked"
+        },
+        "UseTransformer": true
+    }
+}

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

@@ -0,0 +1,46 @@
+{
+    "Guid": "17c7a389-98e1-4383-975d-54c82d1e3860",
+    "Title": "Proxy Mapping for HEAD /devstoreaccount1/myqueue-items",
+    "Description": "Proxy Mapping for HEAD /devstoreaccount1/myqueue-items",
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/devstoreaccount1/myqueue-items",
+                    "IgnoreCase": false
+                }
+            ]
+        },
+        "Methods": [
+            "HEAD"
+        ],
+        "Params": [
+            {
+                "Name": "comp",
+                "Matchers": [
+                    {
+                        "Name": "ExactMatcher",
+                        "Pattern": "metadata",
+                        "IgnoreCase": false
+                    }
+                ]
+            }
+        ]
+    },
+    "Response": {
+        "StatusCode": 200,
+        "Body": "",
+        "Headers": {
+            "Server": "Azurite-Queue/3.19.0",
+            "x-ms-client-request-id": "{{request.headers.x-ms-client-request-id}}",
+            "x-ms-approximate-messages-count": "0",
+            "x-ms-request-id": "{{Random Type=\"Guid\"}}",
+            "x-ms-version": "2021-10-04",
+            "Date": "{{DateTime.Now \"ddd, dd MMM yyy HH’:’mm’:’ss ‘GMT’\"}}",
+            "Connection": "keep-alive",
+            "Keep-Alive": "timeout=5"
+        },
+        "UseTransformer": true
+    }
+}

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

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

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

@@ -1,19 +1,18 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// Fault Model
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class FaultModel
 {
     /// <summary>
-    /// Fault Model
+    /// Gets or sets the fault. Can be null, "", NONE, EMPTY_RESPONSE or MALFORMED_RESPONSE_CHUNK.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class FaultModel
-    {
-        /// <summary>
-        /// Gets or sets the fault. Can be null, "", NONE, EMPTY_RESPONSE, MALFORMED_RESPONSE_CHUNK or RANDOM_DATA_THEN_CLOSE.
-        /// </summary>
-        public string Type { get; set; }
+    public string? Type { get; set; }
 
-        /// <summary>
-        /// Gets or sets the fault percentage.
-        /// </summary>
-        public double? Percentage { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the fault percentage.
+    /// </summary>
+    public double? Percentage { get; set; }
 }

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

@@ -9,7 +9,7 @@ namespace WireMock.Admin.Mappings;
 public class HeaderModel
 {
     /// <summary>
-    /// Gets or sets the name.
+    /// Gets or sets the name (key).
     /// </summary>
     public string Name { get; set; } = null!;
 
@@ -19,12 +19,12 @@ public class HeaderModel
     public IList<MatcherModel>? Matchers { get; set; }
 
     /// <summary>
-    /// Gets or sets the ignore case.
+    /// Gets or sets the ignore case for the Header Key.
     /// </summary>
     public bool? IgnoreCase { get; set; }
 
     /// <summary>
-    /// Reject on match.
+    /// Gets or sets the Reject on match for the Header Key.
     /// </summary>
     public bool? RejectOnMatch { get; set; }
 

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

@@ -14,6 +14,11 @@ public class MappingModel
     /// </summary>
     public Guid? Guid { get; set; }
 
+    /// <summary>
+    /// The datetime when this mapping was created or updated.
+    /// </summary>
+    public DateTime? UpdatedAt { get; set; }
+
     /// <summary>
     /// Gets or sets the TimeSettings when which this mapping should be used.
     /// </summary>
@@ -74,4 +79,23 @@ public class MappingModel
     /// The Webhooks.
     /// </summary>
     public WebhookModel[]? Webhooks { get; set; }
+
+    /// <summary>
+    /// Fire and forget for webhooks.
+    /// </summary>
+    public bool? UseWebhooksFireAndForget { get; set; }
+    
+    /// <summary>
+    /// Data Object which can be used when WithTransformer is used.
+    /// e.g. lookup an path in this object using
+    /// <example>
+    /// lookup data "1"
+    /// </example>
+    /// </summary>
+    public object? Data { get; set; }
+
+    /// <summary> 
+    /// The probability when this request should be matched. Value is between 0 and 1. [Optional]
+    /// </summary>
+    public double? Probability { get; set; }
 }

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

@@ -39,14 +39,42 @@ public class MatcherModel
     /// <summary>
     /// The Operator to use when multiple patterns are defined. Optional.
     /// - null      = Same as "or".
-    /// - "or"      = Only one pattern should match.
+    /// - "or"      = Only one pattern is required to match.
     /// - "and"     = All patterns should match.
     /// - "average" = The average value from all patterns.
     /// </summary>
     public string? MatchOperator { get; set; }
 
+    #region JsonPartialMatcher and JsonPartialWildcardMatcher
     /// <summary>
-    /// Support Regex, only used for JsonPartialMatcher.
+    /// Support Regex.
     /// </summary>
     public bool? Regex { get; set; }
+    #endregion
+
+    #region MimePartMatcher
+    /// <summary>
+    /// ContentType Matcher (image/png; name=image.png)
+    /// </summary>
+    public MatcherModel? ContentTypeMatcher { get; set; }
+
+    /// <summary>
+    /// ContentDisposition Matcher (attachment; filename=image.png)
+    /// </summary>
+    public MatcherModel? ContentDispositionMatcher { get; set; }
+
+    /// <summary>
+    /// ContentTransferEncoding Matcher (base64)
+    /// </summary>
+    public MatcherModel? ContentTransferEncodingMatcher { get; set; }
+
+    /// <summary>
+    /// Content Matcher
+    /// </summary>
+    public MatcherModel? ContentMatcher { get; set; }
+    #endregion
+
+    #region XPathMatcher
+    public XmlNamespace[]? XmlNamespaceMap { get; set; }
+    #endregion
 }

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

@@ -16,6 +16,11 @@ public class ParamModel
     /// </summary>
     public bool? IgnoreCase { get; set; }
 
+    /// <summary>
+    /// Gets or sets the Reject on match for the Param Name.
+    /// </summary>
+    public bool? RejectOnMatch { get; set; }
+
     /// <summary>
     /// Gets or sets the matchers.
     /// </summary>

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

@@ -1,121 +1,120 @@
 using System.Collections.Generic;
 
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// ResponseModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class ResponseModel
 {
     /// <summary>
-    /// ResponseModel
+    /// Gets or sets the HTTP status.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class ResponseModel
-    {
-        /// <summary>
-        /// Gets or sets the HTTP status.
-        /// </summary>
-        public object? StatusCode { get; set; }
+    public object? StatusCode { get; set; }
 
-        /// <summary>
-        /// Gets or sets the body destination (SameAsSource, String or Bytes).
-        /// </summary>
-        public string? BodyDestination { get; set; }
+    /// <summary>
+    /// Gets or sets the body destination (SameAsSource, String or Bytes).
+    /// </summary>
+    public string? BodyDestination { get; set; }
 
-        /// <summary>
-        /// Gets or sets the body.
-        /// </summary>
-        public string? Body { get; set; }
+    /// <summary>
+    /// Gets or sets the body.
+    /// </summary>
+    public string? Body { get; set; }
 
-        /// <summary>
-        /// Gets or sets the body (as JSON object).
-        /// </summary>
-        public object? BodyAsJson { get; set; }
+    /// <summary>
+    /// Gets or sets the body (as JSON object).
+    /// </summary>
+    public object? BodyAsJson { get; set; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether child objects to be indented according to the Newtonsoft.Json.JsonTextWriter.Indentation and Newtonsoft.Json.JsonTextWriter.IndentChar settings.
-        /// </summary>
-        public bool? BodyAsJsonIndented { get; set; }
+    /// <summary>
+    /// Gets or sets a value indicating whether child objects to be indented according to the Newtonsoft.Json.JsonTextWriter.Indentation and Newtonsoft.Json.JsonTextWriter.IndentChar settings.
+    /// </summary>
+    public bool? BodyAsJsonIndented { get; set; }
 
-        /// <summary>
-        /// Gets or sets the body (as bytearray).
-        /// </summary>
-        public byte[]? BodyAsBytes { get; set; }
+    /// <summary>
+    /// Gets or sets the body (as bytearray).
+    /// </summary>
+    public byte[]? BodyAsBytes { get; set; }
 
-        /// <summary>
-        /// Gets or sets the body as a file.
-        /// </summary>
-        public string? BodyAsFile { get; set; }
+    /// <summary>
+    /// Gets or sets the body as a file.
+    /// </summary>
+    public string? BodyAsFile { get; set; }
 
-        /// <summary>
-        /// Is the body as file cached?
-        /// </summary>
-        public bool? BodyAsFileIsCached { get; set; }
+    /// <summary>
+    /// Is the body as file cached?
+    /// </summary>
+    public bool? BodyAsFileIsCached { get; set; }
 
-        /// <summary>
-        /// Gets or sets the body encoding.
-        /// </summary>
-        public EncodingModel? BodyEncoding { get; set; }
+    /// <summary>
+    /// Gets or sets the body encoding.
+    /// </summary>
+    public EncodingModel? BodyEncoding { get; set; }
 
-        /// <summary>
-        /// Use ResponseMessage Transformer.
-        /// </summary>
-        public bool? UseTransformer { get; set; }
+    /// <summary>
+    /// Use ResponseMessage Transformer.
+    /// </summary>
+    public bool? UseTransformer { get; set; }
 
-        /// <summary>
-        /// Gets the type of the transformer.
-        /// </summary>
-        public string? TransformerType { get; set; }
+    /// <summary>
+    /// Gets the type of the transformer.
+    /// </summary>
+    public string? TransformerType { get; set; }
 
-        /// <summary>
-        /// Use the Handlebars transformer for the content from the referenced BodyAsFile.
-        /// </summary>
-        public bool? UseTransformerForBodyAsFile { get; set; }
+    /// <summary>
+    /// Use the Handlebars transformer for the content from the referenced BodyAsFile.
+    /// </summary>
+    public bool? UseTransformerForBodyAsFile { get; set; }
 
-        /// <summary>
-        /// The ReplaceNodeOptions to use when transforming a JSON node.
-        /// </summary>
-        public string? TransformerReplaceNodeOptions { get; set; }
+    /// <summary>
+    /// The ReplaceNodeOptions to use when transforming a JSON node.
+    /// </summary>
+    public string? TransformerReplaceNodeOptions { get; set; }
 
-        /// <summary>
-        /// Gets or sets the headers.
-        /// </summary>
-        public IDictionary<string, object>? Headers { get; set; }
+    /// <summary>
+    /// Gets or sets the headers.
+    /// </summary>
+    public IDictionary<string, object>? Headers { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Headers (Raw).
-        /// </summary>
-        public string? HeadersRaw { get; set; }
+    /// <summary>
+    /// Gets or sets the Headers (Raw).
+    /// </summary>
+    public string? HeadersRaw { get; set; }
 
-        /// <summary>
-        /// Gets or sets the delay in milliseconds.
-        /// </summary>
-        public int? Delay { get; set; }
+    /// <summary>
+    /// Gets or sets the delay in milliseconds.
+    /// </summary>
+    public int? Delay { get; set; }
 
-        /// <summary>
-        /// Gets or sets the minimum random delay in milliseconds.
-        /// </summary>
-        public int? MinimumRandomDelay { get; set; }
+    /// <summary>
+    /// Gets or sets the minimum random delay in milliseconds.
+    /// </summary>
+    public int? MinimumRandomDelay { get; set; }
 
-        /// <summary>
-        /// Gets or sets the maximum random delay in milliseconds.
-        /// </summary>
-        public int? MaximumRandomDelay { get; set; }
+    /// <summary>
+    /// Gets or sets the maximum random delay in milliseconds.
+    /// </summary>
+    public int? MaximumRandomDelay { get; set; }
 
-        /// <summary>
-        /// Gets or sets the Proxy URL.
-        /// </summary>
-        public string? ProxyUrl { get; set; }
+    /// <summary>
+    /// Gets or sets the Proxy URL.
+    /// </summary>
+    public string? ProxyUrl { get; set; }
 
-        /// <summary>
-        /// The client X509Certificate2 Thumbprint or SubjectName to use.
-        /// </summary>
-        public string? X509Certificate2ThumbprintOrSubjectName { get; set; }
+    /// <summary>
+    /// The client X509Certificate2 Thumbprint or SubjectName to use.
+    /// </summary>
+    public string? X509Certificate2ThumbprintOrSubjectName { get; set; }
 
-        /// <summary>
-        /// Gets or sets the fault.
-        /// </summary>
-        public FaultModel? Fault { get; set; }
+    /// <summary>
+    /// Gets or sets the fault.
+    /// </summary>
+    public FaultModel? Fault { get; set; }
 
-        /// <summary>
-        /// Gets or sets the WebProxy settings.
-        /// </summary>
-        public WebProxyModel? WebProxy { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the WebProxy settings.
+    /// </summary>
+    public WebProxyModel? WebProxy { get; set; }
 }

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

@@ -1,21 +1,25 @@
-using System;
+using System;
 
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// Status
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class StatusModel
 {
     /// <summary>
-    /// Status
+    /// The optional guid.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class StatusModel
-    {
-        /// <summary>
-        /// The optional guid.
-        /// </summary>
-        public Guid? Guid { get; set; }
+    public Guid? Guid { get; set; }
 
-        /// <summary>
-        /// The status (can also contain the error message).
-        /// </summary>
-        public string Status { get; set; }
-    }
+    /// <summary>
+    /// The status.
+    /// </summary>
+    public string? Status { get; set; }
+
+    /// <summary>
+    /// The error message.
+    /// </summary>
+    public string? Error { get; set; }
 }

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

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

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

@@ -11,12 +11,12 @@ public class WebhookRequestModel
     /// <summary>
     /// Gets or sets the Url.
     /// </summary>
-    public string Url { get; set; }
+    public string Url { get; set; } = null!;
 
     /// <summary>
     /// The method
     /// </summary>
-    public string Method { get; set; }
+    public string Method { get; set; } = null!;
 
     /// <summary>
     /// Gets or sets the headers.
@@ -47,4 +47,19 @@ public class WebhookRequestModel
     /// The ReplaceNodeOptions to use when transforming a JSON node.
     /// </summary>
     public string? TransformerReplaceNodeOptions { get; set; }
+
+    /// <summary>
+    /// Gets or sets the delay in milliseconds.
+    /// </summary>
+    public int? Delay { get; set; }
+
+    /// <summary>
+    /// Gets or sets the minimum random delay in milliseconds.
+    /// </summary>
+    public int? MinimumRandomDelay { get; set; }
+
+    /// <summary>
+    /// Gets or sets the maximum random delay in milliseconds.
+    /// </summary>
+    public int? MaximumRandomDelay { get; set; }
 }

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

@@ -0,0 +1,21 @@
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// Defines an xml namespace consisting of prefix and uri.
+/// <example>xmlns:i="http://www.w3.org/2001/XMLSchema-instance"</example>
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class XmlNamespace
+{
+    /// <summary>
+    /// The prefix.
+    /// <example>i</example>
+    /// </summary>
+    public string Prefix { get; set; } = null!;
+
+    /// <summary>
+    /// The uri.
+    /// <example>http://www.w3.org/2001/XMLSchema-instance</example>
+    /// </summary>
+    public string Uri { get; set; } = null!;
+}

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

@@ -1,58 +1,76 @@
-namespace WireMock.Admin.Settings
-{
-    [FluentBuilder.AutoGenerateBuilder]
-    public class ProxyAndRecordSettingsModel
-    {
-        /// <summary>
-        /// The clientCertificate thumbprint or subject name fragment to use.
-        /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
-        /// </summary>
-        public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
-
-        /// <summary>
-        /// Defines the WebProxySettings.
-        /// </summary>
-        public WebProxySettingsModel WebProxySettings { get; set; }
-
-        /// <summary>
-        /// Proxy requests should follow redirection (30x).
-        /// </summary>
-        public bool? AllowAutoRedirect { get; set; }
-
-        /// <summary>
-        /// The URL to proxy.
-        /// </summary>
-        public string Url { get; set; }
-
-        /// <summary>
-        /// Save the mapping for each request/response to the internal Mappings.
-        /// </summary>
-        public bool SaveMapping { get; set; }
-
-        /// <summary>
-        /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
-        /// </summary>
-        public bool SaveMappingToFile { get; set; }
-
-        /// <summary>
-        /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
-        /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
-        /// </summary>
-        public string SaveMappingForStatusCodePattern { get; set; } = "*";
-
-        /// <summary>
-        /// Defines a list from headers which will be excluded from the saved mappings.
-        /// </summary>
-        public string[] ExcludedHeaders { get; set; }
-
-        /// <summary>
-        /// Defines a list of cookies which will be excluded from the saved mappings.
-        /// </summary>
-        public string[] ExcludedCookies { get; set; }
-
-        /// <summary>
-        /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
-        /// </summary>
-        // public bool PreferProxyMapping { get; set; }
-    }
+namespace WireMock.Admin.Settings;
+
+[FluentBuilder.AutoGenerateBuilder]
+public class ProxyAndRecordSettingsModel
+{
+    /// <summary>
+    /// The clientCertificate thumbprint or subject name fragment to use.
+    /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+    /// </summary>
+    public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
+
+    /// <summary>
+    /// Defines the WebProxySettings.
+    /// </summary>
+    public WebProxySettingsModel WebProxySettings { get; set; }
+
+    /// <summary>
+    /// Proxy requests should follow redirection (30x).
+    /// </summary>
+    public bool? AllowAutoRedirect { get; set; }
+
+    /// <summary>
+    /// The URL to proxy.
+    /// </summary>
+    public string Url { get; set; }
+
+    /// <summary>
+    /// Save the mapping for each request/response to the internal Mappings.
+    /// </summary>
+    public bool SaveMapping { get; set; }
+
+    /// <summary>
+    /// Save the mapping for each request/response also to a file. (Note that SaveMapping must also be set to true.)
+    /// </summary>
+    public bool SaveMappingToFile { get; set; }
+
+    /// <summary>
+    /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
+    /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
+    /// </summary>
+    public string SaveMappingForStatusCodePattern { get; set; } = "*";
+
+    /// <summary>
+    /// Defines a list from headers which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedHeaders { get; set; }
+
+    /// <summary>
+    /// Defines a list of cookies which will be excluded from the saved mappings.
+    /// </summary>
+    public string[] ExcludedCookies { get; set; }
+
+    /// <summary>
+    /// Prefer the Proxy Mapping over the saved Mapping (in case SaveMapping is set to <c>true</c>).
+    /// </summary>
+    // public bool PreferProxyMapping { get; set; }
+
+    /// <summary>
+    /// When SaveMapping is set to <c>true</c>, this setting can be used to control the behavior of the generated request matchers for the new mapping.
+    /// - <c>false</c>, the default matchers will be used.
+    /// - <c>true</c>, the defined mappings in the request wil be used for the new mapping.
+    ///
+    /// Default value is false.
+    /// </summary>
+    public bool UseDefinedRequestMatchers { get; set; }
+
+    /// <summary>
+    /// Append an unique GUID to the filename from the saved mapping file.
+    /// </summary>
+    public bool AppendGuidToSavedMappingFile { get; set; }
+
+    /// <summary>
+    /// Defines the Replace Settings
+    /// </summary>
+    public ProxyUrlReplaceSettingsModel? ReplaceSettings { get; set; }
 }

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

@@ -0,0 +1,23 @@
+namespace WireMock.Admin.Settings;
+
+/// <summary>
+/// Defines an old path param and a new path param to be replaced when proxying.
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class ProxyUrlReplaceSettingsModel
+{
+    /// <summary>
+    /// The old path value to be replaced by the new path value
+    /// </summary>
+    public string OldValue { get; set; } = null!;
+
+    /// <summary>
+    /// The new path value to replace the old value with
+    /// </summary>
+    public string NewValue { get; set; } = null!;
+
+    /// <summary>
+    /// Defines if the case should be ignore when replacing.
+    /// </summary>
+    public bool IgnoreCase { get; set; }
+}

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

@@ -1,82 +1,128 @@
 using System.Text.RegularExpressions;
 using WireMock.Handlers;
+using WireMock.Types;
 
-namespace WireMock.Admin.Settings
+namespace WireMock.Admin.Settings;
+
+/// <summary>
+/// Settings
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class SettingsModel
 {
     /// <summary>
-    /// Settings
+    /// Gets or sets the global delay in milliseconds.
     /// </summary>
-    [FluentBuilder.AutoGenerateBuilder]
-    public class SettingsModel
-    {
-        /// <summary>
-        /// Gets or sets the global delay in milliseconds.
-        /// </summary>
-        public int? GlobalProcessingDelay { get; set; }
+    public int? GlobalProcessingDelay { get; set; }
 
-        /// <summary>
-        /// Gets or sets if partial mapping is allowed.
-        /// </summary>
-        public bool? AllowPartialMapping { get; set; }
+    /// <summary>
+    /// Gets or sets if partial mapping is allowed.
+    /// </summary>
+    public bool? AllowPartialMapping { get; set; }
 
-        /// <summary>
-        /// Gets or sets the RequestLog expiration in hours
-        /// </summary>
-        public int? RequestLogExpirationDuration { get; set; }
+    /// <summary>
+    /// Gets or sets the RequestLog expiration in hours
+    /// </summary>
+    public int? RequestLogExpirationDuration { get; set; }
 
-        /// <summary>
-        /// Gets or sets the MaxRequestLog count.
-        /// </summary>
-        public int? MaxRequestLogCount { get; set; }
+    /// <summary>
+    /// Gets or sets the MaxRequestLog count.
+    /// </summary>
+    public int? MaxRequestLogCount { get; set; }
 
-        /// <summary>
-        /// Allow a Body for all HTTP Methods. (default set to false).
-        /// </summary>
-        public bool? AllowBodyForAllHttpMethods { get; set; }
+    /// <summary>
+    /// Allow a Body for all HTTP Methods. (default set to <c>false</c>).
+    /// </summary>
+    public bool? AllowBodyForAllHttpMethods { get; set; }
 
-        /// <summary>
-        /// Handle all requests synchronously. (default set to false).
-        /// </summary>
-        public bool? HandleRequestsSynchronously { get; set; }
+    /// <summary>
+    /// Allow only a HttpStatus Code in the response which is defined. (default set to <c>false</c>).
+    /// - false : also null, 0, empty or invalid HttpStatus codes are allowed.
+    /// - true  : only codes defined in <see cref="System.Net.HttpStatusCode"/> are allowed.
+    /// </summary>
+    public bool? AllowOnlyDefinedHttpStatusCodeInResponse { get; set; }
 
-        /// <summary>
-        /// Throw an exception when the Matcher fails because of invalid input. (default set to false).
-        /// </summary>
-        public bool? ThrowExceptionWhenMatcherFails { get; set; }
+    /// <summary>
+    /// Set to true to disable Json deserialization when processing requests. (default set to <c>false</c>).
+    /// </summary>
+    public bool? DisableJsonBodyParsing { get; set; }
 
-        /// <summary>
-        /// Use the RegexExtended instead of the default <see cref="Regex"/>.  (default set to true).
-        /// </summary>
-        public bool? UseRegexExtended { get; set; }
+    /// <summary>
+    /// Disable support for GZip and Deflate request body decompression. (default set to <c>false</c>).
+    /// </summary>
+    public bool? DisableRequestBodyDecompressing { get; set; }
 
-        /// <summary>
-        /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to false).
-        /// </summary>
-        public bool? SaveUnmatchedRequests { get; set; }
+    /// <summary>
+    /// Set to true to disable FormUrlEncoded deserializing when processing requests. (default set to <c>false</c>).
+    /// </summary>
+    public bool? DisableDeserializeFormUrlEncoded { get; set; }
 
-        /// <summary>
-        /// Gets or sets if the static mappings should be read at startup.
-        /// </summary>
-        public bool? ReadStaticMappings { get; set; }
+    /// <summary>
+    /// Handle all requests synchronously. (default set to <c>false</c>).
+    /// </summary>
+    public bool? HandleRequestsSynchronously { get; set; }
 
-        /// <summary>
-        /// Watch the static mapping files + folder for changes when running.
-        /// </summary>
-        public bool? WatchStaticMappings { get; set; }
+    /// <summary>
+    /// Use the RegexExtended instead of the default <see cref="Regex"/>.  (default set to <c>true</c>).
+    /// </summary>
+    public bool? UseRegexExtended { get; set; }
 
-        /// <summary>
-        /// A value indicating whether subdirectories within the static mappings path should be monitored.
-        /// </summary>
-        public bool? WatchStaticMappingsInSubdirectories { get; set; }
+    /// <summary>
+    /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to <c>false</c>).
+    /// </summary>
+    public bool? SaveUnmatchedRequests { get; set; }
 
-        /// <summary>
-        /// Policies to use when using CORS. By default CORS is disabled. [Optional]
-        /// </summary>
-        public string? CorsPolicyOptions { get; set; }
+    /// <summary>
+    /// Gets or sets if the static mappings should be read at startup.
+    /// </summary>
+    public bool? ReadStaticMappings { get; set; }
 
-        /// <summary>
-        /// The proxy and record settings.
-        /// </summary>
-        public ProxyAndRecordSettingsModel? ProxyAndRecordSettings { get; set; }
-    }
+    /// <summary>
+    /// Watch the static mapping files + folder for changes when running.
+    /// </summary>
+    public bool? WatchStaticMappings { get; set; }
+
+    /// <summary>
+    /// A value indicating whether subdirectories within the static mappings path should be monitored.
+    /// </summary>
+    public bool? WatchStaticMappingsInSubdirectories { get; set; }
+
+    /// <summary>
+    /// Policies to use when using CORS. By default CORS is disabled. [Optional]
+    /// </summary>
+    public string? CorsPolicyOptions { get; set; }
+
+    /// <summary>
+    /// The proxy and record settings.
+    /// </summary>
+    public ProxyAndRecordSettingsModel? ProxyAndRecordSettings { get; set; }
+
+    /// <summary>
+    /// Defines on which scheme (http/https) to host. (This overrides the <c>UseSSL</c> value).
+    /// </summary>
+    public HostingScheme? HostingScheme { get; set; }
+
+    /// <summary>
+    /// Don't save the response-string in the LogEntry when WithBody(Func{IRequestMessage, string}) or WithBody(Func{IRequestMessage, Task{string}}) is used. (default set to <c>false</c>).
+    /// </summary>
+    public bool? DoNotSaveDynamicResponseInLogEntry { get; set; }
+
+    /// <summary>
+    /// See <seealso cref="QueryParameterMultipleValueSupport"/>.
+    ///
+    /// Default value = "All".
+    /// </summary>
+    public QueryParameterMultipleValueSupport? QueryParameterMultipleValueSupport { get; set; }
+
+#if NETSTANDARD1_3_OR_GREATER || NET461
+    /// <summary>
+    /// Server client certificate mode
+    /// </summary>
+    public ClientCertificateMode ClientCertificateMode { get; set; }
+
+    /// <summary>
+    /// Whether to accept any client certificate
+    /// </summary>
+    public bool AcceptAnyClientCertificate { get; set; }
+#endif
 }

src/WireMock.Net.Abstractions/BuilderExtensions/RequestModelBuilder.cs

@@ -0,0 +1,139 @@
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// RequestModelBuilder
+/// </summary>
+public partial class RequestModelBuilder
+{
+    /// <summary>
+    /// UsingConnect: add HTTP Method matching on `CONNECT`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingConnect() => WithMethods("CONNECT");
+
+    /// <summary>
+    /// UsingDelete: add HTTP Method matching on `DELETE`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingDelete() => WithMethods("DELETE");
+
+    /// <summary>
+    /// UsingGet: add HTTP Method matching on `GET`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingGet() => WithMethods("GET");
+
+    /// <summary>
+    /// UsingHead: Add HTTP Method matching on `HEAD`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingHead() => WithMethods("HEAD");
+
+    /// <summary>
+    /// UsingPost: add HTTP Method matching on `POST`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingPost() => WithMethods("POST");
+
+    /// <summary>
+    /// UsingPatch: add HTTP Method matching on `PATCH`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingPatch() => WithMethods("PATCH");
+
+    /// <summary>
+    /// UsingPut: add HTTP Method matching on `OPTIONS`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingOptions() => WithMethods("OPTIONS");
+
+    /// <summary>
+    /// UsingPut: add HTTP Method matching on `PUT`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingPut() => WithMethods("PUT");
+
+    /// <summary>
+    /// UsingTrace: add HTTP Method matching on `TRACE`.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingTrace() => WithMethods("TRACE");
+
+    /// <summary>
+    /// UsingAnyMethod: add HTTP Method matching on any method.
+    /// </summary>
+    /// <returns>The <see cref="RequestModelBuilder"/>.</returns>
+    public RequestModelBuilder UsingAnyMethod() => this;
+
+    /// <summary>
+    /// Set the ClientIP.
+    /// </summary>
+    public RequestModelBuilder WithClientIP(string value) => WithClientIP(() => value);
+
+    /// <summary>
+    /// Set the ClientIP.
+    /// </summary>
+    public RequestModelBuilder WithClientIP(ClientIPModel value) => WithClientIP(() => value);
+
+    /// <summary>
+    /// Set the ClientIP.
+    /// </summary>
+    public RequestModelBuilder WithClientIP(Action<ClientIPModelBuilder> action)
+    {
+        return WithClientIP(() =>
+        {
+            var builder = new ClientIPModelBuilder();
+            action(builder);
+            return builder.Build();
+        });
+    }
+
+    /// <summary>
+    /// Set the Path.
+    /// </summary>
+    public RequestModelBuilder WithPath(string value) => WithPath(() => value);
+
+    /// <summary>
+    /// Set the Path.
+    /// </summary>
+    public RequestModelBuilder WithPath(PathModel value) => WithPath(() => value);
+
+    /// <summary>
+    /// Set the Path.
+    /// </summary>
+    public RequestModelBuilder WithPath(Action<PathModelBuilder> action)
+    {
+        return WithPath(() =>
+        {
+            var builder = new PathModelBuilder();
+            action(builder);
+            return builder.Build();
+        });
+    }
+
+    /// <summary>
+    /// Set the Url.
+    /// </summary>
+    public RequestModelBuilder WithUrl(string value) => WithUrl(() => value);
+
+    /// <summary>
+    /// Set the Url.
+    /// </summary>
+    public RequestModelBuilder WithUrl(UrlModel value) => WithUrl(() => value);
+
+    /// <summary>
+    /// Set the Url.
+    /// </summary>
+    public RequestModelBuilder WithUrl(Action<UrlModelBuilder> action)
+    {
+        return WithUrl(() =>
+        {
+            var builder = new UrlModelBuilder();
+            action(builder);
+            return builder.Build();
+        });
+    }
+}

src/WireMock.Net.Abstractions/BuilderExtensions/ResponseModelBuilder.cs

@@ -0,0 +1,36 @@
+using System;
+using System.Net;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.Admin.Mappings;
+
+/// <summary>
+/// ResponseModelBuilder
+/// </summary>
+public partial class ResponseModelBuilder
+{
+    /// <summary>
+    /// Set the StatusCode.
+    /// </summary>
+    public ResponseModelBuilder WithStatusCode(int value) => WithStatusCode(() => value);
+
+    /// <summary>
+    /// Set the StatusCode.
+    /// </summary>
+    public ResponseModelBuilder WithStatusCode(HttpStatusCode value) => WithStatusCode(() => value);
+
+    /// <summary>
+    /// Set the Delay.
+    /// </summary>
+    public ResponseModelBuilder WithDelay(TimeSpan value) => WithDelay((int) value.TotalMilliseconds);
+
+    /// <summary>
+    /// Set the MinimumRandomDelay.
+    /// </summary>
+    public ResponseModelBuilder WithMinimumRandomDelay(TimeSpan value) => WithMinimumRandomDelay((int)value.TotalMilliseconds);
+
+    /// <summary>
+    /// Set the MaximumRandomDelay.
+    /// </summary>
+    public ResponseModelBuilder WithMaximumRandomDelay(TimeSpan value) => WithMaximumRandomDelay((int)value.TotalMilliseconds);
+}

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

@@ -1,9 +1,9 @@
-namespace WireMock.Http;
+namespace WireMock.Constants;
 
 /// <summary>
 /// https://developer.mozilla.org/en-US/docs/Web/HTTP/Methods
 /// </summary>
-internal static class HttpRequestMethods
+public static class HttpRequestMethod
 {
     public const string CONNECT = "CONNECT";
     public const string DELETE = "DELETE";

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

@@ -1,121 +1,120 @@
 using JetBrains.Annotations;
 using System.Collections.Generic;
 
-namespace WireMock.Handlers
+namespace WireMock.Handlers;
+
+/// <summary>
+/// Handler to interact with the file system to handle folders and read and write (static mapping) files.
+/// </summary>
+public interface IFileSystemHandler
 {
     /// <summary>
-    /// Handler to interact with the file system to handle folders and read and write (static mapping) files.
+    /// Gets the folder where the static mappings are located. For local file system, this would be `{CurrentFolder}/__admin/mappings`.
     /// </summary>
-    public interface IFileSystemHandler
-    {
-        /// <summary>
-        /// Gets the folder where the static mappings are located. For local file system, this would be `{CurrentFolder}/__admin/mappings`.
-        /// </summary>
-        /// <returns>The folder name.</returns>
-        string GetMappingFolder();
+    /// <returns>The folder name.</returns>
+    string GetMappingFolder();
 
-        /// <summary>
-        /// Determines whether the given path refers to an existing directory on disk.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>true if path refers to an existing directory; false if the directory does not exist or an error occurs when trying to determine if the specified directory exists.</returns>
-        bool FolderExists([NotNull] string path);
+    /// <summary>
+    /// Determines whether the given path refers to an existing directory on disk.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <returns>true if path refers to an existing directory; false if the directory does not exist or an error occurs when trying to determine if the specified directory exists.</returns>
+    bool FolderExists([NotNull] string path);
 
-        /// <summary>
-        ///  Creates all directories and subdirectories in the specified path unless they already exist.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        void CreateFolder([NotNull] string path);
+    /// <summary>
+    ///  Creates all directories and subdirectories in the specified path unless they already exist.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    void CreateFolder([NotNull] string path);
 
-        /// <summary>
-        ///  Returns an enumerable collection of file names in a specified path.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <param name="includeSubdirectories">A value indicating whether subdirectories should also included when enumerating files.</param>
-        /// <returns>An enumerable collection of the full names (including paths) for the files in the directory (and optionally subdirectories) specified by path.</returns>
-        IEnumerable<string> EnumerateFiles([NotNull] string path, bool includeSubdirectories);
+    /// <summary>
+    ///  Returns an enumerable collection of file names in a specified path.
+    /// </summary>
+    /// <param name="path">The path.</param>
+    /// <param name="includeSubdirectories">A value indicating whether subdirectories should also included when enumerating files.</param>
+    /// <returns>An enumerable collection of the full names (including paths) for the files in the directory (and optionally subdirectories) specified by path.</returns>
+    IEnumerable<string> EnumerateFiles([NotNull] string path, bool includeSubdirectories);
 
-        /// <summary>
-        /// Read a static mapping file as text.
-        /// </summary>
-        /// <param name="path">The path (folder + filename with .json extension).</param>
-        /// <returns>The file content as text.</returns>
-        string ReadMappingFile([NotNull] string path);
+    /// <summary>
+    /// Read a static mapping file as text.
+    /// </summary>
+    /// <param name="path">The path (folder + filename with .json extension).</param>
+    /// <returns>The file content as text.</returns>
+    string ReadMappingFile([NotNull] string path);
 
-        /// <summary>
-        /// Write the static mapping file.
-        /// </summary>
-        /// <param name="path">The path (folder + filename with .json extension).</param>
-        /// <param name="text">The text.</param>
-        void WriteMappingFile([NotNull] string path, [NotNull] string text);
+    /// <summary>
+    /// Write the static mapping file.
+    /// </summary>
+    /// <param name="path">The path (folder + filename with .json extension).</param>
+    /// <param name="text">The text.</param>
+    void WriteMappingFile([NotNull] string path, [NotNull] string text);
 
-        /// <summary>
-        /// Read a response body file as byte[].
-        /// </summary>
-        /// <param name="path">The path or filename from the file to read.</param>
-        /// <returns>The file content as bytes.</returns>
-        byte[] ReadResponseBodyAsFile([NotNull] string path);
+    /// <summary>
+    /// Read a response body file as byte[].
+    /// </summary>
+    /// <param name="path">The path or filename from the file to read.</param>
+    /// <returns>The file content as bytes.</returns>
+    byte[] ReadResponseBodyAsFile([NotNull] string path);
 
-        /// <summary>
-        /// Read a response body file as text.
-        /// </summary>
-        /// <param name="path">The path or filename from the file to read.</param>
-        /// <returns>The file content as text.</returns>
-        string ReadResponseBodyAsString([NotNull] string path);
+    /// <summary>
+    /// Read a response body file as text.
+    /// </summary>
+    /// <param name="path">The path or filename from the file to read.</param>
+    /// <returns>The file content as text.</returns>
+    string ReadResponseBodyAsString([NotNull] string path);
 
-        /// <summary>
-        /// Delete a file.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        void DeleteFile([NotNull] string filename);
+    /// <summary>
+    /// Delete a file.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    void DeleteFile([NotNull] string filename);
 
-        /// <summary>
-        /// Determines whether the given path refers to an existing file on disk.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <returns>true if path refers to an existing file; false if the file does not exist.</returns>
-        bool FileExists([NotNull] string filename);
+    /// <summary>
+    /// Determines whether the given path refers to an existing file on disk.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    /// <returns>true if path refers to an existing file; false if the file does not exist.</returns>
+    bool FileExists([NotNull] string filename);
 
-        /// <summary>
-        /// Write a file.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <param name="bytes">The bytes.</param>
-        void WriteFile([NotNull] string filename, [NotNull] byte[] bytes);
+    /// <summary>
+    /// Write a file.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    /// <param name="bytes">The bytes.</param>
+    void WriteFile([NotNull] string filename, [NotNull] byte[] bytes);
 
-        /// <summary>
-        /// Write a file.
-        /// </summary>
-        /// <param name="folder">The folder.</param>
-        /// <param name="filename">The filename.</param>
-        /// <param name="bytes">The bytes.</param>
-        void WriteFile([NotNull] string folder, [NotNull] string filename, [NotNull] byte[] bytes);
+    /// <summary>
+    /// Write a file.
+    /// </summary>
+    /// <param name="folder">The folder.</param>
+    /// <param name="filename">The filename.</param>
+    /// <param name="bytes">The bytes.</param>
+    void WriteFile([NotNull] string folder, [NotNull] string filename, [NotNull] byte[] bytes);
 
-        /// <summary>
-        /// Read a file as bytes.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <returns>The file content as bytes.</returns>
-        byte[] ReadFile([NotNull] string filename);
+    /// <summary>
+    /// Read a file as bytes.
+    /// </summary>
+    /// <param name="filename">The filename.</param>
+    /// <returns>The file content as bytes.</returns>
+    byte[] ReadFile([NotNull] string filename);
 
-        /// <summary>
-        /// Read a file as string.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <returns>The file content as a string.</returns>
-        string ReadFileAsString([NotNull] string filename);
+    /// <summary>
+    /// Read a file as string.
+    /// </summary>
+    /// <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>
+    /// 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);
-    }
+    /// <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/IRequestMessage.cs

@@ -1,5 +1,8 @@
 using System;
 using System.Collections.Generic;
+#if NETSTANDARD1_3_OR_GREATER || NET461
+using System.Security.Cryptography.X509Certificates;
+#endif
 using WireMock.Types;
 using WireMock.Util;
 
@@ -28,7 +31,7 @@ public interface IRequestMessage
     /// <summary>
     /// The ProxyUrl (if a proxy is used).
     /// </summary>
-    string ProxyUrl { get; set; }
+    string? ProxyUrl { get; set; }
 
     /// <summary>
     /// Gets the DateTime.
@@ -75,6 +78,11 @@ public interface IRequestMessage
     /// </summary>
     IDictionary<string, WireMockList<string>>? Query { get; }
 
+    /// <summary>
+    /// Gets the query.
+    /// </summary>
+    IDictionary<string, WireMockList<string>>? QueryIgnoreCase { get; }
+
     /// <summary>
     /// Gets the raw query.
     /// </summary>
@@ -88,32 +96,39 @@ public interface IRequestMessage
     /// <summary>
     /// The original body as string. Convenience getter for Handlebars.
     /// </summary>
-    string Body { get; }
+    string? Body { get; }
 
     /// <summary>
     /// The body (as JSON object). Convenience getter for Handlebars.
     /// </summary>
-    object BodyAsJson { get; }
+    object? BodyAsJson { get; }
 
     /// <summary>
     /// The body (as bytearray). Convenience getter for Handlebars.
     /// </summary>
-    byte[] BodyAsBytes { get; }
+    byte[]? BodyAsBytes { get; }
+
+#if MIMEKIT
+    /// <summary>
+    /// The original body as MimeMessage. Convenience getter for Handlebars.
+    /// </summary>
+    object? BodyAsMimeMessage { get; }
+#endif
 
     /// <summary>
     /// The detected body type. Convenience getter for Handlebars.
     /// </summary>
-    string DetectedBodyType { get; }
+    string? DetectedBodyType { get; }
 
     /// <summary>
     /// The detected body type from the Content-Type header. Convenience getter for Handlebars.
     /// </summary>
-    string DetectedBodyTypeFromContentType { get; }
+    string? DetectedBodyTypeFromContentType { get; }
 
     /// <summary>
     /// The detected compression from the Content-Encoding header. Convenience getter for Handlebars.
     /// </summary>
-    string DetectedCompression { get; }
+    string? DetectedCompression { get; }
 
     /// <summary>
     /// Gets the Host
@@ -134,4 +149,19 @@ public interface IRequestMessage
     /// Gets the origin
     /// </summary>
     string Origin { get; }
+
+    /// <summary>
+    /// Get a query parameter.
+    /// </summary>
+    /// <param name="key">The key.</param>
+    /// <param name="ignoreCase">Defines if the key should be matched using case-ignore.</param>
+    /// <returns>The query parameter value as WireMockList or null when not found.</returns>
+    WireMockList<string>? GetParameter(string key, bool ignoreCase = false);
+
+#if NETSTANDARD1_3_OR_GREATER || NET461
+    /// <summary>
+    /// Gets the connection's client certificate
+    /// </summary>
+    X509Certificate2? ClientCertificate { get; }
+#endif
 }

src/WireMock.Net.Abstractions/IResponseMessage.cs

@@ -44,7 +44,7 @@ public interface IResponseMessage
     /// Gets or sets the status code.
     /// </summary>
     object? StatusCode { get; }
-
+    
     /// <summary>
     /// Adds the header.
     /// </summary>

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

@@ -2,65 +2,63 @@ using System;
 using JetBrains.Annotations;
 using WireMock.Admin.Requests;
 
-namespace WireMock.Logging
+namespace WireMock.Logging;
+
+/// <summary>
+/// IWireMockLogger interface
+/// </summary>
+[PublicAPI]
+public interface IWireMockLogger
 {
     /// <summary>
-    /// IWireMockLogger interface
+    /// Writes the message at the Debug level using the specified parameters. 
     /// </summary>
+    /// <param name="formatString">The format string.</param>
+    /// <param name="args">The arguments.</param>
     [PublicAPI]
-    public interface IWireMockLogger
-    {
-        /// <summary>
-        /// Writes the message at the Debug level using the specified parameters. 
-        /// </summary>
-        /// <param name="formatString">The format string.</param>
-        /// <param name="args">The arguments.</param>
-        [PublicAPI]
-        [StringFormatMethod("formatString")]
-        void Debug(string formatString, params object[] args);
+    [StringFormatMethod("formatString")]
+    void Debug(string formatString, params object[] args);
 
-        /// <summary>
-        /// Writes the message at the Info level using the specified parameters. 
-        /// </summary>
-        /// <param name="formatString">The format string.</param>
-        /// <param name="args">The arguments.</param>
-        [PublicAPI]
-        [StringFormatMethod("formatString")]
-        void Info(string formatString, params object[] args);
+    /// <summary>
+    /// Writes the message at the Info level using the specified parameters. 
+    /// </summary>
+    /// <param name="formatString">The format string.</param>
+    /// <param name="args">The arguments.</param>
+    [PublicAPI]
+    [StringFormatMethod("formatString")]
+    void Info(string formatString, params object[] args);
 
-        /// <summary>
-        /// Writes the message at the Warning level using the specified parameters. 
-        /// </summary>
-        /// <param name="formatString">The format string.</param>
-        /// <param name="args">The arguments.</param>
-        [PublicAPI]
-        [StringFormatMethod("formatString")]
-        void Warn(string formatString, params object[] args);
+    /// <summary>
+    /// Writes the message at the Warning level using the specified parameters. 
+    /// </summary>
+    /// <param name="formatString">The format string.</param>
+    /// <param name="args">The arguments.</param>
+    [PublicAPI]
+    [StringFormatMethod("formatString")]
+    void Warn(string formatString, params object[] args);
 
-        /// <summary>
-        /// Writes the message at the Error level using the specified parameters. 
-        /// </summary>
-        /// <param name="formatString">The format string.</param>
-        /// <param name="args">The arguments.</param>
-        [PublicAPI]
-        [StringFormatMethod("formatString")]
-        void Error(string formatString, params object[] args);
+    /// <summary>
+    /// Writes the message at the Error level using the specified parameters. 
+    /// </summary>
+    /// <param name="formatString">The format string.</param>
+    /// <param name="args">The arguments.</param>
+    [PublicAPI]
+    [StringFormatMethod("formatString")]
+    void Error(string formatString, params object[] args);
 
-        /// <summary>
-        /// Writes the message at the Error level using the specified exception. 
-        /// </summary>
-        /// <param name="formatString">The format string.</param>
-        /// <param name="exception">The exception.</param>
-        [PublicAPI]
-        [StringFormatMethod("formatString")]
-        void Error(string formatString, Exception exception);
+    /// <summary>
+    /// Writes the message at the Error level using the specified exception. 
+    /// </summary>
+    /// <param name="formatString">The format string.</param>
+    /// <param name="exception">The exception.</param>
+    [PublicAPI]
+    void Error(string formatString, Exception exception);
 
-        /// <summary>
-        /// Writes the LogEntryModel (LogRequestModel, LogResponseModel and more).
-        /// </summary>
-        /// <param name="logEntryModel">The Request Log Model.</param>
-        /// <param name="isAdminRequest">Defines if this request is an admin request.</param>
-        [PublicAPI]
-        void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest);
-    }
+    /// <summary>
+    /// Writes the LogEntryModel (LogRequestModel, LogResponseModel and more).
+    /// </summary>
+    /// <param name="logEntryModel">The Request Log Model.</param>
+    /// <param name="isAdminRequest">Defines if this request is an admin request.</param>
+    [PublicAPI]
+    void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminRequest);
 }

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

@@ -1,56 +1,56 @@
 using System;
 using System.Collections.Generic;
 
-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// IRequestMatchResult
+/// </summary>
+public interface IRequestMatchResult : IComparable
 {
     /// <summary>
-    /// IRequestMatchResult
+    /// Gets the match percentage.
     /// </summary>
-    public interface IRequestMatchResult : IComparable
-    {
-        /// <summary>
-        /// Gets the match percentage.
-        /// </summary>
-        /// <value>
-        /// The match percentage.
-        /// </value>
-        double AverageTotalScore { get; }
+    /// <value>
+    /// The match percentage.
+    /// </value>
+    double AverageTotalScore { get; }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether this instance is perfect match.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this instance is perfect match; otherwise, <c>false</c>.
-        /// </value>
-        bool IsPerfectMatch { get; }
+    /// <summary>
+    /// Gets or sets a value indicating whether this instance is perfect match.
+    /// </summary>
+    /// <value>
+    /// <c>true</c> if this instance is perfect match; otherwise, <c>false</c>.
+    /// </value>
+    bool IsPerfectMatch { get; }
 
-        /// <summary>
-        /// Gets the match details.
-        /// </summary>
-        IList<MatchDetail> MatchDetails { get; }
+    /// <summary>
+    /// Gets the match details.
+    /// </summary>
+    IList<MatchDetail> MatchDetails { get; }
 
-        /// <summary>
-        /// Gets or sets the total number of matches.
-        /// </summary>
-        /// <value>
-        /// The total number of matches.
-        /// </value>
-        int TotalNumber { get; }
+    /// <summary>
+    /// Gets or sets the total number of matches.
+    /// </summary>
+    /// <value>
+    /// The total number of matches.
+    /// </value>
+    int TotalNumber { get; }
 
-        /// <summary>
-        /// Gets or sets the match-score.
-        /// </summary>
-        /// <value>
-        /// The match-score.
-        /// </value>
-        double TotalScore { get; }
+    /// <summary>
+    /// Gets or sets the match-score.
+    /// </summary>
+    /// <value>
+    /// The match-score.
+    /// </value>
+    double TotalScore { get; }
 
-        /// <summary>
-        /// Adds the score.
-        /// </summary>
-        /// <param name="matcherType">The matcher Type.</param>
-        /// <param name="score">The score.</param>
-        /// <returns>The score.</returns>
-        double AddScore(Type matcherType, double score);
-    }
+    /// <summary>
+    /// Adds the score.
+    /// </summary>
+    /// <param name="matcherType">The matcher Type.</param>
+    /// <param name="score">The score.</param>
+    /// <param name="exception">The exception [Optional].</param>
+    /// <returns>The score.</returns>
+    double AddScore(Type matcherType, double score, Exception? exception);
 }

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

@@ -1,20 +1,25 @@
-using System;
+using System;
 
-namespace WireMock.Matchers.Request
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// MatchDetail
+/// </summary>
+public class MatchDetail
 {
     /// <summary>
-    /// MatchDetail
+    /// Gets or sets the type of the matcher.
     /// </summary>
-    public class MatchDetail
-    {
-        /// <summary>
-        /// Gets or sets the type of the matcher.
-        /// </summary>
-        public Type MatcherType { get; set; }
+    public Type MatcherType { get; set; } = null!;
 
-        /// <summary>
-        /// Gets or sets the score between 0.0 and 1.0
-        /// </summary>
-        public double Score { get; set; }
-    }
+    /// <summary>
+    /// Gets or sets the score between 0.0 and 1.0
+    /// </summary>
+    public double Score { get; set; }
+
+    /// <summary>
+    /// The exception in case the Matcher throws exception.
+    /// [Optional]
+    /// </summary>
+    public Exception? Exception { get; set; }
 }