1.0.3.9 (#108)

* Callback

* Add more tests

.axoCover/settings.json

@@ -0,0 +1,15 @@
+{
+  "TestRunner": "",
+  "TestPlatform": "x86",
+  "TestApartmentState": "STA",
+  "TestSettings": "",
+  "ExcludeAttributes": "System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute",
+  "ExcludeFiles": "",
+  "ExcludeDirectories": "",
+  "Filters": "+[*]*",
+  "IsIncludingSolutionAssemblies": true,
+  "IsExcludingTestAssemblies": false,
+  "IsCoveringByTest": true,
+  "IsMergingByHash": true,
+  "IsSkippingAutoProps": true
+}

.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (WireMock.Net.StandAlone.NETCoreApp)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build_WireMock.Net.StandAlone.NETCoreApp",
+            "program": "${workspaceRoot}/examples/WireMock.Net.StandAlone.NETCoreApp/bin/Debug/netcoreapp2.0/WireMock.Net.StandAlone.NETCoreApp.dll",
+            "args": [],
+            "cwd": "${workspaceRoot}",
+            "stopAtEntry": false,
+            "console": "internalConsole"
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}

.vscode/tasks.json

@@ -0,0 +1,17 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "taskName": "build_WireMock.Net.StandAlone.NETCoreApp",
+            "command": "dotnet build ${workspaceRoot}/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj -f netcoreapp2.0 ",
+            "type": "shell",
+            "group": "build",
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}

CHANGELOG.md

