1.4.39

* RandomDataGenerator.Net 1.0.14

* .

CHANGELOG.md

@@ -1,3 +1,20 @@
+# 1.4.39 (25 March 2022)
+- [#739](https://github.com/WireMock-Net/WireMock.Net/pull/739) - Upgrade NuGet for RandomDataGenerator.Net to 1.0.14 contributed by [StefH](https://github.com/StefH)
+
+# 1.4.38 (11 March 2022)
+- [#736](https://github.com/WireMock-Net/WireMock.Net/pull/736) - Remove interface for all Setting classes [feature] contributed by [StefH](https://github.com/StefH)
+- [#737](https://github.com/WireMock-Net/WireMock.Net/pull/737) - Add WireMock.Net.WebApplication.NET6 example contributed by [StefH](https://github.com/StefH)
+
+# 1.4.37 (02 March 2022)
+- [#730](https://github.com/WireMock-Net/WireMock.Net/pull/730) - Fixed bug "dotnet nuget push -n" [bug] contributed by [StefH](https://github.com/StefH)
+- [#732](https://github.com/WireMock-Net/WireMock.Net/pull/732) - Make X509CertificatePassword optional [feature] contributed by [StefH](https://github.com/StefH)
+- [#733](https://github.com/WireMock-Net/WireMock.Net/pull/733) - Fix FileSystemWatcher [bug] contributed by [StefH](https://github.com/StefH)
+- [#726](https://github.com/WireMock-Net/WireMock.Net/issues/726) - Wiremock -  WatchStaticMappings only works until the first request is made  [bug]
+
+# 1.4.36 (25 February 2022)
+- [#728](https://github.com/WireMock-Net/WireMock.Net/pull/728) - Update NuGet packages [feature] contributed by [StefH](https://github.com/StefH)
+- [#729](https://github.com/WireMock-Net/WireMock.Net/pull/729) - BodyAsFile should use BodyAsFileIsCached value [bug] contributed by [StefH](https://github.com/StefH)
+
 # 1.4.35 (09 February 2022)
 - [#722](https://github.com/WireMock-Net/WireMock.Net/pull/722) - Fixed 'Response BodyAsJson with JArray does not work' [bug] contributed by [StefH](https://github.com/StefH)
 - [#721](https://github.com/WireMock-Net/WireMock.Net/issues/721) - Response BodyAsJson with array does not work [bug]

Directory.Build.props

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

Generate-ReleaseNotes.cmd

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

PackageReleaseNotes.txt

@@ -1,4 +1,4 @@
-# 1.4.35 (09 February 2022)
-- #722 Fixed 'Response BodyAsJson with JArray does not work' [bug]
+# 1.4.39 (25 March 2022)
+- #739 Upgrade NuGet for RandomDataGenerator.Net to 1.0.14
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

README.md

@@ -29,7 +29,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 
 ### NuGet packages
 
-| | Official | Preview |
+| | Official | Preview [:information_source:](https://github.com/WireMock-Net/WireMock.Net/wiki/MyGet-preview-versions) |
 | - | - | - |
 |   **WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
 |   **WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)

WireMock.Net Solution.sln

@@ -23,7 +23,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
-		build-info.md = build-info.md
 		CHANGELOG.md = CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
 		Generate-ReleaseNotes.cmd = Generate-ReleaseNotes.cmd
@@ -98,6 +97,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Org.RestClient", "
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Org.Abstractions", "src\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj", "{3BA5109E-5F30-4CC2-B699-02EC82560AA6}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NET6", "examples\WireMock.Net.Console.NET6\WireMock.Net.Console.NET6.csproj", "{2215055B-594E-4C2F-99B2-6DF337F02893}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.WebApplication.NET6", "examples\WireMock.Net.WebApplication.NET6\WireMock.Net.WebApplication.NET6.csproj", "{3F7AA023-6833-4856-A08A-4B5717B592B8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -228,6 +231,14 @@ Global
 		{3BA5109E-5F30-4CC2-B699-02EC82560AA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3BA5109E-5F30-4CC2-B699-02EC82560AA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3BA5109E-5F30-4CC2-B699-02EC82560AA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2215055B-594E-4C2F-99B2-6DF337F02893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2215055B-594E-4C2F-99B2-6DF337F02893}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2215055B-594E-4C2F-99B2-6DF337F02893}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2215055B-594E-4C2F-99B2-6DF337F02893}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F7AA023-6833-4856-A08A-4B5717B592B8}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -266,6 +277,8 @@ Global
 		{5B64F6CA-BF6B-4F67-BB2A-9C47E441703E} = {7EFB2C5B-1BB2-4AAF-BC9F-216ED80C594D}
 		{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{3BA5109E-5F30-4CC2-B699-02EC82560AA6} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{2215055B-594E-4C2F-99B2-6DF337F02893} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{3F7AA023-6833-4856-A08A-4B5717B592B8} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

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 netcoreapp3.1 --logger trx
+    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework net6.0 --logger trx
 - task: PublishTestResults@2
   inputs:
     testRunner: VSTest

azure-pipelines-ci.yml

@@ -35,21 +35,21 @@ jobs:
       projectKey: 'WireMock-Net_WireMock.Net'
       projectName: 'WireMock.Net'
       extraProperties: |
-        sonar.cs.opencover.reportsPaths=**/coverage.netcoreapp3.1.opencover.xml
+        sonar.cs.opencover.reportsPaths=**/coverage.net6.0.opencover.xml
   
   - task: DotNetCoreCLI@2
     displayName: 'Build Unit tests'
     inputs:
       command: 'build'
       projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--configuration Debug --framework netcoreapp3.1'
+      arguments: '--configuration Debug --framework net6.0'
   
   - task: DotNetCoreCLI@2
     displayName: 'Execute Unit tests'
     inputs:
       command: 'test'
       projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--no-build --configuration Debug --framework netcoreapp3.1 --collect:"XPlat Code Coverage" --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
+      arguments: '--no-build --configuration Debug --framework net6.0 --collect:"XPlat Code Coverage" --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
   
   - task: SonarCloudAnalyze@1
     displayName: 'SonarCloud: Run Code Analysis'
@@ -64,7 +64,7 @@ jobs:
     condition: and(succeeded(), eq(variables['RUN_WHITESOURCE'], 'yes'))
  
   - script: |
-      bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) -f ./test/WireMock.Net.Tests/coverage.netcoreapp3.1.opencover.xml
+      bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) -f ./test/WireMock.Net.Tests/coverage.net6.0.opencover.xml
     displayName: 'codecov'
   
   - task: PublishTestResults@2
@@ -76,36 +76,47 @@ jobs:
   - task: PublishBuildArtifacts@1
     displayName: Publish coverage file
     inputs:
-      PathtoPublish: '/home/vsts/work/1/s/test/WireMock.Net.Tests/coverage.netcoreapp3.1.opencover.xml'
+      PathtoPublish: '/home/vsts/work/1/s/test/WireMock.Net.Tests/coverage.net6.0.opencover.xml'
 
 - job: Windows_Build_Test
-  dependsOn: Linux_Build_Test_SonarCloud
 
   pool:
-    vmImage: 'windows-2019'
+    vmImage: 'windows-2022'
 
   steps:
+  - task: UseDotNet@2
+    displayName: Use .NET 6.0
+    inputs:
+      packageType: 'sdk'
+      version: '6.0.x'
+
   - task: DotNetCoreCLI@2
     displayName: 'Build Unit tests'
     inputs:
       command: 'build'
       projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--configuration Debug --framework netcoreapp3.1'
+      arguments: '--configuration Debug --framework net6.0'
   
   - task: DotNetCoreCLI@2
     displayName: 'Execute Unit tests'
     inputs:
       command: 'test'
       projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--no-build --configuration Debug --framework netcoreapp3.1 --collect:"XPlat Code Coverage" --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
+      arguments: '--no-build --configuration Debug --framework net6.0 --collect:"XPlat Code Coverage" --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover'
   
 - job: Windows_Release_to_MyGet
   dependsOn: Windows_Build_Test
 
   pool:
-    vmImage: 'windows-2019'
+    vmImage: 'windows-2022'
 
   steps:
+  - task: UseDotNet@2
+    displayName: Use .NET 6.0
+    inputs:
+      packageType: 'sdk'
+      version: '6.0.x'
+
   - task: DotNetCoreCLI@2
     displayName: Build Release
     inputs:
@@ -136,4 +147,4 @@ jobs:
     inputs:
       command: custom
       custom: nuget
-      arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg -n true -s https://www.myget.org/F/wiremock-net/api/v3/index.json -k $(MyGetKey)
+      arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg -n -s https://www.myget.org/F/wiremock-net/api/v3/index.json -k $(MyGetKey)

azure-pipelines-linux.yml

@@ -2,7 +2,7 @@ trigger:
 - none
 
 pool:
-  vmImage: 'Ubuntu 16.04'
+  vmImage: 'Ubuntu-latest'
 
 variables:
   buildProjects: '**/src/**/*.csproj'

azure-pipelines-nuget.yml

@@ -1,5 +1,5 @@
 pool:
-  vmImage: 'windows-2019'
+  vmImage: 'windows-2022'
 
 variables:
   Prerelease: ''
@@ -43,4 +43,4 @@ steps:
   inputs:
     command: custom
     custom: nuget
-    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg -n true -s https://api.nuget.org/v3/index.json -k $(NuGetKey) --skip-duplicate
+    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg -n -s https://api.nuget.org/v3/index.json -k $(NuGetKey) --skip-duplicate

build-info.md

@@ -1,11 +0,0 @@
-# Build info
-For building and running all code in VSCode:
-
-- download nuget.exe from https://www.nuget.org/downloads
-- copy nuget.exe to a folder which is listed in the path or just in c:\Windows
-- go to the root from this project and run `nuget restore`
-- all packages are now restored into the `WireMock.Net\packages` folder
-
-### Note
-An example project like `WireMock.Net.Console.Net452.Classic` still shows some red errors in VSCode, but you can just run `dotnet build`.
-But you can just execute `.\bin\Debug\WireMock.Net.ConsoleApplication.exe` to run the application

examples/WireMock.Net.Client/Program.cs

@@ -1,9 +1,10 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using RestEase;
 using System;
 using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
+using WireMock.Admin.Settings;
 using WireMock.Client;
 
 namespace WireMock.Net.Client
@@ -22,7 +23,7 @@ namespace WireMock.Net.Client
             var settings1 = await api.GetSettingsAsync();
             Console.WriteLine($"settings1 = {JsonConvert.SerializeObject(settings1)}");
 
-            var settingsViaBuilder = new FluentBuilder.SettingsModelBuilder()
+            var settingsViaBuilder = new SettingsModelBuilder()
                 .WithGlobalProcessingDelay(1077)
                 .WithoutGlobalProcessingDelay()
                 .Build();

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

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
 

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

@@ -23,12 +23,13 @@
 
   <ItemGroup>
     <None Remove="__admin\mappings\array.json" />
+    <None Remove="__admin\mappings\BodyAsFileExample2.json" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
     <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.13" />
+    <PackageReference Include="log4net" Version="2.0.14" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>

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

@@ -4,20 +4,10 @@
             "Matchers": [
                 {
                     "Name": "WildcardMatcher",
-                    "Patterns": [ "/static/mapping", "/static/mapping2" ]
+                    "Pattern": "/static/mapping",
                 }
             ]
         },
-        "Body": {
-            "Matcher": {
-                "Name": "JsonMatcher",
-                "Pattern": {
-                    "post1": "value 1",
-                    "post2": "value 2"
-                },
-                "IgnoreCase": true
-            }
-        },
         "Methods": [
             "get",
             "post"

examples/WireMock.Net.Console.NET5/__admin/mappings/BodyAsFileExample.json

@@ -1,4 +1,5 @@
 {
+    "Guid": "1234567A-940e-4b86-a1f4-4f0fc7be8b8b",
     "Request": {
         "Path": {
             "Matchers": [
@@ -15,8 +16,9 @@
     },
     "Response": {
         "StatusCode": 200,
-        "Headers": {"Content-Type": "application/xml"},
+        "Headers": { "Content-Type": "application/xml" },
         "BodyAsFile": "MyXmlResponse.xml",
+        "BodyAsFileIsCached": false,
         "UseTransformer": false
     }
 }

examples/WireMock.Net.Console.NET5/__admin/mappings/BodyAsFileExample2.json

@@ -0,0 +1,24 @@
+{
+    "Guid": "1234567B-940e-4b86-a1f4-4f0fc7be8b8b",
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/bodyasfilexmltest2",
+                    "IgnoreCase": false
+                }
+            ]
+        },
+        "Methods": [
+            "get"
+        ]
+    },
+    "Response": {
+        "StatusCode": 200,
+        "Headers": { "Content-Type": "application/xml" },
+        "BodyAsFile": "MyXmlResponse.xml",
+        "BodyAsFileIsCached": true,
+        "UseTransformer": false
+    }
+}

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

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

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

@@ -0,0 +1,54 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs" Link="MainApp.cs" />
+    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs" Link="CustomFileSystemFileHandler.cs" />
+    <Compile Include="..\WireMock.Net.Console.NETCoreApp\Program.cs" Link="Program.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="__admin\mappings\*.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Remove="__admin\mappings\1.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="__admin\mappings\array.json" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="Handlebars.Net.Helpers" Version="2.*" />
+    <PackageReference Include="log4net" Version="2.0.14" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="log4net.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="nlog.config">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\791a3f31-6946-4ce7-8e6f-0237c7443275.json">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </None>
+    <None Update="__admin\mappings\MyXmlResponse.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
+</Project>

examples/WireMock.Net.Console.NET6/__admin/mappings/1.cs

@@ -0,0 +1 @@
+// C# Hello

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

@@ -0,0 +1,23 @@
+{
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/static/mapping",
+                }
+            ]
+        },
+        "Methods": [
+            "get",
+            "post"
+        ]
+    },
+    "Response": {
+        "BodyAsJson": { "body": "static mapping" },
+        "Headers": {
+            "Content-Type": "application/json",
+            "Test-X": [ "test 1", "test 2" ]
+        }
+    }
+}

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

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

examples/WireMock.Net.Console.NET6/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json

@@ -0,0 +1,19 @@
+{
+  "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
+  "Priority": 4,
+  "Request": {
+    "Path": {},
+    "Methods": [
+      "get"
+    ]
+  },
+  "Response": {
+    "StatusCode": 200,
+    "BodyDestination": "SameAsSource",
+    "Body": "NO PATH OR URL",
+    "UseTransformer": false,
+    "Headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}

examples/WireMock.Net.Console.NET6/__admin/mappings/BodyAsFileExample.json

@@ -0,0 +1,23 @@
+{
+    "Guid": "1234567A-940e-4b86-a1f4-4f0fc7be8b8b",
+    "Request": {
+        "Path": {
+            "Matchers": [
+                {
+                    "Name": "WildcardMatcher",
+                    "Pattern": "/bodyasfilexmltest",
+                    "IgnoreCase": false
+                }
+            ]
+        },
+        "Methods": [
+            "get"
+        ]
+    },
+    "Response": {
+        "StatusCode": 200,
+        "Headers": { "Content-Type": "application/xml" },
+        "BodyAsFile": "MyXmlResponse.xml",
+        "UseTransformer": false
+    }
+}

examples/WireMock.Net.Console.NET6/__admin/mappings/MyXmlResponse.xml

@@ -0,0 +1,3 @@
+<xml>
+<hello>world</hello>
+</xml>

examples/WireMock.Net.Console.NET6/__admin/mappings/array.json

@@ -0,0 +1,46 @@
+[
+  {
+    "Title": "1",
+    "Request": {
+      "Path": {
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "/mappings_static_1"
+          }
+        ]
+      },
+      "Methods": [
+        "get"
+      ]
+    },
+    "Response": {
+      "BodyAsJson": { "result": "mappings static_1" },
+      "Headers": {
+        "Content-Type": "application/json"
+      }
+    }
+  },
+  {
+    "Title": "2",
+    "Request": {
+      "Path": {
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "/mappings_static_2"
+          }
+        ]
+      },
+      "Methods": [
+        "get"
+      ]
+    },
+    "Response": {
+      "BodyAsJson": { "result": "mappings static_2" },
+      "Headers": {
+        "Content-Type": "application/json"
+      }
+    }
+  }
+]

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

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

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

