1.2.12

* wip

* ByteArrayContentHelper

* ByteArrayContentHelperTests

CHANGELOG.md

@@ -1,3 +1,32 @@
+# 1.2.12.0 (23 May 2020)
+- [#472](https://github.com/WireMock-Net/WireMock.Net/pull/472) - Create new .sln contributed by [StefH](https://github.com/StefH)
+- [#473](https://github.com/WireMock-Net/WireMock.Net/pull/473) - Fixed Proxy when using MultipartForm with byte[] [bug] contributed by [StefH](https://github.com/StefH)
+- [#468](https://github.com/WireMock-Net/WireMock.Net/issues/468) - Proxy mode: Incorrect handling of multipart requests [bug]
+
+# 1.2.11.0 (18 May 2020)
+- [#469](https://github.com/WireMock-Net/WireMock.Net/pull/469) - Fix unhandled exception when target is unavailable [bug] contributed by [StefH](https://github.com/StefH)
+- [#467](https://github.com/WireMock-Net/WireMock.Net/issues/467) - Proxy mode: Unhandled exception when target is not working [bug]
+
+# 1.2.10 (17 May 2020)
+- [#456](https://github.com/WireMock-Net/WireMock.Net/pull/456) - Include Handlebars.Net.Helpers project [feature] contributed by [StefH](https://github.com/StefH)
+- [#457](https://github.com/WireMock-Net/WireMock.Net/pull/457) - Kestrel Options Limits [bug] contributed by [StefH](https://github.com/StefH)
+- [#455](https://github.com/WireMock-Net/WireMock.Net/issues/455) - There is no option to increase body size while proxying [bug]
+
+# 1.2.9.0 (14 May 2020)
+- [#465](https://github.com/WireMock-Net/WireMock.Net/pull/465) - Fix method ResetMappingsAsync in the RestEase-AdminApi [bug] contributed by [StefH](https://github.com/StefH)
+- [#464](https://github.com/WireMock-Net/WireMock.Net/issues/464) - RestClient Admin API Metadata Base Path Duplication [bug]
+
+# 1.2.8.0 (04 May 2020)
+- [#463](https://github.com/WireMock-Net/WireMock.Net/pull/463) - GH161: Fix SourceLink support [bug] contributed by [gitfool](https://github.com/gitfool)
+
+# 1.2.7.0 (30 April 2020)
+- [#461](https://github.com/WireMock-Net/WireMock.Net/pull/461) - Support Path in ProxyUrl contributed by [StefH](https://github.com/StefH)
+- [#459](https://github.com/WireMock-Net/WireMock.Net/issues/459) - When respond with proxy requestMessage.Url is used, not AbsoluteUrl [bug]
+
+# 1.2.6.0 (29 April 2020)
+- [#460](https://github.com/WireMock-Net/WireMock.Net/pull/460) - When using ResponseMessageTransformer : keep BodyEncoding [bug] contributed by [StefH](https://github.com/StefH)
+- [#458](https://github.com/WireMock-Net/WireMock.Net/issues/458) - Response BodyAsString loses BodyData.Encoding when UseTransformer = true [bug]
+
 # 1.2.5.0 (17 April 2020)
 - [#454](https://github.com/WireMock-Net/WireMock.Net/pull/454) - Fix port = 0 for net452 [bug] contributed by [StefH](https://github.com/StefH)
 - [#453](https://github.com/WireMock-Net/WireMock.Net/issues/453) - MockServer not starting  [bug]

Directory.Build.props

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

GitHubReleaseNotes.txt

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

README.md

@@ -21,13 +21,9 @@ A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) w
 | | |
 | ***Quality*** |   |
 |   **Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=7) |
-|   **CodeFactor** | [![CodeFactor](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net)
+|   **Quality** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=alert_status)](https://sonarcloud.io/project/issues?id=wiremock) [![CodeFactor](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net) |
-|   **Sonar Quality Gate** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=alert_status)](https://sonarcloud.io/project/issues?id=wiremock) |
+|   **Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=bugs)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=BUG) [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=code_smells)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=CODE_SMELL) |
-|   **Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=bugs)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=BUG) |
+|   **Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=coverage)](https://sonarcloud.io/component_measures?id=wiremock&metric=coverage) [![codecov](https://codecov.io/gh/WireMock-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/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) |
-|   **Sonar Code Smells** | [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=code_smells)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=CODE_SMELL) |
-|   **Sonar Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=coverage)](https://sonarcloud.io/component_measures?id=wiremock&metric=coverage) |
-|   **Codecov** | [![codecov](https://codecov.io/gh/WireMock-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/WireMock.Net) |
-|   **Coveralls** | [![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) |
 
 ### NuGet packages
 

WireMock.Net Solution.sln

@@ -1,13 +1,27 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
-VisualStudioVersion = 16.0.29709.97
+VisualStudioVersion = 16.0.30114.105
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{EF242EDF-7133-4277-9A0C-18744DE08707}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8F890C6F-9ACC-438D-928A-AD61CDA862F2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{197A0EE3-94E5-4807-BBCF-2F1BCA28A6AE}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0BB8B634-407A-4610-A91F-11586990767A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net", "src\WireMock.Net\WireMock.Net.csproj", "{D3804228-91F4-4502-9595-39584E5A01AD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Abstractions", "src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj", "{B6269AAC-170A-4346-8B9A-579DED3D9A94}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.RestClient", "src\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj", "{B6269AAC-170A-43D6-8B9A-579DED3D9A96}"
+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.Tests", "test\WireMock.Net.Tests\WireMock.Net.Tests.csproj", "{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{985E0ADB-D4B4-473A-AA40-567E279B7946}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7EFB2C5B-1BB2-4AAF-BC9F-216ED80C594D}"
 	ProjectSection(SolutionItems) = preProject
-		.runsettings = .runsettings
+		.gitignore = .gitignore
 		azure-pipelines-ci-linux.yml = azure-pipelines-ci-linux.yml
 		azure-pipelines-ci.yml = azure-pipelines-ci.yml
 		azure-pipelines-linux.yml = azure-pipelines-linux.yml
@@ -17,348 +31,67 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Build.props = Directory.Build.props
 		GitHubReleaseNotes.txt = GitHubReleaseNotes.txt
 		README.md = README.md
-		ReSharper_WireMock.DotSettings = ReSharper_WireMock.DotSettings
-		report\run-codecov-local.cmd = report\run-codecov-local.cmd
-		report\run-coverlet-local.cmd = report\run-coverlet-local.cmd
-		WireMock.Net Solution.sln.DotSettings = WireMock.Net Solution.sln.DotSettings
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{F0C22C47-DF71-463C-9B04-B4E0F3B8708A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp3", "examples\WireMock.Net.Console.NETCoreApp3\WireMock.Net.Console.NETCoreApp3.csproj", "{8C424EAF-8269-46A2-9FF1-F6D4EADB5CD5}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{890A1DED-C229-4FA1-969E-AAC3BBFC05E5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.Proxy.NETCoreApp2", "examples\WireMock.Net.Console.Proxy.NETCoreApp2\WireMock.Net.Console.Proxy.NETCoreApp2.csproj", "{41C19451-E980-4ED4-A011-DA7A1C23FC05}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net", "src\WireMock.Net\WireMock.Net.csproj", "{D3804228-91F4-4502-9595-39584E5A01AD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Client", "examples\WireMock.Net.Client\WireMock.Net.Client.csproj", "{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}"
-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("{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("{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.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}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NETCore2", "examples\WireMock.Net.WebApplication\WireMock.Net.WebApplication.NETCore2.csproj", "{049539C1-7A66-4559-AD7A-B1C73B97CBB0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Proxy.Net452", "examples\WireMock.Net.Console.Proxy.Net452\WireMock.Net.Console.Proxy.Net452.csproj", "{26433A8F-BF01-4962-97EB-81BFFBB61096}"
-EndProject
-Project("{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
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Service", "examples\Wiremock.Net.Service\WireMock.Net.Service.csproj", "{7F0B2446-0363-4720-AF46-F47F83B557DC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net461.Classic", "examples\WireMock.Net.Console.Net461.Classic\WireMock.Net.Console.Net461.Classic.csproj", "{1261BB9B-A7D4-456C-8985-3CE560361B8E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net452.Classic", "examples\WireMock.Net.Console.Net452.Classic\WireMock.Net.Console.Net452.Classic.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp2", "examples\WireMock.Net.Console.NETCoreApp2\WireMock.Net.Console.NETCoreApp2.csproj", "{83645809-9E01-4E81-8733-BA9497554ABF}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.RestClient", "src\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj", "{B6269AAC-170A-43D6-8B9A-579DED3D9A96}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Abstractions", "src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj", "{B6269AAC-170A-4346-8B9A-579DED3D9A94}"
-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.Console.RequestLogTest", "examples\WireMock.Net.Console.RequestLogTest\WireMock.Net.Console.RequestLogTest.csproj", "{A9D039B9-7509-4CF1-9EFD-87EB82998575}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Client.Net472", "examples\WireMock.Net.Client.Net472\WireMock.Net.Client.Net472.csproj", "{02082E34-DEF2-47D0-AF0B-3326FAA908CE}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NETCoreApp3", "examples\WireMock.Net.Console.NETCoreApp3\WireMock.Net.Console.NETCoreApp3.csproj", "{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug - Sonar|Any CPU = Debug - Sonar|Any CPU
-		Debug - Sonar|x64 = Debug - Sonar|x64
 		Debug|Any CPU = Debug|Any CPU
-		Debug|x64 = Debug|x64
 		Release|Any CPU = Release|Any CPU
-		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D3804228-91F4-4502-9595-39584E5A01AD}.Debug|x64.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
-		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|x64.ActiveCfg = Release|Any CPU
-		{D3804228-91F4-4502-9595-39584E5A01AD}.Release|x64.Build.0 = Release|Any CPU
-		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|x64.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
-		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|x64.ActiveCfg = Release|Any CPU
-		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|x64.Build.0 = Release|Any CPU
-		{FE281639-B014-4C8A-96FA-141164A74713}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE281639-B014-4C8A-96FA-141164A74713}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{FE281639-B014-4C8A-96FA-141164A74713}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{FE281639-B014-4C8A-96FA-141164A74713}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FE281639-B014-4C8A-96FA-141164A74713}.Debug|x64.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
-		{FE281639-B014-4C8A-96FA-141164A74713}.Release|x64.ActiveCfg = Release|Any CPU
-		{FE281639-B014-4C8A-96FA-141164A74713}.Release|x64.Build.0 = Release|Any CPU
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Debug|x64.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
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|x64.ActiveCfg = Release|Any CPU
-		{1995E414-F197-4AB4-90C2-68D806B5AF59}.Release|x64.Build.0 = Release|Any CPU
-		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Debug|x64.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
-		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|x64.ActiveCfg = Release|Any CPU
-		{058D4B6C-C03E-49D0-91DB-A535B058FA0D}.Release|x64.Build.0 = Release|Any CPU
-		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{10E16614-61CA-48D8-8BDD-664C13913DED}.Debug|x64.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
-		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|x64.ActiveCfg = Release|Any CPU
-		{10E16614-61CA-48D8-8BDD-664C13913DED}.Release|x64.Build.0 = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA999}.Debug|x64.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-C0FF643CA999}.Release|x64.ActiveCfg = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA999}.Release|x64.Build.0 = Release|Any CPU
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Debug|x64.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
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|x64.ActiveCfg = Release|Any CPU
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0}.Release|x64.Build.0 = Release|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug - Sonar|x64.ActiveCfg = Debug|x64
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug - Sonar|x64.Build.0 = Debug|x64
-		{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}.Debug|x64.ActiveCfg = Debug|x64
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|x64.Build.0 = Debug|x64
-		{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
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|x64.ActiveCfg = Release|x64
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|x64.Build.0 = Release|x64
-		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Debug|x64.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
-		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|x64.ActiveCfg = Release|Any CPU
-		{23A9AA3C-40FC-42AA-8A5E-05899795A1C6}.Release|x64.Build.0 = Release|Any CPU
-		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Debug|x64.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
-		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|x64.ActiveCfg = Release|Any CPU
-		{3C279524-DB73-4DE3-BEF1-F2B2958C9F65}.Release|x64.Build.0 = Release|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|x64.Build.0 = Debug|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x64.ActiveCfg = Release|Any CPU
-		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|x64.Build.0 = Release|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Debug|x64.Build.0 = Debug|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|x64.ActiveCfg = Release|Any CPU
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E}.Release|x64.Build.0 = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|x64.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-C0FF643CA268}.Release|x64.ActiveCfg = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|x64.Build.0 = Release|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Debug|x64.Build.0 = Debug|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|x64.ActiveCfg = Release|Any CPU
-		{83645809-9E01-4E81-8733-BA9497554ABF}.Release|x64.Build.0 = Release|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|x64.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|x64.ActiveCfg = Release|Any CPU
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|x64.Build.0 = Release|Any CPU
-		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
 		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Debug|x64.Build.0 = Debug|Any CPU
 		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|x64.ActiveCfg = Release|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-4346-8B9A-579DED3D9A94}.Release|x64.Build.0 = Release|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug - Sonar|x64.Build.0 = Debug|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}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Debug|x64.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
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|x64.ActiveCfg = Release|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95}.Release|x64.Build.0 = Release|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
+		{8C424EAF-8269-46A2-9FF1-F6D4EADB5CD5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
+		{8C424EAF-8269-46A2-9FF1-F6D4EADB5CD5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8C424EAF-8269-46A2-9FF1-F6D4EADB5CD5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8C424EAF-8269-46A2-9FF1-F6D4EADB5CD5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{41C19451-E980-4ED4-A011-DA7A1C23FC05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|x64.Build.0 = Debug|Any CPU
+		{41C19451-E980-4ED4-A011-DA7A1C23FC05}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{41C19451-E980-4ED4-A011-DA7A1C23FC05}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.Build.0 = Release|Any CPU
+		{41C19451-E980-4ED4-A011-DA7A1C23FC05}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|x64.ActiveCfg = Release|Any CPU
+		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|x64.Build.0 = Release|Any CPU
+		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
+		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
+		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Debug|x64.Build.0 = Debug|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Release|x64.ActiveCfg = Release|Any CPU
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE}.Release|x64.Build.0 = Release|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Debug - Sonar|Any CPU.ActiveCfg = Debug|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Debug - Sonar|Any CPU.Build.0 = Debug|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Debug - Sonar|x64.ActiveCfg = Debug|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Debug - Sonar|x64.Build.0 = Debug|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Debug|x64.Build.0 = Debug|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Release|x64.ActiveCfg = Release|Any CPU
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB}.Release|x64.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}
+		{D3804228-91F4-4502-9595-39584E5A01AD} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
-		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E} = {890A1DED-C229-4FA1-969E-AAC3BBFC05E5}
+		{B6269AAC-170A-4346-8B9A-579DED3D9A94} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
-		{FE281639-B014-4C8A-96FA-141164A74713} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{B6269AAC-170A-43D6-8B9A-579DED3D9A96} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
-		{1995E414-F197-4AB4-90C2-68D806B5AF59} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
-		{058D4B6C-C03E-49D0-91DB-A535B058FA0D} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E} = {0BB8B634-407A-4610-A91F-11586990767A}
-		{10E16614-61CA-48D8-8BDD-664C13913DED} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{8C424EAF-8269-46A2-9FF1-F6D4EADB5CD5} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{668F689E-57B4-422E-8846-C0FF643CA999} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{41C19451-E980-4ED4-A011-DA7A1C23FC05} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{049539C1-7A66-4559-AD7A-B1C73B97CBB0} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
+		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{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}
-		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{1261BB9B-A7D4-456C-8985-3CE560361B8E} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{668F689E-57B4-422E-8846-C0FF643CA268} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{83645809-9E01-4E81-8733-BA9497554ABF} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{B6269AAC-170A-43D6-8B9A-579DED3D9A96} = {EF242EDF-7133-4277-9A0C-18744DE08707}
-		{B6269AAC-170A-4346-8B9A-579DED3D9A94} = {EF242EDF-7133-4277-9A0C-18744DE08707}
-		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {EF242EDF-7133-4277-9A0C-18744DE08707}
-		{A9D039B9-7509-4CF1-9EFD-87EB82998575} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{02082E34-DEF2-47D0-AF0B-3326FAA908CE} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
-		{C54A5D32-EFE0-407B-BA8D-7172A1000DCB} = {F0C22C47-DF71-463C-9B04-B4E0F3B8708A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {BF428BCC-C837-433B-87D2-15C7014B73E9}
+		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
 	EndGlobalSection
 EndGlobal

WireMock.Net Solution.sln.DotSettings

@@ -9,6 +9,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WWW/@EntryIndexedValue">WWW</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XMS/@EntryIndexedValue">XMS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XUA/@EntryIndexedValue">XUA</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Flurl/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=funcs/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>

azure-pipelines-ci-linux.yml

@@ -6,7 +6,7 @@ variables:
 
 steps:
 - script: |
-    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework netcoreapp2.1 --logger trx
+    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework netcoreapp3.1 --logger trx
 - task: PublishTestResults@2
   inputs:
     testRunner: VSTest

azure-pipelines-ci.yml

@@ -28,11 +28,11 @@ steps:
   displayName: Begin SonarScanner
   condition: and(succeeded(), eq(variables['RUN_SONAR'], 'yes'))
 
-# Build source, tests and run tests for net452 and netcoreapp2.1 (with coverage)
+# Build source, tests and run tests for net452 and netcoreapp3.1 (with coverage)
 - script: |
     dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --framework net452
-    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --framework netcoreapp2.1 --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --framework netcoreapp3.1 --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-  displayName: 'Build source, tests and run tests for net452 and netcoreapp2.1 (with coverage)'
+  displayName: 'Build source, tests and run tests for net452 and netcoreapp3.1 (with coverage)'
 
 # End SonarScanner
 - script: |

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

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

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

@@ -97,7 +97,7 @@ namespace WireMock.Net.ConsoleApplication
                     .WithHeader("postmanecho", "post")
                 )
                 .RespondWith(Response.Create()
-                    .WithProxy(new ProxyAndRecordSettings { Url = "http://postman-echo.com/post" })
+                    .WithProxy(new ProxyAndRecordSettings { Url = "http://postman-echo.com" })
                 );
 
             server

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

@@ -40,6 +40,11 @@ namespace WireMock.Admin.Requests
         /// </summary>
         public string AbsoluteUrl { get; set; }
 
+        /// <summary>
+        /// The ProxyUrl (if a proxy is used).
+        /// </summary>
+        public string ProxyUrl { get; set; }
+
         /// <summary>
         /// The query.
         /// </summary>

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

@@ -10,12 +10,10 @@
     <PackageId>WireMock.Net.Abstractions</PackageId>
     <PackageTags>wiremock;interfaces;models;classes;enumerations;types</PackageTags>
     <RootNamespace>WireMock</RootNamespace>
-    <!--<DebugType>full</DebugType>
-    <IncludeSource>True</IncludeSource>
-    <IncludeSymbols>True</IncludeSymbols>-->
     <ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A94}</ProjectGuid>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
@@ -26,14 +24,13 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3">
+    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
-      <PrivateAssets>all</PrivateAssets>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    </PackageReference>
   </ItemGroup>
 
 </Project>

src/WireMock.Net.RestClient/IWireMockAdminApi.cs

@@ -86,7 +86,7 @@ namespace WireMock.Client
         /// Delete (reset) all mappings.
         /// </summary>
         /// <param name="reloadStaticMappings">A value indicating whether to reload the static mappings after the reset.</param>
-        [Post("__admin/mappings/reset")]
+        [Post("mappings/reset")]
         Task<StatusModel> ResetMappingsAsync(bool? reloadStaticMappings = false);
 
         /// <summary>

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

@@ -10,12 +10,10 @@
     <PackageId>WireMock.Net.RestClient</PackageId>
     <PackageTags>wiremock;rest;client;restclient;restease;rest;json</PackageTags>
     <RootNamespace>WireMock.Client</RootNamespace>
-    <!--<DebugType>full</DebugType>
-    <IncludeSource>True</IncludeSource>
-    <IncludeSymbols>True</IncludeSymbols>-->
     <ProjectGuid>{B6269AAC-170A-43D6-8B9A-579DED3D9A96}</ProjectGuid>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
@@ -26,11 +24,12 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
     <PackageReference Include="RestEase" Version="1.4.10" />
   </ItemGroup>
 

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

@@ -9,12 +9,10 @@
     <PackageId>WireMock.Net.StandAlone</PackageId>
     <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
     <RootNamespace>WireMock.Net.StandAlone</RootNamespace>
-    <!--<DebugType>full</DebugType>
-    <IncludeSource>True</IncludeSource>
-    <IncludeSymbols>True</IncludeSymbols>-->
     <ProjectGuid>{B6269AAC-170A-43D5-8B9A-579DED3D9A95}</ProjectGuid>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <CodeAnalysisRuleSet>WireMock.Net.StandAlone.ruleset</CodeAnalysisRuleSet>
@@ -23,9 +21,9 @@
     <!--<DelaySign>true</DelaySign>-->
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
   </PropertyGroup>
-  
+
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <PathMap>$(MSBuildProjectDirectory)=/</PathMap>
+    <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
@@ -38,9 +36,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1">
+    <PackageReference Include="JetBrains.Annotations" Version="2018.2.1" PrivateAssets="All" />
-      <PrivateAssets>All</PrivateAssets>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    </PackageReference>
     <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

src/WireMock.Net/Http/ByteArrayContentHelper.cs

@@ -0,0 +1,30 @@
+using System.Net.Http;
+using System.Net.Http.Headers;
+using JetBrains.Annotations;
+using WireMock.Validation;
+
+namespace WireMock.Http
+{
+    internal static class ByteArrayContentHelper
+    {
+        /// <summary>
+        /// Creates a ByteArrayContent object.
+        /// </summary>
+        /// <param name="content">The byte[] content (cannot be null)</param>
+        /// <param name="contentType">The ContentType (can be null)</param>
+        /// <returns>ByteArrayContent</returns>
+        internal static ByteArrayContent Create([NotNull] byte[] content, [CanBeNull] MediaTypeHeaderValue contentType)
+        {
+            Check.NotNull(content, nameof(content));
+
+            var byteContent = new ByteArrayContent(content);
+            if (contentType != null)
+            {
+                byteContent.Headers.Remove(HttpKnownHeaderNames.ContentType);
+                byteContent.Headers.ContentType = contentType;
+            }
+
+            return byteContent;
+        }
+    }
+}

src/WireMock.Net/Http/HttpRequestMessageHelper.cs

@@ -1,10 +1,10 @@
-using JetBrains.Annotations;
+using System;
-using Newtonsoft.Json;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using JetBrains.Annotations;
+using Newtonsoft.Json;
 using WireMock.Types;
 using WireMock.Validation;
 
@@ -29,7 +29,7 @@ namespace WireMock.Http
             switch (requestMessage.BodyData?.DetectedBodyType)
             {
                 case BodyType.Bytes:
-                    httpRequestMessage.Content = new ByteArrayContent(requestMessage.BodyData.BodyAsBytes);
+                    httpRequestMessage.Content = ByteArrayContentHelper.Create(requestMessage.BodyData.BodyAsBytes, contentType);
                     break;
 
                 case BodyType.Json:

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

@@ -0,0 +1,40 @@
+#if USE_ASPNETCORE && !NETSTANDARD1_3
+using System;
+using System.Collections.Generic;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel.Core;
+
+namespace WireMock.Owin
+{
+    internal partial class AspNetCoreSelfHost
+    {
+        private static void SetKestrelOptionsLimits(KestrelServerOptions options)
+        {
+            options.Limits.KeepAliveTimeout = TimeSpan.MaxValue;
+            options.Limits.MaxRequestBodySize = null; // https://stackoverflow.com/questions/46738364/increase-upload-request-length-limit-in-kestrel
+            options.Limits.MaxRequestBufferSize = null;
+            options.Limits.MaxRequestHeaderCount = 100;
+            options.Limits.MaxResponseBufferSize = null;
+            options.Limits.RequestHeadersTimeout = TimeSpan.MaxValue;
+        }
+
+        private static void SetHttpsAndUrls(KestrelServerOptions options, ICollection<(string Url, int Port)> urlDetails)
+        {
+            foreach (var detail in urlDetails)
+            {
+                if (detail.Url.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
+                {
+                    options.Listen(System.Net.IPAddress.Any, detail.Port, listenOptions =>
+                    {
+                        listenOptions.UseHttps();
+                    });
+                }
+                else
+                {
+                    options.Listen(System.Net.IPAddress.Any, detail.Port);
+                }
+            }
+        }
+    }
+}
+#endif

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

@@ -0,0 +1,32 @@
+#if USE_ASPNETCORE && NETSTANDARD1_3
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Server.Kestrel;
+using WireMock.HttpsCertificate;
+
+namespace WireMock.Owin
+{
+    internal partial class AspNetCoreSelfHost
+    {
+        private static void SetKestrelOptionsLimits(KestrelServerOptions options)
+        {
+            options.Limits.KeepAliveTimeout = TimeSpan.MaxValue;
+            options.Limits.MaxRequestBufferSize = null;
+            options.Limits.MaxRequestHeaderCount = 100;
+            options.Limits.MaxResponseBufferSize = null;
+            options.Limits.RequestHeadersTimeout = TimeSpan.MaxValue;
+        }
+
+        private static void SetHttpsAndUrls(KestrelServerOptions options, ICollection<(string Url, int Port)> urlDetails)
+        {
+            var urls = urlDetails.Select(u => u.Url);
+            if (urls.Any(u => u.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
+            {
+                options.UseHttps(PublicCertificateHelper.GetX509Certificate2());
+            }
+        }
+    }
+}
+#endif

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -8,7 +8,6 @@ using JetBrains.Annotations;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
-using WireMock.HttpsCertificate;
 using WireMock.Logging;
 using WireMock.Owin.Mappers;
 using WireMock.Util;
@@ -16,7 +15,7 @@ using WireMock.Validation;
 
 namespace WireMock.Owin
 {
-    internal class AspNetCoreSelfHost : IOwinSelfHost
+    internal partial class AspNetCoreSelfHost : IOwinSelfHost
     {
         private readonly CancellationTokenSource _cts = new CancellationTokenSource();
         private readonly IWireMockMiddlewareOptions _options;
@@ -78,31 +77,9 @@ namespace WireMock.Owin
                 })
                 .UseKestrel(options =>
                 {
-                    var urlDetails = _urlOptions.GetDetails();
+                    SetKestrelOptionsLimits(options);
 
-#if NETSTANDARD1_3
+                    SetHttpsAndUrls(options, _urlOptions.GetDetails());
-
-                    var urls = urlDetails.Select(u => u.Url);
-                    if (urls.Any(u => u.StartsWith("https://", StringComparison.OrdinalIgnoreCase)))
-                    {
-                        options.UseHttps(PublicCertificateHelper.GetX509Certificate2());
-                    }
-#else
-                    foreach (var detail in urlDetails)
-                    {
-                        if (detail.Url.StartsWith("https://", StringComparison.OrdinalIgnoreCase))
-                        {
-                            options.Listen(System.Net.IPAddress.Any, detail.Port, listenOptions =>
-                            {
-                                listenOptions.UseHttps(); // PublicCertificateHelper.GetX509Certificate2()
-                            });
-                        }
-                        else
-                        {
-                            options.Listen(System.Net.IPAddress.Any, detail.Port);
-                        }
-                    }
-#endif
                 })
 
 #if NETSTANDARD1_3
@@ -144,6 +121,7 @@ namespace WireMock.Owin
 #elif NET46
                 _logger.Info("WireMock.Net server using .net 4.6.1 or higher");
 #endif
+
 #if NETSTANDARD1_3
                 return Task.Run(() =>
                 {

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

@@ -64,6 +64,7 @@ namespace WireMock.Owin.Mappers
                     ContentEncoding = contentEncodingHeader?.FirstOrDefault(),
                     DecompressGZipAndDeflate = !options.DisableRequestBodyDecompressing.GetValueOrDefault(false)
                 };
+
                 body = await BodyParser.Parse(bodyParserSettings);
             }
 

src/WireMock.Net/Owin/WireMockMiddleware.cs

@@ -129,7 +129,7 @@ namespace WireMock.Owin
             catch (Exception ex)
             {
                 _options.Logger.Error($"Providing a Response for Mapping '{result?.Mapping?.Guid}' failed. HttpStatusCode set to 500. Exception: {ex}");
-                response = ResponseMessageBuilder.Create(JsonConvert.SerializeObject(ex), 500);
+                response = ResponseMessageBuilder.Create(ex.Message, 500);
             }
             finally
             {

src/WireMock.Net/RequestMessage.cs

@@ -32,6 +32,11 @@ namespace WireMock
         /// </summary>
         public string AbsoluteUrl { get; }
 
+        /// <summary>
+        /// The ProxyUrl (if a proxy is used).
+        /// </summary>
+        public string ProxyUrl { get; set; }
+
         /// <summary>
         /// Gets the DateTime.
         /// </summary>

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -343,14 +343,22 @@ namespace WireMock.ResponseBuilders
 
             if (ProxyUrl != null && _httpClientForProxy != null)
             {
+                string RemoveFirstOccurrence(string source, string find)
+                {
+                    int place = source.IndexOf(find, StringComparison.OrdinalIgnoreCase);
+                    return place >= 0 ? source.Remove(place, find.Length) : source;
+                }
+
                 var requestUri = new Uri(requestMessage.Url);
-                var proxyUri = new Uri(ProxyUrl);
+
-                var proxyUriWithRequestPathAndQuery = new Uri(proxyUri, requestUri.PathAndQuery);
+                // Build the proxy url and skip duplicates
+                string extra = RemoveFirstOccurrence(requestUri.LocalPath.TrimEnd('/'), new Uri(ProxyUrl).LocalPath.TrimEnd('/'));
+                requestMessage.ProxyUrl = ProxyUrl + extra + requestUri.Query;
 
                 return await HttpClientHelper.SendAsync(
-                    _httpClientForProxy, 
+                    _httpClientForProxy,
                     requestMessage,
-                    proxyUriWithRequestPathAndQuery.AbsoluteUri,
+                    requestMessage.ProxyUrl,
                     !settings.DisableJsonBodyParsing.GetValueOrDefault(false),
                     !settings.DisableRequestBodyDecompressing.GetValueOrDefault(false)
                 );

src/WireMock.Net/Serialization/LogEntryMapper.cs

@@ -2,9 +2,8 @@
 using WireMock.Admin.Mappings;
 using WireMock.Admin.Requests;
 using WireMock.Logging;
-using WireMock.Types;
 using WireMock.ResponseBuilders;
-using WireMock.Util;
+using WireMock.Types;
 
 namespace WireMock.Serialization
 {
@@ -20,6 +19,7 @@ namespace WireMock.Serialization
                 AbsolutePath = logEntry.RequestMessage.AbsolutePath,
                 Url = logEntry.RequestMessage.Url,
                 AbsoluteUrl = logEntry.RequestMessage.AbsoluteUrl,
+                ProxyUrl = logEntry.RequestMessage.ProxyUrl,
                 Query = logEntry.RequestMessage.Query,
                 Method = logEntry.RequestMessage.Method,
                 Headers = logEntry.RequestMessage.Headers,

src/WireMock.Net/Transformers/HandleBarsFile.cs

@@ -5,7 +5,7 @@ using WireMock.Validation;
 
 namespace WireMock.Transformers
 {
-    internal static class HandleBarsFile
+    internal static class HandlebarsFile
     {
         public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
         {

src/WireMock.Net/Transformers/HandleBarsHelpers.cs

@@ -1,25 +0,0 @@
-using HandlebarsDotNet;
-using WireMock.Handlers;
-
-namespace WireMock.Transformers
-{
-    internal static class HandlebarsHelpers
-    {
-        public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
-        {
-            HandleBarsRegex.Register(handlebarsContext);
-
-            HandleBarsJsonPath.Register(handlebarsContext);
-
-            HandleBarsLinq.Register(handlebarsContext);
-
-            HandleBarsRandom.Register(handlebarsContext);
-
-            HandleBarsXeger.Register(handlebarsContext);
-
-            HandleBarsXPath.Register(handlebarsContext);
-
-            HandleBarsFile.Register(handlebarsContext, fileSystemHandler);
-        }
-    }
-}

src/WireMock.Net/Transformers/HandleBarsJsonPath.cs

@@ -9,7 +9,7 @@ using WireMock.Validation;
 
 namespace WireMock.Transformers
 {
-    internal static class HandleBarsJsonPath
+    internal static class HandlebarsJsonPath
     {
         public static void Register(IHandlebars handlebarsContext)
         {

src/WireMock.Net/Transformers/HandleBarsLinq.cs

@@ -9,7 +9,7 @@ using WireMock.Validation;
 
 namespace WireMock.Transformers
 {
-    internal static class HandleBarsLinq
+    internal static class HandlebarsLinq
     {
         public static void Register(IHandlebars handlebarsContext)
         {

src/WireMock.Net/Transformers/HandleBarsRandom.cs

@@ -11,7 +11,7 @@ using WireMock.Validation;
 
 namespace WireMock.Transformers
 {
-    internal static class HandleBarsRandom
+    internal static class HandlebarsRandom
     {
         public static void Register(IHandlebars handlebarsContext)
         {

src/WireMock.Net/Transformers/HandleBarsRegex.cs

@@ -7,7 +7,7 @@ using WireMock.Validation;
 
 namespace WireMock.Transformers
 {
-    internal static class HandleBarsRegex
+    internal static class HandlebarsRegex
     {
         public static void Register(IHandlebars handlebarsContext)
         {

src/WireMock.Net/Transformers/HandleBarsXPath.cs

@@ -10,7 +10,7 @@ using Wmhelp.XPath2;
 
 namespace WireMock.Transformers
 {
-    internal static class HandleBarsXPath
+    internal static class HandlebarsXPath
     {
         public static void Register(IHandlebars handlebarsContext)
         {

src/WireMock.Net/Transformers/HandleBarsXeger.cs

@@ -5,7 +5,7 @@ using WireMock.Validation;
 
 namespace WireMock.Transformers
 {
-    internal static class HandleBarsXeger
+    internal static class HandlebarsXeger
     {
         public static void Register(IHandlebars handlebarsContext)
         {

src/WireMock.Net/Transformers/HandlebarsContextFactory.cs

@@ -24,7 +24,7 @@ namespace WireMock.Transformers
         {
             var handlebars = Handlebars.Create(HandlebarsConfiguration);
 
-            HandlebarsHelpers.Register(handlebars, _fileSystemHandler);
+            WireMockHandlebarsHelpers.Register(handlebars, _fileSystemHandler);
 
             _action?.Invoke(handlebars, _fileSystemHandler);
 

src/WireMock.Net/Transformers/ResponseMessageTransformer.cs

@@ -1,233 +1,236 @@
-using HandlebarsDotNet;
+using HandlebarsDotNet;
-using JetBrains.Annotations;
+using JetBrains.Annotations;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Linq;
+using System.Linq;
-using WireMock.Types;
+using System.Text;
-using WireMock.Util;
+using WireMock.Types;
-using WireMock.Validation;
+using WireMock.Util;
-
+using WireMock.Validation;
-namespace WireMock.Transformers
+
-{
+namespace WireMock.Transformers
-    internal class ResponseMessageTransformer
+{
-    {
+    internal class ResponseMessageTransformer
-        private readonly IHandlebarsContextFactory _factory;
+    {
-
+        private readonly IHandlebarsContextFactory _factory;
-        public ResponseMessageTransformer([NotNull] IHandlebarsContextFactory factory)
+
-        {
+        public ResponseMessageTransformer([NotNull] IHandlebarsContextFactory factory)
-            Check.NotNull(factory, nameof(factory));
+        {
-
+            Check.NotNull(factory, nameof(factory));
-            _factory = factory;
+
-        }
+            _factory = factory;
-
+        }
-        public ResponseMessage Transform(RequestMessage requestMessage, ResponseMessage original, bool useTransformerForBodyAsFile)
+
-        {
+        public ResponseMessage Transform(RequestMessage requestMessage, ResponseMessage original, bool useTransformerForBodyAsFile)
-            var handlebarsContext = _factory.Create();
+        {
-
+            var handlebarsContext = _factory.Create();
-            var responseMessage = new ResponseMessage();
+
-
+            var responseMessage = new ResponseMessage();
-            var template = new { request = requestMessage };
+
-
+            var template = new { request = requestMessage };
-            switch (original.BodyData?.DetectedBodyType)
+
-            {
+            switch (original.BodyData?.DetectedBodyType)
-                case BodyType.Json:
+            {
-                    TransformBodyAsJson(handlebarsContext.Handlebars, template, original, responseMessage);
+                case BodyType.Json:
-                    break;
+                    TransformBodyAsJson(handlebarsContext.Handlebars, template, original, responseMessage);
-
+                    break;
-                case BodyType.File:
+
-                    TransformBodyAsFile(handlebarsContext, template, original, responseMessage, useTransformerForBodyAsFile);
+                case BodyType.File:
-                    break;
+                    TransformBodyAsFile(handlebarsContext, template, original, responseMessage, useTransformerForBodyAsFile);
-
+                    break;
-                case BodyType.String:
+
-                    responseMessage.BodyOriginal = original.BodyData.BodyAsString;
+                case BodyType.String:
-                    TransformBodyAsString(handlebarsContext.Handlebars, template, original, responseMessage);
+                    responseMessage.BodyOriginal = original.BodyData.BodyAsString;
-                    break;
+                    TransformBodyAsString(handlebarsContext.Handlebars, template, original, responseMessage);
-            }
+                    break;
-
+            }
-            responseMessage.FaultType = original.FaultType;
+
-            responseMessage.FaultPercentage = original.FaultPercentage;
+            responseMessage.FaultType = original.FaultType;
-
+            responseMessage.FaultPercentage = original.FaultPercentage;
-            // Headers
+
-            var newHeaders = new Dictionary<string, WireMockList<string>>();
+            // Headers
-            foreach (var header in original.Headers)
+            var newHeaders = new Dictionary<string, WireMockList<string>>();
-            {
+            foreach (var header in original.Headers)
-                var templateHeaderKey = handlebarsContext.Handlebars.Compile(header.Key);
+            {
-                var templateHeaderValues = header.Value
+                var templateHeaderKey = handlebarsContext.Handlebars.Compile(header.Key);
-                    .Select(handlebarsContext.Handlebars.Compile)
+                var templateHeaderValues = header.Value
-                    .Select(func => func(template))
+                    .Select(handlebarsContext.Handlebars.Compile)
-                    .ToArray();
+                    .Select(func => func(template))
-
+                    .ToArray();
-                newHeaders.Add(templateHeaderKey(template), new WireMockList<string>(templateHeaderValues));
+
-            }
+                newHeaders.Add(templateHeaderKey(template), new WireMockList<string>(templateHeaderValues));
-
+            }
-            responseMessage.Headers = newHeaders;
+
-
+            responseMessage.Headers = newHeaders;
-            switch (original.StatusCode)
+
-            {
+            switch (original.StatusCode)
-                case int statusCodeAsInteger:
+            {
-                    responseMessage.StatusCode = statusCodeAsInteger;
+                case int statusCodeAsInteger:
-                    break;
+                    responseMessage.StatusCode = statusCodeAsInteger;
-
+                    break;
-                case string statusCodeAsString:
+
-                    var templateForStatusCode = handlebarsContext.Handlebars.Compile(statusCodeAsString);
+                case string statusCodeAsString:
-                    responseMessage.StatusCode = templateForStatusCode(template);
+                    var templateForStatusCode = handlebarsContext.Handlebars.Compile(statusCodeAsString);
-                    break;
+                    responseMessage.StatusCode = templateForStatusCode(template);
-            }
+                    break;
-
+            }
-            return responseMessage;
+
-        }
+            return responseMessage;
-
+        }
-        private static void TransformBodyAsJson(IHandlebars handlebarsContext, object template, ResponseMessage original, ResponseMessage responseMessage)
+
-        {
+        private static void TransformBodyAsJson(IHandlebars handlebarsContext, object template, ResponseMessage original, ResponseMessage responseMessage)
-            JToken jToken;
+        {
-            switch (original.BodyData.BodyAsJson)
+            JToken jToken;
-            {
+            switch (original.BodyData.BodyAsJson)
-                case JObject bodyAsJObject:
+            {
-                    jToken = bodyAsJObject.DeepClone();
+                case JObject bodyAsJObject:
-                    WalkNode(handlebarsContext, jToken, template);
+                    jToken = bodyAsJObject.DeepClone();
-                    break;
+                    WalkNode(handlebarsContext, jToken, template);
-
+                    break;
-                case Array bodyAsArray:
+
-                    jToken = JArray.FromObject(bodyAsArray);
+                case Array bodyAsArray:
-                    WalkNode(handlebarsContext, jToken, template);
+                    jToken = JArray.FromObject(bodyAsArray);
-                    break;
+                    WalkNode(handlebarsContext, jToken, template);
-
+                    break;
-                case string bodyAsString:
+
-                    jToken = ReplaceSingleNode(handlebarsContext, bodyAsString, template);
+                case string bodyAsString:
-                    break;
+                    jToken = ReplaceSingleNode(handlebarsContext, bodyAsString, template);
-
+                    break;
-                default:
+
-                    jToken = JObject.FromObject(original.BodyData.BodyAsJson);
+                default:
-                    WalkNode(handlebarsContext, jToken, template);
+                    jToken = JObject.FromObject(original.BodyData.BodyAsJson);
-                    break;
+                    WalkNode(handlebarsContext, jToken, template);
-            }
+                    break;
-
+            }
-            responseMessage.BodyData = new BodyData
+
-            {
+            responseMessage.BodyData = new BodyData
-                DetectedBodyType = original.BodyData.DetectedBodyType,
+            {
-                DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
+                Encoding = original.BodyData.Encoding,
-                BodyAsJson = jToken
+                DetectedBodyType = original.BodyData.DetectedBodyType,
-            };
+                DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
-        }
+                BodyAsJson = jToken
-
+            };
-        private static JToken ReplaceSingleNode(IHandlebars handlebarsContext, string stringValue, object context)
+        }
-        {
+
-            var templateForStringValue = handlebarsContext.Compile(stringValue);
+        private static JToken ReplaceSingleNode(IHandlebars handlebarsContext, string stringValue, object context)
-            string transformedString = templateForStringValue(context);
+        {
-            if (!string.Equals(stringValue, transformedString))
+            var templateForStringValue = handlebarsContext.Compile(stringValue);
-            {
+            string transformedString = templateForStringValue(context);
-                const string property = "_";
+            if (!string.Equals(stringValue, transformedString))
-                JObject dummy = JObject.Parse($"{{ \"{property}\": null }}");
+            {
-                JToken node = dummy[property];
+                const string property = "_";
-
+                JObject dummy = JObject.Parse($"{{ \"{property}\": null }}");
-                ReplaceNodeValue(node, transformedString);
+                JToken node = dummy[property];
-
+
-                return dummy[property];
+                ReplaceNodeValue(node, transformedString);
-            }
+
-
+                return dummy[property];
-            return stringValue;
+            }
-        }
+
-
+            return stringValue;
-        private static void WalkNode(IHandlebars handlebarsContext, JToken node, object context)
+        }
-        {
+
-            if (node.Type == JTokenType.Object)
+        private static void WalkNode(IHandlebars handlebarsContext, JToken node, object context)
-            {
+        {
-                // In case of Object, loop all children. Do a ToArray() to avoid `Collection was modified` exceptions.
+            if (node.Type == JTokenType.Object)
-                foreach (JProperty child in node.Children<JProperty>().ToArray())
+            {
-                {
+                // In case of Object, loop all children. Do a ToArray() to avoid `Collection was modified` exceptions.
-                    WalkNode(handlebarsContext, child.Value, context);
+                foreach (JProperty child in node.Children<JProperty>().ToArray())
-                }
+                {
-            }
+                    WalkNode(handlebarsContext, child.Value, context);
-            else if (node.Type == JTokenType.Array)
+                }
-            {
+            }
-                // In case of Array, loop all items. Do a ToArray() to avoid `Collection was modified` exceptions.
+            else if (node.Type == JTokenType.Array)
-                foreach (JToken child in node.Children().ToArray())
+            {
-                {
+                // In case of Array, loop all items. Do a ToArray() to avoid `Collection was modified` exceptions.
-                    WalkNode(handlebarsContext, child, context);
+                foreach (JToken child in node.Children().ToArray())
-                }
+                {
-            }
+                    WalkNode(handlebarsContext, child, context);
-            else if (node.Type == JTokenType.String)
+                }
-            {
+            }
-                // In case of string, try to transform the value.
+            else if (node.Type == JTokenType.String)
-                string stringValue = node.Value<string>();
+            {
-                if (string.IsNullOrEmpty(stringValue))
+                // In case of string, try to transform the value.
-                {
+                string stringValue = node.Value<string>();
-                    return;
+                if (string.IsNullOrEmpty(stringValue))
-                }
+                {
-
+                    return;
-                var templateForStringValue = handlebarsContext.Compile(stringValue);
+                }
-                string transformedString = templateForStringValue(context);
+
-                if (!string.Equals(stringValue, transformedString))
+                var templateForStringValue = handlebarsContext.Compile(stringValue);
-                {
+                string transformedString = templateForStringValue(context);
-                    ReplaceNodeValue(node, transformedString);
+                if (!string.Equals(stringValue, transformedString))
-                }
+                {
-            }
+                    ReplaceNodeValue(node, transformedString);
-        }
+                }
-
+            }
-        private static void ReplaceNodeValue(JToken node, string stringValue)
+        }
-        {
+
-            if (bool.TryParse(stringValue, out bool valueAsBoolean))
+        private static void ReplaceNodeValue(JToken node, string stringValue)
-            {
+        {
-                node.Replace(valueAsBoolean);
+            if (bool.TryParse(stringValue, out bool valueAsBoolean))
-                return;
+            {
-            }
+                node.Replace(valueAsBoolean);
-
+                return;
-            JToken value;
+            }
-            try
+
-            {
+            JToken value;
-                // Try to convert this string into a JsonObject
+            try
-                value = JToken.Parse(stringValue);
+            {
-            }
+                // Try to convert this string into a JsonObject
-            catch (JsonException)
+                value = JToken.Parse(stringValue);
-            {
+            }
-                // Ignore JsonException and just keep string value and convert to JToken
+            catch (JsonException)
-                value = stringValue;
+            {
-            }
+                // Ignore JsonException and just keep string value and convert to JToken
-
+                value = stringValue;
-            node.Replace(value);
+            }
-        }
+
-
+            node.Replace(value);
-        private static void TransformBodyAsString(IHandlebars handlebarsContext, object template, ResponseMessage original, ResponseMessage responseMessage)
+        }
-        {
+
-            var templateBodyAsString = handlebarsContext.Compile(original.BodyData.BodyAsString);
+        private static void TransformBodyAsString(IHandlebars handlebarsContext, object template, ResponseMessage original, ResponseMessage responseMessage)
-
+        {
-            responseMessage.BodyData = new BodyData
+            var templateBodyAsString = handlebarsContext.Compile(original.BodyData.BodyAsString);
-            {
+
-                DetectedBodyType = original.BodyData.DetectedBodyType,
+            responseMessage.BodyData = new BodyData
-                DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
+            {
-                BodyAsString = templateBodyAsString(template)
+                Encoding = original.BodyData.Encoding,
-            };
+                DetectedBodyType = original.BodyData.DetectedBodyType,
-        }
+                DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
-
+                BodyAsString = templateBodyAsString(template)
-        private void TransformBodyAsFile(IHandlebarsContext handlebarsContext, object template, ResponseMessage original, ResponseMessage responseMessage, bool useTransformerForBodyAsFile)
+            };
-        {
+        }
-            var templateBodyAsFile = handlebarsContext.Handlebars.Compile(original.BodyData.BodyAsFile);
+
-            string transformedBodyAsFilename = templateBodyAsFile(template);
+        private void TransformBodyAsFile(IHandlebarsContext handlebarsContext, object template, ResponseMessage original, ResponseMessage responseMessage, bool useTransformerForBodyAsFile)
-
+        {
-            if (!useTransformerForBodyAsFile)
+            var templateBodyAsFile = handlebarsContext.Handlebars.Compile(original.BodyData.BodyAsFile);
-            {
+            string transformedBodyAsFilename = templateBodyAsFile(template);
-                responseMessage.BodyData = new BodyData
+
-                {
+            if (!useTransformerForBodyAsFile)
-                    DetectedBodyType = original.BodyData.DetectedBodyType,
+            {
-                    DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
+                responseMessage.BodyData = new BodyData
-                    BodyAsFile = transformedBodyAsFilename
+                {
-                };
+                    DetectedBodyType = original.BodyData.DetectedBodyType,
-            }
+                    DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
-            else
+                    BodyAsFile = transformedBodyAsFilename
-            {
+                };
-                string text = handlebarsContext.FileSystemHandler.ReadResponseBodyAsString(transformedBodyAsFilename);
+            }
-                var templateBodyAsString = handlebarsContext.Handlebars.Compile(text);
+            else
-
+            {
-                responseMessage.BodyData = new BodyData
+                string text = handlebarsContext.FileSystemHandler.ReadResponseBodyAsString(transformedBodyAsFilename);
-                {
+                var templateBodyAsString = handlebarsContext.Handlebars.Compile(text);
-                    DetectedBodyType = BodyType.String,
+
-                    DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
+                responseMessage.BodyData = new BodyData
-                    BodyAsString = templateBodyAsString(template),
+                {
-                    BodyAsFile = transformedBodyAsFilename
+                    DetectedBodyType = BodyType.String,
-                };
+                    DetectedBodyTypeFromContentType = original.BodyData.DetectedBodyTypeFromContentType,
-            }
+                    BodyAsString = templateBodyAsString(template),
-        }
+                    BodyAsFile = transformedBodyAsFilename
-    }
+                };
+            }
+        }
+    }
 }

src/WireMock.Net/Transformers/WireMockHandlebarsHelpers.cs

@@ -0,0 +1,30 @@
+using HandlebarsDotNet;
+using HandlebarsDotNet.Helpers;
+using WireMock.Handlers;
+
+namespace WireMock.Transformers
+{
+    internal static class WireMockHandlebarsHelpers
+    {
+        public static void Register(IHandlebars handlebarsContext, IFileSystemHandler fileSystemHandler)
+        {
+            // Register https://github.com/StefH/Handlebars.Net.Helpers
+            HandlebarsHelpers.Register(handlebarsContext);
+
+            // Register WireMock.Net specific helpers
+            HandlebarsRegex.Register(handlebarsContext);
+
+            HandlebarsJsonPath.Register(handlebarsContext);
+
+            HandlebarsLinq.Register(handlebarsContext);
+
+            HandlebarsRandom.Register(handlebarsContext);
+
+            HandlebarsXeger.Register(handlebarsContext);
+
+            HandlebarsXPath.Register(handlebarsContext);
+
+            HandlebarsFile.Register(handlebarsContext, fileSystemHandler);
+        }
+    }
+}

src/WireMock.Net/Util/BodyParser.cs

@@ -130,7 +130,7 @@ namespace WireMock.Util
                     data.Encoding = encoding;
                     data.DetectedBodyType = BodyType.String;
                 }
-
+   
                 return data;
             }
 

src/WireMock.Net/WireMock.Net.csproj

@@ -9,13 +9,11 @@
     <PackageId>WireMock.Net</PackageId>
     <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
     <RootNamespace>WireMock</RootNamespace>
-    <!--<DebugType>full</DebugType>
-    <IncludeSource>True</IncludeSource>
-    <IncludeSymbols>True</IncludeSymbols>-->
     <ProjectGuid>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <!--<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <EmbedUntrackedSources>true</EmbedUntrackedSources>
+    <!--<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>-->
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>WireMock.Net.snk</AssemblyOriginatorKeyFile>
@@ -53,14 +51,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3">
+    <PackageReference Include="JetBrains.Annotations" Version="2019.1.3" PrivateAssets="All" />
-      <PrivateAssets>all</PrivateAssets>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    </PackageReference>
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
     <PackageReference Include="RandomDataGenerator.Net" Version="1.0.10" />
     <PackageReference Include="JmesPath.Net" Version="1.0.125" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="1.0.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
@@ -70,14 +68,6 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <PackageReference Include="Handlebars.Net" Version="[1.9.0]" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net451' ">
-    <PackageReference Include="Handlebars.Net" Version="1.9.5" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
     <PackageReference Include="XPath2.Extensions" Version="1.0.6.1" />
   </ItemGroup>

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

@@ -0,0 +1,44 @@
+using System.Net.Http.Headers;
+using System.Text;
+using System.Threading.Tasks;
+using FluentAssertions;
+using WireMock.Http;
+using Xunit;
+
+namespace WireMock.Net.Tests.Http
+{
+    public class ByteArrayContentHelperTests
+    {
+        [Fact]
+        public async Task ByteArrayContentHelperTests_Create_WithNullContentType()
+        {
+            // Arrange
+            var content = Encoding.UTF8.GetBytes("test");
+
+            // Act
+            var result = ByteArrayContentHelper.Create(content, null);
+
+            // Assert
+            result.Headers.ContentType.Should().BeNull();
+            (await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content);
+        }
+
+        [Theory]
+        [InlineData("application/octet-stream", "application/octet-stream")]
+        [InlineData("application/soap+xml", "application/soap+xml")]
+        [InlineData("multipart/form-data; boundary=------------------------x", "multipart/form-data; boundary=------------------------x")]
+        public async Task ByteArrayContentHelperTests_Create(string test, string expected)
+        {
+            // Arrange
+            var content = Encoding.UTF8.GetBytes("test");
+            var contentType = MediaTypeHeaderValue.Parse(test);
+
+            // Act
+            var result = ByteArrayContentHelper.Create(content, contentType);
+
+            // Assert
+            result.Headers.ContentType.ToString().Should().Be(expected);
+            (await result.ReadAsByteArrayAsync()).Should().BeEquivalentTo(content);
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+using System.Threading.Tasks;
+using NFluent;
+using WireMock.Models;
+using WireMock.ResponseBuilders;
+using WireMock.Settings;
+using WireMock.Types;
+using WireMock.Util;
+using Xunit;
+
+namespace WireMock.Net.Tests.ResponseBuilders
+{
+    public class ResponseWithHandlebarsHelpersTests
+    {
+        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
+        private const string ClientIp = "::1";
+
+        [Fact]
+        public async Task Response_ProvideResponseAsync_HandlebarsHelpers_String_Uppercase()
+        {
+            // Assign
+            var body = new BodyData { BodyAsString = "abc", DetectedBodyType = BodyType.String };
+
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);
+
+            var response = Response.Create()
+                .WithBody("{{String.Uppercase request.body}}")
+                .WithTransformer();
+
+            // Act
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+
+            // assert
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("ABC");
+        }
+    }
+}

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

@@ -1,406 +1,432 @@
-using System;
+using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
-using System.Text;
+using System.Text;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
-using FluentAssertions;
+using FluentAssertions;
-using Moq;
+using Moq;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
-using NFluent;
+using NFluent;
-using WireMock.Handlers;
+using WireMock.Handlers;
-using WireMock.Models;
+using WireMock.Models;
-using WireMock.ResponseBuilders;
+using WireMock.ResponseBuilders;
-using WireMock.Settings;
+using WireMock.Settings;
-using WireMock.Types;
+using WireMock.Types;
-using WireMock.Util;
+using WireMock.Util;
-using Xunit;
+using Xunit;
-#if NET452
+#if NET452
-using Microsoft.Owin;
+using Microsoft.Owin;
-#else
+#else
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http;
-#endif
+#endif
-
+
-namespace WireMock.Net.Tests.ResponseBuilders
+namespace WireMock.Net.Tests.ResponseBuilders
-{
+{
-    public class ResponseWithHandlebarsTests
+    public class ResponseWithHandlebarsTests
-    {
+    {
-        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
+        private readonly WireMockServerSettings _settings = new WireMockServerSettings();
-        private const string ClientIp = "::1";
+        private const string ClientIp = "::1";
-        
+        
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_WithNullBody_ShouldNotThrowException()
+        public async Task Response_ProvideResponse_Handlebars_WithNullBody_ShouldNotThrowException()
-        {
+        {
-            // Assign
+            // Assign
-            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
+            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
-            var request = new RequestMessage(urlDetails, "GET", ClientIp);
+            var request = new RequestMessage(urlDetails, "GET", ClientIp);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            responseMessage.BodyData.Should().BeNull();
+            responseMessage.BodyData.Should().BeNull();
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_UrlPathVerb()
+        public async Task Response_ProvideResponse_Handlebars_UrlPathVerb()
-        {
+        {
-            // Assign
+            // Assign
-            var body = new BodyData
+            var body = new BodyData
-            {
+            {
-                BodyAsString = "whatever",
+                BodyAsString = "whatever",
-                DetectedBodyType = BodyType.String
+                DetectedBodyType = BodyType.String
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POSt", ClientIp, body);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POSt", ClientIp, body);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithBody("test {{request.url}} {{request.path}} {{request.method}}")
+                .WithBody("test {{request.url}} {{request.path}} {{request.method}}")
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("test http://localhost/foo /foo POSt");
-        }
+        }
-
+
-        [Theory]
+        [Theory]
-        [InlineData("Get")]
+        [InlineData("Get")]
-        [InlineData("Post")]
+        [InlineData("Post")]
-        public async Task Response_ProvideResponse_Handlebars_UrlPath(string httpMethod)
+        public async Task Response_ProvideResponse_Handlebars_UrlPath(string httpMethod)
-        {
+        {
-            // Assign
+            // Assign
-            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
+            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
-            var request = new RequestMessage(urlDetails, httpMethod, ClientIp);
+            var request = new RequestMessage(urlDetails, httpMethod, ClientIp);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithBody("{{request.url}} {{request.absoluteurl}} {{request.path}} {{request.absolutepath}}")
+                .WithBody("{{request.url}} {{request.absoluteurl}} {{request.path}} {{request.absolutepath}}")
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("http://localhost/a/b http://localhost/wiremock/a/b /a/b /wiremock/a/b");
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("http://localhost/a/b http://localhost/wiremock/a/b /a/b /wiremock/a/b");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_PathSegments()
+        public async Task Response_ProvideResponse_Handlebars_PathSegments()
-        {
+        {
-            // Assign
+            // Assign
-            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
+            var urlDetails = UrlUtils.Parse(new Uri("http://localhost/wiremock/a/b"), new PathString("/wiremock"));
-            var request = new RequestMessage(urlDetails, "POST", ClientIp);
+            var request = new RequestMessage(urlDetails, "POST", ClientIp);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithBody("{{request.pathsegments.[0]}} {{request.absolutepathsegments.[0]}}")
+                .WithBody("{{request.pathsegments.[0]}} {{request.absolutepathsegments.[0]}}")
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("a wiremock");
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("a wiremock");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Query()
+        public async Task Response_ProvideResponse_Handlebars_Query()
-        {
+        {
-            // Assign
+            // Assign
-            var body = new BodyData
+            var body = new BodyData
-            {
+            {
-                BodyAsString = "abc",
+                BodyAsString = "abc",
-                DetectedBodyType = BodyType.String
+                DetectedBodyType = BodyType.String
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=1&a=2&b=5"), "POST", ClientIp, body);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=1&a=2&b=5"), "POST", ClientIp, body);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithBody("test keya={{request.query.a}} idx={{request.query.a.[0]}} idx={{request.query.a.[1]}} keyb={{request.query.b}}")
+                .WithBody("test keya={{request.query.a}} idx={{request.query.a.[0]}} idx={{request.query.a.[1]}} keyb={{request.query.b}}")
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5");
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("test keya=1 idx=1 idx=2 keyb=5");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_StatusCode()
+        public async Task Response_ProvideResponse_Handlebars_StatusCode()
-        {
+        {
-            // Assign
+            // Assign
-            var body = new BodyData
+            var body = new BodyData
-            {
+            {
-                BodyAsString = "abc",
+                BodyAsString = "abc",
-                DetectedBodyType = BodyType.String
+                DetectedBodyType = BodyType.String
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=400"), "POST", ClientIp, body);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=400"), "POST", ClientIp, body);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithStatusCode("{{request.query.a}}")
+                .WithStatusCode("{{request.query.a}}")
-                .WithBody("test")
+                .WithBody("test")
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.StatusCode).Equals("400");
+            Check.That(responseMessage.StatusCode).Equals("400");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_StatusCodeIsNull()
+        public async Task Response_ProvideResponse_Handlebars_StatusCodeIsNull()
-        {
+        {
-            // Assign
+            // Assign
-            var body = new BodyData
+            var body = new BodyData
-            {
+            {
-                BodyAsString = "abc",
+                BodyAsString = "abc",
-                DetectedBodyType = BodyType.String
+                DetectedBodyType = BodyType.String
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=400"), "POST", ClientIp, body);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo?a=400"), "POST", ClientIp, body);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithBody("test")
+                .WithBody("test")
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.StatusCode).Equals(null);
+            Check.That(responseMessage.StatusCode).Equals(null);
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Header()
+        public async Task Response_ProvideResponse_Handlebars_Header()
-        {
+        {
-            // Assign
+            // Assign
-            var body = new BodyData
+            var body = new BodyData
-            {
+            {
-                BodyAsString = "abc",
+                BodyAsString = "abc",
-                DetectedBodyType = BodyType.String
+                DetectedBodyType = BodyType.String
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });
-
+
-            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
+            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}").WithBody("test").WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.Headers).ContainsKey("x");
+            Check.That(responseMessage.Headers).ContainsKey("x");
-            Check.That(responseMessage.Headers["x"]).ContainsExactly("text/plain");
+            Check.That(responseMessage.Headers["x"]).ContainsExactly("text/plain");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Headers()
+        public async Task Response_ProvideResponse_Handlebars_Headers()
-        {
+        {
-            // Assign
+            // Assign
-            var body = new BodyData
+            var body = new BodyData
-            {
+            {
-                BodyAsString = "abc",
+                BodyAsString = "abc",
-                DetectedBodyType = BodyType.String
+                DetectedBodyType = BodyType.String
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, body, new Dictionary<string, string[]> { { "Content-Type", new[] { "text/plain" } } });
-
+
-            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer();
+            var response = Response.Create().WithHeader("x", "{{request.headers.Content-Type}}", "{{request.url}}").WithBody("test").WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("test");
-            Check.That(responseMessage.Headers).ContainsKey("x");
+            Check.That(responseMessage.Headers).ContainsKey("x");
-            Check.That(responseMessage.Headers["x"]).Contains("text/plain");
+            Check.That(responseMessage.Headers["x"]).Contains("text/plain");
-            Check.That(responseMessage.Headers["x"]).Contains("http://localhost/foo");
+            Check.That(responseMessage.Headers["x"]).Contains("http://localhost/foo");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_Origin_Port_Protocol_Host()
+        public async Task Response_ProvideResponse_Handlebars_Origin_Port_Protocol_Host()
-        {
+        {
-            // Assign
+            // Assign
-            var body = new BodyData
+            var body = new BodyData
-            {
+            {
-                BodyAsString = "abc",
+                BodyAsString = "abc",
-                DetectedBodyType = BodyType.String
+                DetectedBodyType = BodyType.String
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);
+            var request = new RequestMessage(new UrlDetails("http://localhost:1234"), "POST", ClientIp, body);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithBody("test {{request.origin}} {{request.port}} {{request.protocol}} {{request.host}}")
+                .WithBody("test {{request.origin}} {{request.port}} {{request.protocol}} {{request.host}}")
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("test http://localhost:1234 1234 http localhost");
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("test http://localhost:1234 1234 http localhost");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsObject()
+        public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsObject()
-        {
+        {
-            // Assign
+            // Assign
-            string jsonString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"Wiremock\" } ] }";
+            string jsonString = "{ \"things\": [ { \"name\": \"RequiredThing\" }, { \"name\": \"Wiremock\" } ] }";
-            var bodyData = new BodyData
+            var bodyData = new BodyData
-            {
+            {
-                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
+                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
-                DetectedBodyType = BodyType.Json,
+                DetectedBodyType = BodyType.Json,
-                Encoding = Encoding.UTF8
+                Encoding = Encoding.UTF8
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithBodyAsJson(new { x = "test {{request.path}}" })
+                .WithBodyAsJson(new { x = "test {{request.path}}" })
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
+            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsArray()
+        public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsArray()
-        {
+        {
-            // Assign
+            // Assign
-            string jsonString = "{ \"a\": \"test 1\", \"b\": \"test 2\" }";
+            string jsonString = "{ \"a\": \"test 1\", \"b\": \"test 2\" }";
-            var bodyData = new BodyData
+            var bodyData = new BodyData
-            {
+            {
-                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
+                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
-                DetectedBodyType = BodyType.Json,
+                DetectedBodyType = BodyType.Json,
-                Encoding = Encoding.UTF8
+                Encoding = Encoding.UTF8
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo_array"), "POST", ClientIp, bodyData);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo_array"), "POST", ClientIp, bodyData);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithBodyAsJson(new[] { "first", "{{request.path}}", "{{request.bodyAsJson.a}}", "{{request.bodyAsJson.b}}", "last" })
+                .WithBodyAsJson(new[] { "first", "{{request.path}}", "{{request.bodyAsJson.a}}", "{{request.bodyAsJson.b}}", "last" })
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]");
+            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("[\"first\",\"/foo_array\",\"test 1\",\"test 2\",\"last\"]");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_WithBodyAsFile()
+        public async Task Response_ProvideResponse_Handlebars_WithBodyAsFile()
-        {
+        {
-            // Assign
+            // Assign
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo?MyUniqueNumber=1"), "GET", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo?MyUniqueNumber=1"), "GET", ClientIp);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithTransformer()
+                .WithTransformer()
-                .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");
+                .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
+            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_WithBodyAsFile_And_TransformContentFromBodyAsFile()
+        public async Task Response_ProvideResponse_Handlebars_WithBodyAsFile_And_TransformContentFromBodyAsFile()
-        {
+        {
-            // Assign
+            // Assign
-            var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
+            var filesystemHandlerMock = new Mock<IFileSystemHandler>(MockBehavior.Strict);
-            filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("<xml MyUniqueNumber=\"{{request.query.MyUniqueNumber}}\"></xml>");
+            filesystemHandlerMock.Setup(fs => fs.ReadResponseBodyAsString(It.IsAny<string>())).Returns("<xml MyUniqueNumber=\"{{request.query.MyUniqueNumber}}\"></xml>");
-
+
-            _settings.FileSystemHandler = filesystemHandlerMock.Object;
+            _settings.FileSystemHandler = filesystemHandlerMock.Object;
-
+
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo?MyUniqueNumber=1"), "GET", ClientIp);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo?MyUniqueNumber=1"), "GET", ClientIp);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithTransformer(true)
+                .WithTransformer(true)
-                .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");
+                .WithBodyFromFile(@"c:\\{{request.query.MyUniqueNumber}}\\test.xml");
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
+            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.xml");
-            Check.That(responseMessage.BodyData.DetectedBodyType).Equals(BodyType.String);
+            Check.That(responseMessage.BodyData.DetectedBodyType).Equals(BodyType.String);
-            Check.That(responseMessage.BodyData.BodyAsString).Equals("<xml MyUniqueNumber=\"1\"></xml>");
+            Check.That(responseMessage.BodyData.BodyAsString).Equals("<xml MyUniqueNumber=\"1\"></xml>");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_WithBodyAsFile_JsonPath()
+        public async Task Response_ProvideResponse_Handlebars_WithBodyAsFile_JsonPath()
-        {
+        {
-            // Assign
+            // Assign
-            string jsonString = "{ \"MyUniqueNumber\": \"1\" }";
+            string jsonString = "{ \"MyUniqueNumber\": \"1\" }";
-            var bodyData = new BodyData
+            var bodyData = new BodyData
-            {
+            {
-                BodyAsString = jsonString,
+                BodyAsString = jsonString,
-                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
+                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
-                DetectedBodyType = BodyType.Json,
+                DetectedBodyType = BodyType.Json,
-                DetectedBodyTypeFromContentType = BodyType.Json,
+                DetectedBodyTypeFromContentType = BodyType.Json,
-                Encoding = Encoding.UTF8
+                Encoding = Encoding.UTF8
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, bodyData);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo"), "POST", ClientIp, bodyData);
-
+
-            string jsonPath = "\"$.MyUniqueNumber\"";
+            string jsonPath = "\"$.MyUniqueNumber\"";
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithTransformer()
+                .WithTransformer()
-                .WithBodyFromFile(@"c:\\{{JsonPath.SelectToken request.body " + jsonPath + "}}\\test.json"); // why use a \\ here ?
+                .WithBodyFromFile(@"c:\\{{JsonPath.SelectToken request.body " + jsonPath + "}}\\test.json"); // why use a \\ here ?
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.json");
+            Check.That(responseMessage.BodyData.BodyAsFile).Equals(@"c:\1\test.json");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsNormalString()
+        public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsNormalString()
-        {
+        {
-            // Assign
+            // Assign
-            string jsonString = "{ \"name\": \"WireMock\" }";
+            string jsonString = "{ \"name\": \"WireMock\" }";
-            var bodyData = new BodyData
+            var bodyData = new BodyData
-            {
+            {
-                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
+                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
-                DetectedBodyType = BodyType.Json,
+                DetectedBodyType = BodyType.Json,
-                Encoding = Encoding.UTF8
+                Encoding = Encoding.UTF8
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithBodyAsJson("test")
+                .WithBodyAsJson("test")
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("\"test\"");
+            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("\"test\"");
-        }
+        }
-
+
-        [Fact]
+        [Fact]
-        public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsHandlebarsString()
+        public async Task Response_ProvideResponse_Handlebars_WithBodyAsJson_ResultAsHandlebarsString()
-        {
+        {
-            // Assign
+            // Assign
-            string jsonString = "{ \"name\": \"WireMock\" }";
+            string jsonString = "{ \"name\": \"WireMock\" }";
-            var bodyData = new BodyData
+            var bodyData = new BodyData
-            {
+            {
-                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
+                BodyAsJson = JsonConvert.DeserializeObject(jsonString),
-                DetectedBodyType = BodyType.Json,
+                DetectedBodyType = BodyType.Json,
-                Encoding = Encoding.UTF8
+                Encoding = Encoding.UTF8
-            };
+            };
-            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);
-
+
-            var response = Response.Create()
+            var response = Response.Create()
-                .WithBodyAsJson("{{{request.bodyAsJson}}}")
+                .WithBodyAsJson("{{{request.bodyAsJson}}}")
-                .WithTransformer();
+                .WithTransformer();
-
+
-            // Act
+            // Act
-            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
-
+
-            // Assert
+            // Assert
-            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
+            Check.That(JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson)).Equals("{\"name\":\"WireMock\"}");
-        }
+        }
-    }
+
+        [Fact]
+        public async Task Response_ProvideResponse_Handlebars_WithBodyAsString_KeepsEncoding()
+        {
+            // Assign
+            const string text = "my-text";
+            Encoding enc = Encoding.Unicode;
+            var bodyData = new BodyData
+            {
+                BodyAsString = text,
+                DetectedBodyType = BodyType.String,
+                Encoding = enc
+            };
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "POST", ClientIp, bodyData);
+
+            var response = Response.Create()
+                .WithBody("{{request.body}}", BodyDestinationFormat.SameAsSource, enc)
+                .WithTransformer();
+
+            // Act
+            var responseMessage = await response.ProvideResponseAsync(request, _settings);
+
+            // Assert
+            responseMessage.BodyData.BodyAsString.Should().Be(text);
+            responseMessage.BodyData.Encoding.Should().Be(enc);
+        }
+    }
 }

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

@@ -16,6 +16,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
 {
     public class ResponseWithProxyTests : IDisposable
     {
+        private const string ClientIp = "::1";
         private readonly WireMockServerSettings _settings = new WireMockServerSettings();
         private readonly WireMockServer _server;
         private readonly Guid _guid;
@@ -27,21 +28,32 @@ namespace WireMock.Net.Tests.ResponseBuilders
             _server = WireMockServer.Start();
             _server.Given(Request.Create().UsingPost().WithPath($"/{_guid}"))
                 .RespondWith(Response.Create().WithStatusCode(201).WithBodyAsJson(new { p = 42 }).WithHeader("Content-Type", "application/json"));
+            _server.Given(Request.Create().UsingPost().WithPath($"/{_guid}/append"))
+                .RespondWith(Response.Create().WithStatusCode(201).WithBodyAsJson(new { p = 10 }).WithHeader("Content-Type", "application/json"));
+            _server.Given(Request.Create().UsingPost().WithPath($"/prepend/{_guid}"))
+                .RespondWith(Response.Create().WithStatusCode(201).WithBodyAsJson(new { p = 11 }).WithHeader("Content-Type", "application/json"));
+            _server.Given(Request.Create().UsingPost().WithPath($"/prepend/{_guid}/append"))
+                .RespondWith(Response.Create().WithStatusCode(201).WithBodyAsJson(new { p = 12 }).WithHeader("Content-Type", "application/json"));
         }
 
-        [Fact]
+        [Theory]
-        public async Task Response_WithProxy()
+        [InlineData("", "", "{\"p\":42}")]
+        [InlineData("", "/append", "{\"p\":10}")]
+        [InlineData("/prepend", "", "{\"p\":11}")]
+        [InlineData("/prepend", "/append", "{\"p\":12}")]
+        public async Task Response_WithProxy(string prepend, string append, string expectedBody)
         {
             // Assign
             var headers = new Dictionary<string, string[]> { { "Content-Type", new[] { "application/xml" } } };
-            var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}/{_guid}"), "POST", "::1", new BodyData { DetectedBodyType = BodyType.Json, BodyAsJson = new { a = 1 } }, headers);
+            var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}{prepend}/{_guid}{append}"), "POST", ClientIp, new BodyData { DetectedBodyType = BodyType.Json, BodyAsJson = new { a = 1 } }, headers);
             var response = Response.Create().WithProxy(_server.Urls[0]);
 
             // Act
             var responseMessage = await response.ProvideResponseAsync(request, _settings);
 
             // Assert
-            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo("{\"p\":42}");
+            Check.That(request.ProxyUrl).IsNotNull();
+            Check.That(responseMessage.BodyData.BodyAsString).IsEqualTo(expectedBody);
             Check.That(responseMessage.StatusCode).IsEqualTo(201);
             Check.That(responseMessage.Headers["Content-Type"].ToString()).IsEqualTo("application/json");
         }
@@ -63,7 +75,7 @@ namespace WireMock.Net.Tests.ResponseBuilders
             var response = Response.Create().WithProxy(settings);
 
             // Act
-            var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}/{_guid}"), "GET", "::1");
+            var request = new RequestMessage(new UrlDetails($"{_server.Urls[0]}/{_guid}"), "GET", ClientIp);
 
             Check.ThatAsyncCode(() => response.ProvideResponseAsync(request, _settings)).Throws<HttpRequestException>();
         }

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

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Authors>Stef Heyenrath</Authors>
     <!--<TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>-->
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <DebugType>full</DebugType>
     <AssemblyName>WireMock.Net.Tests</AssemblyName>
     <PackageId>WireMock.Net.Tests</PackageId>

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

@@ -5,7 +5,10 @@ using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
+using FluentAssertions;
 using NFluent;
+using WireMock.Admin.Mappings;
+using WireMock.Logging;
 using WireMock.Matchers.Request;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
@@ -50,7 +53,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_proxy_responses()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var server = WireMockServer.Start();
             server
                 .Given(Request.Create().WithPath(path))
@@ -76,7 +79,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_preserve_content_header_in_proxied_request()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var serverForProxyForwarding = WireMockServer.Start();
             serverForProxyForwarding
                 .Given(Request.Create().WithPath(path))
@@ -123,7 +126,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_exclude_blacklisted_content_header_in_mapping()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var serverForProxyForwarding = WireMockServer.Start();
             serverForProxyForwarding
                 .Given(Request.Create().WithPath(path))
@@ -165,7 +168,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_exclude_blacklisted_cookies_in_mapping()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var serverForProxyForwarding = WireMockServer.Start();
             serverForProxyForwarding
                 .Given(Request.Create().WithPath(path))
@@ -214,7 +217,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_preserve_content_header_in_proxied_request_with_empty_content()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var serverForProxyForwarding = WireMockServer.Start();
             serverForProxyForwarding
                 .Given(Request.Create().WithPath(path))
@@ -246,7 +249,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_preserve_content_header_in_proxied_response()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var serverForProxyForwarding = WireMockServer.Start();
             serverForProxyForwarding
                 .Given(Request.Create().WithPath(path))
@@ -277,7 +280,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_change_absolute_location_header_in_proxied_response()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var settings = new WireMockServerSettings { AllowPartialMapping = false };
 
             var serverForProxyForwarding = WireMockServer.Start(settings);
@@ -310,7 +313,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_preserve_cookie_header_in_proxied_request()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var serverForProxyForwarding = WireMockServer.Start();
             serverForProxyForwarding
                 .Given(Request.Create().WithPath(path))
@@ -379,7 +382,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_set_BodyAsJson_in_proxied_response()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var serverForProxyForwarding = WireMockServer.Start();
             serverForProxyForwarding
                 .Given(Request.Create().WithPath(path))
@@ -410,7 +413,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_set_Body_in_multipart_proxied_response()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var serverForProxyForwarding = WireMockServer.Start();
             serverForProxyForwarding
                 .Given(Request.Create().WithPath(path))
@@ -440,7 +443,7 @@ namespace WireMock.Net.Tests
         public async Task WireMockServer_Proxy_Should_Not_overrule_AdminMappings()
         {
             // Assign
-            string path = $"/prx_{Guid.NewGuid().ToString()}";
+            string path = $"/prx_{Guid.NewGuid()}";
             var serverForProxyForwarding = WireMockServer.Start();
             serverForProxyForwarding
                 .Given(Request.Create().WithPath(path))
@@ -482,5 +485,37 @@ namespace WireMock.Net.Tests
             string content2 = await response2.Content.ReadAsStringAsync();
             Check.That(content2).IsEqualTo("[]");
         }
+
+        [Fact]
+        public async Task WireMockServer_Proxy_WhenTargetIsNotAvailable_Should_Return_CorrectResponse()
+        {
+            // Assign
+            var settings = new WireMockServerSettings
+            {
+                ProxyAndRecordSettings = new ProxyAndRecordSettings
+                {
+                    Url = $"http://error{Guid.NewGuid()}:12345"
+                }
+            };
+            var server = WireMockServer.Start(settings);
+
+            // Act
+            var requestMessage = new HttpRequestMessage
+            {
+                Method = HttpMethod.Get,
+                RequestUri = new Uri(server.Urls[0])
+            };
+            var httpClientHandler = new HttpClientHandler { AllowAutoRedirect = false };
+            var result = await new HttpClient(httpClientHandler).SendAsync(requestMessage);
+
+            // Assert
+            result.StatusCode.Should().Be(500);
+
+            var content = await result.Content.ReadAsStringAsync();
+            content.Should().Contain("known"); // On Linux it's "Name or service not known". On Windows it's "No such host is known.".
+
+            server.LogEntries.Should().HaveCount(1);
+            ((StatusModel) server.LogEntries.First().ResponseMessage.BodyData.BodyAsJson).Status.Should().Contain("known");
+        }
     }
 }