@@ -0,0 +1,205 @@
+# 1.0.3.9 (15 March 2018)
+
+ - [#108](https://github.com/WireMock-Net/WireMock.Net/issues/108) - Issue: provide correct contentTypeHeader value for the bodyparser +fix
+
+Commits: f604be3c02...b7dd1b9242
+
+
+# 1.0.3.8 (10 March 2018)
+
+ - [#106](https://github.com/WireMock-Net/WireMock.Net/issues/106) - Issue: Params does not work, when there are multiple values for a key
+
+Commits: f604be3c02...f604be3c02
+
+
+# 1.0.3.7 (09 March 2018)
+
+ - [#104](https://github.com/WireMock-Net/WireMock.Net/issues/104) - Issue: PlatformNotSupportedException
+
+Commits: 3e634c2fde...3e634c2fde
+
+
+# 1.0.3.4 (04 March 2018)
+
+ - [#102](https://github.com/WireMock-Net/WireMock.Net/pull/102) - Feature: add WithBody(req => dostuff) style callback contributed by Alastair Crabtree ([alastairtree](https://github.com/alastairtree)) +feature
+ - [#101](https://github.com/WireMock-Net/WireMock.Net/pull/101) - ICallbackResponseBuilder + added more unit-tests contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +fix
+ - [#100](https://github.com/WireMock-Net/WireMock.Net/issues/100) - Question: JsonPathMatcher - not working for rootless jsons?
+ - [#99](https://github.com/WireMock-Net/WireMock.Net/pull/99) - feat: simple implementation/spike of dynamic responses using callbacks contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#98](https://github.com/WireMock-Net/WireMock.Net/issues/98) - IBodyResponseBuilder.WithBody* should receive the request as a parameter
+ - [#96](https://github.com/WireMock-Net/WireMock.Net/pull/96) - Replace log4net by custom logger (#94) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#95](https://github.com/WireMock-Net/WireMock.Net/pull/95) - Unittest fix contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#94](https://github.com/WireMock-Net/WireMock.Net/issues/94) - Issue: Introduced dependency on log4net
+ - [#93](https://github.com/WireMock-Net/WireMock.Net/issues/93) - Bug: FluentMockServer IsStarted after calling Start()
+ - [#66](https://github.com/WireMock-Net/WireMock.Net/issues/66) - Interested in callbacks?
+
+Commits: e850126184...a2df91a2a2
+
+
+# 1.0.3.3 (24 February 2018)
+
+ - [#92](https://github.com/WireMock-Net/WireMock.Net/pull/92) - Json fixes (#91) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#91](https://github.com/WireMock-Net/WireMock.Net/issues/91) - Bug: WireMock.Net is not matching application/json http requests using JSONPathMatcher +fix
+
+Commits: 1ffd56701c...ad6c59e3b5
+
+
+# 1.0.3.2 (14 February 2018)
+
+ - [#90](https://github.com/WireMock-Net/WireMock.Net/pull/90) - Concurrent issue (#88) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#89](https://github.com/WireMock-Net/WireMock.Net/pull/89) - Add log4net logging contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#88](https://github.com/WireMock-Net/WireMock.Net/issues/88) - Bug: Standalone server throws 500 error when receiving concurrent requests +fix
+ - [#87](https://github.com/WireMock-Net/WireMock.Net/issues/87) - Feature: Add logging
+
+Commits: 51070dab63...4f87146622
+
+
+# 1.0.3.0 (05 February 2018)
+
+ - [#86](https://github.com/WireMock-Net/WireMock.Net/issues/86) - Feature : Add FileSystemWatcher logic for watching static mapping files +feature
+ - [#85](https://github.com/WireMock-Net/WireMock.Net/issues/85) - Bug: https for netstandard does not work ? +fix
+ - [#83](https://github.com/WireMock-Net/WireMock.Net/issues/83) - Feature : Add also a method in IProxyResponseBuilder to provide proxy-settings +feature
+ - [#82](https://github.com/WireMock-Net/WireMock.Net/issues/82) - Feature: make it possible to ignore some headers when proxying +feature
+ - [#81](https://github.com/WireMock-Net/WireMock.Net/issues/81) - Feature: When using proxy, only BodyAsBytes in case of binary data?
+ - [#80](https://github.com/WireMock-Net/WireMock.Net/issues/80) - Feature: When using proxy, in case Content-Type is JSON, use BodyAsJson in Response
+
+Commits: 40ff8514ac...9778c5adbe
+
+
+# 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))
+ - [#78](https://github.com/WireMock-Net/WireMock.Net/issues/78) - WireMock not working when attempting to access from anything other than localhost.
+ - [#57](https://github.com/WireMock-Net/WireMock.Net/issues/57) - ProxyAndRecord does not save query-parameters, headers and body +fix
+
+Commits: 6d60b3773a...cdcaaa970a
+
+
+# 1.0.2.12 (16 January 2018)
+
+ - [#77](https://github.com/WireMock-Net/WireMock.Net/pull/77) - Fixed issue #76 contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#76](https://github.com/WireMock-Net/WireMock.Net/issues/76) - Bug: IFluentMockServerAdmin is missing content-type for some POST/PUT calls
+ - [#75](https://github.com/WireMock-Net/WireMock.Net/pull/75) - Add WireMock.Net.WebApplication example contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#74](https://github.com/WireMock-Net/WireMock.Net/pull/74) - Capturing the index of the existing mapping before removing and insert the updated mapping at the same index of the list contributed by ([raghavendrabankapur](https://github.com/raghavendrabankapur))
+ - [#73](https://github.com/WireMock-Net/WireMock.Net/issues/73) - Updated mapping is not being picked and responded with the response
+
+Commits: da798a59aa...e6af765777
+
+
+# 1.0.2.11 (20 December 2017)
+
+ - [#72](https://github.com/WireMock-Net/WireMock.Net/issues/72) - Matching WithParam on OData End Points
+
+Commits: 71196b51c9...71196b51c9
+
+
+# 1.0.2.9 (07 December 2017)
+
+ - [#71](https://github.com/WireMock-Net/WireMock.Net/pull/71) - Fixed restricted headers on response contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#69](https://github.com/WireMock-Net/WireMock.Net/issues/69) - Instructions are incorrect (?)
+
+Commits: 601af2d6b2...fd5bc203c3
+
+
+# 1.0.2.10 (12 December 2017)
+
+ - [#70](https://github.com/WireMock-Net/WireMock.Net/issues/70) - Proxy/Intercept pattern is throwing a keep alive header error with net461
+
+Commits: d0fc889f42...d0fc889f42
+
+
+# 1.0.2.8 (23 November 2017)
+
+ - [#68](https://github.com/WireMock-Net/WireMock.Net/issues/68) - Full path required in Stub
+ - [#67](https://github.com/WireMock-Net/WireMock.Net/pull/67) - bug: fix supporting the Patch method and logging the body contributed by Alastair Crabtree ([alastairtree](https://github.com/alastairtree))
+ - [#65](https://github.com/WireMock-Net/WireMock.Net/pull/65) - bug: Fix admin api client definition returning the wrong types contributed by Alastair Crabtree ([alastairtree](https://github.com/alastairtree))
+ - [#64](https://github.com/WireMock-Net/WireMock.Net/issues/64) - Pull Requests do not trigger test + codecoverage ?
+
+Commits: d0b48e2967...ea16ee866b
+
+
+# 1.0.2.7 (18 November 2017)
+
+ - [#63](https://github.com/WireMock-Net/WireMock.Net/pull/63) - Fix issue with concurrent logging contributed by ([vladimir-fed](https://github.com/vladimir-fed))
+ - [#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 Alastair Crabtree ([alastairtree](https://github.com/alastairtree))
+ - [#61](https://github.com/WireMock-Net/WireMock.Net/issues/61) - Partial mapping
+ - [#53](https://github.com/WireMock-Net/WireMock.Net/issues/53) - New feature request: Access to Owin pipeline
+ - [#42](https://github.com/WireMock-Net/WireMock.Net/issues/42) - Enhancement - Save/load request logs to/from disk +feature
+ - [#27](https://github.com/WireMock-Net/WireMock.Net/issues/27) - New feature: Record and Save
+
+Commits: e25c873765...018d2a904d
+
+
+# 1.0.2.6 (30 October 2017)
+
+ - [#60](https://github.com/WireMock-Net/WireMock.Net/pull/60) - Fix proxy headers handling contributed by Oleksandr Liakhevych ([Dreamescaper](https://github.com/Dreamescaper))
+ - [#59](https://github.com/WireMock-Net/WireMock.Net/pull/59) - Add ability to provide multiple values for headers in response contributed by Oleksandr Liakhevych ([Dreamescaper](https://github.com/Dreamescaper))
+ - [#58](https://github.com/WireMock-Net/WireMock.Net/issues/58) - Multiple headers with same name +feature
+ - [#56](https://github.com/WireMock-Net/WireMock.Net/issues/56) - WithBodyFromFile Support +feature
+ - [#54](https://github.com/WireMock-Net/WireMock.Net/issues/54) - Proxy for AWS: Error unmarshalling response back from AWS +fix
+
+Commits: cbe6a0a2b4...d83f308591
+
+
+# 1.0.2.5 (24 October 2017)
+
+ - [#55](https://github.com/WireMock-Net/WireMock.Net/pull/55) - Fix the problem with headers passthrough contributed by deeptowncitizen ([deeptowncitizen](https://github.com/deeptowncitizen)) +fix
+ - [#52](https://github.com/WireMock-Net/WireMock.Net/issues/52) - SimMetrics.NET error when trying to install NuGet Package
+ - [#48](https://github.com/WireMock-Net/WireMock.Net/issues/48) - Stateful support +feature
+ - [#44](https://github.com/WireMock-Net/WireMock.Net/issues/44) - Bug: Server not listening after Start() returns (on macOS) +fix
+
+Commits: 7c289d44a7...15370a89ca
+
+
+# 1.0.2.4 (10 October 2017)
+
+ - [#51](https://github.com/WireMock-Net/WireMock.Net/pull/51) - Observable logs contributed by deeptowncitizen ([deeptowncitizen](https://github.com/deeptowncitizen))
+ - [#50](https://github.com/WireMock-Net/WireMock.Net/issues/50) - New Feature: Callbacks
+ - [#49](https://github.com/WireMock-Net/WireMock.Net/pull/49) - stateful behavior contributed by deeptowncitizen ([deeptowncitizen](https://github.com/deeptowncitizen))
+ - [#47](https://github.com/WireMock-Net/WireMock.Net/issues/47) - Feature: add matcher details to Request to see which matchers match/not match +feature
+ - [#46](https://github.com/WireMock-Net/WireMock.Net/issues/46) - Log the ip-address from the client/caller also in the RequestLog +feature
+ - [#45](https://github.com/WireMock-Net/WireMock.Net/pull/45) - Add RequestLogExpirationDuration and MaxRequestLogCount (#43) contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#43](https://github.com/WireMock-Net/WireMock.Net/issues/43) - Feature: Add RequestLogExpirationDuration and MaxRequestLogCount
+ - [#41](https://github.com/WireMock-Net/WireMock.Net/pull/41) - Dotnet 20 preview final contributed by Stef Heyenrath ([StefH](https://github.com/StefH)) +feature
+ - [#40](https://github.com/WireMock-Net/WireMock.Net/pull/40) - Expose more settings to stand-alone app contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#39](https://github.com/WireMock-Net/WireMock.Net/pull/39) - Listen on http://*:9090 contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#38](https://github.com/WireMock-Net/WireMock.Net/issues/38) - Bug: support also listening on *:{port}
+ - [#37](https://github.com/WireMock-Net/WireMock.Net/issues/37) - Wrong Request Match result is returning
+ - [#36](https://github.com/WireMock-Net/WireMock.Net/issues/36) - How to implement a request body-dependent response?
+ - [#35](https://github.com/WireMock-Net/WireMock.Net/pull/35) - Revert changes that were made by mistake in prior PR contributed by ([phillee007](https://github.com/phillee007))
+ - [#34](https://github.com/WireMock-Net/WireMock.Net/issues/34) - Where is SearchLogsFor method?
+ - [#33](https://github.com/WireMock-Net/WireMock.Net/issues/33) - Issue with launching sample code (StandAlone server) +fix
+ - [#32](https://github.com/WireMock-Net/WireMock.Net/pull/32) - [Feature] Add support for client certificate password and test with real services that require client certificate auth contributed by ([phillee007](https://github.com/phillee007)) +feature
+ - [#31](https://github.com/WireMock-Net/WireMock.Net/issues/31) - Feature request: Nuget package for standalone version +feature
+ - [#20](https://github.com/WireMock-Net/WireMock.Net/issues/20) - Add client certificate authentication
+ - [#19](https://github.com/WireMock-Net/WireMock.Net/issues/19) - Is this the same as Mock4Net?
+ - [#15](https://github.com/WireMock-Net/WireMock.Net/issues/15) - New feature: Proxying +feature
+
+Commits: 538195551d...e87e09e10d
+
+
+# 1.02.1 (14 June 2017)
+
+ - [#30](https://github.com/WireMock-Net/WireMock.Net/issues/30) - [Feature] Disable partial mappings by default in standalone version +fix
+ - [#29](https://github.com/WireMock-Net/WireMock.Net/issues/29) - Support of .Net 4.0
+ - [#28](https://github.com/WireMock-Net/WireMock.Net/issues/28) - Facing issue with WildcardMatcher and '?'
+
+Commits: 84db9bbf0d...7111ab384b
+
+
+# 1.0.2.0 (05 May 2017)
+
+ - [#26](https://github.com/WireMock-Net/WireMock.Net/pull/26) - merge netstandard into main contributed by Stef Heyenrath ([StefH](https://github.com/StefH))
+ - [#25](https://github.com/WireMock-Net/WireMock.Net/issues/25) - Upgrade to vs2017 +feature
+ - [#23](https://github.com/WireMock-Net/WireMock.Net/issues/23) - Consider port to .Net Core
+ - [#21](https://github.com/WireMock-Net/WireMock.Net/issues/21) - Admin static json mappings +feature
+
+Commits: b547993415...8d9cef6dd1
+
+
+# 1.0.1.2 (27 February 2017)
+
+ - [#24](https://github.com/WireMock-Net/WireMock.Net/pull/24) - Body Encoding contributed by Sebastian Bebrys ([sbebrys](https://github.com/sbebrys))
+ - [#22](https://github.com/WireMock-Net/WireMock.Net/issues/22) - Add basic-authentication for accessing admin-interface +feature
+ - [#8](https://github.com/WireMock-Net/WireMock.Net/issues/8) - admin rest api
+
+Commits: bb35f55bbb...02803562c6

GitReleaseNotes.txt

@@ -0,0 +1,5 @@
+https://github.com/GitTools/GitReleaseNotes
+
+GitReleaseNotes.exe . /OutputFile CHANGELOG.md /Version 1.0.3.9
+
+GitReleaseNotes.exe . /OutputFile CHANGELOG.md /allTags

README.md

@@ -2,17 +2,32 @@
 A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based http://WireMock.org
 
 [![Build status](https://ci.appveyor.com/api/projects/status/b3n6q3ygbww4lyls?svg=true)](https://ci.appveyor.com/project/StefH/wiremock-net)
-[![codecov](https://codecov.io/gh/StefH/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/StefH/WireMock.Net)
-[![Coverage Status](https://coveralls.io/repos/github/StefH/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/StefH/WireMock.Net?branch=master)
-[![NuGet Badge](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net)
+[![Coverage Status](https://coveralls.io/repos/github/WireMock-Net/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/WireMock-Net/WireMock.Net?branch=master)
+[![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues)
+[![GitHub stars](https://img.shields.io/github/stars/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/stargazers)
+
+| Name | NuGet |
+| ---- | ----- |
+| WireMock.Net | [![NuGet Badge](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |
+| WireMock.Net.StandAlone | [![NuGet Badge](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |
 
 ### Frameworks
 The following frameworks are supported:
-- net45 and up
+- net 4.5.2 and up
+- net 4.6 and up
 - netstandard 1.3
+- netstandard 2.0
+
+## Build info
+To build you need:
+- Microsoft .NET Framework 4.5.2 Developer Pack (https://www.microsoft.com/en-us/download/details.aspx?id=42637)
+- Microsoft .NET Framework 4.6 Targeting Pack (https://www.microsoft.com/en-us/download/confirmation.aspx?id=48136)
+- Microsoft .NET Framework 4.6.2 Developer Pack (https://www.microsoft.com/en-us/download/confirmation.aspx?id=53321)
+- .NET Core 2.0 (https://www.microsoft.com/net/core)
+
 
 ## Stubbing
-A core feature of WireMock.Net is the ability to return canned/predefined HTTP responses for requests matching criteria, see [Wiki : Stubbing](https://github.com/StefH/WireMock.Net/wiki/Stubbing).
+A core feature of WireMock.Net is the ability to return canned/predefined HTTP responses for requests matching criteria, see [Wiki : Stubbing & Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing-and-Request-Matching).
 
 ## Using WireMock in UnitTest framework
 You can use your favorite test framework and use WireMock within your tests, see
@@ -27,6 +42,16 @@ This is quite straight forward to launch a mock server within a console applicat
 ### SSL
 You can start a standalone mock server listening for HTTPS requests. To do so, there is just a flag to set when creating the server:
 ```csharp
-var server = FluentMockServer.Start(port: 8443, ssl: true);
+var server1 = FluentMockServer.Start(port: 8443, ssl: true);
+
+// or like this
+
+var server2 = FluentMockServer.Start(new FluentMockServerSettings
+{
+    Urls = new[] { "http://localhost:9091", "https://localhost:9443" }
+});
 ```
-Obviously you need a certificate registered on your box, properly associated with your application and the port number that will be used. This is not really specific to WireMock, not very straightforward and hence the following stackoverflow thread might come handy: [Httplistener with https support](http://stackoverflow.com/questions/11403333/httplistener-with-https-support)
+
+- In case when using **net 4.5.2** or **net 4.6**, you need a certificate registered on your box, properly associated with your application and the port number that will be used. This is not really specific to WireMock.Net, not very straightforward and hence the following stackoverflow thread might come handy: [Httplistener with https support](http://stackoverflow.com/questions/11403333/httplistener-with-https-support).
+
+- When using **netstandard**, WireMock.Net uses a self signed certificate (which can be overriden if you like) to host https urls.

WireMock.Net Solution.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26403.7
+VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF242EDF-7133-4277-9A0C-18744DE08707}"
 EndProject
@@ -9,7 +9,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.runsettings = .runsettings
 		appveyor.yml = appveyor.yml
+		CHANGELOG.md = CHANGELOG.md
 		codecov-local.cmd = codecov-local.cmd
+		GitReleaseNotes.txt = GitReleaseNotes.txt
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -19,21 +21,32 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{890A1DED-C
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net", "src\WireMock.Net\WireMock.Net.csproj", "{D3804228-91F4-4502-9595-39584E5A01AD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ConsoleApplication", "examples\WireMock.Net.ConsoleApplication\WireMock.Net.ConsoleApplication.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3804228-91F4-4502-9595-39584E5A01AD} = {D3804228-91F4-4502-9595-39584E5A01AD}
-	EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone", "src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj", "{668F689E-57B4-422E-8846-C0FF643CA999}"
-	ProjectSection(ProjectDependencies) = postProject
-		{D3804228-91F4-4502-9595-39584E5A01AD} = {D3804228-91F4-4502-9595-39584E5A01AD}
-	EndProjectSection
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Tests", "test\WireMock.Net.Tests\WireMock.Net.Tests.csproj", "{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.NETCoreApp", "src\WireMock.Net.StandAlone.NETCoreApp\WireMock.Net.StandAlone.NETCoreApp.csproj", "{14D7298C-2BE5-42C3-A3D5-9433E77218F9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp", "examples\WireMock.Net.Console.NETCoreApp\WireMock.Net.Console.NETCoreApp.csproj", "{FE281639-B014-4C8A-96FA-141164A74713}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NETCoreApp", "examples\WireMock.Net.Console.NETCoreApp\WireMock.Net.Console.NETCoreApp.csproj", "{FE281639-B014-4C8A-96FA-141164A74713}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.NETCoreApp", "examples\WireMock.Net.Console.Record.NETCoreApp\WireMock.Net.Console.Proxy.NETCoreApp.csproj", "{1995E414-F197-4AB4-90C2-68D806B5AF59}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Client", "examples\WireMock.Net.Client\WireMock.Net.Client.csproj", "{058D4B6C-C03E-49D0-91DB-A535B058FA0D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone", "src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj", "{B6269AAC-170A-43D5-8B9A-579DED3D9A95}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.StandAlone.NETCoreApp", "examples\WireMock.Net.StandAlone.NETCoreApp\WireMock.Net.StandAlone.NETCoreApp.csproj", "{10E16614-61CA-48D8-8BDD-664C13913DED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net452", "examples\WireMock.Net.StandAlone.Net452\WireMock.Net.StandAlone.Net452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA999}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {B6269AAC-170A-43D5-8B9A-579DED3D9A95}
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.NET452", "examples\WireMock.Net.ConsoleApplication\WireMock.Net.Console.NET452.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.csproj", "{049539C1-7A66-4559-AD7A-B1C73B97CBB0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Proxy.Net452", "examples\WireMock.Net.Console.Proxy.Net452\WireMock.Net.Console.Proxy.Net452.csproj", "{26433A8F-BF01-4962-97EB-81BFFBB61096}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.NETCoreApp2", "examples\WireMock.Net.Console.Proxy.NETCoreApp2\WireMock.Net.Console.Proxy.NETCoreApp2.csproj", "{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.StandAlone.Net461", "examples\WireMock.Net.StandAlone.Net461\WireMock.Net.StandAlone.Net461.csproj", "{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -45,36 +58,74 @@ Global
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.Build.0 = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.Build.0 = Release|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{14D7298C-2BE5-42C3-A3D5-9433E77218F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{14D7298C-2BE5-42C3-A3D5-9433E77218F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{14D7298C-2BE5-42C3-A3D5-9433E77218F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{14D7298C-2BE5-42C3-A3D5-9433E77218F9}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{FE281639-B014-4C8A-96FA-141164A74713}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|Any CPU.Build.0 = Release|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|Any CPU.Build.0 = Release|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|Any CPU.Build.0 = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|Any CPU.Build.0 = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.Build.0 = Release|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{D3804228-91F4-4502-9595-39584E5A01AD} = {EF242EDF-7133-4277-9A0C-18744DE08707}
-		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{668F689E-57B4-422E-8846-C0FF643CA999} = {EF242EDF-7133-4277-9A0C-18744DE08707}
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E} = {890A1DED-C229-4FA1-969E-AAC3BBFC05E5}
-		{14D7298C-2BE5-42C3-A3D5-9433E77218F9} = {EF242EDF-7133-4277-9A0C-18744DE08707}
 		{FE281639-B014-4C8A-96FA-141164A74713} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{1995E414-F197-4AB4-90C2-68D806B5AF59} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{058D4B6C-C03E-49D0-91DB-A535B058FA0D} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {EF242EDF-7133-4277-9A0C-18744DE08707}
+		{10E16614-61CA-48D8-8BDD-664C13913DED} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{668F689E-57B4-422E-8846-C0FF643CA999} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{049539C1-7A66-4559-AD7A-B1C73B97CBB0} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{26433A8F-BF01-4962-97EB-81BFFBB61096} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}
 	EndGlobalSection
 EndGlobal

WireMock.Net Solution.sln.DotSettings

@@ -1,6 +1,3 @@
 <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/Environment/InjectedLayers/FileInjectedLayer/=FBE2016FCEACD34DB66E1CC40B87F9F2/AbsolutePath/@EntryValue">C:\Users\azureuser\Documents\Github\WireMock.Net\ReSharper_WireMock.DotSettings</s:String>
-	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=FBE2016FCEACD34DB66E1CC40B87F9F2/RelativePath/@EntryValue">..\ReSharper_WireMock.DotSettings</s:String>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=FBE2016FCEACD34DB66E1CC40B87F9F2/@KeyIndexDefined">True</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileFBE2016FCEACD34DB66E1CC40B87F9F2/@KeyIndexDefined">True</s:Boolean>
-	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileFBE2016FCEACD34DB66E1CC40B87F9F2/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSL/@EntryIndexedValue">SSL</s:String></wpf:ResourceDictionary>

appveyor.yml

@@ -9,8 +9,8 @@ init:
 - ps: $Env:LABEL = "CI" + $Env:APPVEYOR_BUILD_NUMBER.PadLeft(5, "0")
 
 install:
-  - ps: Start-FileDownload 'https://download.microsoft.com/download/8/F/9/8F9659B9-E628-4D1A-B6BF-C3004C8C954B/dotnet-1.1.1-sdk-win-x64.exe'
-  - cmd: dotnet-1.1.1-sdk-win-x64.exe /quiet
+  - ps: Start-FileDownload 'https://download.microsoft.com/download/0/F/D/0FD852A4-7EA1-4E2A-983A-0484AC19B92C/dotnet-sdk-2.0.0-win-gs-x64.exe'
+  - cmd: dotnet-sdk-2.0.0-win-gs-x64.exe /quiet
   - ps: $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = "true"
 
 environment:
@@ -20,28 +20,24 @@ environment:
 
 before_build:
 - dotnet restore .\src\WireMock.Net\WireMock.Net.csproj
-- dotnet restore .\src\WireMock.Net.StandAlone.NETCoreApp\WireMock.Net.StandAlone.NETCoreApp.csproj
-- nuget restore .\src\WireMock.Net.Standalone\WireMock.Net.Standalone.csproj -PackagesDirectory packages
-- nuget restore .\examples\WireMock.Net.ConsoleApplication\WireMock.Net.ConsoleApplication.csproj -PackagesDirectory packages
+- dotnet restore .\src\WireMock.Net.Standalone\WireMock.Net.Standalone.csproj
 
 build_script:
 # build WireMock.Net
 - dotnet build .\src\WireMock.Net\WireMock.Net.csproj -c %CONFIGURATION%
 
+# build WireMock.Net.Standalone
+- dotnet build .\src\WireMock.Net.Standalone\WireMock.Net.Standalone.csproj -c %CONFIGURATION%
+
 # restore and build WireMock.Net.Tests
 - dotnet restore .\test\WireMock.Net.Tests\WireMock.Net.Tests.csproj
 - dotnet build .\test\WireMock.Net.Tests\WireMock.Net.Tests.csproj -c %CONFIGURATION%
 
-# build WireMock.Net.ConsoleApplication, WireMock.Net.StandAlone.NETCoreApp and WireMock.Net.Standalone
-- dotnet build .\src\WireMock.Net.StandAlone.NETCoreApp\WireMock.Net.StandAlone.NETCoreApp.csproj -c %CONFIGURATION%
-- cmd: msbuild .\examples\WireMock.Net.ConsoleApplication\WireMock.Net.ConsoleApplication.csproj /p:Configuration=%CONFIGURATION%
-- cmd: msbuild .\src\WireMock.Net.Standalone\WireMock.Net.Standalone.csproj /p:Configuration=%CONFIGURATION%
-
 test_script:
   - nuget.exe install OpenCover -ExcludeVersion
   - nuget.exe install coveralls.net -ExcludeVersion
   - pip install codecov
 
-  - cmd: '"OpenCover\tools\OpenCover.Console.exe" -register:user -target:dotnet.exe -targetargs:"test test\WireMock.Net.Tests\WireMock.Net.Tests.csproj --no-build" -returntargetcode -filter:"+[WireMock.Net]* -[WireMock.Net.Tests*]*" -output:coverage.xml -oldstyle -searchdirs:".\test\WireMock.Net.Tests\bin\%CONFIGURATION%\net452"'
+  - cmd: '"OpenCover\tools\OpenCover.Console.exe" -target:dotnet.exe -targetargs:"test test\WireMock.Net.Tests\WireMock.Net.Tests.csproj --no-build" -output:coverage.xml -returntargetcode -register:user -filter:"+[WireMock.Net]* -[WireMock.Net.Tests*]*" -nodefaultfilters -returntargetcode -oldstyle -searchdirs:".\test\WireMock.Net.Tests\bin\%CONFIGURATION%\net452"'
   - codecov -f "coverage.xml"
   - coveralls.net\tools\csmacnz.Coveralls.exe --opencover -i .\coverage.xml

examples/WireMock.Net.Client/Program.cs

@@ -0,0 +1,56 @@
+using Newtonsoft.Json;
+using RestEase;
+using System;
+using System.Net.Http.Headers;
+using System.Text;
+using WireMock.Client;
+
+namespace WireMock.Net.Client
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            // Create an implementation of the IFluentMockServerAdmin and pass in the base URL for the API.
+            var api = RestClient.For<IFluentMockServerAdmin>("http://localhost:9091");
+
+            // Set BASIC Auth
+            var value = Convert.ToBase64String(Encoding.ASCII.GetBytes("a:b"));
+            api.Authorization = new AuthenticationHeaderValue("Basic", value);
+
+            var settings1 = api.GetSettingsAsync().Result;
+            Console.WriteLine($"settings1 = {JsonConvert.SerializeObject(settings1)}");
+
+            settings1.GlobalProcessingDelay = 1077;
+            api.PostSettingsAsync(settings1).Wait();
+
+            var settings2 = api.GetSettingsAsync().Result;
+            Console.WriteLine($"settings2 = {JsonConvert.SerializeObject(settings2)}");
+
+            var mappings = api.GetMappingsAsync().Result;
+            Console.WriteLine($"mappings = {JsonConvert.SerializeObject(mappings)}");
+
+            try
+            {
+                var guid = Guid.Parse("11111110-a633-40e8-a244-5cb80bc0ab66");
+                var mapping = api.GetMappingAsync(guid).Result;
+                Console.WriteLine($"mapping = {JsonConvert.SerializeObject(mapping)}");
+            }
+            catch (Exception e)
+            {
+            }
+
+            var request = api.GetRequestsAsync().Result;
+            Console.WriteLine($"request = {JsonConvert.SerializeObject(request)}");
+
+            string deleteRequestsAsync = api.DeleteRequestsAsync().Result;
+            Console.WriteLine($"deleteRequestsAsync = {deleteRequestsAsync}");
+
+            string resetRequestsAsync = api.ResetRequestsAsync().Result;
+            Console.WriteLine($"resetRequestsAsync = {resetRequestsAsync}");
+
+            Console.WriteLine("Press any key to quit");
+            Console.ReadKey();
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <!-- <RuntimeFrameworkVersion>1.0.1</RuntimeFrameworkVersion> -->
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="RestEase" Version="1.4.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+</Project>

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

@@ -1,110 +1,22 @@
-using System;
-using System.Linq;
-using Newtonsoft.Json;
-using WireMock.Matchers;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Server;
+using System.IO;
+using System.Reflection;
+using log4net;
+using log4net.Config;
+using log4net.Repository;
+using WireMock.Net.ConsoleApplication;
 
 namespace WireMock.Net.Console.NETCoreApp
 {
     static class Program
     {
+        private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
         static void Main(params string[] args)
         {
-            string url1 = "http://localhost:9090/";
-            string url2 = "http://localhost:9091/";
-            string url3 = "https://localhost:9443/";
+            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
 
-            var server = FluentMockServer.Start(new FluentMockServerSettings
-            {
-                Urls = new[] { url1, url2, url3 },
-                StartAdminInterface = true,
-                ReadStaticMappings = true
-            });
-            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(" and ", server.Urls));
-
-            server.SetBasicAuthentication("a", "b");
-
-            server.AllowPartialMapping();
-
-            server
-                .Given(Request.Create().WithPath(p => p.Contains("x")).UsingGet())
-                .AtPriority(4)
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""Contains x with FUNC 200""}"));
-
-            server
-                .Given(Request.Create().WithPath("/data").UsingPost().WithBody(b => b.Contains("e")))
-                .AtPriority(999)
-                .RespondWith(Response.Create()
-                    .WithStatusCode(201)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""data posted with FUNC 201""}"));
-
-            server
-                .Given(Request.Create().WithPath("/data", "/ax").UsingPost().WithHeader("Content-Type", "application/json*"))
-                .RespondWith(Response.Create()
-                    .WithStatusCode(201)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""data posted with 201""}"));
-
-            server
-                .Given(Request.Create().WithPath("/json").UsingPost().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]")))
-                .RespondWith(Response.Create()
-                    .WithStatusCode(201)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""json posted with 201""}"));
-
-            server
-                .Given(Request.Create().WithPath("/json2").UsingPost().WithBody("x"))
-                .RespondWith(Response.Create()
-                    .WithStatusCode(201)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""json posted with x - 201""}"));
-
-            server
-                .Given(Request.Create().WithPath("/data").UsingDelete())
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""data deleted with 200""}"));
-
-            server
-                .Given(Request.Create().WithPath("/nobody").UsingGet())
-                .RespondWith(Response.Create().WithDelay(TimeSpan.FromSeconds(1))
-                    .WithStatusCode(200));
-
-            server
-                .Given(Request.Create().WithPath("/partial").UsingPost().WithBody(new SimMetricsMatcher(new[] { "cat", "dog" })))
-                .RespondWith(Response.Create().WithStatusCode(200).WithBody("partial = 200"));
-
-            // http://localhost:8080/any/any?start=1000&stop=1&stop=2
-            server
-                .Given(Request.Create().WithPath("/*").UsingGet())
-                .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
-                .AtPriority(server.Mappings.Count() + 1)
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithHeader("Transformed-Postman-Token", "token is {{request.headers.Postman-Token}}")
-                    .WithBody(@"{""msg"": ""Hello world CATCH-ALL on /*, {{request.path}}, bykey={{request.query.start}}, bykey={{request.query.stop}}, byidx0={{request.query.stop.[0]}}, byidx1={{request.query.stop.[1]}}"" }")
-                    .WithTransformer()
-                    .WithDelay(TimeSpan.FromMilliseconds(100))
-                );
-
-            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();
+            MainApp.Run();
         }
     }
 }

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

@@ -6,6 +6,14 @@
     <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="__admin\mappings\826aff7c-6208-4a3c-923d-575248907db4.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="..\WireMock.Net.ConsoleApplication\MainApp.cs" Link="MainApp.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -13,13 +21,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineArgumentsParser" Version="3.0.9" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-    <!--<ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />-->
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <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>
   </ItemGroup>
 
 </Project>

examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json

@@ -14,8 +14,9 @@
     },
     "Response": {
         "BodyAsJson": { "body": "static mapping" },
-        "Headers": {
-            "Content-Type": "application/json"
-        }
+      "Headers": {
+        "Content-Type": "application/json",
+        "Test-X": [ "test 1", "test 2" ]
+      }
     }
 }

examples/WireMock.Net.Console.NETCoreApp/__admin/mappings/791a3f31-6946-4ce7-8e6f-0237c7443275.json

@@ -0,0 +1,36 @@
+{
+  "Guid": "791a3f31-6946-4ce7-8e6f-0237c7443275",
+  "Title": "",
+  "Priority": 0,
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "WildcardMatcher",
+          "Pattern": "/proxy-google-test-post"
+        }
+      ]
+    },
+    "Methods": [
+      "post"
+    ],
+    "Body": {}
+  },
+  "Response": {
+    "StatusCode": 404,
+    "Body": "<!DOCTYPE html>\n<html lang=en>\n  <meta charset=utf-8>\n  <meta name=viewport content=\"initial-scale=1, minimum-scale=1, width=device-width\">\n  <title>Error 404 (Not Found)!!1</title>\n  <style>\n    *{margin:0;padding:0}html,code{font:15px/22px arial,sans-serif}html{background:#fff;color:#222;padding:15px}body{margin:7% auto 0;max-width:390px;min-height:180px;padding:30px 0 15px}* > body{background:url(//www.google.com/images/errors/robot.png) 100% 5px no-repeat;padding-right:205px}p{margin:11px 0 22px;overflow:hidden}ins{color:#777;text-decoration:none}a img{border:0}@media screen and (max-width:772px){body{background:none;margin-top:0;max-width:none;padding-right:0}}#logo{background:url(//www.google.com/images/branding/googlelogo/1x/googlelogo_color_150x54dp.png) no-repeat;margin-left:-5px}@media only screen and (min-resolution:192dpi){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat 0% 0%/100% 100%;-moz-border-image:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) 0}}@media only screen and (-webkit-min-device-pixel-ratio:2){#logo{background:url(//www.google.com/images/branding/googlelogo/2x/googlelogo_color_150x54dp.png) no-repeat;-webkit-background-size:100% 100%}}#logo{display:inline-block;height:54px;width:150px}\n  </style>\n  <a href=//www.google.com/><span id=logo aria-label=Google></span></a>\n  <p><b>404.</b> <ins>That’s an error.</ins>\n  <p>The requested URL <code>/proxy-google-test-post</code> was not found on this server.  <ins>That’s all we know.</ins>\n",
+    "BodyAsBytes": "PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ZW4+CiAgPG1ldGEgY2hhcnNldD11dGYtOD4KICA8bWV0YSBuYW1lPXZpZXdwb3J0IGNvbnRlbnQ9ImluaXRpYWwtc2NhbGU9MSwgbWluaW11bS1zY2FsZT0xLCB3aWR0aD1kZXZpY2Utd2lkdGgiPgogIDx0aXRsZT5FcnJvciA0MDQgKE5vdCBGb3VuZCkhITE8L3RpdGxlPgogIDxzdHlsZT4KICAgICp7bWFyZ2luOjA7cGFkZGluZzowfWh0bWwsY29kZXtmb250OjE1cHgvMjJweCBhcmlhbCxzYW5zLXNlcmlmfWh0bWx7YmFja2dyb3VuZDojZmZmO2NvbG9yOiMyMjI7cGFkZGluZzoxNXB4fWJvZHl7bWFyZ2luOjclIGF1dG8gMDttYXgtd2lkdGg6MzkwcHg7bWluLWhlaWdodDoxODBweDtwYWRkaW5nOjMwcHggMCAxNXB4fSogPiBib2R5e2JhY2tncm91bmQ6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2Vycm9ycy9yb2JvdC5wbmcpIDEwMCUgNXB4IG5vLXJlcGVhdDtwYWRkaW5nLXJpZ2h0OjIwNXB4fXB7bWFyZ2luOjExcHggMCAyMnB4O292ZXJmbG93OmhpZGRlbn1pbnN7Y29sb3I6Izc3Nzt0ZXh0LWRlY29yYXRpb246bm9uZX1hIGltZ3tib3JkZXI6MH1AbWVkaWEgc2NyZWVuIGFuZCAobWF4LXdpZHRoOjc3MnB4KXtib2R5e2JhY2tncm91bmQ6bm9uZTttYXJnaW4tdG9wOjA7bWF4LXdpZHRoOm5vbmU7cGFkZGluZy1yaWdodDowfX0jbG9nb3tiYWNrZ3JvdW5kOnVybCgvL3d3dy5nb29nbGUuY29tL2ltYWdlcy9icmFuZGluZy9nb29nbGVsb2dvLzF4L2dvb2dsZWxvZ29fY29sb3JfMTUweDU0ZHAucG5nKSBuby1yZXBlYXQ7bWFyZ2luLWxlZnQ6LTVweH1AbWVkaWEgb25seSBzY3JlZW4gYW5kIChtaW4tcmVzb2x1dGlvbjoxOTJkcGkpeyNsb2dve2JhY2tncm91bmQ6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2JyYW5kaW5nL2dvb2dsZWxvZ28vMngvZ29vZ2xlbG9nb19jb2xvcl8xNTB4NTRkcC5wbmcpIG5vLXJlcGVhdCAwJSAwJS8xMDAlIDEwMCU7LW1vei1ib3JkZXItaW1hZ2U6dXJsKC8vd3d3Lmdvb2dsZS5jb20vaW1hZ2VzL2JyYW5kaW5nL2dvb2dsZWxvZ28vMngvZ29vZ2xlbG9nb19jb2xvcl8xNTB4NTRkcC5wbmcpIDB9fUBtZWRpYSBvbmx5IHNjcmVlbiBhbmQgKC13ZWJraXQtbWluLWRldmljZS1waXhlbC1yYXRpbzoyKXsjbG9nb3tiYWNrZ3JvdW5kOnVybCgvL3d3dy5nb29nbGUuY29tL2ltYWdlcy9icmFuZGluZy9nb29nbGVsb2dvLzJ4L2dvb2dsZWxvZ29fY29sb3JfMTUweDU0ZHAucG5nKSBuby1yZXBlYXQ7LXdlYmtpdC1iYWNrZ3JvdW5kLXNpemU6MTAwJSAxMDAlfX0jbG9nb3tkaXNwbGF5OmlubGluZS1ibG9jaztoZWlnaHQ6NTRweDt3aWR0aDoxNTBweH0KICA8L3N0eWxlPgogIDxhIGhyZWY9Ly93d3cuZ29vZ2xlLmNvbS8+PHNwYW4gaWQ9bG9nbyBhcmlhLWxhYmVsPUdvb2dsZT48L3NwYW4+PC9hPgogIDxwPjxiPjQwNC48L2I+IDxpbnM+VGhhdOKAmXMgYW4gZXJyb3IuPC9pbnM+CiAgPHA+VGhlIHJlcXVlc3RlZCBVUkwgPGNvZGU+L3Byb3h5LWdvb2dsZS10ZXN0LXBvc3Q8L2NvZGU+IHdhcyBub3QgZm91bmQgb24gdGhpcyBzZXJ2ZXIuICA8aW5zPlRoYXTigJlzIGFsbCB3ZSBrbm93LjwvaW5zPgo=",
+    "BodyEncoding": {
+      "CodePage": 65001,
+      "EncodingName": "Unicode (UTF-8)",
+      "WebName": "utf-8"
+    },
+    "UseTransformer": false,
+    "Headers": {
+      "Date": "Wed, 27 Oct 2017 18:57:40 GMT",
+      "Alt-Svc": "quic=\":443\"; ma=2592000; v=\"39,38,37,35\"",
+      "Referrer-Policy": "no-referrer",
+      "Connection": "close"
+    }
+  }
+}

examples/WireMock.Net.Console.NETCoreApp/log4net.config

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+  </configSections>
+  <appSettings>
+    <add key="log4net.Internal.Debug" value="true"/>
+  </appSettings>
+  <log4net>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
+      </layout>
+    </appender>
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="ConsoleAppender" />
+    </root>
+  </log4net>
+</configuration>

examples/WireMock.Net.Console.NETCoreApp/nlog.config

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      autoReload="true"
+      internalLogLevel="info"
+      internalLogFile="c:\temp\wiremock-internal-nlog.log">
+
+  <targets>
+    <!-- write logs to file  -->
+    <target xsi:type="File" name="all" fileName="c:\temp\wiremock-${shortdate}.log"
+            layout="${longdate}|${event-properties:item=EventId.Id}|${uppercase:${level}}|${logger}|${message} ${exception}" />
+  </targets>
+
+  <!-- rules to map from logger name to target -->
+  <rules>
+    <logger name="*" minlevel="Debug" writeTo="all" />
+  </rules>
+</nlog>

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

@@ -0,0 +1,36 @@
+using Newtonsoft.Json;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.Proxy.NETCoreApp2
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Urls = new[] { "http://localhost:9091", "https://localhost:9443" },
+                StartAdminInterface = true,
+                ReadStaticMappings = false,
+                ProxyAndRecordSettings = new ProxyAndRecordSettings
+                {
+                    Url = "https://www.google.com",
+                    //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
+                    SaveMapping = true,
+                    SaveMappingToFile = false,
+                    BlackListedHeaders = new[] { "dnt", "Content-Length" }
+                }
+            });
+
+            server.LogEntriesChanged += (sender, eventRecordArgs) =>
+            {
+                System.Console.WriteLine(JsonConvert.SerializeObject(eventRecordArgs.NewItems, Formatting.Indented));
+            };
+
+            System.Console.WriteLine("Press any key to stop the server");
+            System.Console.ReadKey();
+            server.Stop();
+        }
+    }
+}

examples/WireMock.Net.Console.Proxy.NETCoreApp2/Properties/launchSettings.json

@@ -0,0 +1,27 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:63377/",
+      "sslPort": 0
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "WireMock.Net.Console.Proxy.NETCoreApp2": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "http://localhost:63378/"
+    }
+  }
+}

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

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+</Project>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
+    </startup>
+</configuration>

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

@@ -0,0 +1,36 @@
+using Newtonsoft.Json;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.Proxy.Net452
+{
+    class Program
+    {
+        static void Main(string[] args)
+        {
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Urls = new[] { "http://localhost:9091/", "https://localhost:9443/" },
+                StartAdminInterface = true,
+                ReadStaticMappings = false,
+                ProxyAndRecordSettings = new ProxyAndRecordSettings
+                {
+                    Url = "https://www.google.com",
+                    //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
+                    SaveMapping = true,
+                    SaveMappingToFile = false,
+                    BlackListedHeaders = new[] { "dnt", "Content-Length" }
+                }
+            });
+
+            server.LogEntriesChanged += (sender, eventRecordArgs) =>
+            {
+                System.Console.WriteLine(JsonConvert.SerializeObject(eventRecordArgs.NewItems, Formatting.Indented));
+            };
+
+            System.Console.WriteLine("Press any key to stop the server");
+            System.Console.ReadKey();
+            server.Stop();
+        }
+    }
+}

examples/WireMock.Net.Console.Proxy.Net452/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("WireMock.Net.Console.Proxy.Net452")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("WireMock.Net.Console.Proxy.Net452")]
+[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2018")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("26433a8f-bf01-4962-97eb-81bffbb61096")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

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

@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{26433A8F-BF01-4962-97EB-81BFFBB61096}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WireMock.Net.Console.Proxy.Net452</RootNamespace>
+    <AssemblyName>WireMock.Net.Console.Proxy.Net452</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>WireMock.Net.Console.Proxy.Net452.Program</StartupObject>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <Prefer32Bit>true</Prefer32Bit>
+  </PropertyGroup>
+  <ItemGroup>
+    <None Condition="'$(Platform)' == 'x64'" Include="..\packages\Libuv.1.10.0\runtimes\win7-x64\native\libuv.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+      <Link>libuv.dll</Link>
+    </None>
+    <None Condition="'$(Platform)' == 'x86'" Include="..\packages\Libuv.1.10.0\runtimes\win7-x86\native\libuv.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Visible>False</Visible>
+      <Link>libuv.dll</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <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=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
+      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
+      <Name>WireMock.Net.StandAlone</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" />
+</Project>

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

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

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

@@ -0,0 +1,38 @@
+using Newtonsoft.Json;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.Proxy.NETCoreApp
+{
+    static class Program
+    {
+        static void Main(params string[] args)
+        {
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Urls = new[] { "http://localhost:9091/", "https://localhost:9443/" },
+                StartAdminInterface = true,
+                ReadStaticMappings = false,
+                ProxyAndRecordSettings = new ProxyAndRecordSettings
+                {
+                    Url = "https://www.google.com",
+                    //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
+                    SaveMapping = true,
+                    SaveMappingToFile = false,
+                    BlackListedHeaders = new [] { "dnt", "Content-Length" }
+                }
+            });
+
+            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/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj

@@ -7,11 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineArgumentsParser" Version="3.0.9" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
+    <Folder Include="__admin\mappings\" />
   </ItemGroup>
 
 </Project>

examples/WireMock.Net.ConsoleApplication/MainApp.cs

@@ -0,0 +1,224 @@
+using System;
+using Newtonsoft.Json;
+using WireMock.Matchers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.ConsoleApplication
+{
+    public static class MainApp
+    {
+        public static void Run()
+        {
+            string url1 = "http://localhost:9091/";
+            string url2 = "http://localhost:9092/";
+            string url3 = "https://localhost:9443/";
+
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Urls = new[] { url1, url2, url3 },
+                StartAdminInterface = true,
+                ReadStaticMappings = true,
+                WatchStaticMappings = true,
+                //ProxyAndRecordSettings = new ProxyAndRecordSettings
+                //{
+                //    SaveMapping = true
+                //},
+                PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
+                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); }
+            });
+            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
+
+            server.SetBasicAuthentication("a", "b");
+
+            server.AllowPartialMapping();
+
+            // .WithHeader("Stef", "Stef")
+            //server
+            //    .Given(Request.Create().WithPath("*"))
+            //    .RespondWith(Response.Create()
+            //    .WithProxy("http://restcountries.eu"));
+
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath("/jsonthings")
+                    .WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]"))
+                    .UsingPut())
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ ""result"": ""JsonPathMatcher !!!""}"));
+
+            server
+                .Given(Request
+                    .Create()
+                    .WithPath(new WildcardMatcher("/navision/OData/Company('My Company')/School*", true))
+                    .WithParam("$filter", "(substringof(Code, 'WA')")
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBody(@"{ ""result"": ""odata""}"));
+
+            server
+                .Given(Request.Create().WithPath("/headers", "/headers_test").UsingPost().WithHeader("Content-Type", "application/json*"))
+                .RespondWith(Response.Create()
+                    .WithStatusCode(201)
+                    //.WithHeader("MyHeader", "application/json", "application/json2")
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { result = "data:headers posted with 201" }));
+
+            server
+                .Given(Request.Create().WithPath("/file").UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBodyFromFile(@"c:\temp\x.json", false)
+                );
+
+            server
+                .Given(Request.Create().WithPath("/filecache").UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBodyFromFile(@"c:\temp\x.json")
+                );
+
+            server
+                .Given(Request.Create().WithPath("/file_rel").UsingGet())
+                .RespondWith(Response.Create()
+                    .WithBodyFromFile("Program.cs", false)
+                );
+
+            server
+                .Given(Request.Create().WithHeader("ProxyThis", "true")
+                    .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithProxy("http://www.google.com")
+            );
+
+            server
+                .Given(Request.Create().WithPath("/bodyasbytes.png")
+                .UsingGet())
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "image/png")
+                    .WithBody(Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAIAAAACUFjqAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuMTczbp9jAAAAJ0lEQVQoU2NgUPuPD6Hz0RCEAtJoiAxpCCBXGgmRIo0TofORkdp/AMiMdRVnV6O0AAAAAElFTkSuQmCC"))
+                );
+
+            server
+                .Given(Request.Create().WithPath("/oauth2/access").UsingPost().WithBody("grant_type=password;username=u;password=p"))
+                .RespondWith(Response.Create()
+                    .WithStatusCode(200)
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { access_token = "AT", refresh_token = "RT" }));
+
+            server
+                .Given(Request.Create().WithPath("/helloworld").UsingGet().WithHeader("Authorization", new RegexMatcher("^(?i)Bearer AT$")))
+                .RespondWith(Response.Create()
+                    .WithStatusCode(200)
+                    .WithBody("hi"));
+
+            server
+                .Given(Request.Create().WithPath(p => p.Contains("x")).UsingGet())
+                .AtPriority(4)
+                .RespondWith(Response.Create()
+                    .WithStatusCode(200)
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody(@"{ ""result"": ""Contains x with FUNC 200""}"));
+
+            server
+                .Given(Request.Create().WithPath("/data").UsingPost().WithBody(b => b.Contains("e")))
+                .AtPriority(999)
+                .RespondWith(Response.Create()
+                    .WithStatusCode(201)
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBodyAsJson(new { result = "data posted with FUNC 201" }));
+
+            server
+                .Given(Request.Create().WithPath("/json").UsingPost().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]")))
+                .RespondWith(Response.Create()
+                    .WithStatusCode(201)
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody(@"{ ""result"": ""json posted with 201""}"));
+
+            server
+                .Given(Request.Create().WithPath("/json2").UsingPost().WithBody("x"))
+                .RespondWith(Response.Create()
+                    .WithStatusCode(201)
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody(@"{ ""result"": ""json posted with x - 201""}"));
+
+            server
+                .Given(Request.Create().WithPath("/data").UsingDelete())
+                .RespondWith(Response.Create()
+                    .WithStatusCode(200)
+                    .WithHeader("Content-Type", "application/json")
+                    .WithBody(@"{ ""result"": ""data deleted with 200""}"));
+
+            server
+                .Given(Request.Create().WithPath("/nobody").UsingGet())
+                .RespondWith(Response.Create().WithDelay(TimeSpan.FromSeconds(1))
+                    .WithStatusCode(200));
+
+            server
+                .Given(Request.Create().WithPath("/partial").UsingPost().WithBody(new SimMetricsMatcher(new[] { "cat", "dog" })))
+                .RespondWith(Response.Create().WithStatusCode(200).WithBody("partial = 200"));
+
+            // http://localhost:8080/any/any?start=1000&stop=1&stop=2
+            //server
+            //    .Given(Request.Create().WithPath("/*").UsingGet())
+            //    .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
+            //    .AtPriority(server.Mappings.Count() + 1)
+            //    .RespondWith(Response.Create()
+            //        .WithStatusCode(200)
+            //        .WithHeader("Content-Type", "application/json")
+            //        .WithHeader("Transformed-Postman-Token", "token is {{request.headers.Postman-Token}}")
+            //        .WithBody(@"{""msg"": ""Hello world CATCH-ALL on /*, {{request.path}}, bykey={{request.query.start}}, bykey={{request.query.stop}}, byidx0={{request.query.stop.[0]}}, byidx1={{request.query.stop.[1]}}"" }")
+            //        .WithTransformer()
+            //        .WithDelay(TimeSpan.FromMilliseconds(100))
+            //    );
+
+            server
+                .Given(Request.Create()
+                    .WithPath("/state1")
+                    .UsingGet())
+                .InScenario("s1")
+                .WillSetStateTo("Test state 1")
+                .RespondWith(Response.Create()
+                    .WithBody("No state msg 1"));
+
+            server
+                .Given(Request.Create()
+                    .WithPath("/foostate1")
+                    .UsingGet())
+                .InScenario("s1")
+                .WhenStateIs("Test state 1")
+                .RespondWith(Response.Create()
+                    .WithBody("Test state msg 1"));
+
+            server
+                .Given(Request.Create()
+                    .WithPath("/state2")
+                    .UsingGet())
+                .InScenario("s2")
+                .WillSetStateTo("Test state 2")
+                .RespondWith(Response.Create()
+                    .WithBody("No state msg 2"));
+
+            server
+                .Given(Request.Create()
+                    .WithPath("/foostate2")
+                    .UsingGet())
+                .InScenario("s2")
+                .WhenStateIs("Test state 2")
+                .RespondWith(Response.Create()
+                    .WithBody("Test state msg 2"));
+
+            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/WireMock.Net.ConsoleApplication/Program.cs

@@ -1,10 +1,5 @@
-using System;
-using System.Linq;
-using Newtonsoft.Json;
-using WireMock.Matchers;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Server;
+using System.IO;
+using log4net.Config;
 
 namespace WireMock.Net.ConsoleApplication
 {
@@ -12,99 +7,9 @@ namespace WireMock.Net.ConsoleApplication
     {
         static void Main(params string[] args)
         {
-            string url1 = "http://localhost:9090/";
-            string url2 = "http://localhost:9091/";
-            string url3 = "https://localhost:9443/";
+            XmlConfigurator.Configure(new FileInfo("log4net.config"));
 
-            var server = FluentMockServer.Start(new FluentMockServerSettings
-            {
-                Urls = new [] { url1, url2, url3 },
-                StartAdminInterface = true,
-                ReadStaticMappings = true
-            });
-            Console.WriteLine("FluentMockServer listening at {0}", string.Join(" and ", server.Urls));
-
-            server.SetBasicAuthentication("a", "b");
-
-            server.AllowPartialMapping();
-
-            server
-                .Given(Request.Create().WithPath(p => p.Contains("x")).UsingGet())
-                .AtPriority(4)
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""Contains x with FUNC 200""}"));
-
-            server
-                .Given(Request.Create().WithPath("/data").UsingPost().WithBody(b => b.Contains("e")))
-                .AtPriority(999)
-                .RespondWith(Response.Create()
-                    .WithStatusCode(201)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""data posted with FUNC 201""}"));
-
-            server
-                .Given(Request.Create().WithPath("/data", "/ax").UsingPost().WithHeader("Content-Type", "application/json*"))
-                .RespondWith(Response.Create()
-                    .WithStatusCode(201)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""data posted with 201""}"));
-
-            server
-                .Given(Request.Create().WithPath("/json").UsingPost().WithBody(new JsonPathMatcher("$.things[?(@.name == 'RequiredThing')]")))
-                .RespondWith(Response.Create()
-                    .WithStatusCode(201)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""json posted with 201""}"));
-
-            server
-                .Given(Request.Create().WithPath("/json2").UsingPost().WithBody("x"))
-                .RespondWith(Response.Create()
-                    .WithStatusCode(201)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""json posted with x - 201""}"));
-
-            server
-                .Given(Request.Create().WithPath("/data").UsingDelete())
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithBody(@"{ ""result"": ""data deleted with 200""}"));
-
-            server
-                .Given(Request.Create().WithPath("/nobody").UsingGet())
-                .RespondWith(Response.Create().WithDelay(TimeSpan.FromSeconds(1))
-                    .WithStatusCode(200));
-
-            server
-                .Given(Request.Create().WithPath("/partial").UsingPost().WithBody(new SimMetricsMatcher(new [] { "cat", "dog" })))
-                .RespondWith(Response.Create().WithStatusCode(200).WithBody("partial = 200"));
-
-            // http://localhost:8080/any/any?start=1000&stop=1&stop=2
-            server
-                .Given(Request.Create().WithPath("/*").UsingGet())
-                .WithGuid("90356dba-b36c-469a-a17e-669cd84f1f05")
-                .AtPriority(server.Mappings.Count() + 1)
-                .RespondWith(Response.Create()
-                    .WithStatusCode(200)
-                    .WithHeader("Content-Type", "application/json")
-                    .WithHeader("Transformed-Postman-Token", "token is {{request.headers.Postman-Token}}")
-                    .WithBody(@"{""msg"": ""Hello world CATCH-ALL on /*, {{request.path}}, bykey={{request.query.start}}, bykey={{request.query.stop}}, byidx0={{request.query.stop.[0]}}, byidx1={{request.query.stop.[1]}}"" }")
-                    .WithTransformer()
-                    .WithDelay(TimeSpan.FromMilliseconds(100))
-                );
-
-            Console.WriteLine("Press any key to stop the server");
-            Console.ReadKey();
-            server.Stop();
-
-            Console.WriteLine("Displaying all requests");
-            var allRequests = server.LogEntries;
-            Console.WriteLine(JsonConvert.SerializeObject(allRequests, Formatting.Indented));
-
-            Console.WriteLine("Press any key to quit");
-            Console.ReadKey();
+            MainApp.Run();
         }
     }
 }

examples/WireMock.Net.ConsoleApplication/WireMock.Net.Console.NET452.csproj

@@ -36,22 +36,25 @@
     <ApplicationIcon>..\..\WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\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=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="SimMetrics.Net, Version=1.0.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SimMetrics.Net.1.0.3\lib\net45\SimMetrics.Net.dll</HintPath>
+    <Reference Include="SimMetrics.Net, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimMetrics.Net.1.0.4\lib\net45\SimMetrics.Net.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="WireMock.Net">
-      <HintPath>..\..\src\WireMock.Net\bin\$(Configuration)\net45\WireMock.Net.dll</HintPath>
-    </Reference>
+    <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="MainApp.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -59,6 +62,9 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
@@ -66,6 +72,16 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
+      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
+      <Name>WireMock.Net.StandAlone</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" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

examples/WireMock.Net.ConsoleApplication/log4net.config

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+  </configSections>
+  <appSettings>
+    <add key="log4net.Internal.Debug" value="true"/>
+  </appSettings>
+  <log4net>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
+      </layout>
+    </appender>
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="ConsoleAppender" />
+    </root>
+  </log4net>
+</configuration>

examples/WireMock.Net.ConsoleApplication/packages.config

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="log4net" version="2.0.8" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="10.0.2" targetFramework="net452" />
-  <package id="SimMetrics.Net" version="1.0.3" targetFramework="net452" />
+  <package id="SimMetrics.Net" version="1.0.4" targetFramework="net452" />
 </packages>

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

@@ -0,0 +1,52 @@
+using System;
+using System.IO;
+using System.Reflection;
+using System.Threading;
+using log4net;
+using log4net.Config;
+using log4net.Repository;
+using WireMock.Server;
+
+namespace WireMock.Net.StandAlone.NETCoreApp
+{
+    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 FluentMockServer _server;
+
+        static void Main(string[] args)
+        {
+            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
+
+            _server = StandAloneApp.Start(args, new WireMockLog4NetLogger());
+
+            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);
+            }
+        }
+
+        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");
+        }
+    }
+}

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

@@ -0,0 +1,8 @@
+{
+  "profiles": {
+    "WireMock.Net.StandAlone.NETCoreApp": {
+      "commandName": "Project",
+      "commandLineArgs": "--Urls http://*:9091"
+    }
+  }
+}

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

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFrameworks>netcoreapp2.0;netcoreapp1.1</TargetFrameworks>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="log4net" Version="2.0.8" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

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

@@ -0,0 +1,30 @@
+using log4net;
+using WireMock.Logging;
+
+namespace WireMock.Net.StandAlone.NETCoreApp
+{
+    internal class WireMockLog4NetLogger : IWireMockLogger
+    {
+        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+        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 Warn(string formatString, params object[] args)
+        {
+            Log.WarnFormat(formatString, args);
+        }
+
+        public void Error(string formatString, params object[] args)
+        {
+            Log.ErrorFormat(formatString, args);
+        }
+    }
+}

examples/WireMock.Net.StandAlone.NETCoreApp/log4net.config

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+  </configSections>
+  <appSettings>
+    <add key="log4net.Internal.Debug" value="true"/>
+  </appSettings>
+  <log4net>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
+      </layout>
+    </appender>
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="ConsoleAppender" />
+    </root>
+  </log4net>
+</configuration>

examples/WireMock.Net.StandAlone.NETCoreApp/run1.cmd

@@ -0,0 +1 @@
+dotnet run --framework netcoreapp1.1

examples/WireMock.Net.StandAlone.NETCoreApp/run2.cmd

@@ -0,0 +1 @@
+dotnet run --framework netcoreapp2.0

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

@@ -0,0 +1,19 @@
+using System;
+using System.IO;
+using log4net.Config;
+
+namespace WireMock.Net.StandAlone.Net452
+{
+    public class Program
+    {
+        static void Main(params string[] args)
+        {
+            XmlConfigurator.Configure(new FileInfo("log4net.config"));
+
+            StandAloneApp.Start(args);
+
+            Console.WriteLine("Press any key to stop the server");
+            Console.ReadKey();
+        }
+    }
+}

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

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{668F689E-57B4-422E-8846-C0FF643CA999}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>WireMock.Net.StandAlone.Net452</RootNamespace>
+    <AssemblyName>WireMock.Net.StandAlone.Net452</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>..\..\WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>WireMock.Net.StandAlone.Net452.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj">
+      <Project>{b6269aac-170a-43d5-8b9a-579ded3d9a95}</Project>
+      <Name>WireMock.Net.StandAlone</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" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>

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

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
+  </configSections>
+  <appSettings>
+    <add key="log4net.Internal.Debug" value="true"/>
+  </appSettings>
+  <log4net>
+    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
+      <layout type="log4net.Layout.PatternLayout">
+        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
+      </layout>
+    </appender>
+    <root>
+      <level value="DEBUG" />
+      <appender-ref ref="ConsoleAppender" />
+    </root>
+  </log4net>
+</configuration>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="log4net" version="2.0.8" targetFramework="net452" />
+</packages>

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

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
+      </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" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.2" newVersion="4.1.1.2" />
+      </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" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.X509Certificates" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Microsoft.Win32.Primitives" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

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

@@ -0,0 +1,19 @@
+using System;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+
+namespace WireMock.Net.StandAlone.Net461
+{
+    static class Program
+    {
+        static void Main(string[] args)
+        {
+            var server = StandAloneApp.Start(args);
+            server.Given(Request.Create())
+                .RespondWith(Response.Create().WithProxy("http://10.10.66.65"));
+
+            Console.WriteLine("Press any key to stop the server");
+            Console.ReadKey();
+        }
+    }
+}

examples/WireMock.Net.StandAlone.Net461/Properties/AssemblyInfo.cs

@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("WireMock.Net.StandAlone.Net461")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("WireMock.Net.StandAlone.Net461")]
+[assembly: AssemblyCopyright("Copyright © Stef Heyenrath")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("3c279524-db73-4de3-bef1-f2b2958c9f65")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

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

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <RootNamespace>WireMock.Net.StandAlone.Net461</RootNamespace>
+    <AssemblyName>WireMock.Net.StandAlone.Net461</AssemblyName>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup>
+    <StartupObject>WireMock.Net.StandAlone.Net461.Program</StartupObject>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Handlebars, Version=1.8.1.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.1.9.0\lib\net40\Handlebars.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>
+    <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="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>
+    <Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.10.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>
+    </Reference>
+    <Reference Include="RestEase, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RestEase.1.4.4\lib\net45\RestEase.dll</HintPath>
+    </Reference>
+    <Reference Include="SimMetrics.Net, Version=1.0.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SimMetrics.Net.1.0.4\lib\net45\SimMetrics.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Net.Http, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Net.Http.4.3.3\lib\net46\System.Net.Http.dll</HintPath>
+    </Reference>
+    <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>
+    <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Numerics" />
+    <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.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>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.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>
+    <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>
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="WireMock.Net, Version=1.0.3.6, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\WireMock.Net.1.0.3.6\lib\net46\WireMock.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="WireMock.Net.StandAlone, Version=1.0.3.6, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\WireMock.Net.StandAlone.1.0.3.6\lib\net46\WireMock.Net.StandAlone.dll</HintPath>
+    </Reference>
+    <Reference Include="XPath2, Version=1.0.5.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\XPath2.1.0.5.1\lib\net40\XPath2.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

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

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Handlebars.Net" version="1.9.0" 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.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="Newtonsoft.Json" version="10.0.3" targetFramework="net461" />
+  <package id="Owin" version="1.0" targetFramework="net461" />
+  <package id="RestEase" version="1.4.4" targetFramework="net461" />
+  <package id="SimMetrics.Net" version="1.0.4" targetFramework="net461" />
+  <package id="System.Net.Http" version="4.3.3" targetFramework="net461" />
+  <package id="System.Security.Cryptography.Algorithms" version="4.3.0" 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="WireMock.Net" version="1.0.3.6" targetFramework="net461" />
+  <package id="WireMock.Net.StandAlone" version="1.0.3.6" targetFramework="net461" />
+  <package id="XPath2" version="1.0.5.1" targetFramework="net461" />
+</packages>

examples/WireMock.Net.WebApplication/App.cs

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

examples/WireMock.Net.WebApplication/IWireMockService.cs

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

examples/WireMock.Net.WebApplication/Program.cs

@@ -0,0 +1,57 @@
+using System;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApplication
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            // Create service collection
+            var serviceCollection = new ServiceCollection();
+            ConfigureServices(serviceCollection);
+
+            // Create service provider
+            var serviceProvider = serviceCollection.BuildServiceProvider();
+
+            // Run app
+            serviceProvider.GetService<App>().Run();
+        }
+
+        private static void ConfigureServices(IServiceCollection serviceCollection)
+        {
+            // Build configuration
+            var configuration = new ConfigurationBuilder()
+                .SetBasePath(AppContext.BaseDirectory)
+                .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true)
+                .AddEnvironmentVariables() // <-- this is needed to to override settings via the Azure Portal App Settings
+                .Build();
+
+            // Add LoggerFactory
+            var factory = new LoggerFactory();
+            serviceCollection.AddSingleton(factory
+                .AddConsole(configuration.GetSection("Logging"))
+                .AddDebug()
+                .AddAzureWebAppDiagnostics()
+            );
+
+            serviceCollection.AddSingleton(factory.CreateLogger("WireMock.Net Logger"));
+
+            // Add access to generic IConfigurationRoot
+            serviceCollection.AddSingleton(configuration);
+
+            // Add access to IFluentMockServerSettings
+            var settings = configuration.GetSection("FluentMockServerSettings").Get<FluentMockServerSettings>();
+            serviceCollection.AddSingleton<IFluentMockServerSettings>(settings);
+
+            // Add services
+            serviceCollection.AddTransient<IWireMockService, WireMockService>();
+
+            // Add app
+            serviceCollection.AddTransient<App>();
+        }
+    }
+}

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

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

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

@@ -0,0 +1,29 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net.StandAlone\WireMock.Net.StandAlone.csproj" />
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Update="appsettings.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+</Project>

examples/WireMock.Net.WebApplication/WireMockService.cs

@@ -0,0 +1,70 @@
+using System.Threading;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using WireMock.Logging;
+using WireMock.Net.StandAlone;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApplication
+{
+    public class WireMockService : IWireMockService
+    {
+        private static int sleepTime = 30000;
+
+        private readonly ILogger _logger;
+        private readonly IFluentMockServerSettings _settings;
+
+        private class Logger : IWireMockLogger
+        {
+            private readonly ILogger _logger;
+
+            public Logger(ILogger logger)
+            {
+                _logger = logger;
+            }
+
+            public void Debug(string formatString, params object[] args)
+            {
+                _logger.LogDebug(formatString, args);
+            }
+
+            public void Info(string formatString, params object[] args)
+            {
+                _logger.LogInformation(formatString, args);
+            }
+
+            public void Warn(string formatString, params object[] args)
+            {
+                _logger.LogWarning(formatString, args);
+            }
+
+            public void Error(string formatString, params object[] args)
+            {
+                _logger.LogError(formatString, args);
+            }
+        }
+
+        public WireMockService(ILogger logger, IFluentMockServerSettings settings)
+        {
+            _logger = logger;
+            _settings = settings;
+
+            _settings.Logger = new Logger(logger);
+        }
+
+        public void Run()
+        {
+            _logger.LogInformation("WireMock.Net server starting");
+
+            StandAloneApp.Start(_settings);
+
+            _logger.LogInformation($"WireMock.Net server settings {JsonConvert.SerializeObject(_settings)}");
+
+            while (true)
+            {
+                _logger.LogInformation("WireMock.Net server running");
+                Thread.Sleep(sleepTime);
+            }
+        }
+    }
+}

examples/WireMock.Net.WebApplication/appsettings.json

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

src/WireMock.Net.Logic/WireMock.Net.Logic.csproj

@@ -1,46 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <AssemblyTitle>WireMock.Net.Logic</AssemblyTitle>
-    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>WireMock.Net.Logic</AssemblyName>
-    <DebugType>full</DebugType>
-    <ApplicationIcon>../WireMock.Net-Logo.ico</ApplicationIcon>
-    <Version>1.0.2.0</Version>
-    <RootNamespace>WireMock</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <DefineConstants>NETSTANDARD</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="10.4.0">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <PackageReference Include="SimMetrics.Net" Version="1.0.3" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.3" />
-    <PackageReference Include="Handlebars.Net" Version="1.8.0" />
-    <PackageReference Include="XPath2" Version="1.0.3.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.1" />
-    <!--<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.1.1" />-->
-    <PackageReference Include="Handlebars.NetStandard" Version="1.8.1" />
-    <PackageReference Include="System.Threading" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Thread">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-  </ItemGroup>
-
-</Project>

src/WireMock.Net.Middleware/FluentMockServerSettings.cs

@@ -1,49 +0,0 @@
-namespace WireMock.Net
-{
-    /// <summary>
-    /// WireMockSettings
-    /// </summary>
-    public class WireMockSettings
-    {
-        /// <summary>
-        /// Gets or sets the port.
-        /// </summary>
-        /// <value>
-        /// The port.
-        /// </value>
-        public int? Port { get; set; }
-
-        /// <summary>
-        /// Gets or sets the use SSL.
-        /// </summary>
-        /// <value>
-        /// The use SSL.
-        /// </value>
-        // ReSharper disable once InconsistentNaming
-        public bool? UseSSL { get; set; }
-
-        /// <summary>
-        /// Gets or sets the start admin interface.
-        /// </summary>
-        /// <value>
-        /// The start admin interface.
-        /// </value>
-        public bool? StartAdminInterface { get; set; }
-
-        /// <summary>
-        /// Gets or sets the read static mappings.
-        /// </summary>
-        /// <value>
-        /// The read static mappings.
-        /// </value>
-        public bool? ReadStaticMappings { get; set; }
-
-        /// <summary>
-        /// Gets or sets the urls.
-        /// </summary>
-        /// <value>
-        /// The urls.
-        /// </value>
-        public string[] Urls { get; set; }
-    }
-}

src/WireMock.Net.Middleware/WireMock.Net.Middleware.csproj

@@ -1,60 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <Description>WireMock.Net Owin Middleware.</Description>
-    <Version>1.0.0.0</Version>
-    <AssemblyTitle>WireMock.Net</AssemblyTitle>
-    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net45;netstandard1.3</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>WireMock.Net.Middleware</AssemblyName>
-    <PackageId>WireMock.Net.Middleware</PackageId>
-    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
-    <PackageReleaseNotes>Initial version</PackageReleaseNotes>
-    <PackageIconUrl>https://raw.githubusercontent.com/StefH/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/StefH/WireMock.Net</PackageProjectUrl>
-    <PackageLicenseUrl>https://raw.githubusercontent.com/StefH/WireMock.Net/master/LICENSE</PackageLicenseUrl>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/StefH/WireMock.Net</RepositoryUrl>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <DebugType>full</DebugType>
-    <ApplicationIcon>../WireMock.Net-Logo.ico</ApplicationIcon>
-    <RootNamespace>WireMock</RootNamespace>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <DefineConstants>NETSTANDARD</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="10.4.0">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-    <!--<PackageReference Include="SimMetrics.Net" Version="1.0.3" />-->
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.3" />
-    <PackageReference Include="Handlebars.Net" Version="1.8.0" />
-    <PackageReference Include="XPath2" Version="1.0.3.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.1" />
-    <!--<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="1.1.1" />-->
-    <PackageReference Include="Handlebars.NetStandard" Version="1.8.1" />
-    <PackageReference Include="System.Threading" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Tasks" Version="4.3.0" />
-    <PackageReference Include="System.Threading.Thread">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-  </ItemGroup>
-
-</Project>

src/WireMock.Net.Middleware/WireMockMiddleware.cs

@@ -1,144 +0,0 @@
-using System;
-using System.Collections;
-using System.Threading.Tasks;
-using WireMock.Logging;
-using WireMock.Matchers.Request;
-using System.Linq;
-#if NETSTANDARD
-using Microsoft.AspNetCore.Http;
-#else
-using Microsoft.Owin;
-#endif
-
-namespace WireMock.Owin
-{
-#if NETSTANDARD
-    internal class WireMockMiddleware
-#else
-    internal class WireMockMiddleware : OwinMiddleware
-#endif
-    {
-        private static readonly Task CompletedTask = Task.FromResult(false);
-        private readonly WireMockMiddlewareOptions _options;
-
-        private readonly OwinRequestMapper _requestMapper = new OwinRequestMapper();
-        private readonly OwinResponseMapper _responseMapper = new OwinResponseMapper();
-
-#if NETSTANDARD
-        public WireMockMiddleware(RequestDelegate next, WireMockMiddlewareOptions options)
-        {
-            _options = options;
-        }
-#else
-        public WireMockMiddleware(OwinMiddleware next, WireMockMiddlewareOptions options) : base(next)
-        {
-            _options = options;
-        }
-#endif
-
-#if NETSTANDARD
-        public async Task Invoke(HttpContext ctx)
-#else
-        public override async Task Invoke(IOwinContext ctx)
-#endif
-        {
-            if (_options.RequestProcessingDelay > TimeSpan.Zero)
-            {
-                await Task.Delay(_options.RequestProcessingDelay.Value);
-                // Thread.Sleep(_options.RequestProcessingDelay.Value);
-            }
-
-            var request = await _requestMapper.MapAsync(ctx.Request);
-
-            ResponseMessage response = null;
-            Mapping targetMapping = null;
-            RequestMatchResult requestMatchResult = null;
-            try
-            {
-                var mappings = _options.Mappings
-                    .Select(m => new
-                    {
-                        Mapping = m,
-                        MatchResult = m.IsRequestHandled(request)
-                    })
-                    .ToList();
-
-                if (_options.AllowPartialMapping)
-                {
-                    var partialMappings = mappings
-                        .Where(pm => pm.Mapping.IsAdminInterface && pm.MatchResult.IsPerfectMatch || !pm.Mapping.IsAdminInterface)
-                        .OrderBy(m => m.MatchResult)
-                        .ThenBy(m => m.Mapping.Priority)
-                        .ToList();
-
-                    var bestPartialMatch = partialMappings.FirstOrDefault(pm => pm.MatchResult.AverageTotalScore > 0.0);
-
-                    targetMapping = bestPartialMatch?.Mapping;
-                    requestMatchResult = bestPartialMatch?.MatchResult;
-                }
-                else
-                {
-                    var perfectMatch = mappings
-                        .OrderBy(m => m.Mapping.Priority)
-                        .FirstOrDefault(m => m.MatchResult.IsPerfectMatch);
-
-                    targetMapping = perfectMatch?.Mapping;
-                    requestMatchResult = perfectMatch?.MatchResult;
-                }
-
-                if (targetMapping == null)
-                {
-                    response = new ResponseMessage { StatusCode = 404, Body = "No matching mapping found" };
-                    return;
-                }
-
-                if (targetMapping.IsAdminInterface && _options.AuthorizationMatcher != null)
-                {
-                    string authorization;
-                    bool present = request.Headers.TryGetValue("Authorization", out authorization);
-                    if (!present || _options.AuthorizationMatcher.IsMatch(authorization) < 1.0)
-                    {
-                        response = new ResponseMessage { StatusCode = 401 };
-                        return;
-                    }
-                }
-
-                response = await targetMapping.ResponseTo(request);
-            }
-            catch (Exception ex)
-            {
-                response = new ResponseMessage { StatusCode = 500, Body = ex.ToString() };
-            }
-            finally
-            {
-                var log = new LogEntry
-                {
-                    Guid = Guid.NewGuid(),
-                    RequestMessage = request,
-                    ResponseMessage = response,
-                    MappingGuid = targetMapping?.Guid,
-                    MappingTitle = targetMapping?.Title,
-                    RequestMatchResult = requestMatchResult
-                };
-
-                LogRequest(log);
-
-                await _responseMapper.MapAsync(response, ctx.Response);
-            }
-
-            await CompletedTask;
-        }
-
-        /// <summary>
-        /// The log request.
-        /// </summary>
-        /// <param name="entry">The request.</param>
-        private void LogRequest(LogEntry entry)
-        {
-            lock (((ICollection)_options.LogEntries).SyncRoot)
-            {
-                _options.LogEntries.Add(entry);
-            }
-        }
-    }
-}

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

@@ -1,66 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using CommandLineParser.Arguments;
-using CommandLineParser.Exceptions;
-using WireMock.Server;
-
-namespace WireMock.Net.StandAlone.NETCoreApp
-{
-    class Program
-    {
-        private class Options
-        {
-            [ValueArgument(typeof(string), 'u', "Urls", Description = "URL(s) to listen on.", Optional = true, AllowMultiple = true)]
-            public List<string> Urls { get; set; }
-
-            [SwitchArgument('p', "AllowPartialMapping", true, Description = "Allow Partial Mapping (default set to true).", Optional = true)]
-            public bool AllowPartialMapping { get; set; }
-
-            [SwitchArgument('s', "StartAdminInterface", true, Description = "Start the AdminInterface (default set to true).", Optional = true)]
-            public bool StartAdminInterface { get; set; }
-
-            [SwitchArgument('r', "ReadStaticMappings", true, Description = "Read StaticMappings from ./__admin/mappings (default set to true).", Optional = true)]
-            public bool ReadStaticMappings { get; set; }
-        }
-
-        static void Main(string[] args)
-        {
-            var options = new Options();
-            var parser = new CommandLineParser.CommandLineParser();
-            parser.ExtractArgumentAttributes(options);
-
-            try
-            {
-                parser.ParseCommandLine(args);
-
-                if (!options.Urls.Any())
-                {
-                    options.Urls.Add("http://localhost:9090/");
-                }
-
-                var server = FluentMockServer.Start(new FluentMockServerSettings
-                {
-                    Urls = options.Urls.ToArray(),
-                    StartAdminInterface = options.StartAdminInterface,
-                    ReadStaticMappings = options.ReadStaticMappings
-                });
-
-                if (options.AllowPartialMapping)
-                {
-                    server.AllowPartialMapping();
-                }
-
-                Console.WriteLine("WireMock.Net server listening at {0}", string.Join(" and ", server.Urls));
-            }
-            catch (CommandLineException e)
-            {
-                Console.WriteLine(e.Message);
-                parser.ShowUsage();
-            }
-
-            Console.WriteLine("Press any key to stop the server");
-            Console.ReadKey();
-        }
-    }
-}

src/WireMock.Net.StandAlone/Program.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using CommandLineParser.Arguments;
-using CommandLineParser.Exceptions;
-using WireMock.Server;
-
-namespace WireMock.Net.StandAlone
-{
-    public class Program
-    {
-        private class Options
-        {
-            [ValueArgument(typeof(string), 'u', "Urls", Description = "URL(s) to listen on.", Optional = true, AllowMultiple = true)]
-            public List<string> Urls { get; set; }
-
-            [SwitchArgument('p', "AllowPartialMapping", true, Description = "Allow Partial Mapping (default set to true).", Optional = true)]
-            public bool AllowPartialMapping { get; set; }
-
-            [SwitchArgument('s', "StartAdminInterface", true, Description = "Start the AdminInterface (default set to true).", Optional = true)]
-            public bool StartAdminInterface { get; set; }
-
-            [SwitchArgument('r', "ReadStaticMappings", true, Description = "Read StaticMappings from ./__admin/mappings (default set to true).", Optional = true)]
-            public bool ReadStaticMappings { get; set; }
-        }
-
-        static void Main(params string[] args)
-        {
-            var options = new Options();
-            var parser = new CommandLineParser.CommandLineParser();
-            parser.ExtractArgumentAttributes(options);
-
-            try
-            {
-                parser.ParseCommandLine(args);
-
-                if (!options.Urls.Any())
-                    options.Urls.Add("http://localhost:9090/");
-
-                var server = FluentMockServer.Start(new FluentMockServerSettings
-                {
-                    Urls = options.Urls.ToArray(),
-                    StartAdminInterface = options.StartAdminInterface,
-                    ReadStaticMappings = options.ReadStaticMappings
-                });
-
-                if (options.AllowPartialMapping)
-                    server.AllowPartialMapping();
-
-                Console.WriteLine("WireMock.Net server listening at {0}", string.Join(" and ", server.Urls));
-            }
-            catch (CommandLineException e)
-            {
-                Console.WriteLine(e.Message);
-                parser.ShowUsage();
-            }
-
-            Console.WriteLine("Press any key to stop the server");
-            Console.ReadKey();
-        }
-    }
-}

src/WireMock.Net.StandAlone/SimpleCommandLineParser.cs

@@ -0,0 +1,82 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace WireMock.Net.StandAlone
+{
+    // Based on http://blog.gauffin.org/2014/12/simple-command-line-parser/
+    internal class SimpleCommandLineParser
+    {
+        private IDictionary<string, string[]> Arguments { get; } = new Dictionary<string, string[]>();
+
+        public void Parse(string[] args)
+        {
+            string currentName = null;
+
+            var values = new List<string>();
+            foreach (string arg in args)
+            {
+                if (arg.StartsWith("--"))
+                {
+                    if (!string.IsNullOrEmpty(currentName))
+                    {
+                        Arguments[currentName] = values.ToArray();
+                    }
+
+                    values.Clear();
+                    currentName = arg.Substring(2);
+                }
+                else if (string.IsNullOrEmpty(currentName))
+                {
+                    Arguments[arg] = new string[0];
+                }
+                else
+                {
+                    values.Add(arg);
+                }
+            }
+
+            if (!string.IsNullOrEmpty(currentName))
+            {
+                Arguments[currentName] = values.ToArray();
+            }
+        }
+        public bool Contains(string name)
+        {
+            return Arguments.ContainsKey(name);
+        }
+
+        public string[] GetValues(string name, string[] defaultValue = null)
+        {
+            return Contains(name) ? Arguments[name] : defaultValue;
+        }
+
+        public T GetValue<T>(string name, Func<string[], T> func, T defaultValue = default(T))
+        {
+            return Contains(name) ? func(Arguments[name]) : defaultValue;
+        }
+
+        public bool GetBoolValue(string name, bool defaultValue = false)
+        {
+            return GetValue(name, values =>
+            {
+                string value = values.FirstOrDefault();
+                return !string.IsNullOrEmpty(value) ? bool.Parse(value) : defaultValue;
+            }, defaultValue);
+        }
+
+        public int? GetIntValue(string name, int? defaultValue = null)
+        {
+            return GetValue(name, values =>
+            {
+                string value = values.FirstOrDefault();
+                return !string.IsNullOrEmpty(value) ? int.Parse(value) : defaultValue;
+            }, defaultValue);
+        }
+
+        public string GetStringValue(string name, string defaultValue = null)
+        {
+            return GetValue(name, values => values.FirstOrDefault() ?? defaultValue, defaultValue);
+        }
+    }
+}

src/WireMock.Net.StandAlone/StandAloneApp.cs

@@ -0,0 +1,88 @@
+using System.Linq;
+using WireMock.Server;
+using WireMock.Settings;
+using WireMock.Validation;
+using JetBrains.Annotations;
+using WireMock.Logging;
+
+namespace WireMock.Net.StandAlone
+{
+    /// <summary>
+    /// The StandAloneApp
+    /// </summary>
+    public static class StandAloneApp
+    {
+        /// <summary>
+        /// Start WireMock.Net standalone Server based on the FluentMockServerSettings.
+        /// </summary>
+        /// <param name="settings">The FluentMockServerSettings</param>
+        [PublicAPI]
+        public static FluentMockServer Start([NotNull] IFluentMockServerSettings settings)
+        {
+            Check.NotNull(settings, nameof(settings));
+
+            return FluentMockServer.Start(settings);
+        }
+
+        /// <summary>
+        /// Start WireMock.Net standalone Server based on the commandline arguments.
+        /// </summary>
+        /// <param name="args">The commandline arguments</param>
+        /// <param name="logger">The logger</param>
+        [PublicAPI]
+        public static FluentMockServer Start([NotNull] string[] args, [CanBeNull] IWireMockLogger logger = null)
+        {
+            Check.NotNull(args, nameof(args));
+
+            var parser = new SimpleCommandLineParser();
+            parser.Parse(args);
+
+            var settings = new FluentMockServerSettings
+            {
+                StartAdminInterface = parser.GetBoolValue("StartAdminInterface", true),
+                ReadStaticMappings = parser.GetBoolValue("ReadStaticMappings"),
+                WatchStaticMappings = parser.GetBoolValue("WatchStaticMappings"),
+                AllowPartialMapping = parser.GetBoolValue("AllowPartialMapping", true),
+                AdminUsername = parser.GetStringValue("AdminUsername"),
+                AdminPassword = parser.GetStringValue("AdminPassword"),
+                MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"),
+                RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
+            };
+
+            if (logger != null)
+            {
+                settings.Logger = logger;
+            }
+
+            if (parser.Contains("Port"))
+            {
+                settings.Port = parser.GetIntValue("Port");
+            }
+            else
+            {
+                settings.Urls = parser.GetValues("Urls", new[] { "http://*:9091/" });
+            }
+
+            string proxyURL = parser.GetStringValue("ProxyURL");
+            if (!string.IsNullOrEmpty(proxyURL))
+            {
+                settings.ProxyAndRecordSettings = new ProxyAndRecordSettings
+                {
+                    Url = proxyURL,
+                    SaveMapping = parser.GetBoolValue("SaveMapping"),
+                    SaveMappingToFile = parser.GetBoolValue("SaveMappingToFile"),
+                    ClientX509Certificate2ThumbprintOrSubjectName = parser.GetStringValue("ClientX509Certificate2ThumbprintOrSubjectName"),
+                    BlackListedHeaders = parser.GetValues("BlackListedHeaders")
+                };
+            }
+
+            settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+
+            FluentMockServer server = Start(settings);
+
+            settings.Logger.Info("WireMock.Net server listening at {0}", string.Join(",", server.Urls));
+
+            return server;
+        }
+    }
+}

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

@@ -1,67 +1,45 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{668F689E-57B4-422E-8846-C0FF643CA999}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WireMock.Net.StandAlone</RootNamespace>
-    <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>..\..\WireMock.Net-Logo.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="CommandLineArgumentsParser, Version=3.0.9.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CommandLineArgumentsParser.3.0.9\lib\net45\CommandLineArgumentsParser.dll</HintPath>
-    </Reference>
-    <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="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="WireMock.Net">
-      <HintPath>..\..\src\WireMock.Net\bin\$(Configuration)\net45\WireMock.Net.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
+    <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
+    <Version>1.0.3.9</Version>
+    <Authors>Stef Heyenrath</Authors>
+    <TargetFrameworks>net452;net46;netstandard1.3;netstandard2.0</TargetFrameworks>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
+    <PackageId>WireMock.Net.StandAlone</PackageId>
+    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
+    <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
+    <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
+    <PackageLicenseUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/LICENSE</PackageLicenseUrl>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <RootNamespace>WireMock.Net.StandAlone</RootNamespace>
+  </PropertyGroup>
+  
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <DebugType>full</DebugType>
+    <IncludeSource>True</IncludeSource>
+    <IncludeSymbols>True</IncludeSymbols>
+    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' ">
+    <DefineConstants>NETSTANDARD</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="JetBrains.Annotations" Version="10.4.0">
+      <PrivateAssets>All</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
 </Project>

src/WireMock.Net.StandAlone/app.config

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-</configuration>

src/WireMock.Net/Admin/Mappings/ClientIPModel.cs

@@ -0,0 +1,24 @@
+namespace WireMock.Admin.Mappings
+{
+    /// <summary>
+    /// ClientIPModel
+    /// </summary>
+    public class ClientIPModel
+    {
+        /// <summary>
+        /// Gets or sets the matchers.
+        /// </summary>
+        /// <value>
+        /// The matchers.
+        /// </value>
+        public MatcherModel[] Matchers { get; set; }
+
+        /// <summary>
+        /// Gets or sets the functions.
+        /// </summary>
+        /// <value>
+        /// The functions.
+        /// </value>
+        public string[] Funcs { get; set; }
+    }
+}

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

@@ -10,41 +10,42 @@ namespace WireMock.Admin.Mappings
         /// <summary>
         /// Gets or sets the unique identifier.
         /// </summary>
-        /// <value>
-        /// The unique identifier.
-        /// </value>
         public Guid? Guid { get; set; }
 
         /// <summary>
-        /// Gets or sets the unique title.
-        /// </summary>
-        /// <value>
         /// The unique title.
-        /// </value>
+        /// </summary>
         public string Title { get; set; }
 
         /// <summary>
-        /// Gets or sets the priority.
-        /// </summary>
-        /// <value>
         /// The priority.
-        /// </value>
+        /// </summary>
         public int? Priority { get; set; }
 
         /// <summary>
-        /// Gets or sets the request.
+        /// The Scenario.
         /// </summary>
-        /// <value>
+        public string Scenario { get; set; }
+
+        /// <summary>
+        /// Execution state condition for the current mapping.
+        /// </summary>
+        public object WhenStateIs { get; set; }
+
+        /// <summary>
+        /// The next state which will be signaled after the current mapping execution.
+        /// In case the value is null state will not be changed.
+        /// </summary>
+        public object SetStateTo { get; set; }
+
+        /// <summary>
         /// The request.
-        /// </value>
+        /// </summary>
         public RequestModel Request { get; set; }
 
         /// <summary>
-        /// Gets or sets the response.
-        /// </summary>
-        /// <value>
         /// The response.
-        /// </value>
+        /// </summary>
         public ResponseModel Response { get; set; }
     }
 }

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

@@ -8,33 +8,21 @@
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
-        /// <value>
-        /// The name.
-        /// </value>
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the pattern.
         /// </summary>
-        /// <value>
-        /// The pattern.
-        /// </value>
         public string Pattern { get; set; }
 
         /// <summary>
         /// Gets or sets the patterns.
         /// </summary>
-        /// <value>
-        /// The patterns.
-        /// </value>
         public string[] Patterns { get; set; }
 
         /// <summary>
         /// Gets or sets the ignore case.
         /// </summary>
-        /// <value>
-        /// The ignore case.
-        /// </value>
         public bool? IgnoreCase { get; set; }
     }
 }

src/WireMock.Net/Admin/Mappings/RequestModel.cs

@@ -7,11 +7,19 @@ namespace WireMock.Admin.Mappings
     /// </summary>
     public class RequestModel
     {
+        /// <summary>
+        /// Gets or sets the ClientIP. (Can be a string or a ClientIPModel)
+        /// </summary>
+        /// <value>
+        /// The ClientIP.
+        /// </value>
+        public object ClientIP { get; set; }
+
         /// <summary>
         /// Gets or sets the Path. (Can be a string or a PathModel)
         /// </summary>
         /// <value>
-        /// The URL.
+        /// The Path.
         /// </value>
         public object Path { get; set; }
 

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

@@ -10,73 +10,76 @@ namespace WireMock.Admin.Mappings
         /// <summary>
         /// Gets or sets the HTTP status.
         /// </summary>
-        /// <value>
-        /// The HTTP status.
-        /// </value>
         public int? 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.
         /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
         public string Body { get; set; }
 
         /// <summary>
         /// Gets or sets the body.
         /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
-        public string BodyAsBase64 { get; set; }
+        public string BodyFromBase64 { get; set; }
 
         /// <summary>
         /// Gets or sets the body (as JSON object).
         /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
         public object BodyAsJson { 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>
+        /// Is the body as file cached?
+        /// </summary>
+        public bool? BodyAsFileIsCached { get; set; }
+
         /// <summary>
         /// Gets or sets the body encoding.
         /// </summary>
-        /// <value>
-        /// The body encoding.
-        /// </value>
         public EncodingModel BodyEncoding { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [use transformer].
         /// </summary>
-        /// <value>
-        ///   <c>true</c> if [use transformer]; otherwise, <c>false</c>.
-        /// </value>
         public bool UseTransformer { get; set; }
 
         /// <summary>
         /// Gets or sets the headers.
         /// </summary>
-        /// <value>
-        /// The headers.
-        /// </value>
-        public IDictionary<string, string> Headers { get; set; }
+        public IDictionary<string, object> Headers { get; set; }
 
         /// <summary>
         /// Gets or sets the Headers (Raw).
         /// </summary>
-        /// <value>
-        /// The Headers (Raw).
-        /// </value>
         public string HeadersRaw { get; set; }
 
         /// <summary>
         /// Gets or sets the delay in milliseconds.
         /// </summary>
-        /// <value>
-        /// The delay in milliseconds.
-        /// </value>
         public int? Delay { 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; }
     }
 }

src/WireMock.Net/Admin/Requests/LogEntryModel.cs

@@ -8,51 +8,33 @@ namespace WireMock.Admin.Requests
     public class LogEntryModel
     {
         /// <summary>
-        /// Gets or sets the unique identifier.
-        /// </summary>
-        /// <value>
         /// The unique identifier.
-        /// </value>
+        /// </summary>
         public Guid Guid { get; set; }
 
         /// <summary>
-        /// Gets or sets the request.
-        /// </summary>
-        /// <value>
         /// The request.
-        /// </value>
+        /// </summary>
         public LogRequestModel Request { get; set; }
 
         /// <summary>
-        /// Gets or sets the response.
-        /// </summary>
-        /// <value>
         /// The response.
-        /// </value>
+        /// </summary>
         public LogResponseModel Response { get; set; }
 
         /// <summary>
-        /// Gets or sets the mapping unique identifier.
-        /// </summary>
-        /// <value>
         /// The mapping unique identifier.
-        /// </value>
+        /// </summary>
         public Guid? MappingGuid { get; set; }
 
         /// <summary>
-        /// Gets or sets the mapping unique title.
-        /// </summary>
-        /// <value>
         /// The mapping unique title.
-        /// </value>
+        /// </summary>
         public string MappingTitle { get; set; }
 
         /// <summary>
-        /// Gets or sets the request match result.
-        /// </summary>
-        /// <value>
         /// The request match result.
-        /// </value>
+        /// </summary>
         public LogRequestMatchModel RequestMatchResult { get; set; }
     }
 }

src/WireMock.Net/Admin/Requests/LogRequestMatchModel.cs

@@ -1,4 +1,6 @@
-namespace WireMock.Admin.Requests
+using System.Collections.Generic;
+
+namespace WireMock.Admin.Requests
 {
     /// <summary>
     /// LogRequestMatchModel
@@ -36,5 +38,13 @@
         /// The match percentage.
         /// </value>
         public double AverageTotalScore { get; set; }
+
+        /// <summary>
+        /// Gets the match details.
+        /// </summary>
+        /// <value>
+        /// The match details.
+        /// </value>
+        public IList<object> MatchDetails { get; set; }
     }
 }

src/WireMock.Net/Admin/Requests/LogRequestModel.cs

@@ -11,69 +11,63 @@ namespace WireMock.Admin.Requests
     public class LogRequestModel
     {
         /// <summary>
-        /// Gets the DateTime.
+        /// The Client IP Address.
+        /// </summary>
+        public string ClientIP { get; set; }
+
+        /// <summary>
+        /// The DateTime.
         /// </summary>
         public DateTime DateTime { get; set; }
 
         /// <summary>
-        /// Gets or sets the Path.
-        /// </summary>
-        /// <value>
         /// The Path.
-        /// </value>
+        /// </summary>
         public string Path { get; set; }
 
         /// <summary>
-        /// Gets or sets the absolete URL.
+        ///The absolete URL.
         /// </summary>
-        /// <value>
-        /// The absolute URL.
-        /// </value>
         public string AbsoluteUrl { get; set; }
 
         /// <summary>
-        /// Gets the query.
+        /// The query.
         /// </summary>
         public IDictionary<string, WireMockList<string>> Query { get; set; }
 
         /// <summary>
-        /// Gets or sets the method.
-        /// </summary>
-        /// <value>
         /// The method.
-        /// </value>
+        /// </summary>
         public string Method { get; set; }
 
         /// <summary>
-        /// Gets or sets the Headers.
-        /// </summary>
-        /// <value>
         /// The Headers.
-        /// </value>
-        public IDictionary<string, string> Headers { get; set; }
+        /// </summary>
+        public IDictionary<string, WireMockList<string>> Headers { get; set; }
 
         /// <summary>
-        /// Gets or sets the Cookies.
+        /// Tthe Cookies.
         /// </summary>
-        /// <value>
-        /// The Cookies.
-        /// </value>
         public IDictionary<string, string> Cookies { get; set; }
 
         /// <summary>
-        /// Gets or sets the body.
+        /// The body (as string).
         /// </summary>
-        /// <value>
-        /// The body.
-        /// </value>
         public string Body { get; set; }
 
         /// <summary>
-        /// Gets or sets the body encoding.
+        /// The body (as JSON object).
         /// </summary>
-        /// <value>
+        public object BodyAsJson { get; set; }
+
+        /// <summary>
+        /// The body (as bytearray).
+        /// </summary>
+        public byte[] BodyAsBytes { get; set; }
+
+        /// <summary>
         /// The body encoding.
-        /// </value>
+        /// </summary>
         public EncodingModel BodyEncoding { get; set; }
     }
 }

src/WireMock.Net/Admin/Requests/LogResponseModel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using WireMock.Admin.Mappings;
+using WireMock.Util;
 
 namespace WireMock.Admin.Requests
 {
@@ -16,13 +17,38 @@ namespace WireMock.Admin.Requests
         /// <summary>
         /// Gets the headers.
         /// </summary>
-        public IDictionary<string, string> Headers { get; set; }
+        public IDictionary<string, WireMockList<string>> Headers { get; set; }
 
         /// <summary>
-        /// Gets or sets the body.
+        /// Gets or sets the body destination (SameAsSource, String or Bytes).
+        /// </summary>
+        public string BodyDestination { get; set; }
+
+        /// <summary>
+        /// The body (as string).
         /// </summary>
         public string Body { get; set; }
 
+        /// <summary>
+        /// The body (as JSON object).
+        /// </summary>
+        public object BodyAsJson { get; set; }
+
+        /// <summary>
+        /// The body (as bytearray).
+        /// </summary>
+        public byte[] BodyAsBytes { get; set; }
+
+        /// <summary>
+        /// Gets or sets the body as file.
+        /// </summary>
+        public string BodyAsFile { get; set; }
+
+        /// <summary>
+        /// Is the body as file cached?
+        /// </summary>
+        public bool? BodyAsFileIsCached { get; set; }
+
         /// <summary>
         /// Gets or sets the original body.
         /// </summary>

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

@@ -14,5 +14,15 @@
         /// 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 MaxRequestLog count.
+        /// </summary>
+        public int? MaxRequestLogCount { get; set; }
     }
 }

src/WireMock.Net/Client/IFluentMockServerAdmin.cs

@@ -0,0 +1,162 @@
+using RestEase;
+using System;
+using System.Collections.Generic;
+using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using WireMock.Admin.Mappings;
+using WireMock.Admin.Requests;
+using WireMock.Admin.Settings;
+
+namespace WireMock.Client
+{
+    /// <summary>
+    /// The RestEase interface which defines all admin commands.
+    /// </summary>
+    public interface IFluentMockServerAdmin
+    {
+        /// <summary>
+        /// Authentication header
+        /// </summary>
+        [Header("Authorization")]
+        AuthenticationHeaderValue Authorization { get; set; }
+
+        /// <summary>
+        /// Get the settings.
+        /// </summary>
+        /// <returns>SettingsModel</returns>
+        [Get("__admin/settings")]
+        Task<SettingsModel> GetSettingsAsync();
+
+        /// <summary>
+        /// Update the settings.
+        /// </summary>
+        /// <param name="settings">SettingsModel</param>
+        [Put("__admin/settings")]
+        [Header("Content-Type", "application/json")]
+        Task<string> PutSettingsAsync([Body] SettingsModel settings);
+
+        /// <summary>
+        /// Update the settings
+        /// </summary>
+        /// <param name="settings">SettingsModel</param>
+        [Post("__admin/settings")]
+        [Header("Content-Type", "application/json")]
+        Task<string> PostSettingsAsync([Body] SettingsModel settings);
+
+        /// <summary>
+        /// Get the mappings.
+        /// </summary>
+        /// <returns>MappingModels</returns>
+        [Get("__admin/mappings")]
+        Task<IList<MappingModel>> GetMappingsAsync();
+
+        /// <summary>
+        /// Add a new mapping.
+        /// </summary>
+        /// <param name="mapping">MappingModel</param>
+        [Post("__admin/mappings")]
+        [Header("Content-Type", "application/json")]
+        Task<string> PostMappingAsync([Body] MappingModel mapping);
+
+        /// <summary>
+        /// Delete all mappings.
+        /// </summary>
+        [Delete("__admin/mappings")]
+        Task<string> DeleteMappingsAsync();
+
+        /// <summary>
+        /// Delete (reset) all mappings.
+        /// </summary>
+        [Post("__admin/mappings/reset")]
+        Task<string> ResetMappingsAsync();
+
+        /// <summary>
+        /// Get a mapping based on the guid
+        /// </summary>
+        /// <param name="guid">The Guid</param>
+        /// <returns>MappingModel</returns>
+        [Get("__admin/mappings/{guid}")]
+        Task<MappingModel> GetMappingAsync([Path] Guid guid);
+
+        /// <summary>
+        /// Update a mapping based on the guid
+        /// </summary>
+        /// <param name="guid">The Guid</param>
+        /// <param name="mapping">MappingModel</param>
+        [Put("__admin/mappings/{guid}")]
+        Task<string> PutMappingAsync([Path] Guid guid, [Body] MappingModel mapping);
+
+        /// <summary>
+        /// Delete a mapping based on the guid
+        /// </summary>
+        /// <param name="guid">The Guid</param>
+        [Delete("__admin/mappings/{guid}")]
+        Task<string> DeleteMappingAsync([Path] Guid guid);
+
+        /// <summary>
+        /// Save the mappings
+        /// </summary>
+        [Post("__admin/mappings/save")]
+        Task<string> SaveMappingAsync();
+
+        /// <summary>
+        /// Get the requests.
+        /// </summary>
+        /// <returns>LogRequestModels</returns>
+        [Get("__admin/requests")]
+        Task<IList<LogEntryModel>> GetRequestsAsync();
+
+        /// <summary>
+        /// Delete all requests.
+        /// </summary>
+        [Delete("__admin/requests")]
+        Task<string> DeleteRequestsAsync();
+
+        /// <summary>
+        /// Delete (reset) all requests.
+        /// </summary>
+        [Post("__admin/requests/reset")]
+        Task<string> ResetRequestsAsync();
+
+        /// <summary>
+        /// Get a request based on the guid
+        /// </summary>
+        /// <param name="guid">The Guid</param>
+        /// <returns>MappingModel</returns>
+        [Get("__admin/requests/{guid}")]
+        Task<LogEntryModel> GetRequestAsync([Path] Guid guid);
+
+        /// <summary>
+        /// Delete a request based on the guid
+        /// </summary>
+        /// <param name="guid">The Guid</param>
+        [Delete("__admin/requests/{guid}")]
+        Task<string> DeleteRequestAsync([Path] Guid guid);
+
+        /// <summary>
+        /// Find a request based on the criteria
+        /// </summary>
+        /// <param name="model">The RequestModel</param>
+        [Post("__admin/requests/find")]
+        [Header("Content-Type", "application/json")]
+        Task<IList<LogEntryModel>> FindRequestsAsync([Body] RequestModel model);
+
+        /// <summary>
+        /// Get all scenarios
+        /// </summary>
+        [Get("__admin/scenarios")]
+        Task<string> GetScenariosAsync();
+
+        /// <summary>
+        /// Delete (reset) all scenarios
+        /// </summary>
+        [Delete("__admin/scenarios")]
+        Task<string> DeleteScenariosAsync();
+
+        /// <summary>
+        /// Delete (reset) all scenarios
+        /// </summary>
+        [Post("__admin/scenarios")]
+        Task<string> ResetScenariosAsync();
+    }
+}

src/WireMock.Net/Http/HttpClientHelper.cs

@@ -0,0 +1,147 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
+using WireMock.HttpsCertificate;
+using WireMock.Util;
+using WireMock.Validation;
+
+namespace WireMock.Http
+{
+    internal static class HttpClientHelper
+    {
+        public static HttpClient CreateHttpClient(string clientX509Certificate2ThumbprintOrSubjectName = null)
+        {
+#if NETSTANDARD
+            var handler = new HttpClientHandler
+            {
+                CheckCertificateRevocationList = false,
+                SslProtocols = System.Security.Authentication.SslProtocols.Tls12 | System.Security.Authentication.SslProtocols.Tls11 | System.Security.Authentication.SslProtocols.Tls,
+                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
+                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+            };
+#elif NET46
+            var handler = new HttpClientHandler
+            {
+                ServerCertificateCustomValidationCallback = (message, cert, chain, errors) => true,
+                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+            };
+            ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11;
+#else
+            var handler = new WebRequestHandler
+            {
+                ServerCertificateValidationCallback = (sender, certificate, chain, errors) => true,
+                AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
+            };
+            ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11;
+#endif
+
+            if (!string.IsNullOrEmpty(clientX509Certificate2ThumbprintOrSubjectName))
+            {
+                handler.ClientCertificateOptions = ClientCertificateOption.Manual;
+
+                var x509Certificate2 = ClientCertificateHelper.GetCertificate(clientX509Certificate2ThumbprintOrSubjectName);
+                handler.ClientCertificates.Add(x509Certificate2);
+            }
+
+            // For proxy we shouldn't follow auto redirects
+            handler.AllowAutoRedirect = false;
+
+            // If UseCookies enabled, httpClient ignores Cookie header
+            handler.UseCookies = false;
+
+            var client = new HttpClient(handler);
+#if NET452 || NET46
+            ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12 | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls;
+#endif
+            return client;
+        }
+
+        public static async Task<ResponseMessage> SendAsync([NotNull] HttpClient client, [NotNull] RequestMessage requestMessage, string url)
+        {
+            Check.NotNull(client, nameof(client));
+            Check.NotNull(requestMessage, nameof(requestMessage));
+
+            var originalUri = new Uri(requestMessage.Url);
+            var requiredUri = new Uri(url);
+
+            var httpRequestMessage = new HttpRequestMessage(new HttpMethod(requestMessage.Method), url);
+
+            // Set Body if present
+            if (requestMessage.BodyAsBytes != null)
+            {
+                httpRequestMessage.Content = new ByteArrayContent(requestMessage.BodyAsBytes);
+            }
+            else if (requestMessage.BodyAsJson != null)
+            {
+                httpRequestMessage.Content = new StringContent(JsonConvert.SerializeObject(requestMessage.BodyAsJson), requestMessage.BodyEncoding);
+            }
+            else if (requestMessage.Body != null)
+            {
+                httpRequestMessage.Content = new StringContent(requestMessage.Body, requestMessage.BodyEncoding);
+            }
+
+            // Overwrite the host header
+            httpRequestMessage.Headers.Host = requiredUri.Authority;
+
+            // Set headers if present
+            if (requestMessage.Headers != null)
+            {
+                foreach (var header in requestMessage.Headers.Where(header => !string.Equals(header.Key, "HOST", StringComparison.OrdinalIgnoreCase)))
+                {
+                    // Try to add to request headers. If failed - try to add to content headers
+                    if (!httpRequestMessage.Headers.TryAddWithoutValidation(header.Key, header.Value))
+                    {
+                        httpRequestMessage.Content?.Headers.TryAddWithoutValidation(header.Key, header.Value);
+                    }
+                }
+            }
+
+            // Call the URL
+            var httpResponseMessage = await client.SendAsync(httpRequestMessage, HttpCompletionOption.ResponseContentRead);
+
+            // Create transform response
+            var responseMessage = new ResponseMessage { StatusCode = (int)httpResponseMessage.StatusCode };
+
+            // Set both content and response headers, replacing URLs in values
+            var headers = (httpResponseMessage.Content?.Headers.Union(httpResponseMessage.Headers) ?? Enumerable.Empty<KeyValuePair<string, IEnumerable<string>>>()).ToArray();
+            if (httpResponseMessage.Content != null)
+            {
+                var stream = await httpResponseMessage.Content.ReadAsStreamAsync();
+                IEnumerable<string> contentTypeHeader = null;
+                if (headers.Any(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)))
+                {
+                    contentTypeHeader = headers.First(header => string.Equals(header.Key, HttpKnownHeaderNames.ContentType, StringComparison.OrdinalIgnoreCase)).Value;
+                }
+
+                var body = await BodyParser.Parse(stream, contentTypeHeader?.FirstOrDefault());
+                responseMessage.Body = body.BodyAsString;
+                responseMessage.BodyAsJson = body.BodyAsJson;
+                responseMessage.BodyAsBytes = body.BodyAsBytes;
+            }
+
+            foreach (var header in headers)
+            {
+                // If Location header contains absolute redirect URL, and base URL is one that we proxy to,
+                // we need to replace it to original one.
+                if (string.Equals(header.Key, HttpKnownHeaderNames.Location, StringComparison.OrdinalIgnoreCase)
+                    && Uri.TryCreate(header.Value.First(), UriKind.Absolute, out Uri absoluteLocationUri)
+                    && string.Equals(absoluteLocationUri.Host, requiredUri.Host, StringComparison.OrdinalIgnoreCase))
+                {
+                    var replacedLocationUri = new Uri(originalUri, absoluteLocationUri.PathAndQuery);
+                    responseMessage.AddHeader(header.Key, replacedLocationUri.ToString());
+                }
+                else
+                {
+                    responseMessage.AddHeader(header.Key, header.Value.ToArray());
+                }
+            }
+
+            return responseMessage;
+        }
+    }
+}

src/WireMock.Net/Http/HttpKnownHeaderNames.cs

@@ -0,0 +1,96 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+namespace WireMock.Http
+{
+    /// <summary>
+    /// Copied from https://raw.githubusercontent.com/dotnet/corefx/master/src/Common/src/System/Net/HttpKnownHeaderNames.cs
+    /// </summary>
+    internal static class HttpKnownHeaderNames
+    {
+        public const string Accept = "Accept";
+        public const string AcceptCharset = "Accept-Charset";
+        public const string AcceptEncoding = "Accept-Encoding";
+        public const string AcceptLanguage = "Accept-Language";
+        public const string AcceptPatch = "Accept-Patch";
+        public const string AcceptRanges = "Accept-Ranges";
+        public const string AccessControlAllowCredentials = "Access-Control-Allow-Credentials";
+        public const string AccessControlAllowHeaders = "Access-Control-Allow-Headers";
+        public const string AccessControlAllowMethods = "Access-Control-Allow-Methods";
+        public const string AccessControlAllowOrigin = "Access-Control-Allow-Origin";
+        public const string AccessControlExposeHeaders = "Access-Control-Expose-Headers";
+        public const string AccessControlMaxAge = "Access-Control-Max-Age";
+        public const string Age = "Age";
+        public const string Allow = "Allow";
+        public const string AltSvc = "Alt-Svc";
+        public const string Authorization = "Authorization";
+        public const string CacheControl = "Cache-Control";
+        public const string Connection = "Connection";
+        public const string ContentDisposition = "Content-Disposition";
+        public const string ContentEncoding = "Content-Encoding";
+        public const string ContentLanguage = "Content-Language";
+        public const string ContentLength = "Content-Length";
+        public const string ContentLocation = "Content-Location";
+        public const string ContentMD5 = "Content-MD5";
+        public const string ContentRange = "Content-Range";
+        public const string ContentSecurityPolicy = "Content-Security-Policy";
+        public const string ContentType = "Content-Type";
+        public const string Cookie = "Cookie";
+        public const string Cookie2 = "Cookie2";
+        public const string Date = "Date";
+        public const string ETag = "ETag";
+        public const string Expect = "Expect";
+        public const string Expires = "Expires";
+        public const string From = "From";
+        public const string Host = "Host";
+        public const string IfMatch = "If-Match";
+        public const string IfModifiedSince = "If-Modified-Since";
+        public const string IfNoneMatch = "If-None-Match";
+        public const string IfRange = "If-Range";
+        public const string IfUnmodifiedSince = "If-Unmodified-Since";
+        public const string KeepAlive = "Keep-Alive";
+        public const string LastModified = "Last-Modified";
+        public const string Link = "Link";
+        public const string Location = "Location";
+        public const string MaxForwards = "Max-Forwards";
+        public const string Origin = "Origin";
+        public const string P3P = "P3P";
+        public const string Pragma = "Pragma";
+        public const string ProxyAuthenticate = "Proxy-Authenticate";
+        public const string ProxyAuthorization = "Proxy-Authorization";
+        public const string ProxyConnection = "Proxy-Connection";
+        public const string PublicKeyPins = "Public-Key-Pins";
+        public const string Range = "Range";
+        public const string Referer = "Referer"; // NB: The spelling-mistake "Referer" for "Referrer" must be matched.
+        public const string RetryAfter = "Retry-After";
+        public const string SecWebSocketAccept = "Sec-WebSocket-Accept";
+        public const string SecWebSocketExtensions = "Sec-WebSocket-Extensions";
+        public const string SecWebSocketKey = "Sec-WebSocket-Key";
+        public const string SecWebSocketProtocol = "Sec-WebSocket-Protocol";
+        public const string SecWebSocketVersion = "Sec-WebSocket-Version";
+        public const string Server = "Server";
+        public const string SetCookie = "Set-Cookie";
+        public const string SetCookie2 = "Set-Cookie2";
+        public const string StrictTransportSecurity = "Strict-Transport-Security";
+        public const string TE = "TE";
+        public const string TSV = "TSV";
+        public const string Trailer = "Trailer";
+        public const string TransferEncoding = "Transfer-Encoding";
+        public const string Upgrade = "Upgrade";
+        public const string UpgradeInsecureRequests = "Upgrade-Insecure-Requests";
+        public const string UserAgent = "User-Agent";
+        public const string Vary = "Vary";
+        public const string Via = "Via";
+        public const string WWWAuthenticate = "WWW-Authenticate";
+        public const string Warning = "Warning";
+        public const string XAspNetVersion = "X-AspNet-Version";
+        public const string XContentDuration = "X-Content-Duration";
+        public const string XContentTypeOptions = "X-Content-Type-Options";
+        public const string XFrameOptions = "X-Frame-Options";
+        public const string XMSEdgeRef = "X-MSEdge-Ref";
+        public const string XPoweredBy = "X-Powered-By";
+        public const string XRequestID = "X-Request-ID";
+        public const string XUACompatible = "X-UA-Compatible";
+    }
+}

src/WireMock.Net/Http/HttpListenerRequestMapper.cs

@@ -1,65 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//using System.IO;
-//using System.Linq;
-//using System.Net;
-//using System.Text;
-//#if NET45
-
-//#else
-//using System.Net.Http;
-//#endif
-
-//namespace WireMock.Http
-//{
-//    /// <summary>
-//    /// The http listener request mapper.
-//    /// </summary>
-//    public class HttpListenerRequestMapperOld
-//    {
-//        /// <summary>
-//        /// The map.
-//        /// </summary>
-//        /// <param name="listenerRequest">The listener request.</param>
-//        /// <returns>The <see cref="RequestMessage"/>.</returns>
-//        public RequestMessage MapAsync(HttpListenerRequest listenerRequest)
-//        {
-//            Uri url = listenerRequest.Url;
-//            string verb = listenerRequest.HttpMethod;
-//            byte[] body = GetRequestBody(listenerRequest);
-//            Encoding bodyEncoding = body != null ? listenerRequest.ContentEncoding : null;
-//            string bodyAsString = bodyEncoding?.GetString(body);
-//            var listenerHeaders = listenerRequest.Headers;
-//            var headers = listenerHeaders.AllKeys.ToDictionary(k => k, k => listenerHeaders[k]);
-//            var cookies = new Dictionary<string, string>();
-
-//            foreach (Cookie cookie in listenerRequest.Cookies)
-//                cookies.Add(cookie.Name, cookie.Value);
-
-//            return new RequestMessage(url, verb, body, bodyAsString, bodyEncoding, headers, cookies) { DateTime = DateTime.Now };
-//        }
-
-//        /// <summary>
-//        /// The get request body.
-//        /// </summary>
-//        /// <param name="request">The request.</param>
-//        /// <returns>The <see cref="string"/>.</returns>
-//        private byte[] GetRequestBody(HttpListenerRequest request)
-//        {
-//            if (!request.HasEntityBody)
-//            {
-//                return null;
-//            }
-
-//            using (var bodyStream = request.InputStream)
-//            {
-//                using (var memoryStream = new MemoryStream())
-//                {
-//                    bodyStream.CopyTo(memoryStream);
-
-//                    return memoryStream.ToArray();
-//                }
-//            }
-//        }
-//    }
-//}

src/WireMock.Net/Http/HttpListenerResponseMapper.cs

@@ -1,44 +0,0 @@
-//using System.Linq;
-//using System.Net;
-//using System.Text;
-//#if NET45
-
-//#else
-//using System.Net.Http;
-//#endif
-
-//namespace WireMock.Http
-//{
-//    /// <summary>
-//    /// The http listener response mapper.
-//    /// </summary>
-//    public class HttpListenerResponseMapperOld
-//    {
-//        private readonly Encoding _utf8NoBom = new UTF8Encoding(false);
-
-//        /// <summary>
-//        /// The map.
-//        /// </summary>
-//        /// <param name="responseMessage">
-//        /// The response.
-//        /// </param>
-//        /// <param name="listenerResponse">The listenerResponse.</param>
-//        public void MapAsync(ResponseMessage responseMessage, HttpListenerResponse listenerResponse)
-//        {
-//            listenerResponse.StatusCode = responseMessage.StatusCode;
-
-//            responseMessage.Headers.ToList().ForEach(pair => listenerResponse.AddHeader(pair.Key, pair.Value));
-
-//            if (responseMessage.Body == null)
-//                return;
-
-//            var encoding = responseMessage.BodyEncoding ?? _utf8NoBom;
-//            byte[] buffer = encoding.GetBytes(responseMessage.Body);
-
-//            listenerResponse.ContentEncoding = encoding;
-//            listenerResponse.ContentLength64 = buffer.Length;
-//            listenerResponse.OutputStream.Write(buffer, 0, buffer.Length);
-//            listenerResponse.OutputStream.Flush();
-//        }
-//    }
-//}

src/WireMock.Net/Http/PortUtil.cs

@@ -1,19 +1,19 @@
 using System.Net;
 using System.Net.Sockets;
+using System.Text.RegularExpressions;
 
 namespace WireMock.Http
 {
     /// <summary>
-    /// The ports.
+    /// Port Utility class
     /// </summary>
     public static class PortUtil
     {
+        private static readonly Regex UrlDetailsRegex = new Regex(@"^(?<proto>\w+)://[^/]+?(?<port>\d+)?/", RegexOptions.Compiled);
+
         /// <summary>
-        /// The find free TCP port.
+        /// Finds a free TCP port.
         /// </summary>
-        /// <returns>
-        /// The <see cref="int"/>.
-        /// </returns>
         /// <remarks>see http://stackoverflow.com/questions/138043/find-the-next-tcp-port-in-net.</remarks>
         public static int FindFreeTcpPort()
         {
@@ -30,5 +30,24 @@ namespace WireMock.Http
                 tcpListener?.Stop();
             }
         }
+
+        /// <summary>
+        /// Extract a proto and port from a URL.
+        /// </summary>
+        public static bool TryExtractProtocolAndPort(string url, out string proto, out int port)
+        {
+            proto = null;
+            port = 0;
+
+            Match m = UrlDetailsRegex.Match(url);
+            if (m.Success)
+            {
+                proto = m.Groups["proto"].Value;
+
+                return int.TryParse(m.Groups["port"].Value, out port);
+            }
+
+            return false;
+        }
     }
 }

src/WireMock.Net/Http/TinyHttpServer.cs

@@ -1,117 +0,0 @@
-//using System;
-//using System.Collections.Generic;
-//#if NET45
-//using System.Net;
-//#else
-//using System.Net.Http;
-//#endif
-//using System.Threading;
-//using System.Threading.Tasks;
-//using JetBrains.Annotations;
-//using WireMock.Validation;
-
-//namespace WireMock.Http
-//{
-//    /// <summary>
-//    /// The tiny http server.
-//    /// </summary>
-//    public class TinyHttpServerOld
-//    {
-//        private readonly Action<HttpListenerContext, CancellationToken> _httpHandler;
-
-//        private readonly HttpListener _listener;
-
-//        private readonly CancellationTokenSource _cts;
-
-//        /// <summary>
-//        /// Gets a value indicating whether this server is started.
-//        /// </summary>
-//        /// <value>
-//        /// <c>true</c> if this server is started; otherwise, <c>false</c>.
-//        /// </value>
-//        public bool IsStarted { get; private set; }
-
-//        /// <summary>
-//        /// Gets the url.
-//        /// </summary>
-//        /// <value>
-//        /// The urls.
-//        /// </value>
-//        [PublicAPI]
-//        public List<Uri> Urls { get; } = new List<Uri>();
-
-//        /// <summary>
-//        /// Gets the ports.
-//        /// </summary>
-//        /// <value>
-//        /// The ports.
-//        /// </value>
-//        [PublicAPI]
-//        public List<int> Ports { get; } = new List<int>();
-
-//        /// <summary>
-//        /// Initializes a new instance of the <see cref="TinyHttpServer"/> class.
-//        /// </summary>
-//        /// <param name="uriPrefixes">The uriPrefixes.</param>
-//        /// <param name="httpHandler">The http handler.</param>
-//        public TinyHttpServerOld([NotNull] Action<HttpListenerContext, CancellationToken> httpHandler, [NotNull] params string[] uriPrefixes)
-//        {
-//            Check.NotNull(httpHandler, nameof(httpHandler));
-//            Check.NotEmpty(uriPrefixes, nameof(uriPrefixes));
-
-//            _cts = new CancellationTokenSource();
-
-//            _httpHandler = httpHandler;
-
-//            // Create a listener.
-//            _listener = new HttpListener();
-//            foreach (string uriPrefix in uriPrefixes)
-//            {
-//                var uri = new Uri(uriPrefix);
-//                Urls.Add(uri);
-//                Ports.Add(uri.Port);
-
-//                _listener.Prefixes.Add(uriPrefix);
-//            }
-//        }
-
-//        /// <summary>
-//        /// Start the server.
-//        /// </summary>
-//        [PublicAPI]
-//        public void Start()
-//        {
-//            _listener.Start();
-
-//            IsStarted = true;
-
-//            Task.Run(
-//                async () =>
-//                    {
-//                        //using (_listener)
-//                        {
-//                            while (!_cts.Token.IsCancellationRequested)
-//                            {
-//                                HttpListenerContext context = await _listener.GetContextAsync();
-//                                _httpHandler(context, _cts.Token);
-//                            }
-
-//                            _listener.Stop();
-//                            IsStarted = false;
-//                        }
-//                    },
-//                _cts.Token);
-//        }
-
-//        /// <summary>
-//        /// Stop the server.
-//        /// </summary>
-//        [PublicAPI]
-//        public void Stop()
-//        {
-//            _listener?.Stop();
-
-//            _cts.Cancel();
-//        }
-//    }
-//}

src/WireMock.Net/HttpsCertificate/ClientCertificateHelper.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Security.Cryptography.X509Certificates;
+
+namespace WireMock.HttpsCertificate
+{
+    internal static class ClientCertificateHelper
+    {
+        public static X509Certificate2 GetCertificate(string thumbprintOrSubjectName)
+        {
+            X509Store certStore = new X509Store(StoreName.My, StoreLocation.LocalMachine);
+            try
+            {
+                //Certificate must be in the local machine store
+                certStore.Open(OpenFlags.ReadOnly);
+
+                //Attempt to find by thumbprint first
+                var matchingCertificates = certStore.Certificates.Find(X509FindType.FindByThumbprint, thumbprintOrSubjectName, false);
+                if (matchingCertificates.Count == 0)
+                {
+                    //Fallback to subject name
+                    matchingCertificates = certStore.Certificates.Find(X509FindType.FindBySubjectName, thumbprintOrSubjectName, false);
+                    if (matchingCertificates.Count == 0)
+                    {
+                        // No certificates matched the search criteria.
+                        throw new Exception($"No certificate found with Thumbprint or SubjectName '{thumbprintOrSubjectName}'");
+                    }
+                }
+                // Use the first matching certificate.
+                return matchingCertificates[0];
+            }
+            finally
+            {
+#if NETSTANDARD || NET46
+                certStore.Dispose();
+#else
+                certStore.Close();
+#endif
+            }
+        }
+    }
+}

src/WireMock.Net/HttpsCertificate/PublicCertificateHelper.cs

@@ -0,0 +1,91 @@
+using System;
+using System.Security.Cryptography.X509Certificates;
+
+namespace WireMock.HttpsCertificate
+{
+    internal static class PublicCertificateHelper
+    {
+        // 1] Generate using https://www.pluralsight.com/blog/software-development/selfcert-create-a-self-signed-certificate-interactively-gui-or-programmatically-in-net
+        // 2] Converted to Base64
+        private const string Data = @"MIIQMgIBAzCCD+4GCSqGSIb3DQEHAaCCD98Egg/bMIIP1zCCCogGCSqGSIb3DQEHAaCCCnkEggp1
+MIIKcTCCCm0GCyqGSIb3DQEMCgECoIIJfjCCCXowHAYKKoZIhvcNAQwBAzAOBAi1j9x1jTfUewIC
+B9AEgglYa48lP16+isiGEVT7zwN3XwaPwPOHZcQ7tRA/DA8LZnZbwU7XhtPObF5bZcHn4engX2An
+ISFpe2S5XJ7BfHmsGOO7Bxj6C2IcZIPTefvAd9vWE0WUAGN11SLhJ3fB/ZRt3Nys7JCJzywQCkYK
+dCA35V7WfETCLT6+ArtRU4qsjop2YXyUzcLw3OuumBAoRsazgUKz8rkZJbifkSikbdxs+Hupcf2I
+NOOuKStKoqouqCO/vmRi8u8g0KQhf2LcQBSqLk6OZ8TQuv07W5tVO2Ky5qCYu6aXBBlHhGSY9fGL
+vqaYcxMcVJQpXUUL6nSWCoaLdaAAB+Anw1Tpbd47W7ieTK5Yq2IROPQIr1mk8nvFbxoTcBuIQ6oU
+RiiLX+mb3hYgbTL3LqDmmm9FFI8enJu6pUxP8iKKROtCqhYXhF1i3EwReBzJzpDGZ+y4rJxb0Es4
+sPVc/TaVPSJCTmgcKzwps7M12uxm8G9Dv3lKgZVmgDRivovCJFxHdCdgCYB08FvNWuFtXO+schsE
+N0nY2i07A2joaJC18yvoNGZ+ySBTBPOBN+5XbiQs0vsQ4MfLETb2O2dFjwE/tErgo6RWYg2qQNAe
+DSh2wHzI0YJM3PqaUR0Q9KnjEWc92hsLI34KnuNkNkVk4NEjPOetxeIBcYN7CDD6tTxp42sU++bT
+o9zyjy1BPS+LuEblxDTSlVPb0dxvkwNBXBi0RXIOWfD15BWcV1Uv972jB6To1XPDIOc+eq7fa5yn
+HRW/GYdGPmOYKietdw6V3t2Et9cPlw4v08IelucF06Ju2a73QtidtkA89vxjn7qOEVACAXpsiMsM
+4JCcAzF7jh0U2mskSB14I9HcZh1Sei0J2ZULcXNyuIw9nsWp8vrH04OOoUDe7/UpX7c8+A+tqDUy
+1W2V1dJDhlwu2SXL5jJFBK4P9p2e+XyHJ+AcYXrHQIKxqoCgvnywT4HnI2bvZ1+lmIR99mp1Cvzj
+RUgJaqhI7u6WH3i6fmkA92hF8MP5WDYTGwjsHPrCg6Xkqykuvub4osu+gLq5t+JC9rOczgrRNYXg
+54FMzlCyQxTfgY6IRwPH/xYHKGbViFF+jA4ksLMRjI2XOV4swbI232SxMoQQDNsjx1la2nZM3P5z
+g7zpmaiyzY44q3kU1viMMR7qM/w1S6nTW0ZkzTXk8Gttor/0JWT1K8KgwK02B6Q9zNwfK60a0cQm
+SbA/dXkWapuIzQLz+ZUPyG/1EP5KuKNnsp0hfVi8TTgOFceoV9kyIhrTQNI0o5O91dqkyWd/bMl2
+OnrnRnhka6f839zJKUpWPTfRX9RMJTk/5HVcL/qsHYcJedZyPawJjMU+cxW1ZZjr1Lo6M0fjKuTI
+Askg0ZKS0FJ60jTKnc1DmldQLtieHh1UTdty+yn1A0rGnrFEyN7if2/d1EduWJaf6bvWzfH+d/36
+1gDwp4OXi0qWu7c5zByGZi2j2sFo4v0cGgjPZUJvF5z0V8OkE15DiA4xtTSkIjCnEmOhODViwrfc
+ONvHB+inBW9wLp26qFgNcYrYxP2FC54pPCxO+KJaAJrtfE3A4lkboB7V0xFu23ecOy4n2gho39tg
+Bxkt1Xj3GCLgeKvcYLzOPytZldXDTtoCcsm5uhCmBHEmPUsnLc7Tt1cFflFtWTOjtyv0Lk8Qu2BU
+B/hSSgjZRpqE+hzjtghjXdFOT5wKULvtUz5eu+lH7kjGghQbF962vLcRCsr+tMPba6MFqhy5Q+dM
+NcHc+HIx2WiuRZ6jdCZSUpH3f1+kH6XYj2P3/F0kLBRAMPGKbXpIi9Px4AVDEDClL77mDpVgeEoh
+kkVh5zvk2PsEPonmTFK0kQE8Q4cYFWTKa9lAE4Wc35EzvpKFdTwQKhr5kN7tEq17n5wJt/499164
+ho0+LjzYy62JI/fv3RPISL0gXr2INLW7fgZ5KNjcnu/AITJu3ycw/XH8BKsx4dcbBgBdrKY8afEn
+IZ1EIv/TuNvmifmAEGX/DWuVmZIOU6pTystzTQwfz0wko3lUKjkPM40RLN9o6lddV6fM3QNtK0ac
+hqOOmG68LzI1U33nvUBol/FeEV0DLvGjvsIRC/TCtDu5Vk2tKS13p9kNj4owJK8d343PZ/eyi/Oe
+sNZCCJJuj4iIodekm1hzj7zc6ZLNudgab/WkF7TbWDOhDPwG1gE/McffGNWPFlwsaopoZaH8E8tl
+QSOnHqAiNa7B3ifxMrGDWHDlxkWddClbKd9ujL4mgB88Wo8JceLawDOcSVGImvWGxsrK2RX7FK57
+GQYuc0zcq3NH4jpoOyS+vpMeigTPDOvQdqjGgEUW3aXdA8Ma0KYVEyAhK/rFXw8FelGREM2ku1kN
+kziOTAe52SWqcrv6NUPfo1/Uc6u7KpwQrcDlFZWxPCKomeRQTm6AmP2QHMgl2gaUbmuBF/C9Ccl2
+1Iqh8vUdDT3lHdf5I5SjRPJJXX2/0/oUFmwIC5AFp8/XXnIG05BER1X2Y+SL15QHW7lYsvd4ZKTv
+tvYaZNWajgAVZl8gJYFUQG+U+cFYcpHhf6SGzcuwcmQJGxptZAVnRtDzNjJ04vJB616/uoI2Qkp2
+ysGAjDNlwgeckmU7TSYoYaML29pRupTTQqKItyFDuebUpSKBTxsEFIJBCTErA8TD8I9T5nzT+rTy
++Lpp9mqcxQR1RhxgTx5bE7D4igdblobX0IONARg4EIAk8xj1Ba3k4skdjAQcJOHKd+xVo+vsrIqg
+a+ycemROE5F3D3s21ozMOn1Dy8iIeQusJQTSkP82+wHYWXRg59N0cq/40CaJskK+yp7afOWFoCqY
+T/D9OGlfeIIiLivwMh8naPZyM4+pd/CFZwcWoGtIno04nWWR/xQVe17jqPMov1xonC2E3AcKxUXl
+PMdZoOARkR+KHZnoBZ/vjqxeDPARKupijkw5QQI3jNmd5IELjcL8OraHlo+e884mRsa/66J7p94D
+bidzjiVLUhCsZnVks9eZF6PIEg49eq/+w8ph3X7XBNnZYAbgola/0yy/PlPzgJ3p/AgXMoGr+HXO
+p2WAs1WRo9mAdeOBMrAMvXKFD04bZPNHke0Ri03O5U7NRRs1T0LnqdZHyF39As8FiktfJl1bn/U0
+sUjhc4fDNnDaBN8VF8VsEa7UolRC6NqQ1oHaeEZRoq0li6NbXIXdxIIT4bbqwajqFkvvO6qc6SEG
+iAlUzTGB2zATBgkqhkiG9w0BCRUxBgQEAQAAADBXBgkqhkiG9w0BCRQxSh5IADcAOAA1ADAAZABj
+ADAAYwAtAGIAZQBmAGIALQA0AGEANQBiAC0AOAA5ADcAMAAtAGIAZAA5ADkAOQAxADEAOQA2AGIA
+YgA1MGsGCSsGAQQBgjcRATFeHlwATQBpAGMAcgBvAHMAbwBmAHQAIABFAG4AaABhAG4AYwBlAGQA
+IABDAHIAeQBwAHQAbwBnAHIAYQBwAGgAaQBjACAAUAByAG8AdgBpAGQAZQByACAAdgAxAC4AMDCC
+BUcGCSqGSIb3DQEHBqCCBTgwggU0AgEAMIIFLQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQMwDgQI
+Amt1zAZpKWkCAgfQgIIFAJoBLiXPEZGuUfsyM2ed66sBIirBctHbhyydZsQDT8V2crq6AI3P0dBT
+Agf/MouK/JcAfdGEEpU6SKxqZBDZoTRbyK7VdW5YiKGUurFGf66L9K3c4MHhVLMWnSkwK+0gwiIB
+RB82Or4ru0cSQbF32vsuJgJY9Ax4YODKokPFUzZjPrmch4AgZWKxslDFDq4xs3tpLIeZbALWYdrR
+PUZaReO+NaLfNKwTZsinzjPkCst7R1Jfjf1abikPrOMPgYFUiQL7GNQFbefeJu9SCXlj09u/qw+l
+uLrwEyMamG0cgjrWbMOohGtvAuHqeZIIWuLnGE2quq7Ah/U55lliZn3IFgs1n6FalW/XGH0T0aRA
+im6f1EgxtJShBNdG6qNrkzYMyY2Xvpk82qtmvMbhJMDstpovsdT1rZ6OGfsyJAlG94BcCWC2wuvW
+MYs6H7AirBG/iocNm7JwSBQ7wjl0keH9vuHDQsI+uu9yWGuyZK6MmxDEOEMZRndU0GrlLIp7zQx8
+gPeagKqSHhPK0ghHhDilMyToE3Euvi5jneh90eofWK6E4E8KtQTWvFeCe9fYRhMaflH9lwfHfXPo
+9J+7GZLRF/MDTlE8jzWoP5csUxV3jnXQkTUOfHvO7QK6POKwLGkCyZ5wKFydyYdTekG+KU2Vml2y
+s6pZ+kME1VMYiHRF3CaXX1ZYKikEdnuB1Qp8BE2uKQTaYO4Wns0vQIVRWTrk/Gp5RXu1ihzoTiFb
+YqLFROQTM+dVTUk3C6W82OroNwofW5ErZwpbdgJJ83gbPLr9W4KZ6YegvEWFT1MawnIYDC6RSKtg
+fI1blSZOo1SIF6+nR0gFPivSEGBJHclIg7TtvGSB1q7TQFS4W5l+AHdgGPqqURnjuJ7/DVFZHqEV
+jJM1QEvH/RY1rDXP8FZC6CZR/Le7tVm5o8bHnlU4gyStvNyLXHCP6o3gHmaBcfYmqJr/0ZEKnwnd
+MBmdIgwQ3+JnKvjAeDe8Z/l0U03CbzeyN3TgUolDlUGVDF2FdPZqrVsLKw6VJv3hoFZmgEbb1fDq
+Jblc82lrYIEW8E7ltRLDyNDmRdyaqkqw0e7SygXXxv6SKerxoJ5E1NyJdHeQXSahRrsj5UZpxlTE
+ylb3upIF0F006w2D5J7xUDktPetVgM97dN3whbOrzWPPkn5CTZMaUdYGTYQK3/K/jQSKuXcaM04A
+EWmcQOQ/5Quco/aMYWTTwFI9+bKZayZKHqQjNKuwss+iWTW2b26cA2XAr2XWCL9PEybVRK/5n4km
+5qkGIMjjczZxNy1+H1QoEOwkGVzQd390ktQajJBFcf9wBO+Ar14EgPKvdL4DRvCvXOK3CtrgbAq6
+GK7uULRrz9t/5lu27ba5wcwxg6bFhgCsJsoSCJnLCR7H+QMB4LhnWA10U4hFWCamCKFoGkiXW6yV
+OF4x+0D0MmrjrrAGi05KzfrsXNtRG0xbkmvrsjqzmsOKyjvtiBCrR0S6NUtKhyxoiz5bCCm+d8rm
+jaPk9q01k52pjJAKYW0f+5+r15LamBecnjXtJ07LCl6cMA1Cj4L0mQUSefyFi666GC3TmhzHwhnj
+SV64nTApS0gBsc6c18fUBsMcUj5nCNclIzfxwnARd/30yg22r09nUY2gtQTwk/W6VCpAH+7yZkH1
+TLNGa+UmMnPsnBjlAJ6l9VPsa4uJM2DIQKtZXWq4DkhSAYKF6joIP7nKMDswHzAHBgUrDgMCGgQU
+wTM1Z+CJZG9xAcf1zAVGl4ggYyYEFGBFyJ8VBwijS2zy1qwN1WYGtcWoAgIH0A==
+";
+
+        public static X509Certificate2 GetX509Certificate2()
+        {
+            byte[] data = Convert.FromBase64String(Data);
+            return new X509Certificate2(data);
+        }
+    }
+}

src/WireMock.Net/IResponseProvider.cs

@@ -1,21 +0,0 @@
-using System.Threading.Tasks;
-
-namespace WireMock
-{
-    /// <summary>
-    /// The Response Provider interface.
-    /// </summary>
-    public interface IResponseProvider
-    {
-        /// <summary>
-        /// The provide response.
-        /// </summary>
-        /// <param name="requestMessage">
-        /// The request.
-        /// </param>
-        /// <returns>
-        /// The <see cref="Task"/>.
-        /// </returns>
-        Task<ResponseMessage> ProvideResponse(RequestMessage requestMessage);
-    }
-}

src/WireMock.Net/Logging/IWireMockLogger.cs

@@ -0,0 +1,47 @@
+using JetBrains.Annotations;
+
+namespace WireMock.Logging
+{
+    /// <summary>
+    /// IWireMockLogger interface
+    /// </summary>
+    [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([NotNull] string formatString, [NotNull] 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([NotNull] string formatString, [NotNull] 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([NotNull] string formatString, [NotNull] 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([NotNull] string formatString, [NotNull] params object[] args);
+    }
+}

src/WireMock.Net/Logging/WireMockConsoleLogger.cs

@@ -0,0 +1,42 @@
+using System;
+
+namespace WireMock.Logging
+{
+    /// <summary>
+    /// WireMockConsoleLogger which logs to Console
+    /// </summary>
+    /// <seealso cref="IWireMockLogger" />
+    public class WireMockConsoleLogger : IWireMockLogger
+    {
+        /// <see cref="IWireMockLogger.Debug"/>
+        public void Debug(string formatString, params object[] args)
+        {
+            Console.WriteLine(Format("Debug", formatString, args));
+        }
+
+        /// <see cref="IWireMockLogger.Info"/>
+        public void Info(string formatString, params object[] args)
+        {
+            Console.WriteLine(Format("Info", formatString, args));
+        }
+
+        /// <see cref="IWireMockLogger.Warn"/>
+        public void Warn(string formatString, params object[] args)
+        {
+            Console.WriteLine(Format("Warn", formatString, args));
+        }
+
+        /// <see cref="IWireMockLogger.Error"/>
+        public void Error(string formatString, params object[] args)
+        {
+            Console.WriteLine(Format("Error", formatString, args));
+        }
+
+        private static string Format(string level, string formatString, params object[] args)
+        {
+            string message = string.Format(formatString, args);
+
+            return $"{DateTime.UtcNow} [{level}] : {message}";
+        }
+    }
+}

src/WireMock.Net/Logging/WireMockNullLogger.cs

@@ -0,0 +1,29 @@
+namespace WireMock.Logging
+{
+    /// <summary>
+    /// WireMockNullLogger which does not log.
+    /// </summary>
+    /// <seealso cref="IWireMockLogger" />
+    public class WireMockNullLogger : IWireMockLogger
+    {
+        /// <see cref="IWireMockLogger.Debug"/>
+        public void Debug(string formatString, params object[] args)
+        {
+        }
+
+        /// <see cref="IWireMockLogger.Info"/>
+        public void Info(string formatString, params object[] args)
+        {
+        }
+
+        /// <see cref="IWireMockLogger.Warn"/>
+        public void Warn(string formatString, params object[] args)
+        {
+        }
+
+        /// <see cref="IWireMockLogger.Error"/>
+        public void Error(string formatString, params object[] args)
+        {
+        }
+    }
+}

src/WireMock.Net/Mapping.cs

@@ -1,96 +1,140 @@
-using System;
-using System.Threading.Tasks;
-using JetBrains.Annotations;
-using WireMock.Matchers.Request;
-
-namespace WireMock
-{
-    /// <summary>
-    /// The Mapping.
-    /// </summary>
-    public class Mapping
-    {
-        /// <summary>
-        /// Gets the unique identifier.
-        /// </summary>
-        /// <value>
-        /// The unique identifier.
-        /// </value>
-        public Guid Guid { get; }
-
-        /// <summary>
-        /// Gets the unique title.
-        /// </summary>
-        /// <value>
-        /// The unique title.
-        /// </value>
-        public string Title { get; }
-
-        /// <summary>
-        /// Gets the priority.
-        /// </summary>
-        /// <value>
-        /// The priority.
-        /// </value>
-        public int Priority { get; }
-
-        /// <summary>
-        /// The Request matcher.
-        /// </summary>
-        public IRequestMatcher RequestMatcher { get; }
-
-        /// <summary>
-        /// The Provider.
-        /// </summary>
-        public IResponseProvider Provider { get; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Mapping"/> class.
-        /// </summary>
-        /// <param name="guid">The unique identifier.</param>
-        /// <param name="title">The unique title (can be null_.</param>
-        /// <param name="requestMatcher">The request matcher.</param>
-        /// <param name="provider">The provider.</param>
-        /// <param name="priority">The priority for this mapping.</param>
-        public Mapping(Guid guid, [CanBeNull] string title, IRequestMatcher requestMatcher, IResponseProvider provider, int priority)
-        {
-            Priority = priority;
-            Guid = guid;
-            Title = title;
-            RequestMatcher = requestMatcher;
-            Provider = provider;
-        }
-
-        /// <summary>
-        /// The response to.
-        /// </summary>
-        /// <param name="requestMessage">The request message.</param>
-        /// <returns>The <see cref="Task"/>.</returns>
-        public async Task<ResponseMessage> ResponseTo(RequestMessage requestMessage)
-        {
-            return await Provider.ProvideResponse(requestMessage);
-        }
-
-        /// <summary>
-        /// Determines whether the RequestMessage is handled.
-        /// </summary>
-        /// <param name="requestMessage">The request message.</param>
-        /// <returns>The <see cref="RequestMatchResult"/>.</returns>
-        public RequestMatchResult IsRequestHandled(RequestMessage requestMessage)
-        {
-            var result = new RequestMatchResult();
-
-            RequestMatcher.GetMatchingScore(requestMessage, result);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this mapping is an Admin Interface.
-        /// </summary>
-        /// <value>
-        /// <c>true</c> if this mapping is an Admin Interface; otherwise, <c>false</c>.
-        /// </value>
-        public bool IsAdminInterface => Provider is DynamicResponseProvider;
-    }
+using System;
+using System.Threading.Tasks;
+using JetBrains.Annotations;
+using WireMock.Matchers.Request;
+using WireMock.ResponseProviders;
+
+namespace WireMock
+{
+    /// <summary>
+    /// The Mapping.
+    /// </summary>
+    public class Mapping
+    {
+        /// <summary>
+        /// Gets the unique identifier.
+        /// </summary>
+        public Guid Guid { get; }
+
+        /// <summary>
+        /// Gets the unique title.
+        /// </summary>
+        public string Title { get; }
+
+        /// <summary>
+        /// The full filename path for this mapping (only defined for static mappings).
+        /// </summary>
+        public string Path { get; set; }
+
+        /// <summary>
+        /// Gets the priority.
+        /// </summary>
+        public int Priority { get; }
+
+        /// <summary>
+        /// Scenario.
+        /// </summary>
+        [CanBeNull]
+        public string Scenario { get; }
+
+        /// <summary>
+        /// Execution state condition for the current mapping.
+        /// </summary>
+        [CanBeNull]
+        public object ExecutionConditionState { get; }
+
+        /// <summary>
+        /// The next state which will be signaled after the current mapping execution.
+        /// In case the value is null state will not be changed.
+        /// </summary>
+        [CanBeNull]
+        public object NextState { get; }
+
+        /// <summary>
+        /// The Request matcher.
+        /// </summary>
+        public IRequestMatcher RequestMatcher { get; }
+
+        /// <summary>
+        /// The Provider.
+        /// </summary>
+        public IResponseProvider Provider { get; }
+
+        /// <summary>
+        /// Is State started ?
+        /// </summary>
+        public bool IsStartState => Scenario == null || Scenario != null && NextState != null && ExecutionConditionState == null;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Mapping"/> class.
+        /// </summary>
+        /// <param name="guid">The unique identifier.</param>
+        /// <param name="title">The unique title (can be null).</param>
+        /// <param name="path">The full file path from this mapping title (can be null).</param>
+        /// <param name="requestMatcher">The request matcher.</param>
+        /// <param name="provider">The provider.</param>
+        /// <param name="priority">The priority for this mapping.</param>
+        /// <param name="scenario">The scenario. [Optional]</param>
+        /// <param name="executionConditionState">State in which the current mapping can occur. [Optional]</param>
+        /// <param name="nextState">The next state which will occur after the current mapping execution. [Optional]</param>
+        public Mapping(Guid guid, [CanBeNull] string title, [CanBeNull] string path, IRequestMatcher requestMatcher, IResponseProvider provider, int priority, [CanBeNull] string scenario, [CanBeNull] object executionConditionState, [CanBeNull] object nextState)
+        {
+            Guid = guid;
+            Title = title;
+            Path = path;
+            RequestMatcher = requestMatcher;
+            Provider = provider;
+            Priority = priority;
+            Scenario = scenario;
+            ExecutionConditionState = executionConditionState;
+            NextState = nextState;
+        }
+
+        /// <summary>
+        /// The response to.
+        /// </summary>
+        /// <param name="requestMessage">The request message.</param>
+        /// <returns>The <see cref="ResponseMessage"/>.</returns>
+        public async Task<ResponseMessage> ResponseToAsync(RequestMessage requestMessage)
+        {
+            return await Provider.ProvideResponseAsync(requestMessage);
+        }
+
+        /// <summary>
+        /// Gets the RequestMatchResult based on the RequestMessage.
+        /// </summary>
+        /// <param name="requestMessage">The request message.</param>
+        /// <param name="nextState">The Next State.</param>
+        /// <returns>The <see cref="RequestMatchResult"/>.</returns>
+        public RequestMatchResult GetRequestMatchResult(RequestMessage requestMessage, [CanBeNull] object nextState)
+        {
+            var result = new RequestMatchResult();
+
+            RequestMatcher.GetMatchingScore(requestMessage, result);
+
+            // Only check state if Scenario is defined
+            if (Scenario != null)
+            {
+                var matcher = new RequestMessageScenarioAndStateMatcher(nextState, ExecutionConditionState);
+                matcher.GetMatchingScore(requestMessage, result);
+                //// If ExecutionConditionState is null, this means that request is the start from a scenario. So just return.
+                //if (ExecutionConditionState != null)
+                //{
+                //    // ExecutionConditionState is not null, so get score for matching with the nextState.
+                //    var matcher = new RequestMessageScenarioAndStateMatcher(nextState, ExecutionConditionState);
+                //    matcher.GetMatchingScore(requestMessage, result);
+                //}
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this mapping is an Admin Interface.
+        /// </summary>
+        /// <value>
+        /// <c>true</c> if this mapping is an Admin Interface; otherwise, <c>false</c>.
+        /// </value>
+        public bool IsAdminInterface => Provider is DynamicResponseProvider || Provider is DynamicAsyncResponseProvider || Provider is ProxyAsyncResponseProvider;
+    }
 }

src/WireMock.Net/MappingRegistrationCallback.cs

@@ -3,8 +3,6 @@
     /// <summary>
     /// The registration callback.
     /// </summary>
-    /// <param name="mapping">
-    /// The route.
-    /// </param>
+    /// <param name="mapping">The mapping.</param>
     public delegate void RegistrationCallback(Mapping mapping);
 }

src/WireMock.Net/Matchers/ExactMatcher.cs

@@ -7,8 +7,8 @@ namespace WireMock.Matchers
     /// <summary>
     /// ExactMatcher
     /// </summary>
-    /// <seealso cref="IMatcher" />
-    public class ExactMatcher : IMatcher
+    /// <seealso cref="IStringMatcher" />
+    public class ExactMatcher : IStringMatcher
     {
         private readonly string[] _values;
 
@@ -18,34 +18,24 @@ namespace WireMock.Matchers
         /// <param name="values">The values.</param>
         public ExactMatcher([NotNull] params string[] values)
         {
-            Check.NotNull(values, nameof(values));
+            Check.HasNoNulls(values, nameof(values));
 
             _values = values;
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             return MatchScores.ToScore(_values.Select(value => value.Equals(input)));
         }
 
-        /// <summary>
-        /// Gets the value.
-        /// </summary>
-        /// <returns>Patterns</returns>
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public string[] GetPatterns()
         {
             return _values;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>Name</returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public string GetName()
         {
             return "ExactMatcher";

src/WireMock.Net/Matchers/ExactObjectMatcher.cs

@@ -0,0 +1,46 @@
+using System.Linq;
+using JetBrains.Annotations;
+
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// ExactMatcher
+    /// </summary>
+    /// <seealso cref="IObjectMatcher" />
+    public class ExactObjectMatcher : IObjectMatcher
+    {
+        private readonly object _object;
+        private readonly byte[] _bytes;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public ExactObjectMatcher([NotNull] object value)
+        {
+            _object = value;
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+        /// </summary>
+        /// <param name="value">The value.</param>
+        public ExactObjectMatcher([NotNull] byte[] value)
+        {
+            _bytes = value;
+        }
+
+        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+        public double IsMatch(object input)
+        {
+            bool equals = _object != null ? Equals(_object, input) : _bytes.SequenceEqual((byte[])input);
+            return MatchScores.ToScore(equals);
+        }
+
+        /// <inheritdoc cref="IMatcher.GetName"/>
+        public string GetName()
+        {
+            return "ExactObjectMatcher";
+        }
+    }
+}

src/WireMock.Net/Matchers/IIgnoreCaseMatcher.cs

@@ -0,0 +1,13 @@
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// IIgnoreCaseMatcher
+    /// </summary>
+    public interface IIgnoreCaseMatcher : IMatcher
+    {
+        /// <summary>
+        /// Ignore the case.
+        /// </summary>
+        bool IgnoreCase { get; }
+    }
+}

src/WireMock.Net/Matchers/IMatcher.cs

@@ -5,19 +5,6 @@
     /// </summary>
     public interface IMatcher
     {
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input.</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
-        double IsMatch(string input);
-
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Patterns</returns>
-        string[] GetPatterns();
-
         /// <summary>
         /// Gets the name.
         /// </summary>

src/WireMock.Net/Matchers/IObjectMatcher.cs

@@ -0,0 +1,15 @@
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// IObjectMatcher
+    /// </summary>
+    public interface IObjectMatcher : IMatcher
+    {
+        /// <summary>
+        /// Determines whether the specified input is match.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        double IsMatch(object input);
+    }
+}

src/WireMock.Net/Matchers/IStringMatcher.cs

@@ -0,0 +1,21 @@
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// IStringMatcher
+    /// </summary>
+    public interface IStringMatcher : IMatcher
+    {
+        /// <summary>
+        /// Determines whether the specified input is match.
+        /// </summary>
+        /// <param name="input">The input.</param>
+        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        double IsMatch(string input);
+
+        /// <summary>
+        /// Gets the patterns.
+        /// </summary>
+        /// <returns>Patterns</returns>
+        string[] GetPatterns();
+    }
+}

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -10,8 +10,9 @@ namespace WireMock.Matchers
     /// JSONPathMatcher
     /// </summary>
     /// <seealso cref="IMatcher" />
-    public class JsonPathMatcher : IMatcher
+    public class JsonPathMatcher : IStringMatcher, IObjectMatcher
     {
+        // private readonly object _jsonPattern;
         private readonly string[] _patterns;
 
         /// <summary>
@@ -25,15 +26,20 @@ namespace WireMock.Matchers
             _patterns = patterns;
         }
 
-        /// <summary>
-        /// Determines whether the specified input is match.
-        /// </summary>
-        /// <param name="input">The input string</param>
-        /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
+        //public JsonPathMatcher([NotNull] object jsonPattern)
+        //{
+        //    Check.NotNull(jsonPattern, nameof(jsonPattern));
+
+        //    _jsonPattern = jsonPattern;
+        //}
+
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
         public double IsMatch(string input)
         {
             if (input == null)
+            {
                 return MatchScores.Mismatch;
+            }
 
             try
             {
@@ -47,19 +53,33 @@ namespace WireMock.Matchers
             }
         }
 
-        /// <summary>
-        /// Gets the patterns.
-        /// </summary>
-        /// <returns>Pattern</returns>
+        /// <inheritdoc cref="IObjectMatcher.IsMatch"/>
+        public double IsMatch(object input)
+        {
+            if (input == null)
+            {
+                return MatchScores.Mismatch;
+            }
+
+            try
+            {
+                var o = input as JObject ?? JObject.FromObject(input);
+
+                return MatchScores.ToScore(_patterns.Select(p => o.SelectToken(p) != null));
+            }
+            catch (Exception)
+            {
+                return MatchScores.Mismatch;
+            }
+        }
+
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
         public string[] GetPatterns()
         {
             return _patterns;
         }
 
-        /// <summary>
-        /// Gets the name.
-        /// </summary>
-        /// <returns>Name</returns>
+        /// <inheritdoc cref="IMatcher.GetName"/>
         public string GetName()
         {
             return "JsonPathMatcher";

src/WireMock.Net/Matchers/MatchScores.cs

@@ -23,6 +23,11 @@ namespace WireMock.Matchers
         /// </summary>
         public const double Perfect = 1.0;
 
+        /// <summary>
+        /// The almost perfect match score
+        /// </summary>
+        public const double AlmostPerfect = 0.99;
+
         /// <summary>
         /// Convert a bool to the score.
         /// </summary>
@@ -37,22 +42,20 @@ namespace WireMock.Matchers
         /// Calculates the score from multiple funcs.
         /// </summary>
         /// <param name="values">The values.</param>
-        /// <returns>score</returns>
+        /// <returns>average score</returns>
         public static double ToScore(IEnumerable<bool> values)
         {
-            var list = values.Select(ToScore).ToList();
-            return list.Sum() / list.Count;
+            return values.Any() ? values.Select(ToScore).Average() : Mismatch;
         }
 
         /// <summary>
         /// Calculates the score from multiple funcs.
         /// </summary>
         /// <param name="values">The values.</param>
-        /// <returns>score</returns>
+        /// <returns>average score</returns>
         public static double ToScore(IEnumerable<double> values)
         {
-            var list = values.ToList();
-            return list.Sum() / list.Count;
+            return values.Any() ? values.Average() : Mismatch;
         }
     }
 }