@@ -25,7 +25,7 @@
     <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
     <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
     <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.13" />
+    <PackageReference Include="log4net" Version="2.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
   </ItemGroup>
 

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

@@ -34,7 +34,7 @@
     <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.*" />
     <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.*" />
     <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.*" />
-    <PackageReference Include="log4net" Version="2.0.13" />
+    <PackageReference Include="log4net" Version="2.0.14" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
   </ItemGroup>
 

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

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

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

@@ -7,7 +7,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="HandlebarsDotNet.Helpers.Core" publicKeyToken="00d131fae0c250bc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.1.0" newVersion="2.1.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.3.0" newVersion="2.3.3.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Handlebars" publicKeyToken="22225d0bf33cd661" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

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

@@ -459,6 +459,15 @@ namespace WireMock.Net.ConsoleApplication
                     .WithBody("linq match !!!")
                 );
 
+            server
+                .Given(Request.Create().WithPath("/linq2")
+                    .WithBody(new LinqMatcher("it.applicationId != null"))
+                    .UsingPost()
+                )
+                .RespondWith(Response.Create()
+                    .WithBody("linq2 match !!!")
+                );
+
             server
                 .Given(Request.Create().WithPath("/myendpoint").UsingAnyMethod())
                 .RespondWith(Response.Create()
@@ -577,6 +586,9 @@ namespace WireMock.Net.ConsoleApplication
 
             System.Console.WriteLine("Press any key to quit");
             System.Console.ReadKey();
+
+            server.Stop();
+            server.Dispose();
         }
     }
 }

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

@@ -36,20 +36,20 @@
     <ApplicationIcon>..\..\resources\WireMock.Net-Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AnyOf, Version=0.2.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AnyOf.0.2.0\lib\net45\AnyOf.dll</HintPath>
+    <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars, Version=2.0.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.0.4\lib\net452\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.0.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.0\lib\net452\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.1.1-preview-01\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.2.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.2\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.1.1-preview-01\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.3\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -64,8 +64,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.XML" />
@@ -80,6 +80,7 @@
     <None Include="App.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="libman.json" />
     <None Include="log4net.config">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AnyOf" version="0.2.0" targetFramework="net452" />
-  <package id="Handlebars.Net" version="2.0.4" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers" version="2.1.1-preview-01" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.1.1-preview-01" targetFramework="net452" />
-  <package id="log4net" version="2.0.13" targetFramework="net452" />
+  <package id="AnyOf" version="0.3.0" targetFramework="net452" />
+  <package id="Handlebars.Net" version="2.1.0" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers" version="2.3.2" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.3" targetFramework="net452" />
+  <package id="log4net" version="2.0.14" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
-  <package id="System.ValueTuple" version="4.3.0" targetFramework="net452" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
 </packages>

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

@@ -1,6 +1,18 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
         <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
     </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Handlebars" publicKeyToken="22225d0bf33cd661" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="HandlebarsDotNet.Helpers.Core" publicKeyToken="00d131fae0c250bc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.3.0" newVersion="2.3.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

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

@@ -35,17 +35,17 @@
     <StartupObject>WireMock.Net.ConsoleApplication.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AnyOf, Version=0.2.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AnyOf.0.2.0\lib\net45\AnyOf.dll</HintPath>
+    <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars, Version=2.0.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.0.4\lib\net46\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.0.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.0\lib\net46\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.1.1-preview-01\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.1\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.1.1-preview-01\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.3\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
     <Reference Include="log4net, Version=2.0.13.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
       <HintPath>..\..\packages\log4net.2.0.13\lib\net45\log4net.dll</HintPath>
@@ -62,8 +62,8 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />

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

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AnyOf" version="0.2.0" targetFramework="net461" />
-  <package id="Handlebars.Net" version="2.0.4" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers" version="2.1.1-preview-01" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.1.1-preview-01" targetFramework="net461" />
+  <package id="AnyOf" version="0.3.0" targetFramework="net461" />
+  <package id="Handlebars.Net" version="2.1.0" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers" version="2.3.1" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.3" targetFramework="net461" />
   <package id="log4net" version="2.0.13" targetFramework="net461" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
-  <package id="System.ValueTuple" version="4.3.0" targetFramework="net461" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net461" />
 </packages>

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

@@ -49,6 +49,14 @@
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Handlebars" publicKeyToken="22225d0bf33cd661" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="HandlebarsDotNet.Helpers.Core" publicKeyToken="00d131fae0c250bc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-2.3.3.0" newVersion="2.3.3.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

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

@@ -39,20 +39,20 @@
     <StartupObject>WireMock.Net.ConsoleApplication.Program</StartupObject>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AnyOf, Version=0.2.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AnyOf.0.2.0\lib\net45\AnyOf.dll</HintPath>
+    <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
     </Reference>
-    <Reference Include="Fare, Version=2.1.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Fare.2.1.1\lib\net35\Fare.dll</HintPath>
+    <Reference Include="Fare, Version=2.2.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Fare.2.2.0\lib\net35\Fare.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars, Version=2.0.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.0.4\lib\net46\Handlebars.dll</HintPath>
+    <Reference Include="Handlebars, Version=2.1.0.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.2.1.0\lib\net46\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.1.1-preview-01\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+    <Reference Include="Handlebars.Net.Helpers, Version=2.3.2.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.3.2\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.1.1.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.1.1-preview-01\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.3.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.3.3\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
     <Reference Include="JmesPath.Net, Version=1.0.125.0, Culture=neutral, PublicKeyToken=b29d616b7f4faff0, processorArchitecture=MSIL">
       <HintPath>..\..\packages\JmesPath.Net.1.0.125\lib\net45\JmesPath.Net.dll</HintPath>
@@ -213,8 +213,8 @@
     <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="RandomDataGenerator, Version=1.0.12.0, Culture=neutral, PublicKeyToken=ae5c571d29a3b8d9, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RandomDataGenerator.Net.1.0.12\lib\net45\RandomDataGenerator.dll</HintPath>
+    <Reference Include="RandomDataGenerator, Version=1.0.13.0, Culture=neutral, PublicKeyToken=ae5c571d29a3b8d9, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RandomDataGenerator.Net.1.0.14\lib\net45\RandomDataGenerator.dll</HintPath>
     </Reference>
     <Reference Include="Scriban.Signed, Version=2.1.4.0, Culture=neutral, PublicKeyToken=5675fb69b15f2433, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Scriban.Signed.2.1.4\lib\net45\Scriban.Signed.dll</HintPath>
@@ -241,8 +241,8 @@
     <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
     </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.0.12.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.0.12\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.16.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.16\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AnyOf" version="0.2.0" targetFramework="net472" />
-  <package id="Fare" version="2.1.1" targetFramework="net472" />
-  <package id="Handlebars.Net" version="2.0.4" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers" version="2.1.1-preview-01" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.1.1-preview-01" targetFramework="net472" />
+  <package id="AnyOf" version="0.3.0" targetFramework="net472" />
+  <package id="Fare" version="2.2.0" targetFramework="net472" />
+  <package id="Handlebars.Net" version="2.1.0" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers" version="2.3.2" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.3.3" targetFramework="net472" />
   <package id="JmesPath.Net" version="1.0.125" targetFramework="net472" />
   <package id="log4net" version="2.0.13" targetFramework="net472" />
   <package id="Microsoft.AspNetCore" version="2.2.0" targetFramework="net472" />
@@ -59,7 +59,7 @@
   <package id="Microsoft.Extensions.Primitives" version="5.0.0" targetFramework="net472" />
   <package id="Microsoft.Net.Http.Headers" version="2.2.0" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
-  <package id="RandomDataGenerator.Net" version="1.0.12" targetFramework="net472" />
+  <package id="RandomDataGenerator.Net" version="1.0.14" targetFramework="net472" />
   <package id="Scriban.Signed" version="2.1.4" targetFramework="net472" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
@@ -67,7 +67,7 @@
   <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net472" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net472" />
   <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net472" />
-  <package id="System.Linq.Dynamic.Core" version="1.0.12" targetFramework="net472" />
+  <package id="System.Linq.Dynamic.Core" version="1.2.16" targetFramework="net472" />
   <package id="System.Memory" version="4.5.4" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />

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

@@ -35,21 +35,21 @@ namespace WireMock.Net.StandAlone.NETCoreApp
 
             _server = WireMockServer.Start(settings);
 
-            _server.Given(Request.Create().WithPath("/api/sap")
-                .UsingPost()
-                .WithBody((IBodyData xmlData) =>
-                {
-                    //xmlData is always null
-                    return true;
-                }))
-                .RespondWith(Response.Create().WithStatusCode(System.Net.HttpStatusCode.OK));
+            //_server.Given(Request.Create().WithPath("/api/sap")
+            //    .UsingPost()
+            //    .WithBody((IBodyData xmlData) =>
+            //    {
+            //        //xmlData is always null
+            //        return true;
+            //    }))
+            //    .RespondWith(Response.Create().WithStatusCode(System.Net.HttpStatusCode.OK));
 
-            _server
-                .Given(Request.Create()
-                    .UsingAnyMethod())
-                .RespondWith(Response.Create()
-                    .WithTransformer()
-                    .WithBody("{{Random Type=\"Integer\" Min=100 Max=999999}} {{DateTime.Now}} {{DateTime.Now \"yyyy-MMM\"}} {{String.Format (DateTime.Now) \"MMM-dd\"}}"));
+            //_server
+            //    .Given(Request.Create()
+            //        .UsingAnyMethod())
+            //    .RespondWith(Response.Create()
+            //        .WithTransformer()
+            //        .WithBody("{{Random Type=\"Integer\" Min=100 Max=999999}} {{DateTime.Now}} {{DateTime.Now \"yyyy-MMM\"}} {{String.Format (DateTime.Now) \"MMM-dd\"}}"));
 
             Console.WriteLine($"{DateTime.UtcNow} Press Ctrl+C to shut down");
 

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

@@ -225,8 +225,8 @@
     <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.IO.Pipelines.4.5.2\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
     </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.0.12.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.0.12\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.2.16.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.2.16\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>

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

@@ -65,7 +65,7 @@
   <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
   <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net461" />
   <package id="System.IO.Pipelines" version="4.5.2" targetFramework="net461" />
-  <package id="System.Linq.Dynamic.Core" version="1.0.12" targetFramework="net461" />
+  <package id="System.Linq.Dynamic.Core" version="1.2.16" targetFramework="net461" />
   <package id="System.Memory" version="4.5.1" targetFramework="net461" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net461" />
   <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net461" />

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

@@ -0,0 +1,28 @@
+using Microsoft.Extensions.Hosting;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace WireMock.Net.WebApplication
+{
+    public class App : IHostedService
+    {
+        private readonly IWireMockService _service;
+        
+        public App(IWireMockService service)
+        {
+            _service = service;
+        }
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            _service.Start();
+            return Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            _service.Stop();
+            return Task.CompletedTask;
+        }
+    }
+}

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

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

examples/WireMock.Net.WebApplication.NET6/Program.cs

@@ -0,0 +1,30 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApplication
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+            CreateHostBuilder(args).Build().Run();
+        }
+
+        private static IHostBuilder CreateHostBuilder(string[] args)
+            => Host.CreateDefaultBuilder(args)
+                .ConfigureServices((host, services) => ConfigureServices(services, host.Configuration));
+
+        private static void ConfigureServices(IServiceCollection services, IConfiguration configuration)
+        {
+            services.AddLogging(logging => logging.AddConsole().AddDebug());
+
+            services.AddTransient<IWireMockService, WireMockService>();
+            services.Configure<WireMockServerSettings>(configuration.GetSection("WireMockServerSettings"));
+
+            services.AddHostedService<App>();
+        }
+    }
+}

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

@@ -0,0 +1,12 @@
+{
+  "profiles": {
+    "WireMock.Net.WebApplication.NET6": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:54544;http://localhost:54545"
+    }
+  }
+}

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

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

examples/WireMock.Net.WebApplication.NET6/WireMockService.cs

@@ -0,0 +1,83 @@
+using System;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+
+using WireMock.Admin.Requests;
+using WireMock.Logging;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.WebApplication
+{
+    public class WireMockService : IWireMockService
+    {
+        private WireMockServer _server;
+        private readonly ILogger _logger;
+        private readonly WireMockServerSettings _settings;
+
+        private class Logger : IWireMockLogger
+        {
+            private readonly ILogger _logger;
+
+            public Logger(ILogger logger)
+            {
+                _logger = logger;
+            }
+
+            public void Debug(string formatString, params object[] args)
+            {
+                _logger.LogDebug(formatString, args);
+            }
+
+            public void Info(string formatString, params object[] args)
+            {
+                _logger.LogInformation(formatString, args);
+            }
+
+            public void Warn(string formatString, params object[] args)
+            {
+                _logger.LogWarning(formatString, args);
+            }
+
+            public void Error(string formatString, params object[] args)
+            {
+                _logger.LogError(formatString, args);
+            }
+
+            public void DebugRequestResponse(LogEntryModel logEntryModel, bool isAdminrequest)
+            {
+                string message = JsonConvert.SerializeObject(logEntryModel, Formatting.Indented);
+                _logger.LogDebug("Admin[{0}] {1}", isAdminrequest, message);
+            }
+
+            public void Error(string formatString, Exception exception)
+            {
+                _logger.LogError(formatString, exception.Message);
+            }
+        }
+
+        public WireMockService(ILogger<WireMockService> logger, IOptions<WireMockServerSettings> settings)
+        {
+            _logger = logger;
+            _settings = settings.Value;
+
+            _settings.Logger = new Logger(logger);
+        }
+
+        public void Start()
+        {
+            _logger.LogInformation("WireMock.Net server starting");
+
+            _server = WireMockServer.Start(_settings);
+
+            _logger.LogInformation($"WireMock.Net server settings {JsonConvert.SerializeObject(_settings)}");
+        }
+
+        public void Stop()
+        {
+            _logger.LogInformation("WireMock.Net server stopping");
+            _server?.Stop();
+        }
+    }
+}

examples/WireMock.Net.WebApplication.NET6/__admin/mappings/1e0686d3-5eb0-4c30-9482-db3735a1e4c4.json

@@ -0,0 +1,184 @@
+{
+  "Guid": "1e0686d3-5eb0-4c30-9482-db3735a1e4c4",
+  "Title": "",
+  "Request": {
+    "Path": {
+      "Matchers": [
+        {
+          "Name": "WildcardMatcher",
+          "Pattern": "/favicon.ico",
+          "IgnoreCase": false
+        }
+      ]
+    },
+    "Methods": [
+      "GET"
+    ],
+    "Headers": [
+      {
+        "Name": "Accept",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "image/avif,image/webp,image/apng,image/svg+xml,image/*,*/*;q=0.8",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Host",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "localhost:8081",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "User-Agent",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.51 Safari/537.36",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": ":method",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "GET",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Accept-Encoding",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "gzip, deflate, br",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Accept-Language",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "en-US,en;q=0.9,nl;q=0.8",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "Referer",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "https://localhost:8081/__admin/mappings",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "sec-ch-ua",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "\" Not A;Brand\";v=\"99\", \"Chromium\";v=\"99\", \"Google Chrome\";v=\"99\"",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "sec-ch-ua-mobile",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "?0",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "sec-ch-ua-platform",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "\"Windows\"",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "sec-fetch-site",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "same-origin",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "sec-fetch-mode",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "no-cors",
+            "IgnoreCase": true
+          }
+        ]
+      },
+      {
+        "Name": "sec-fetch-dest",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "image",
+            "IgnoreCase": true
+          }
+        ]
+      }
+    ],
+    "Cookies": [
+      {
+        "Name": "ai_user",
+        "Matchers": [
+          {
+            "Name": "WildcardMatcher",
+            "Pattern": "4z4B71qxV7rOSA6Gf3IFZ1|2021-07-20T17:07:54.344Z",
+            "IgnoreCase": true
+          }
+        ]
+      }
+    ]
+  },
+  "Response": {
+    "StatusCode": 200,
+    "Body": "<!doctype html><html lang=\"en\"><head><script>!function(e,t,a,n,g){e[n]=e[n]||[],e[n].push({\"gtm.start\":(new Date).getTime(),event:\"gtm.js\"});var m=t.getElementsByTagName(a)[0],r=t.createElement(a);r.async=!0,r.src=\"https://www.googletagmanager.com/gtm.js?id=GTM-NTGJQ9S\",m.parentNode.insertBefore(r,m)}(window,document,\"script\",\"dataLayer\")</script><meta charset=\"utf-8\"/><link rel=\"icon\" type=\"image/png\" href=\"/favicon.png\"/><meta name=\"viewport\" content=\"width=device-width,initial-scale=1\"/><title>Product Support Portal | SmartBear Software</title><link href=\"https://fonts.googleapis.com/css?family=Open+Sans:300,400,400i,600,700|Roboto+Mono:400,400i\" rel=\"stylesheet\"><link rel=\"stylesheet\" href=\"https://pro.fontawesome.com/releases/v5.13.1/css/all.css\" integrity=\"sha384-B9BoFFAuBaCfqw6lxWBZrhg/z4NkwqdBci+E+Sc2XlK/Rz25RYn8Fetb+Aw5irxa\" crossorigin=\"anonymous\"><script src=\"https://code.jquery.com/jquery-3.3.1.min.js\" integrity=\"sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=\" crossorigin=\"anonymous\"></script><script src=\"https://cdn.jsdelivr.net/gh/google/code-prettify@master/loader/run_prettify.js\" type=\"text/javascript\"></script><link href=\"/static/css/main.f0fcb0c0.chunk.css\" rel=\"stylesheet\"></head><body><noscript><iframe src=\"https://www.googletagmanager.com/ns.html?id=GTM-NTGJQ9S\" height=\"0\" width=\"0\" style=\"display:none;visibility:hidden\"></iframe></noscript><noscript>You need to enable JavaScript to run this website.</noscript><div id=\"root\"></div><script>!function(e){function r(r){for(var n,p,l=r[0],a=r[1],f=r[2],c=0,s=[];c<l.length;c++)p=l[c],Object.prototype.hasOwnProperty.call(o,p)&&o[p]&&s.push(o[p][0]),o[p]=0;for(n in a)Object.prototype.hasOwnProperty.call(a,n)&&(e[n]=a[n]);for(i&&i(r);s.length;)s.shift()();return u.push.apply(u,f||[]),t()}function t(){for(var e,r=0;r<u.length;r++){for(var t=u[r],n=!0,l=1;l<t.length;l++){var a=t[l];0!==o[a]&&(n=!1)}n&&(u.splice(r--,1),e=p(p.s=t[0]))}return e}var n={},o={1:0},u=[];function p(r){if(n[r])return n[r].exports;var t=n[r]={i:r,l:!1,exports:{}};return e[r].call(t.exports,t,t.exports,p),t.l=!0,t.exports}p.m=e,p.c=n,p.d=function(e,r,t){p.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},p.r=function(e){\"undefined\"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:\"Module\"}),Object.defineProperty(e,\"__esModule\",{value:!0})},p.t=function(e,r){if(1&r&&(e=p(e)),8&r)return e;if(4&r&&\"object\"==typeof e&&e&&e.__esModule)return e;var t=Object.create(null);if(p.r(t),Object.defineProperty(t,\"default\",{enumerable:!0,value:e}),2&r&&\"string\"!=typeof e)for(var n in e)p.d(t,n,function(r){return e[r]}.bind(null,n));return t},p.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return p.d(r,\"a\",r),r},p.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},p.p=\"/\";var l=this[\"webpackJsonpweb-support-react\"]=this[\"webpackJsonpweb-support-react\"]||[],a=l.push.bind(l);l.push=r,l=l.slice();for(var f=0;f<l.length;f++)r(l[f]);var i=a;t()}([])</script><script src=\"/static/js/2.cfa1a356.chunk.js\"></script><script src=\"/static/js/main.cb89e4ed.chunk.js\"></script></body></html>",
+    "Headers": {
+      "Content-Type": "text/html",
+      "Last-Modified": "Thu, 10 Mar 2022 08:39:07 GMT",
+      "Transfer-Encoding": "chunked",
+      "Connection": "keep-alive",
+      "Date": "Fri, 11 Mar 2022 09:21:22 GMT",
+      "ETag": "W/\"cd426e4e5a34d81:0\"",
+      "X-XSS-Protection": "1; mode=block",
+      "Strict-Transport-Security": "max-age=31536000; includeSubDomains; preload",
+      "X-Frame-Options": "SAMEORIGIN",
+      "X-Content-Type-Options": "nosniff",
+      "Content-Security-Policy": "frame-ancestors 'self'",
+      "Vary": "Accept-Encoding",
+      "X-Cache": "Miss from cloudfront",
+      "Via": "1.1 e328b143eb69c36369a2def78300d502.cloudfront.net (CloudFront)",
+      "X-Amz-Cf-Pop": "AMS1-C1",
+      "X-Amz-Cf-Id": "fUBp1b6g0N3JnLuj_VcueuCf0Rw-eXfBNKHq7luNlAOtqAxU5MUdcA=="
+    }
+  }
+}

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

@@ -0,0 +1,29 @@
+{
+  "Logging": {
+    "IncludeScopes": false,
+    "Debug": {
+      "LogLevel": {
+        "Default": "Debug"
+      }
+    },
+    "Console": {
+      "LogLevel": {
+        "Default": "Debug"
+      }
+    }
+  },
+  "WireMockServerSettings": {
+    "StartAdminInterface": true,
+    "Urls": [
+      "https://localhost:8081/"
+    ],
+    "AllowPartialMapping": false,
+    "HandleRequestsSynchronously": true,
+    "ThrowExceptionWhenMatcherFails": true,
+    "ProxyAndRecordSettings": {
+      "Url": "https://support.smartbear.com/",
+      "SaveMapping": true,
+      "SaveMappingToFile": true
+    }
+  }
+}

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

@@ -0,0 +1,21 @@
+# Running in IIS
+
+Follow these links / steps:
+* https://weblog.west-wind.com/posts/2016/Jun/06/Publishing-and-Running-ASPNET-Core-Applications-with-IIS
+* https://docs.microsoft.com/en-us/aspnet/core/host-and-deploy/iis/development-time-iis-support?view=aspnetcore-2.1
+* Create a `web.config` file
+
+## IIS Sites
+![IIS Multiple](resources/iis-wiremock1and2.png)
+
+## App Pool settings
+![IIS Multiple](resources/iis-apppool.png)
+
+## Publish Profiles
+Two example publish profiles are created:
+* [IIS Localhost 1](./Properties/PublishProfiles/IIS%20Localhost%201.pubxml)
+* [IIS Localhost 2](./Properties/PublishProfiles/IIS%20Localhost%202.pubxml)
+
+## Debugging
+Select the debug "IIS" if you want to debug in IIS.
+![IIS Debug](resources/iis-debug.png)

examples/WireMock.Net.WebApplication.NET6/web.config

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <!--
+    Configure your application settings in appsettings.json. Learn more at http://go.microsoft.com/fwlink/?LinkId=786380
+  -->
+  <system.webServer>
+    <handlers>
+      <add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
+    </handlers>
+    <aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" />
+  </system.webServer>
+</configuration>

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

@@ -32,10 +32,10 @@
 
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 
         <!-- See also https://mstack.nl/blog/20210801-source-generators -->
-        <PackageReference Include="FluentBuilder" Version="0.0.11">
+        <PackageReference Include="FluentBuilder" Version="0.4.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

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

@@ -38,7 +38,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'netstandard1.3'">
-    <PackageReference Include="FluentAssertions" Version="6.1.0" />
+    <PackageReference Include="FluentAssertions" Version="6.5.1" />
   </ItemGroup>
 
 	<ItemGroup>

src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs

@@ -155,7 +155,7 @@ namespace WireMock.Matchers
                 throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
             }
 
-#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0)
+#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0 || NET6_0)
             Assembly assembly;
             try
             {
@@ -169,11 +169,11 @@ namespace WireMock.Matchers
             dynamic script;
             try
             {
-#if NETSTANDARD2_0
-                script = csscript.GenericExtensions.CreateObject(assembly, "*");
-#else
-                script = CSScriptLib.ReflectionExtensions.CreateObject(assembly, "*");
-#endif
+//#if NETSTANDARD2_0
+//                script = csscript.GenericExtensions.CreateObject(assembly, "*");
+//#else
+                script = CSScripting.ReflectionExtensions.CreateObject(assembly, "*");
+//#endif
             }
             catch (Exception ex)
             {

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

@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>A CSharpCodeMatcher which can be used to match WireMock.Net Requests using C# code.</Description>
     <AssemblyTitle>WireMock.Net.Matchers.CSharpCode</AssemblyTitle>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>wiremock;matchers;matcher;csharp;csharpcode</PackageTags>
     <RootNamespace>WireMock</RootNamespace>
@@ -32,7 +32,7 @@
 
   <ItemGroup>
     <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
 
     <ProjectReference Include="..\WireMock.Net\WireMock.Net.csproj" />
   </ItemGroup>
@@ -45,16 +45,8 @@
     <PackageReference Include="CS-Script" Version="3.30.3" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0'">
-    <PackageReference Include="CS-Script.Core" Version="1.1.1" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1'">
-    <PackageReference Include="CS-Script.Core" Version="1.4.2-preview" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
-    <PackageReference Include="CS-Script.Core" Version="1.4.2-preview" />
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="CS-Script" Version="4.4.1" />
   </ItemGroup>
 
 </Project>

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

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
 		<Description>An OpenApi (swagger) parser to generate MappingModel or mapping.json file.</Description>
@@ -22,10 +22,10 @@
 	<ItemGroup>
 		<PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
 		<PackageReference Include="Microsoft.OpenApi.Readers" Version="1.2.3" />
-		<PackageReference Include="RamlToOpenApiConverter" Version="0.6.0" />
+		<PackageReference Include="RamlToOpenApiConverter" Version="0.6.1" />
 		<PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-		<PackageReference Include="RandomDataGenerator.Net" Version="1.0.13" />
+		<PackageReference Include="RandomDataGenerator.Net" Version="1.0.14" />
 		<PackageReference Include="Stef.Validation" Version="0.1.0" />
 	</ItemGroup>
 

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

@@ -30,7 +30,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="RestEase" Version="1.5.5" />
   </ItemGroup>
 

src/WireMock.Net.StandAlone/StandAloneApp.cs

@@ -16,11 +16,11 @@ namespace WireMock.Net.StandAlone
         private static readonly string Version = typeof(StandAloneApp).GetTypeInfo().Assembly.GetName().Version.ToString();
 
         /// <summary>
-        /// Start WireMock.Net standalone Server based on the IWireMockServerSettings.
+        /// Start WireMock.Net standalone Server based on the WireMockServerSettings.
         /// </summary>
-        /// <param name="settings">The IWireMockServerSettings</param>
+        /// <param name="settings">The WireMockServerSettings</param>
         [PublicAPI]
-        public static WireMockServer Start([NotNull] IWireMockServerSettings settings)
+        public static WireMockServer Start([NotNull] WireMockServerSettings settings)
         {
             Guard.NotNull(settings, nameof(settings));
 

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

@@ -1,9 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Lightweight StandAlone Http Mocking Server for .Net.</Description>
     <AssemblyTitle>WireMock.Net.StandAlone</AssemblyTitle>
     <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+    <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>WireMock.Net.StandAlone</AssemblyName>
     <PackageId>WireMock.Net.StandAlone</PackageId>

src/WireMock.Net/Http/HttpClientBuilder.cs

@@ -1,4 +1,4 @@
-using System.Net;
+using System.Net;
 using System.Net.Http;
 using WireMock.HttpsCertificate;
 using WireMock.Settings;
@@ -7,9 +7,9 @@ namespace WireMock.Http
 {
     internal static class HttpClientBuilder
     {
-        public static HttpClient Build(IHttpClientSettings settings)
+        public static HttpClient Build(HttpClientSettings settings)
         {
-#if NETSTANDARD || NETCOREAPP3_1 || NET5_0
+#if NETSTANDARD || NETCOREAPP3_1 || NET5_0 || NET6_0
             var handler = new HttpClientHandler
             {
                 CheckCertificateRevocationList = false,

src/WireMock.Net/Http/WebhookSender.cs

@@ -19,9 +19,9 @@ namespace WireMock.Http
     {
         private const string ClientIp = "::1";
 
-        private readonly IWireMockServerSettings _settings;
+        private readonly WireMockServerSettings _settings;
 
-        public WebhookSender(IWireMockServerSettings settings)
+        public WebhookSender(WireMockServerSettings settings)
         {
             _settings = settings ?? throw new ArgumentNullException(nameof(settings));
         }

src/WireMock.Net/HttpsCertificate/CertificateLoader.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Security.Cryptography.X509Certificates;
 
@@ -57,7 +57,12 @@ namespace WireMock.HttpsCertificate
                 return new X509Certificate2(filePath, password);
             }
 
-            throw new InvalidOperationException("X509StoreName and X509StoreLocation OR X509CertificateFilePath and X509CertificatePassword are mandatory.");
+            if (!string.IsNullOrEmpty(filePath))
+            {
+                return new X509Certificate2(filePath);
+            }
+
+            throw new InvalidOperationException("X509StoreName and X509StoreLocation OR X509CertificateFilePath are mandatory. Note that X509CertificatePassword is optional.");
         }
 
         /// <summary>

src/WireMock.Net/IMapping.cs

@@ -76,8 +76,8 @@ namespace WireMock
         /// <summary>
         /// The WireMockServerSettings.
         /// </summary>
-        IWireMockServerSettings Settings { get; }
-        
+        WireMockServerSettings Settings { get; }
+
         /// <summary>
         /// Is State started ?
         /// </summary>
@@ -90,7 +90,7 @@ namespace WireMock
         /// <c>true</c> if this mapping is an Admin Interface; otherwise, <c>false</c>.
         /// </value>
         bool IsAdminInterface { get; }
-        
+
         /// <summary>
         /// Gets a value indicating whether this mapping to be logged.
         /// </summary>

src/WireMock.Net/Mapping.cs

@@ -44,7 +44,7 @@ namespace WireMock
         public IResponseProvider Provider { get; }
 
         /// <inheritdoc />
-        public IWireMockServerSettings Settings { get; }
+        public WireMockServerSettings Settings { get; }
 
         /// <inheritdoc />
         public bool IsStartState => Scenario == null || Scenario != null && NextState != null && ExecutionConditionState == null;
@@ -81,7 +81,7 @@ namespace WireMock
             Guid guid,
             [CanBeNull] string title,
             [CanBeNull] string path,
-            [NotNull] IWireMockServerSettings settings,
+            [NotNull] WireMockServerSettings settings,
             [NotNull] IRequestMatcher requestMatcher,
             [NotNull] IResponseProvider provider,
             int priority,

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

@@ -1,4 +1,4 @@
-#if NETCOREAPP3_1_OR_GREATER
+#if NETCOREAPP3_1 || NET5_0 || NET6_0
 using Microsoft.AspNetCore.Builder;
 using Microsoft.Extensions.DependencyInjection;
 using WireMock.Types;

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -70,7 +70,7 @@ namespace WireMock.Owin
                     services.AddSingleton<IOwinRequestMapper, OwinRequestMapper>();
                     services.AddSingleton<IOwinResponseMapper, OwinResponseMapper>();
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NETCOREAPP3_1 || NET5_0 || NET6_0
                     AddCors(services);
 #endif
                     _wireMockMiddlewareOptions.AdditionalServiceRegistration?.Invoke(services);
@@ -79,7 +79,7 @@ namespace WireMock.Owin
                 {
                     appBuilder.UseMiddleware<GlobalExceptionMiddleware>();
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NETCOREAPP3_1 || NET5_0 || NET6_0
                     UseCors(appBuilder);
 #endif
                     _wireMockMiddlewareOptions.PreWireMockMiddlewareInit?.Invoke(appBuilder);
@@ -136,6 +136,8 @@ namespace WireMock.Owin
                 _logger.Info("Server using .NET Core 3.1");
 #elif NET5_0
                 _logger.Info("Server using .NET 5.0");
+#elif NET6_0
+                _logger.Info("Server using .NET 6.0");
 #elif NET46
                 _logger.Info("Server using .NET Framework 4.6.1 or higher");
 #endif

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -80,7 +80,7 @@ namespace WireMock.Owin
         /// <inheritdoc cref="IWireMockMiddlewareOptions.CustomCertificateDefined"/>
         public bool CustomCertificateDefined =>
             !string.IsNullOrEmpty(X509StoreName) && !string.IsNullOrEmpty(X509StoreLocation) ||
-            !string.IsNullOrEmpty(X509CertificateFilePath) && !string.IsNullOrEmpty(X509CertificatePassword);
+            !string.IsNullOrEmpty(X509CertificateFilePath);
 
         /// <inheritdoc cref="IWireMockMiddlewareOptions.SaveUnmatchedRequests"/>
         public bool? SaveUnmatchedRequests { get; set; }

src/WireMock.Net/Proxy/ProxyHelper.cs

@@ -17,15 +17,15 @@ namespace WireMock.Proxy
 {
     internal class ProxyHelper
     {
-        private readonly IWireMockServerSettings _settings;
+        private readonly WireMockServerSettings _settings;
 
-        public ProxyHelper([NotNull] IWireMockServerSettings settings)
+        public ProxyHelper([NotNull] WireMockServerSettings settings)
         {
             _settings = Guard.NotNull(settings, nameof(settings));
         }
 
         public async Task<(ResponseMessage Message, IMapping Mapping)> SendAsync(
-            [NotNull] IProxyAndRecordSettings proxyAndRecordSettings,
+            [NotNull] ProxyAndRecordSettings proxyAndRecordSettings,
             [NotNull] HttpClient client,
             [NotNull] RequestMessage requestMessage,
             [NotNull] string url)
@@ -59,7 +59,7 @@ namespace WireMock.Proxy
             return (responseMessage, mapping);
         }
 
-        private IMapping ToMapping(IProxyAndRecordSettings proxyAndRecordSettings, RequestMessage requestMessage, ResponseMessage responseMessage)
+        private IMapping ToMapping(ProxyAndRecordSettings proxyAndRecordSettings, RequestMessage requestMessage, ResponseMessage responseMessage)
         {
             string[] excludedHeaders = proxyAndRecordSettings.ExcludedHeaders ?? new string[] { };
             string[] excludedCookies = proxyAndRecordSettings.ExcludedCookies ?? new string[] { };

src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs

@@ -1,74 +1,74 @@
-using JetBrains.Annotations;
-using System;
-using System.Text;
+using JetBrains.Annotations;
+using System;
+using System.Text;
 using System.Threading.Tasks;
 
-namespace WireMock.ResponseBuilders
-{
-    /// <summary>
-    /// The BodyResponseBuilder interface.
-    /// </summary>
-    public interface IBodyResponseBuilder : IFaultResponseBuilder
-    {
-        /// <summary>
-        /// WithBody : Create a ... response based on a string.
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
-        /// <param name="encoding">The body encoding.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBody([NotNull] string body, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
-
-        /// <summary>
-        /// WithBody : Create a ... response based on a callback function.
-        /// </summary>
-        /// <param name="bodyFactory">The delegate to build the body.</param>
-        /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
-        /// <param name="encoding">The body encoding.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBody([NotNull] Func<RequestMessage, string> bodyFactory, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
-
-        /// <summary>
-        /// WithBody : Create a ... response based on a callback function.
-        /// </summary>
-        /// <param name="bodyFactory">The async delegate to build the body.</param>
-        /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
-        /// <param name="encoding">The body encoding.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBody([NotNull] Func<RequestMessage, Task<string>> bodyFactory, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
-
-        /// <summary>
-        /// WithBody : Create a ... response based on a bytearray.
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
-        /// <param name="encoding">The body encoding.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBody([NotNull] byte[] body, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
-
-        /// <summary>
-        /// WithBody : Create a string response based on a object (which will be converted to a JSON string).
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="encoding">The body encoding.</param>
-        /// <param name="indented">Use JSON indented.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBodyAsJson([NotNull] object body, [CanBeNull] Encoding encoding = null, bool? indented = null);
-
-        /// <summary>
-        /// WithBody : Create a string response based on a object (which will be converted to a JSON string).
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="indented">Define whether child objects to be indented according to the Newtonsoft.Json.JsonTextWriter.Indentation and Newtonsoft.Json.JsonTextWriter.IndentChar settings.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBodyAsJson([NotNull] object body, bool indented);
-
-        /// <summary>
-        /// WithBodyFromFile : Create a ... response based on a File.
-        /// </summary>
-        /// <param name="filename">The filename.</param>
-        /// <param name="cache">Defines if this file is cached in memory or retrieved from disk every time the response is created.</param>
-        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithBodyFromFile([NotNull] string filename, bool cache = true);
-    }
+namespace WireMock.ResponseBuilders
+{
+    /// <summary>
+    /// The BodyResponseBuilder interface.
+    /// </summary>
+    public interface IBodyResponseBuilder : IFaultResponseBuilder
+    {
+        /// <summary>
+        /// WithBody : Create a ... response based on a string.
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
+        /// <param name="encoding">The body encoding.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBody([NotNull] string body, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
+
+        /// <summary>
+        /// WithBody : Create a ... response based on a callback function.
+        /// </summary>
+        /// <param name="bodyFactory">The delegate to build the body.</param>
+        /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
+        /// <param name="encoding">The body encoding.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBody([NotNull] Func<RequestMessage, string> bodyFactory, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
+
+        /// <summary>
+        /// WithBody : Create a ... response based on a callback function.
+        /// </summary>
+        /// <param name="bodyFactory">The async delegate to build the body.</param>
+        /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
+        /// <param name="encoding">The body encoding.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBody([NotNull] Func<RequestMessage, Task<string>> bodyFactory, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
+
+        /// <summary>
+        /// WithBody : Create a ... response based on a bytearray.
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="destination">The Body Destination format (SameAsSource, String or Bytes).</param>
+        /// <param name="encoding">The body encoding.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBody([NotNull] byte[] body, [CanBeNull] string destination = BodyDestinationFormat.SameAsSource, [CanBeNull] Encoding encoding = null);
+
+        /// <summary>
+        /// WithBody : Create a string response based on a object (which will be converted to a JSON string).
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="encoding">The body encoding.</param>
+        /// <param name="indented">Use JSON indented.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBodyAsJson([NotNull] object body, [CanBeNull] Encoding encoding = null, bool? indented = null);
+
+        /// <summary>
+        /// WithBody : Create a string response based on a object (which will be converted to a JSON string).
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="indented">Define whether child objects to be indented according to the Newtonsoft.Json.JsonTextWriter.Indentation and Newtonsoft.Json.JsonTextWriter.IndentChar settings.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBodyAsJson([NotNull] object body, bool indented);
+
+        /// <summary>
+        /// WithBodyFromFile : Create a ... response based on a File.
+        /// </summary>
+        /// <param name="filename">The filename.</param>
+        /// <param name="cache">Defines if this file is cached in memory or retrieved from disk every time the response is created.</param>
+        /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithBodyFromFile([NotNull] string filename, bool cache = true);
+    }
 }

src/WireMock.Net/ResponseBuilders/IProxyResponseBuilder.cs

@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using WireMock.Settings;
 
 namespace WireMock.ResponseBuilders
@@ -21,6 +21,6 @@ namespace WireMock.ResponseBuilders
         /// </summary>
         /// <param name="settings">The IProxyAndRecordSettings.</param>
         /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-        IResponseBuilder WithProxy([NotNull] IProxyAndRecordSettings settings);
+        IResponseBuilder WithProxy([NotNull] ProxyAndRecordSettings settings);
     }
 }

src/WireMock.Net/ResponseBuilders/IStatusCodeResponseBuilder.cs

@@ -10,7 +10,7 @@ namespace WireMock.ResponseBuilders
     {
         /// <summary>
         /// The with status code.
-        /// By default all status codes are allowed, to change this behaviour, see <inheritdoc cref="IWireMockServerSettings.AllowOnlyDefinedHttpStatusCodeInResponse"/>.
+        /// By default all status codes are allowed, to change this behaviour, see <inheritdoc cref="WireMockServerSettings.AllowOnlyDefinedHttpStatusCodeInResponse"/>.
         /// </summary>
         /// <param name="code">The code.</param>
         /// <returns>The <see cref="IResponseBuilder"/>.</returns>
@@ -18,7 +18,7 @@ namespace WireMock.ResponseBuilders
 
         /// <summary>
         /// The with status code.
-        /// By default all status codes are allowed, to change this behaviour, see <inheritdoc cref="IWireMockServerSettings.AllowOnlyDefinedHttpStatusCodeInResponse"/>.
+        /// By default all status codes are allowed, to change this behaviour, see <inheritdoc cref="WireMockServerSettings.AllowOnlyDefinedHttpStatusCodeInResponse"/>.
         /// </summary>
         /// <param name="code">The code.</param>
         /// <returns>The <see cref="IResponseBuilder"/>.</returns>
@@ -26,7 +26,7 @@ namespace WireMock.ResponseBuilders
 
         /// <summary>
         /// The with status code.
-        /// By default all status codes are allowed, to change this behaviour, see <inheritdoc cref="IWireMockServerSettings.AllowOnlyDefinedHttpStatusCodeInResponse"/>.
+        /// By default all status codes are allowed, to change this behaviour, see <inheritdoc cref="WireMockServerSettings.AllowOnlyDefinedHttpStatusCodeInResponse"/>.
         /// </summary>
         /// <param name="code">The code.</param>
         /// <returns>The <see cref="IResponseBuilder"/>.</returns>

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

@@ -1,4 +1,4 @@
-using System.Net.Http;
+using System.Net.Http;
 using WireMock.Http;
 using WireMock.Settings;
 using Stef.Validation;
@@ -12,7 +12,7 @@ namespace WireMock.ResponseBuilders
         /// <summary>
         /// The WebProxy settings.
         /// </summary>
-        public IProxyAndRecordSettings ProxyAndRecordSettings { get; private set; }
+        public ProxyAndRecordSettings ProxyAndRecordSettings { get; private set; }
 
         /// <inheritdoc cref="IProxyResponseBuilder.WithProxy(string, string)"/>
         public IResponseBuilder WithProxy(string proxyUrl, string clientX509Certificate2ThumbprintOrSubjectName = null)
@@ -28,8 +28,8 @@ namespace WireMock.ResponseBuilders
             return WithProxy(settings);
         }
 
-        /// <inheritdoc cref="IProxyResponseBuilder.WithProxy(IProxyAndRecordSettings)"/>
-        public IResponseBuilder WithProxy(IProxyAndRecordSettings settings)
+        /// <inheritdoc cref="IProxyResponseBuilder.WithProxy(ProxyAndRecordSettings)"/>
+        public IResponseBuilder WithProxy(ProxyAndRecordSettings settings)
         {
             Guard.NotNull(settings, nameof(settings));
 

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -385,8 +385,8 @@ namespace WireMock.ResponseBuilders
             return this;
         }
 
-        /// <inheritdoc cref="IResponseProvider.ProvideResponseAsync(RequestMessage, IWireMockServerSettings)"/>
-        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        /// <inheritdoc cref="IResponseProvider.ProvideResponseAsync(RequestMessage, WireMockServerSettings)"/>
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, WireMockServerSettings settings)
         {
             Guard.NotNull(requestMessage, nameof(requestMessage));
             Guard.NotNull(settings, nameof(settings));

src/WireMock.Net/ResponseProviders/DynamicAsyncResponseProvider.cs

@@ -13,7 +13,7 @@ namespace WireMock.ResponseProviders
             _responseMessageFunc = responseMessageFunc;
         }
 
-        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, WireMockServerSettings settings)
         {
             return (await _responseMessageFunc(requestMessage).ConfigureAwait(false), null);
         }

src/WireMock.Net/ResponseProviders/DynamicResponseProvider.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using WireMock.Settings;
 
@@ -13,7 +13,7 @@ namespace WireMock.ResponseProviders
             _responseMessageFunc = responseMessageFunc;
         }
 
-        public Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, WireMockServerSettings settings)
         {
             (ResponseMessage responseMessage, IMapping mapping) result = (_responseMessageFunc(requestMessage), null);
             return Task.FromResult(result);

src/WireMock.Net/ResponseProviders/IResponseProvider.cs

@@ -17,6 +17,6 @@ namespace WireMock.ResponseProviders
         /// <param name="requestMessage">The request.</param>
         /// <param name="settings">The WireMockServerSettings.</param>
         /// <returns>The <see cref="ResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
-        Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync([NotNull] RequestMessage requestMessage, [NotNull] IWireMockServerSettings settings);
+        Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync([NotNull] RequestMessage requestMessage, [NotNull] WireMockServerSettings settings);
     }
 }

src/WireMock.Net/ResponseProviders/ProxyAsyncResponseProvider.cs

@@ -6,16 +6,16 @@ namespace WireMock.ResponseProviders
 {
     internal class ProxyAsyncResponseProvider : IResponseProvider
     {
-        private readonly Func<RequestMessage, IWireMockServerSettings, Task<ResponseMessage>> _responseMessageFunc;
-        private readonly IWireMockServerSettings _settings;
+        private readonly Func<RequestMessage, WireMockServerSettings, Task<ResponseMessage>> _responseMessageFunc;
+        private readonly WireMockServerSettings _settings;
 
-        public ProxyAsyncResponseProvider(Func<RequestMessage, IWireMockServerSettings, Task<ResponseMessage>> responseMessageFunc, IWireMockServerSettings settings)
+        public ProxyAsyncResponseProvider(Func<RequestMessage, WireMockServerSettings, Task<ResponseMessage>> responseMessageFunc, WireMockServerSettings settings)
         {
             _responseMessageFunc = responseMessageFunc;
             _settings = settings;
         }
 
-        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, WireMockServerSettings settings)
         {
             return (await _responseMessageFunc(requestMessage, _settings).ConfigureAwait(false), null);
         }

src/WireMock.Net/Serialization/MappingConverter.cs

@@ -209,7 +209,7 @@ namespace WireMock.Serialization
             return mappingModel;
         }
 
-        private static WebProxyModel MapWebProxy(IWebProxySettings settings)
+        private static WebProxyModel MapWebProxy(WebProxySettings settings)
         {
             return settings != null ? new WebProxyModel
             {

src/WireMock.Net/Serialization/MappingToFileSaver.cs

@@ -8,10 +8,10 @@ namespace WireMock.Serialization
 {
     internal class MappingToFileSaver
     {
-        private readonly IWireMockServerSettings _settings;
+        private readonly WireMockServerSettings _settings;
         private readonly MappingConverter _mappingConverter;
 
-        public MappingToFileSaver(IWireMockServerSettings settings, MappingConverter mappingConverter)
+        public MappingToFileSaver(WireMockServerSettings settings, MappingConverter mappingConverter)
         {
             Guard.NotNull(settings, nameof(settings));
 

src/WireMock.Net/Serialization/MatcherMapper.cs

@@ -15,9 +15,9 @@ namespace WireMock.Serialization
 {
     internal class MatcherMapper
     {
-        private readonly IWireMockServerSettings _settings;
+        private readonly WireMockServerSettings _settings;
 
-        public MatcherMapper(IWireMockServerSettings settings)
+        public MatcherMapper(WireMockServerSettings settings)
         {
             _settings = settings ?? throw new ArgumentNullException(nameof(settings));
         }
@@ -54,7 +54,7 @@ namespace WireMock.Serialization
                         return PluginLoader.Load<ICSharpCodeMatcher>(matchBehaviour, stringPatterns);
                     }
 
-                    throw new NotSupportedException("It's not allowed to use the 'CSharpCodeMatcher' because IWireMockServerSettings.AllowCSharpCodeMatcher is not set to 'true'.");
+                    throw new NotSupportedException("It's not allowed to use the 'CSharpCodeMatcher' because WireMockServerSettings.AllowCSharpCodeMatcher is not set to 'true'.");
 
                 case nameof(LinqMatcher):
                     return new LinqMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);

src/WireMock.Net/Server/RespondWithAProvider.cs

@@ -27,7 +27,7 @@ namespace WireMock.Server
         private int _timesInSameState = 1;
         private readonly RegistrationCallback _registrationCallback;
         private readonly IRequestMatcher _requestMatcher;
-        private readonly IWireMockServerSettings _settings;
+        private readonly WireMockServerSettings _settings;
         private readonly bool _saveToFile;
 
         public Guid Guid { get; private set; } = Guid.NewGuid();
@@ -43,7 +43,7 @@ namespace WireMock.Server
         /// <param name="requestMatcher">The request matcher.</param>
         /// <param name="settings">The WireMockServerSettings.</param>
         /// <param name="saveToFile">Optional boolean to indicate if this mapping should be saved as static mapping file.</param>
-        public RespondWithAProvider(RegistrationCallback registrationCallback, IRequestMatcher requestMatcher, IWireMockServerSettings settings, bool saveToFile = false)
+        public RespondWithAProvider(RegistrationCallback registrationCallback, IRequestMatcher requestMatcher, WireMockServerSettings settings, bool saveToFile = false)
         {
             _registrationCallback = registrationCallback;
             _requestMatcher = requestMatcher;

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

@@ -49,6 +49,8 @@ namespace WireMock.Server
         private readonly RegexMatcher _adminMappingsGuidPathMatcher = new RegexMatcher(@"^\/__admin\/mappings\/([0-9A-Fa-f]{8}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{12})$");
         private readonly RegexMatcher _adminRequestsGuidPathMatcher = new RegexMatcher(@"^\/__admin\/requests\/([0-9A-Fa-f]{8}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{4}[-][0-9A-Fa-f]{12})$");
 
+        private EnhancedFileSystemWatcher _enhancedFileSystemWatcher;
+
         #region InitAdmin
         private void InitAdmin()
         {
@@ -163,45 +165,17 @@ namespace WireMock.Server
 
             _settings.Logger.Info($"Watching folder '{folder}'{includeSubdirectoriesText} for new, updated and deleted MappingFiles.");
 
-            var watcher = new EnhancedFileSystemWatcher(folder, "*.json", EnhancedFileSystemWatcherTimeoutMs)
+            DisposeEnhancedFileSystemWatcher();
+            _enhancedFileSystemWatcher = new EnhancedFileSystemWatcher(folder, "*.json", EnhancedFileSystemWatcherTimeoutMs)
             {
                 IncludeSubdirectories = includeSubdirectories
             };
-
-            watcher.Created += (sender, args) =>
-            {
-                _settings.Logger.Info("MappingFile created : '{0}', reading file.", args.FullPath);
-                if (!ReadStaticMappingAndAddOrUpdate(args.FullPath))
-                {
-                    _settings.Logger.Error("Unable to read MappingFile '{0}'.", args.FullPath);
-                }
-            };
-            watcher.Changed += (sender, args) =>
-            {
-                _settings.Logger.Info("MappingFile updated : '{0}', reading file.", args.FullPath);
-                if (!ReadStaticMappingAndAddOrUpdate(args.FullPath))
-                {
-                    _settings.Logger.Error("Unable to read MappingFile '{0}'.", args.FullPath);
-                }
-            };
-            watcher.Deleted += (sender, args) =>
-            {
-                _settings.Logger.Info("MappingFile deleted : '{0}'", args.FullPath);
-                string filenameWithoutExtension = Path.GetFileNameWithoutExtension(args.FullPath);
-
-                if (Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
-                {
-                    DeleteMapping(guidFromFilename);
-                }
-                else
-                {
-                    DeleteMapping(args.FullPath);
-                }
-            };
-
-            watcher.EnableRaisingEvents = true;
+            _enhancedFileSystemWatcher.Created += EnhancedFileSystemWatcherCreated;
+            _enhancedFileSystemWatcher.Changed += EnhancedFileSystemWatcherChanged;
+            _enhancedFileSystemWatcher.Deleted += EnhancedFileSystemWatcherDeleted;
+            _enhancedFileSystemWatcher.EnableRaisingEvents = true;
         }
-
+        
         /// <inheritdoc cref="IWireMockServer.WatchStaticMappings" />
         [PublicAPI]
         public bool ReadStaticMappingAndAddOrUpdate([NotNull] string path)
@@ -235,7 +209,7 @@ namespace WireMock.Server
         #region Proxy and Record
         private HttpClient _httpClientForProxy;
 
-        private void InitProxyAndRecord(IWireMockServerSettings settings)
+        private void InitProxyAndRecord(WireMockServerSettings settings)
         {
             _httpClientForProxy = HttpClientBuilder.Build(settings.ProxyAndRecordSettings);
 
@@ -248,7 +222,7 @@ namespace WireMock.Server
             respondProvider.RespondWith(new ProxyAsyncResponseProvider(ProxyAndRecordAsync, settings));
         }
 
-        private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
+        private async Task<ResponseMessage> ProxyAndRecordAsync(RequestMessage requestMessage, WireMockServerSettings settings)
         {
             var requestUri = new Uri(requestMessage.Url);
             var proxyUri = new Uri(settings.ProxyAndRecordSettings.Url);
@@ -868,7 +842,7 @@ namespace WireMock.Server
             }
             else if (responseModel.BodyAsFile != null)
             {
-                responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile);
+                responseBuilder = responseBuilder.WithBodyFromFile(responseModel.BodyAsFile, responseModel.BodyAsFileIsCached == true);
             }
 
             if (responseModel.Fault != null && Enum.TryParse(responseModel.Fault.Type, out FaultType faultType))
@@ -940,5 +914,52 @@ namespace WireMock.Server
         {
             return DeserializeObjectToArray<T>(JsonUtils.DeserializeObject(value));
         }
+
+        private void DisposeEnhancedFileSystemWatcher()
+        {
+            if (_enhancedFileSystemWatcher != null)
+            {
+                _enhancedFileSystemWatcher.EnableRaisingEvents = false;
+
+                _enhancedFileSystemWatcher.Created -= EnhancedFileSystemWatcherCreated;
+                _enhancedFileSystemWatcher.Changed -= EnhancedFileSystemWatcherChanged;
+                _enhancedFileSystemWatcher.Deleted -= EnhancedFileSystemWatcherDeleted;
+
+                _enhancedFileSystemWatcher.Dispose();
+            }
+        }
+
+        private void EnhancedFileSystemWatcherCreated(object sender, FileSystemEventArgs args)
+        {
+            _settings.Logger.Info("MappingFile created : '{0}', reading file.", args.FullPath);
+            if (!ReadStaticMappingAndAddOrUpdate(args.FullPath))
+            {
+                _settings.Logger.Error("Unable to read MappingFile '{0}'.", args.FullPath);
+            }
+        }
+
+        private void EnhancedFileSystemWatcherChanged(object sender, FileSystemEventArgs args)
+        {
+            _settings.Logger.Info("MappingFile updated : '{0}', reading file.", args.FullPath);
+            if (!ReadStaticMappingAndAddOrUpdate(args.FullPath))
+            {
+                _settings.Logger.Error("Unable to read MappingFile '{0}'.", args.FullPath);
+            }
+        }
+
+        private void EnhancedFileSystemWatcherDeleted(object sender, FileSystemEventArgs args)
+        {
+            _settings.Logger.Info("MappingFile deleted : '{0}'", args.FullPath);
+            string filenameWithoutExtension = Path.GetFileNameWithoutExtension(args.FullPath);
+
+            if (Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
+            {
+                DeleteMapping(guidFromFilename);
+            }
+            else
+            {
+                DeleteMapping(args.FullPath);
+            }
+        }
     }
 }

src/WireMock.Net/Server/WireMockServer.cs

@@ -29,7 +29,7 @@ namespace WireMock.Server
     {
         private const int ServerStartDelayInMs = 100;
 
-        private readonly IWireMockServerSettings _settings;
+        private readonly WireMockServerSettings _settings;
         private readonly IOwinSelfHost _httpServer;
         private readonly IWireMockMiddlewareOptions _options = new WireMockMiddlewareOptions();
         private readonly MappingConverter _mappingConverter;
@@ -80,6 +80,7 @@ namespace WireMock.Server
         /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
         protected virtual void Dispose(bool disposing)
         {
+            DisposeEnhancedFileSystemWatcher();
             _httpServer?.StopAsync();
         }
         #endregion
@@ -91,7 +92,7 @@ namespace WireMock.Server
         /// <param name="settings">The WireMockServerSettings.</param>
         /// <returns>The <see cref="WireMockServer"/>.</returns>
         [PublicAPI]
-        public static WireMockServer Start([NotNull] IWireMockServerSettings settings)
+        public static WireMockServer Start([NotNull] WireMockServerSettings settings)
         {
             Guard.NotNull(settings, nameof(settings));
 
@@ -192,7 +193,7 @@ namespace WireMock.Server
         /// Service start failed with error: {startTask.Exception.Message}
         /// </exception>
         /// <exception cref="TimeoutException">Service start timed out after {TimeSpan.FromMilliseconds(settings.StartTimeout)}</exception>
-        protected WireMockServer(IWireMockServerSettings settings)
+        protected WireMockServer(WireMockServerSettings settings)
         {
             _settings = settings;
 

src/WireMock.Net/Settings/HttpClientSettings.cs

@@ -1,17 +1,24 @@
-namespace WireMock.Settings
+namespace WireMock.Settings
 {
     /// <summary>
     /// HttpClientSettings
     /// </summary>
-    public class HttpClientSettings : IHttpClientSettings
+    public class HttpClientSettings
     {
-        /// <inheritdoc cref="IHttpClientSettings.ClientX509Certificate2ThumbprintOrSubjectName"/>
+        /// <summary>
+        /// The clientCertificate thumbprint or subject name fragment to use.
+        /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
+        /// </summary>
         public string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
 
-        /// <inheritdoc cref="IHttpClientSettings.WebProxySettings"/>
-        public IWebProxySettings WebProxySettings { get; set; }
+        /// <summary>
+        /// Defines the WebProxySettings.
+        /// </summary>
+        public WebProxySettings WebProxySettings { get; set; }
 
-        /// <inheritdoc cref="IHttpClientSettings.AllowAutoRedirect"/>
+        /// <summary>
+        /// Proxy requests should follow redirection (30x).
+        /// </summary>
         public bool? AllowAutoRedirect { get; set; }
     }
 }

src/WireMock.Net/Settings/IHttpClientSettings.cs

@@ -1,24 +0,0 @@
-namespace WireMock.Settings
-{
-    /// <summary>
-    /// IHttpClientSettings
-    /// </summary>
-    public interface IHttpClientSettings
-    {
-        /// <summary>
-        /// The clientCertificate thumbprint or subject name fragment to use.
-        /// Example thumbprint : "D2DBF135A8D06ACCD0E1FAD9BFB28678DF7A9818". Example subject name: "www.google.com""
-        /// </summary>
-        string ClientX509Certificate2ThumbprintOrSubjectName { get; set; }
-
-        /// <summary>
-        /// Defines the WebProxySettings.
-        /// </summary>
-        IWebProxySettings WebProxySettings { get; set; }
-
-        /// <summary>
-        /// Proxy requests should follow redirection (30x).
-        /// </summary>
-        bool? AllowAutoRedirect { get; set; }
-    }
-}

src/WireMock.Net/Settings/IProxyAndRecordSettings.cs

@@ -1,42 +0,0 @@
-using JetBrains.Annotations;
-
-namespace WireMock.Settings
-{
-    /// <summary>
-    /// IProxyAndRecordSettings
-    /// </summary>
-    public interface IProxyAndRecordSettings : IHttpClientSettings
-    {
-        /// <summary>
-        /// The URL to proxy.
-        /// </summary>
-        string Url { get; set; }
-
-        /// <summary>
-        /// Save the mapping for each request/response to the internal Mappings.
-        /// </summary>
-        bool SaveMapping { get; set; }
-
-        /// <summary>
-        /// Only save request/response to the internal Mappings if the status code is included in this pattern. (Note that SaveMapping must also be set to true.)
-        /// The pattern can contain a single value like "200", but also ranges like "2xx", "100,300,600" or "100-299,6xx" are supported.
-        /// </summary>
-        [CanBeNull]
-        string SaveMappingForStatusCodePattern { get; set; }
-
-        /// <summary>
-        /// Save the mapping for each request/response to a .json mapping file.
-        /// </summary>
-        bool SaveMappingToFile { get; set; }
-
-        /// <summary>
-        /// Defines a list from headers which will be excluded from the saved mappings.
-        /// </summary>
-        string[] ExcludedHeaders { get; set; }
-
-        /// <summary>
-        /// Defines a list of cookies which will be excluded from the saved mappings.
-        /// </summary>
-        string[] ExcludedCookies { get; set; }
-    }
-}

src/WireMock.Net/Settings/IWebProxySettings.cs

@@ -1,23 +0,0 @@
-namespace WireMock.Settings
-{
-    /// <summary>
-    /// IWebProxySettings
-    /// </summary>
-    public interface IWebProxySettings
-    {
-        /// <summary>
-        /// A string instance that contains the address of the proxy server.
-        /// </summary>
-        string Address { get; set; }
-
-        /// <summary>
-        /// The user name associated with the credentials.
-        /// </summary>
-        string UserName { get; set; }
-
-        /// <summary>
-        /// The password for the user name associated with the credentials.
-        /// </summary>
-        string Password { get; set; }
-    }
-}

src/WireMock.Net/Settings/IWebhookSettings.cs

@@ -1,9 +0,0 @@
-namespace WireMock.Settings
-{
-    /// <summary>
-    /// IWebhookSettings
-    /// </summary>
-    public interface IWebhookSettings : IHttpClientSettings
-    {
-    }
-}

src/WireMock.Net/Settings/IWireMockCertificateSettings.cs

@@ -1,44 +0,0 @@
-namespace WireMock.Settings
-{
-    /// <summary>
-    /// If https is used, these settings can be used to configure the CertificateSettings in case a custom certificate instead the default .NET certificate should be used.
-    ///
-    /// X509StoreName and X509StoreLocation should be defined
-    /// OR
-    /// X509CertificateFilePath and X509CertificatePassword should be defined
-    /// </summary>
-    public interface IWireMockCertificateSettings
-    {
-        /// <summary>
-        /// X509 StoreName (AddressBook, AuthRoot, CertificateAuthority, My, Root, TrustedPeople or TrustedPublisher)
-        /// </summary>
-        string X509StoreName { get; set; }
-
-        /// <summary>
-        /// X509 StoreLocation (CurrentUser or LocalMachine)
-        /// </summary>
-        string X509StoreLocation { get; set; }
-
-        /// <summary>
-        /// X509 Thumbprint or SubjectName (if not defined, the 'host' is used)
-        /// </summary>
-        string X509StoreThumbprintOrSubjectName { get; set; }
-
-        /// <summary>
-        /// X509Certificate FilePath
-        /// </summary>
-        string X509CertificateFilePath { get; set; }
-
-        /// <summary>
-        /// X509Certificate Password
-        /// </summary>
-        string X509CertificatePassword { get; set; }
-
-        /// <summary>
-        /// X509StoreName and X509StoreLocation should be defined
-        /// OR
-        /// X509CertificateFilePath and X509CertificatePassword should be defined
-        /// </summary>
-        bool IsDefined { get; }
-    }
-}

src/WireMock.Net/Settings/IWireMockServerSettings.cs

@@ -1,249 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
-using HandlebarsDotNet;
-using JetBrains.Annotations;
-using Newtonsoft.Json;
-using WireMock.Admin.Mappings;
-using WireMock.Handlers;
-using WireMock.Logging;
-using WireMock.Matchers;
-using WireMock.RegularExpressions;
-#if USE_ASPNETCORE
-using Microsoft.Extensions.DependencyInjection;
-using WireMock.Types;
-#endif
-
-namespace WireMock.Settings
-{
-    /// <summary>
-    /// IWireMockServerSettings
-    /// </summary>
-    public interface IWireMockServerSettings
-    {
-        /// <summary>
-        /// Gets or sets the port.
-        /// </summary>
-        [PublicAPI]
-        int? Port { get; set; }
-
-        /// <summary>
-        /// Gets or sets the use SSL.
-        /// </summary>
-        // ReSharper disable once InconsistentNaming
-        [PublicAPI]
-        bool? UseSSL { get; set; }
-
-        /// <summary>
-        /// Gets or sets whether to start admin interface.
-        /// </summary>
-        [PublicAPI]
-        bool? StartAdminInterface { get; set; }
-
-        /// <summary>
-        /// Gets or sets if the static mappings should be read at startup.
-        /// </summary>
-        [PublicAPI]
-        bool? ReadStaticMappings { get; set; }
-
-        /// <summary>
-        /// Watch the static mapping files + folder for changes when running.
-        /// </summary>
-        [PublicAPI]
-        bool? WatchStaticMappings { get; set; }
-
-        /// <summary>
-        /// A value indicating whether subdirectories within the static mappings path should be monitored.
-        /// </summary>
-        [PublicAPI]
-        bool? WatchStaticMappingsInSubdirectories { get; set; }
-
-        /// <summary>
-        /// Gets or sets if the proxy and record settings.
-        /// </summary>
-        [PublicAPI]
-        IProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
-
-        /// <summary>
-        /// Gets or sets the urls.
-        /// </summary>
-        [PublicAPI]
-        string[] Urls { get; set; }
-
-        /// <summary>
-        /// StartTimeout
-        /// </summary>
-        [PublicAPI]
-        int StartTimeout { get; set; }
-
-        /// <summary>
-        /// Allow Partial Mapping (default set to false).
-        /// </summary>
-        [PublicAPI]
-        bool? AllowPartialMapping { get; set; }
-
-        /// <summary>
-        /// The username needed for __admin access.
-        /// </summary>
-        [PublicAPI]
-        string AdminUsername { get; set; }
-
-        /// <summary>
-        /// The password needed for __admin access.
-        /// </summary>
-        [PublicAPI]
-        string AdminPassword { get; set; }
-
-        /// <summary>
-        /// The AzureAD Tenant needed for __admin access.
-        /// </summary>
-        [PublicAPI]
-        string AdminAzureADTenant { get; set; }
-
-        /// <summary>
-        /// The AzureAD Audience / Resource for __admin access.
-        /// </summary>
-        [PublicAPI]
-        string AdminAzureADAudience { get; set; }
-
-        /// <summary>
-        /// The RequestLog expiration in hours (optional).
-        /// </summary>
-        [PublicAPI]
-        int? RequestLogExpirationDuration { get; set; }
-
-        /// <summary>
-        /// The MaxRequestLog count (optional).
-        /// </summary>
-        [PublicAPI]
-        int? MaxRequestLogCount { get; set; }
-
-        /// <summary>
-        /// Action which is called (with the IAppBuilder or IApplicationBuilder) before the internal WireMockMiddleware is initialized. [Optional]
-        /// </summary>
-        [PublicAPI]
-        Action<object> PreWireMockMiddlewareInit { get; set; }
-
-        /// <summary>
-        /// Action which is called (with the IAppBuilder or IApplicationBuilder) after the internal WireMockMiddleware is initialized. [Optional]
-        /// </summary>
-        [PublicAPI]
-        Action<object> PostWireMockMiddlewareInit { get; set; }
-
-#if USE_ASPNETCORE
-        /// <summary>
-        /// Action which is called with IServiceCollection when ASP.NET Core DI is being configured. [Optional]
-        /// </summary>
-        [PublicAPI]
-        Action<IServiceCollection> AdditionalServiceRegistration { get; set; }
-
-        /// <summary>
-        /// Policies to use when using CORS. By default CORS is disabled. [Optional]
-        /// </summary>
-        [PublicAPI]
-        CorsPolicyOptions? CorsPolicyOptions { get; set; }
-#endif
-
-        /// <summary>
-        /// The IWireMockLogger which logs Debug, Info, Warning or Error
-        /// </summary>
-        [PublicAPI]
-        IWireMockLogger Logger { get; set; }
-
-        /// <summary>
-        /// Handler to interact with the file system to read and write static mapping files.
-        /// </summary>
-        [PublicAPI]
-        IFileSystemHandler FileSystemHandler { get; set; }
-
-        /// <summary>
-        /// Action which can be used to add additional Handlebars registrations. [Optional]
-        /// </summary>
-        [PublicAPI]
-        Action<IHandlebars, IFileSystemHandler> HandlebarsRegistrationCallback { get; set; }
-
-        /// <summary>
-        /// Allow the usage of CSharpCodeMatcher (default is not allowed).
-        /// </summary>
-        [PublicAPI]
-        bool? AllowCSharpCodeMatcher { get; set; }
-
-        /// <summary>
-        /// Allow a Body for all HTTP Methods. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        bool? AllowBodyForAllHttpMethods { get; set; }
-
-        /// <summary>
-        /// Allow only a HttpStatus Code in the response which is defined. (default set to false).
-        /// - false : also null, 0, empty or invalid HttpStatus codes are allowed.
-        /// - true  : only codes defined in <see cref="System.Net.HttpStatusCode"/> are allowed.
-        /// </summary>
-        [PublicAPI]
-        bool? AllowOnlyDefinedHttpStatusCodeInResponse { get; set; }
-
-        /// <summary>
-        /// Set to true to disable Json deserialization when processing requests. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        bool? DisableJsonBodyParsing { get; set; }
-
-        /// <summary>
-        /// Disable support for GZip and Deflate request body decompression. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        bool? DisableRequestBodyDecompressing { get; set; }
-
-        /// <summary>
-        /// Handle all requests synchronously. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        bool? HandleRequestsSynchronously { get; set; }
-
-        /// <summary>
-        /// Throw an exception when the <see cref="IMatcher"/> fails because of invalid input. (default set to false).
-        /// </summary>
-        [PublicAPI]
-        bool? ThrowExceptionWhenMatcherFails { get; set; }
-
-        /// <summary>
-        /// If https is used, these settings can be used to configure the CertificateSettings in case a custom certificate instead the default .NET certificate should be used.
-        ///
-        /// X509StoreName and X509StoreLocation should be defined
-        /// OR
-        /// X509CertificateFilePath and X509CertificatePassword should be defined
-        /// </summary>
-        [PublicAPI]
-        IWireMockCertificateSettings CertificateSettings { get; set; }
-
-        /// <summary>
-        /// Defines if custom CertificateSettings are defined
-        /// </summary>
-        [PublicAPI]
-        bool CustomCertificateDefined { get; }
-
-        /// <summary>
-        /// Defines the global IWebhookSettings to use.
-        /// </summary>
-        [PublicAPI]
-        IWebhookSettings WebhookSettings { get; set; }
-
-        /// <summary>
-        /// Use the <see cref="RegexExtended"/> instead of the default <see cref="Regex"/> (default set to true).
-        /// </summary>
-        [PublicAPI]
-        bool? UseRegexExtended { get; set; }
-
-        /// <summary>
-        /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/> (default set to false).
-        /// </summary>
-        [PublicAPI]
-        bool? SaveUnmatchedRequests { get; set; }
-
-        /// <summary>
-        /// Custom matcher mappings for static mappings
-        /// </summary>
-        [PublicAPI, JsonIgnore]
-        IDictionary<string, Func<MatcherModel, IMatcher>> CustomMatcherMappings { get; set; }
-    }
-}

src/WireMock.Net/Settings/ProxyAndRecordSettings.cs

@@ -1,11 +1,11 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
     /// <summary>
     /// ProxyAndRecordSettings
     /// </summary>
-    public class ProxyAndRecordSettings : HttpClientSettings, IProxyAndRecordSettings
+    public class ProxyAndRecordSettings : HttpClientSettings
     {
         /// <summary>
         /// The URL to proxy.
@@ -32,11 +32,15 @@ namespace WireMock.Settings
         [PublicAPI]
         public string SaveMappingForStatusCodePattern { get; set; } = "*";
 
-        /// <inheritdoc cref="IProxyAndRecordSettings.ExcludedHeaders"/>
+        /// <summary>
+        /// Defines a list from headers which will be excluded from the saved mappings.
+        /// </summary>
         [PublicAPI]
         public string[] ExcludedHeaders { get; set; }
 
-        /// <inheritdoc cref="IProxyAndRecordSettings.ExcludedCookies"/>
+        /// <summary>
+        /// Defines a list of cookies which will be excluded from the saved mappings.
+        /// </summary>
         [PublicAPI]
         public string[] ExcludedCookies { get; set; }
     }

src/WireMock.Net/Settings/WebProxySettings.cs

@@ -1,19 +1,27 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
-    /// <seealso cref="IWebProxySettings" />
-    public class WebProxySettings : IWebProxySettings
+    /// <summary>
+    /// WebProxySettings
+    /// </summary>
+    public class WebProxySettings
     {
-        /// <inheritdoc cref="IWebProxySettings.Address"/>
+        /// <summary>
+        /// A string instance that contains the address of the proxy server.
+        /// </summary>
         [PublicAPI]
         public string Address { get; set; }
 
-        /// <inheritdoc cref="IWebProxySettings.UserName"/>
+        /// <summary>
+        /// The user name associated with the credentials.
+        /// </summary>
         [PublicAPI]
         public string UserName { get; set; }
 
-        /// <inheritdoc cref="IWebProxySettings.Password"/>
+        /// <summary>
+        /// The password for the user name associated with the credentials.
+        /// </summary>
         [PublicAPI]
         public string Password { get; set; }
     }

src/WireMock.Net/Settings/WebhookSettings.cs

@@ -1,9 +1,9 @@
-namespace WireMock.Settings
+namespace WireMock.Settings
 {
     /// <summary>
     /// WebhookSettings
     /// </summary>
-    public class WebhookSettings : HttpClientSettings, IWebhookSettings
+    public class WebhookSettings : HttpClientSettings
     {
     }
 }

src/WireMock.Net/Settings/WireMockCertificateSettings.cs

@@ -1,36 +1,54 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
     /// <summary>
-    /// <see cref="IWireMockCertificateSettings"/>
+    /// If https is used, these settings can be used to configure the CertificateSettings in case a custom certificate instead the default .NET certificate should be used.
+    ///
+    /// X509StoreName and X509StoreLocation should be defined
+    /// OR
+    /// X509CertificateFilePath and X509CertificatePassword should be defined
     /// </summary>
-    public class WireMockCertificateSettings : IWireMockCertificateSettings
+    public class WireMockCertificateSettings
     {
-        /// <inheritdoc cref="IWireMockCertificateSettings.X509StoreName"/>
+        /// <summary>
+        /// X509 StoreName (AddressBook, AuthRoot, CertificateAuthority, My, Root, TrustedPeople or TrustedPublisher)
+        /// </summary>
         [PublicAPI]
         public string X509StoreName { get; set; }
 
-        /// <inheritdoc cref="IWireMockCertificateSettings.X509StoreLocation"/>
+        /// <summary>
+        /// X509 StoreLocation (CurrentUser or LocalMachine)
+        /// </summary>
         [PublicAPI]
         public string X509StoreLocation { get; set; }
 
-        /// <inheritdoc cref="IWireMockCertificateSettings.X509StoreThumbprintOrSubjectName"/>
+        /// <summary>
+        /// X509 Thumbprint or SubjectName (if not defined, the 'host' is used)
+        /// </summary>
         [PublicAPI]
         public string X509StoreThumbprintOrSubjectName { get; set; }
 
-        /// <inheritdoc cref="IWireMockCertificateSettings.X509CertificateFilePath"/>
+        /// <summary>
+        /// X509Certificate FilePath
+        /// </summary>
         [PublicAPI]
         public string X509CertificateFilePath { get; set; }
 
-        /// <inheritdoc cref="IWireMockCertificateSettings.X509CertificatePassword"/>
+        /// <summary>
+        /// X509Certificate Password
+        /// </summary>
         [PublicAPI]
         public string X509CertificatePassword { get; set; }
 
-        /// <inheritdoc cref="IWireMockCertificateSettings.IsDefined"/>
+        /// <summary>
+        /// X509StoreName and X509StoreLocation should be defined
+        /// OR
+        /// X509CertificateFilePath and X509CertificatePassword should be defined
+        /// </summary>
         [PublicAPI]
         public bool IsDefined =>
             !string.IsNullOrEmpty(X509StoreName) && !string.IsNullOrEmpty(X509StoreLocation) ||
-            !string.IsNullOrEmpty(X509CertificateFilePath) && !string.IsNullOrEmpty(X509CertificatePassword);
+            !string.IsNullOrEmpty(X509CertificateFilePath);
     }
 }

src/WireMock.Net/Settings/WireMockServerSettings.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Text.RegularExpressions;
 using HandlebarsDotNet;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
@@ -7,6 +8,7 @@ using WireMock.Admin.Mappings;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.RegularExpressions;
 using WireMock.Types;
 #if USE_ASPNETCORE
 using Microsoft.Extensions.DependencyInjection;
@@ -17,157 +19,236 @@ namespace WireMock.Settings
     /// <summary>
     /// WireMockServerSettings
     /// </summary>
-    public class WireMockServerSettings : IWireMockServerSettings
+    public class WireMockServerSettings
     {
-        /// <inheritdoc cref="IWireMockServerSettings.Port"/>
+        /// <summary>
+        /// Gets or sets the port.
+        /// </summary>
         [PublicAPI]
         public int? Port { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.UseSSL"/>
+        /// <summary>
+        /// Gets or sets the use SSL.
+        /// </summary>
+        // ReSharper disable once InconsistentNaming
         [PublicAPI]
         public bool? UseSSL { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.StartAdminInterface"/>
+        /// <summary>
+        /// Gets or sets whether to start admin interface.
+        /// </summary>
         [PublicAPI]
         public bool? StartAdminInterface { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.ReadStaticMappings"/>
+        /// <summary>
+        /// Gets or sets if the static mappings should be read at startup.
+        /// </summary>
         [PublicAPI]
         public bool? ReadStaticMappings { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.WatchStaticMappings"/>
+        /// <summary>
+        /// Watch the static mapping files + folder for changes when running.
+        /// </summary>
         [PublicAPI]
         public bool? WatchStaticMappings { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.WatchStaticMappingsInSubdirectories"/>
+        /// <summary>
+        /// A value indicating whether subdirectories within the static mappings path should be monitored.
+        /// </summary>
         [PublicAPI]
         public bool? WatchStaticMappingsInSubdirectories { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.ProxyAndRecordSettings"/>
+        /// <summary>
+        /// Gets or sets if the proxy and record settings.
+        /// </summary>
         [PublicAPI]
-        public IProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
+        public ProxyAndRecordSettings ProxyAndRecordSettings { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.Urls"/>
+        /// <summary>
+        /// Gets or sets the urls.
+        /// </summary>
         [PublicAPI]
         public string[] Urls { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.StartTimeout"/>
+        /// <summary>
+        /// StartTimeout
+        /// </summary>
         [PublicAPI]
         public int StartTimeout { get; set; } = 10000;
 
-        /// <inheritdoc cref="IWireMockServerSettings.AllowPartialMapping"/>
+        /// <summary>
+        /// Allow Partial Mapping (default set to false).
+        /// </summary>
         [PublicAPI]
         public bool? AllowPartialMapping { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.AdminUsername"/>
+        /// <summary>
+        /// The username needed for __admin access.
+        /// </summary>
         [PublicAPI]
         public string AdminUsername { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.AdminPassword"/>
+        /// <summary>
+        /// The password needed for __admin access.
+        /// </summary>
         [PublicAPI]
         public string AdminPassword { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.AdminAzureADTenant"/>
+        /// <summary>
+        /// The AzureAD Tenant needed for __admin access.
+        /// </summary>
         [PublicAPI]
         public string AdminAzureADTenant { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.AdminAzureADAudience"/>
+        /// <summary>
+        /// The AzureAD Audience / Resource for __admin access.
+        /// </summary>
         [PublicAPI]
         public string AdminAzureADAudience { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.RequestLogExpirationDuration"/>
+        /// <summary>
+        /// The RequestLog expiration in hours (optional).
+        /// </summary>
         [PublicAPI]
         public int? RequestLogExpirationDuration { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.MaxRequestLogCount"/>
+        /// <summary>
+        /// The MaxRequestLog count (optional).
+        /// </summary>
         [PublicAPI]
         public int? MaxRequestLogCount { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.PreWireMockMiddlewareInit"/>
+        /// <summary>
+        /// Action which is called (with the IAppBuilder or IApplicationBuilder) before the internal WireMockMiddleware is initialized. [Optional]
+        /// </summary>
         [PublicAPI]
         [JsonIgnore]
         public Action<object> PreWireMockMiddlewareInit { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.PostWireMockMiddlewareInit"/>
+        /// <summary>
+        /// Action which is called (with the IAppBuilder or IApplicationBuilder) after the internal WireMockMiddleware is initialized. [Optional]
+        /// </summary>
         [PublicAPI]
         [JsonIgnore]
         public Action<object> PostWireMockMiddlewareInit { get; set; }
 
 #if USE_ASPNETCORE
-        /// <inheritdoc cref="IWireMockServerSettings.AdditionalServiceRegistration"/>
+        /// <summary>
+        /// Action which is called with IServiceCollection when ASP.NET Core DI is being configured. [Optional]
+        /// </summary>
         [PublicAPI]
         [JsonIgnore]
         public Action<IServiceCollection> AdditionalServiceRegistration { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.CorsPolicyOptions"/>
+        /// <summary>
+        /// Policies to use when using CORS. By default CORS is disabled. [Optional]
+        /// </summary>
         [PublicAPI]
         public CorsPolicyOptions? CorsPolicyOptions { get; set; }
 #endif
 
-        /// <inheritdoc cref="IWireMockServerSettings.Logger"/>
+        /// <summary>
+        /// The IWireMockLogger which logs Debug, Info, Warning or Error
+        /// </summary>
         [PublicAPI]
         [JsonIgnore]
         public IWireMockLogger Logger { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.FileSystemHandler"/>
+        /// <summary>
+        /// Handler to interact with the file system to read and write static mapping files.
+        /// </summary>
         [PublicAPI]
         [JsonIgnore]
         public IFileSystemHandler FileSystemHandler { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.HandlebarsRegistrationCallback"/>
+        /// <summary>
+        /// Action which can be used to add additional Handlebars registrations. [Optional]
+        /// </summary>
         [PublicAPI]
         [JsonIgnore]
         public Action<IHandlebars, IFileSystemHandler> HandlebarsRegistrationCallback { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.AllowCSharpCodeMatcher"/>
+        /// <summary>
+        /// Allow the usage of CSharpCodeMatcher (default is not allowed).
+        /// </summary>
         [PublicAPI]
         public bool? AllowCSharpCodeMatcher { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.AllowBodyForAllHttpMethods"/>
+        /// <summary>
+        /// Allow a Body for all HTTP Methods. (default set to false).
+        /// </summary>
         [PublicAPI]
         public bool? AllowBodyForAllHttpMethods { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.AllowOnlyDefinedHttpStatusCodeInResponse"/>
+        /// <summary>
+        /// Allow only a HttpStatus Code in the response which is defined. (default set to false).
+        /// - false : also null, 0, empty or invalid HttpStatus codes are allowed.
+        /// - true  : only codes defined in <see cref="System.Net.HttpStatusCode"/> are allowed.
+        /// </summary>
         [PublicAPI]
         public bool? AllowOnlyDefinedHttpStatusCodeInResponse { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.DisableJsonBodyParsing"/>
+        /// <summary>
+        /// Set to true to disable Json deserialization when processing requests. (default set to false).
+        /// </summary>
         [PublicAPI]
         public bool? DisableJsonBodyParsing { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.DisableRequestBodyDecompressing"/>
+        /// <summary>
+        /// Disable support for GZip and Deflate request body decompression. (default set to false).
+        /// </summary>
         [PublicAPI]
         public bool? DisableRequestBodyDecompressing { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.HandleRequestsSynchronously"/>
+        /// <summary>
+        /// Handle all requests synchronously. (default set to false).
+        /// </summary>
         [PublicAPI]
         public bool? HandleRequestsSynchronously { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.ThrowExceptionWhenMatcherFails"/>
+        /// <summary>
+        /// Throw an exception when the <see cref="IMatcher"/> fails because of invalid input. (default set to false).
+        /// </summary>
         [PublicAPI]
         public bool? ThrowExceptionWhenMatcherFails { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.CertificateSettings"/>
+        /// <summary>
+        /// If https is used, these settings can be used to configure the CertificateSettings in case a custom certificate instead the default .NET certificate should be used.
+        ///
+        /// X509StoreName and X509StoreLocation should be defined
+        /// OR
+        /// X509CertificateFilePath and X509CertificatePassword should be defined
+        /// </summary>
         [PublicAPI]
-        public IWireMockCertificateSettings CertificateSettings { get; set; }
+        public WireMockCertificateSettings CertificateSettings { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.CustomCertificateDefined"/>
+        /// <summary>
+        /// Defines if custom CertificateSettings are defined
+        /// </summary>
         [PublicAPI]
         public bool CustomCertificateDefined => CertificateSettings?.IsDefined == true;
 
-        /// <inheritdoc cref="IWireMockServerSettings.WebhookSettings"/>
+        /// <summary>
+        /// Defines the global IWebhookSettings to use.
+        /// </summary>
         [PublicAPI]
-        public IWebhookSettings WebhookSettings { get; set; }
+        public WebhookSettings WebhookSettings { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.UseRegexExtended"/>
+        /// <summary>
+        /// Use the <see cref="RegexExtended"/> instead of the default <see cref="Regex"/> (default set to true).
+        /// </summary>
         [PublicAPI]
         public bool? UseRegexExtended { get; set; } = true;
 
-        /// <inheritdoc cref="IWireMockServerSettings.SaveUnmatchedRequests"/>
+        /// <summary>
+        /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/> (default set to false).
+        /// </summary>
         [PublicAPI]
         public bool? SaveUnmatchedRequests { get; set; }
 
-        /// <inheritdoc cref="IWireMockServerSettings.CustomMatcherMappings"/>
+        /// <summary>
+        /// Custom matcher mappings for static mappings
+        /// </summary>
         [PublicAPI, JsonIgnore]
         public IDictionary<string, Func<MatcherModel, IMatcher>> CustomMatcherMappings { get; set; }
     }

src/WireMock.Net/Settings/WireMockServerSettingsParser.cs

@@ -8,7 +8,7 @@ using WireMock.Types;
 namespace WireMock.Settings
 {
     /// <summary>
-    /// A static helper class to parse commandline arguments into IWireMockServerSettings.
+    /// A static helper class to parse commandline arguments into WireMockServerSettings.
     /// </summary>
     public static class WireMockServerSettingsParser
     {
@@ -19,7 +19,7 @@ namespace WireMock.Settings
         /// <param name="logger">The logger (optional, can be null)</param>
         /// <param name="settings">The parsed settings</param>
         [PublicAPI]
-        public static bool TryParseArguments([NotNull] string[] args, out IWireMockServerSettings settings, [CanBeNull] IWireMockLogger logger = null)
+        public static bool TryParseArguments([NotNull] string[] args, out WireMockServerSettings settings, [CanBeNull] IWireMockLogger logger = null)
         {
             Guard.HasNoNulls(args, nameof(args));
 
@@ -42,8 +42,8 @@ namespace WireMock.Settings
                 WatchStaticMappingsInSubdirectories = parser.GetBoolValue("WatchStaticMappingsInSubdirectories"),
                 AdminUsername = parser.GetStringValue("AdminUsername"),
                 AdminPassword = parser.GetStringValue("AdminPassword"),
-                AdminAzureADTenant = parser.GetStringValue(nameof(IWireMockServerSettings.AdminAzureADTenant)),
-                AdminAzureADAudience = parser.GetStringValue(nameof(IWireMockServerSettings.AdminAzureADAudience)),
+                AdminAzureADTenant = parser.GetStringValue(nameof(WireMockServerSettings.AdminAzureADTenant)),
+                AdminAzureADAudience = parser.GetStringValue(nameof(WireMockServerSettings.AdminAzureADAudience)),
                 MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"),
                 RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
                 AllowCSharpCodeMatcher = parser.GetBoolValue("AllowCSharpCodeMatcher"),
@@ -52,13 +52,13 @@ namespace WireMock.Settings
                 DisableJsonBodyParsing = parser.GetBoolValue("DisableJsonBodyParsing"),
                 HandleRequestsSynchronously = parser.GetBoolValue("HandleRequestsSynchronously"),
                 ThrowExceptionWhenMatcherFails = parser.GetBoolValue("ThrowExceptionWhenMatcherFails"),
-                UseRegexExtended = parser.GetBoolValue(nameof(IWireMockServerSettings.UseRegexExtended), true),
-                SaveUnmatchedRequests = parser.GetBoolValue(nameof(IWireMockServerSettings.SaveUnmatchedRequests)),
+                UseRegexExtended = parser.GetBoolValue(nameof(WireMockServerSettings.UseRegexExtended), true),
+                SaveUnmatchedRequests = parser.GetBoolValue(nameof(WireMockServerSettings.SaveUnmatchedRequests)),
             };
 
 #if USE_ASPNETCORE
             settings.CorsPolicyOptions = parser.GetValue(
-                nameof(IWireMockServerSettings.CorsPolicyOptions), values =>
+                nameof(WireMockServerSettings.CorsPolicyOptions), values =>
                 {
                     var value = string.Join(string.Empty, values);
                     return Enum.TryParse<CorsPolicyOptions>(value, true, out var corsPolicyOptions) ? corsPolicyOptions : CorsPolicyOptions.None;

src/WireMock.Net/WireMock.Net.csproj

@@ -3,7 +3,7 @@
         <Description>Lightweight Http Mocking Server for .Net, inspired by WireMock from the Java landscape.</Description>
         <AssemblyTitle>WireMock.Net</AssemblyTitle>
         <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>net451;net452;net46;net461;netstandard1.3;netstandard2.0;netstandard2.1;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <AssemblyName>WireMock.Net</AssemblyName>
         <PackageId>WireMock.Net</PackageId>
@@ -42,7 +42,7 @@
         <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
     </PropertyGroup>
 
-    <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
+    <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'or '$(TargetFramework)' == 'net6.0' ">
         <DefineConstants>USE_ASPNETCORE</DefineConstants>
     </PropertyGroup>
 
@@ -50,16 +50,20 @@
         <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
     </PropertyGroup>
 
+    <ItemGroup>
+      <Compile Remove="Util\FileSystemWatcherExtensions.cs" />
+    </ItemGroup>
+
     <ItemGroup>
         <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
         <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
         <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
         <PackageReference Include="Stef.Validation" Version="0.1.0" />
-        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
-        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.13" />
+        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.17" />
+        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.14" />
         <PackageReference Include="JmesPath.Net" Version="1.0.125" />
-        <PackageReference Include="AnyOf" Version="0.2.0" />
+        <PackageReference Include="AnyOf" Version="0.3.0" />
         <!--<PackageReference Include="TinyMapper" Version="3.0.3" />-->
         <!--<PackageReference Include="Mapster" Version="7.2.0" />-->
     </ItemGroup>
@@ -72,7 +76,7 @@
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
-        <PackageReference Include="XPath2.Extensions" Version="1.1.0" />
+        <PackageReference Include="XPath2.Extensions" Version="1.1.2" />
         <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.12.2" />
     </ItemGroup>
 
@@ -100,6 +104,9 @@
         <PackageReference Include="Scriban.Signed" Version="2.1.4" />
         <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
 
+        <!-- https://github.com/WireMock-Net/WireMock.Net/issues/697 -->
+        <PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
+
         <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
         <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
     </ItemGroup>
@@ -121,19 +128,19 @@
         <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
     </ItemGroup>
 
-    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' ">
         <FrameworkReference Include="Microsoft.AspNetCore.App" />
         <PackageReference Include="Scriban.Signed" Version="3.3.2" />
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Handlebars.Net.Helpers" Version="2.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.2.1" />
-        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.2.1" />
+        <PackageReference Include="Handlebars.Net.Helpers" Version="2.3.3" />
+        <PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.3.3" />
+        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.3.3" />
+        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.3.3" />
+        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.3.3" />
+        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.3.3" />
+        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.3.3" />
     </ItemGroup>
 
     <ItemGroup>

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

@@ -1,18 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <Description>Commonly used interfaces, models, enumerations and types.</Description>
         <AssemblyTitle>WireMock.Org.Abstractions</AssemblyTitle>
         <Authors>Stef Heyenrath</Authors>
         <TargetFrameworks>net45;netstandard1.0;netstandard2.0;netstandard2.1</TargetFrameworks>
-
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591;8603</NoWarn>
-
+        <RootNamespace>WireMock.Org.Abstractions</RootNamespace>
         <AssemblyName>WireMock.Org.Abstractions</AssemblyName>
         <PackageId>WireMock.Org.Abstractions</PackageId>
         <PackageTags>wiremock;wiremock.org;interfaces;models;classes;enumerations;types</PackageTags>
-        <RootNamespace>WireMock</RootNamespace>
         <ProjectGuid>{3BA5109E-5F30-4CC2-B699-02EC82560AA6}</ProjectGuid>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
@@ -35,7 +33,7 @@
     <ItemGroup>
         <!--<PackageReference Include="AnyOf" Version="0.1.0" />-->
         <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     </ItemGroup>
 
 </Project>