1.4.37

* Define EnhancedFileSystemWatcher in class

* d

CHANGELOG.md

@@ -1,3 +1,24 @@
+# 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]
+
+# 1.4.34 (27 January 2022)
+- [#716](https://github.com/WireMock-Net/WireMock.Net/pull/716) - MatcherMapper : Always use Pattern [bug] contributed by [StefH](https://github.com/StefH)
+- [#715](https://github.com/WireMock-Net/WireMock.Net/issues/715) - Record request mapping outputs JsonMatcher with Patterns instead of Pattern [bug]
+
+# 1.4.33 (24 January 2022)
+- [#714](https://github.com/WireMock-Net/WireMock.Net/pull/714) - Add support for Cors [feature] contributed by [StefH](https://github.com/StefH)
+
 # 1.4.32 (17 January 2022)
 - [#713](https://github.com/WireMock-Net/WireMock.Net/pull/713) - Added support of custom matchers in static mappings contributed by [levanoz](https://github.com/levanoz)
 
@@ -166,6 +187,7 @@
 - [#549](https://github.com/WireMock-Net/WireMock.Net/issues/549) - WithProxy(...) does not save the mappings to file [bug]
 
 # 1.3.8 (03 December 2020)
+- [#539](https://github.com/WireMock-Net/WireMock.Net/pull/539) - Support for partial JSON matching contributed by [gleb-osokin](https://github.com/gleb-osokin)
 - [#542](https://github.com/WireMock-Net/WireMock.Net/pull/542) - Create dotnet-wiremock tool [feature] contributed by [StefH](https://github.com/StefH)
 - [#543](https://github.com/WireMock-Net/WireMock.Net/pull/543) - Add support for .NET 5 [feature] contributed by [StefH](https://github.com/StefH)
 - [#544](https://github.com/WireMock-Net/WireMock.Net/pull/544) - Use Java 11 in Azure Pipelines (needed for SonarCloud) [feature] contributed by [StefH](https://github.com/StefH)
@@ -173,9 +195,6 @@
 - [#547](https://github.com/WireMock-Net/WireMock.Net/pull/547) - Fix Proxying with SSL and NetCoreApp3.1 [bug] contributed by [StefH](https://github.com/StefH)
 - [#524](https://github.com/WireMock-Net/WireMock.Net/issues/524) - Proxying with SSL Not Working in .NET Core 3.1 [bug]
 
-# 1.3.7 (17 November 2020)
-- [#539](https://github.com/WireMock-Net/WireMock.Net/pull/539) - Support for partial JSON matching contributed by [gleb-osokin](https://github.com/gleb-osokin)
-
 # 1.3.6 (10 November 2020)
 - [#529](https://github.com/WireMock-Net/WireMock.Net/pull/529) - Add assertions for ClientIP, Url and ProxyUrl [feature] contributed by [akamud](https://github.com/akamud)
 - [#535](https://github.com/WireMock-Net/WireMock.Net/pull/535) - WithCallback should use also use enum HttpStatusCode [bug] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.4.32</VersionPrefix>
+        <VersionPrefix>1.4.37</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.32
+SET version=1.4.37
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,4 +1,7 @@
-# 1.4.32 (17 January 2022)
-- #713 Added support of custom matchers in static mappings
+# 1.4.37 (02 March 2022)
+- #730 Fixed bug "dotnet nuget push -n" [bug]
+- #732 Make X509CertificatePassword optional [feature]
+- #733 Fix FileSystemWatcher [bug]
+- #726 Wiremock -  WatchStaticMappings only works until the first request is made  [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

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,8 @@ 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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -228,6 +229,10 @@ 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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -266,6 +271,7 @@ 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}
 	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

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

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>
+      <HintPath>..\..\packages\Fare.2.1.2\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>
@@ -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.1.2" 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" />
@@ -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

@@ -6,8 +6,6 @@ using System.Threading;
 using log4net;
 using log4net.Config;
 using log4net.Repository;
-using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.DependencyInjection;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
@@ -35,50 +33,23 @@ namespace WireMock.Net.StandAlone.NETCoreApp
 
             settings.Logger.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
 
-            /* https://stackoverflow.com/questions/31942037/how-to-enable-cors-in-asp-net-core */
-            /* Enable Cors */
-            var policyName = "MyPolicy";
-            settings.AdditionalServiceRegistration = services =>
-            {
-                services.AddCors(corsOptions =>
-                    corsOptions.AddPolicy(policyName,
-                        corsPolicyBuilder =>
-                        {
-                            corsPolicyBuilder
-                                .AllowAnyHeader()
-                                .AllowAnyMethod()
-                                .AllowAnyOrigin();
-                        }));
-
-                settings.Logger.Debug("Enable Cors");
-            };
-
-            /* Use Cors */
-            settings.PreWireMockMiddlewareInit = app =>
-            {
-                var appBuilder = (IApplicationBuilder)app;
-                appBuilder.UseCors(policyName);
-
-                settings.Logger.Debug("Use Cors");
-            };
-
             _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.NETCoreApp/Properties/launchSettings.json

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

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" />

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

@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using WireMock.Handlers;
+using WireMock.Types;
 
 namespace WireMock.Admin.Settings
 {
@@ -53,5 +54,10 @@ namespace WireMock.Admin.Settings
         /// Save unmatched requests to a file using the <see cref="IFileSystemHandler"/>. (default set to false).
         /// </summary>
         public bool? SaveUnmatchedRequests { get; set; }
+
+        /// <summary>
+        /// Policies to use when using CORS. By default CORS is disabled. [Optional]
+        /// </summary>
+        public string CorsPolicyOptions { get; set; }
     }
 }

src/WireMock.Net.Abstractions/Types/CorsPolicyOptions.cs

@@ -0,0 +1,36 @@
+using System;
+
+namespace WireMock.Types
+{
+    /// <summary>
+    /// Policies to use when using CORS.
+    /// </summary>
+    [Flags]
+    public enum CorsPolicyOptions
+    {
+        /// <summary>
+        /// Cors is disabled
+        /// </summary>
+        None = 0,
+
+        /// <summary>
+        /// Ensures that the policy allows any header.
+        /// </summary>
+        AllowAnyHeader = 0b00000001,
+
+        /// <summary>
+        /// Ensures that the policy allows any method.
+        /// </summary>
+        AllowAnyMethod = 0b00000010,
+
+        /// <summary>
+        /// Ensures that the policy allows any origin.
+        /// </summary>
+        AllowAnyOrigin = 0b00000100,
+
+        /// <summary>
+        /// Ensures that the policy allows any header, method and origin.
+        /// </summary>
+        AllowAll = AllowAnyHeader | AllowAnyMethod | AllowAnyOrigin
+    }
+}

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

@@ -4,11 +4,9 @@
         <Description>Commonly used models, enumerations and types.</Description>
         <AssemblyTitle>WireMock.Net.Abstractions</AssemblyTitle>
         <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net45;netstandard1.0;netstandard2.0;netstandard2.1</TargetFrameworks>
-
+        <TargetFrameworks>net45;net451;netstandard1.0;netstandard2.0;netstandard2.1</TargetFrameworks>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>$(NoWarn);1591;8603</NoWarn>
-
         <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
         <PackageId>WireMock.Net.Abstractions</PackageId>
         <PackageTags>wiremock;wiremock.org;interfaces;models;classes;enumerations;types</PackageTags>
@@ -34,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,7 +22,7 @@
 	<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" />

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/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;
@@ -9,7 +9,7 @@ namespace WireMock.Http
     {
         public static HttpClient Build(IHttpClientSettings settings)
         {
-#if NETSTANDARD || NETCOREAPP3_1 || NET5_0
+#if NETSTANDARD || NETCOREAPP3_1 || NET5_0 || NET6_0
             var handler = new HttpClientHandler
             {
                 CheckCertificateRevocationList = false,

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/Owin/AspNetCoreSelfHost.NETCore.cs

@@ -0,0 +1,48 @@
+#if NETCOREAPP3_1 || NET5_0 || NET6_0
+using Microsoft.AspNetCore.Builder;
+using Microsoft.Extensions.DependencyInjection;
+using WireMock.Types;
+
+namespace WireMock.Owin
+{
+    internal partial class AspNetCoreSelfHost
+    {
+        public void AddCors(IServiceCollection services)
+        {
+            if (_wireMockMiddlewareOptions.CorsPolicyOptions > CorsPolicyOptions.None)
+            {
+                /* https://stackoverflow.com/questions/31942037/how-to-enable-cors-in-asp-net-core */
+                /* Enable Cors */
+                services.AddCors(corsOptions => corsOptions
+                    .AddPolicy(CorsPolicyName,
+                        corsPolicyBuilder =>
+                        {
+                            if (_wireMockMiddlewareOptions.CorsPolicyOptions.Value.HasFlag(CorsPolicyOptions.AllowAnyHeader))
+                            {
+                                corsPolicyBuilder.AllowAnyHeader();
+                            }
+
+                            if (_wireMockMiddlewareOptions.CorsPolicyOptions.Value.HasFlag(CorsPolicyOptions.AllowAnyMethod))
+                            {
+                                corsPolicyBuilder.AllowAnyMethod();
+                            }
+
+                            if (_wireMockMiddlewareOptions.CorsPolicyOptions.Value.HasFlag(CorsPolicyOptions.AllowAnyOrigin))
+                            {
+                                corsPolicyBuilder.AllowAnyOrigin();
+                            }
+                        }));
+            }
+        }
+
+        public void UseCors(IApplicationBuilder appBuilder)
+        {
+            if (_wireMockMiddlewareOptions.CorsPolicyOptions > CorsPolicyOptions.None)
+            {
+                /* Use Cors */
+                appBuilder.UseCors(CorsPolicyName);
+            }
+        }
+    }
+}
+#endif

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

@@ -1,10 +1,11 @@
-#if USE_ASPNETCORE && !NETSTANDARD1_3
+#if USE_ASPNETCORE && !NETSTANDARD1_3
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using WireMock.HttpsCertificate;
+using WireMock.Types;
 
 namespace WireMock.Owin
 {

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -18,6 +18,8 @@ namespace WireMock.Owin
 {
     internal partial class AspNetCoreSelfHost : IOwinSelfHost
     {
+        private const string CorsPolicyName = "WireMock.Net - Policy";
+
         private readonly CancellationTokenSource _cts = new CancellationTokenSource();
         private readonly IWireMockMiddlewareOptions _wireMockMiddlewareOptions;
         private readonly IWireMockLogger _logger;
@@ -68,12 +70,18 @@ namespace WireMock.Owin
                     services.AddSingleton<IOwinRequestMapper, OwinRequestMapper>();
                     services.AddSingleton<IOwinResponseMapper, OwinResponseMapper>();
 
+#if NETCOREAPP3_1 || NET5_0 || NET6_0
+                    AddCors(services);
+#endif
                     _wireMockMiddlewareOptions.AdditionalServiceRegistration?.Invoke(services);
                 })
                 .Configure(appBuilder =>
                 {
                     appBuilder.UseMiddleware<GlobalExceptionMiddleware>();
 
+#if NETCOREAPP3_1 || NET5_0 || NET6_0
+                    UseCors(appBuilder);
+#endif
                     _wireMockMiddlewareOptions.PreWireMockMiddlewareInit?.Invoke(appBuilder);
 
                     appBuilder.UseMiddleware<WireMockMiddleware>();
@@ -128,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/IWireMockMiddlewareOptions.cs

@@ -4,6 +4,8 @@ using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
 using WireMock.Util;
+using JetBrains.Annotations;
+using WireMock.Types;
 #if !USE_ASPNETCORE
 using Owin;
 #else
@@ -39,6 +41,8 @@ namespace WireMock.Owin
 
 #if USE_ASPNETCORE
         Action<IServiceCollection> AdditionalServiceRegistration { get; set; }
+
+        CorsPolicyOptions? CorsPolicyOptions { get; set; }
 #endif
 
         IFileSystemHandler FileSystemHandler { get; set; }

src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs

@@ -3,6 +3,7 @@ using System.Collections.Concurrent;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Types;
 using WireMock.Util;
 #if !USE_ASPNETCORE
 using Owin;
@@ -39,6 +40,8 @@ namespace WireMock.Owin
 
 #if USE_ASPNETCORE
         public Action<IServiceCollection> AdditionalServiceRegistration { get; set; }
+
+        public CorsPolicyOptions? CorsPolicyOptions { get; set; }
 #endif
 
         /// <inheritdoc cref="IWireMockMiddlewareOptions.FileSystemHandler"/>
@@ -77,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/RequestBuilders/IBodyRequestBuilder.cs

@@ -1,80 +1,80 @@
-using JetBrains.Annotations;
-using System;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
+using JetBrains.Annotations;
+using System;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
 using WireMock.Util;
 
-namespace WireMock.RequestBuilders
-{
-    /// <summary>
-    /// The BodyRequestBuilder interface.
-    /// </summary>
-    public interface IBodyRequestBuilder : IRequestMatcher
-    {
-        /// <summary>
-        /// WithBody: IMatcher
-        /// </summary>
-        /// <param name="matcher">The matcher.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] IMatcher matcher);
-
-        /// <summary>
-        /// WithBody: IMatcher[]
-        /// </summary>
-        /// <param name="matchers">The matchers.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] IMatcher[] matchers);
-
-        /// <summary>
-        /// WithBody: Body as string
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-        /// <summary>
-        /// WithBody: Body as byte[]
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-        /// <summary>
-        /// WithBody: Body as object
-        /// </summary>
-        /// <param name="body">The body.</param>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-        /// <summary>
-        /// WithBody: func (string)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<string, bool> func);
-
-        /// <summary>
-        /// WithBody: func (byte[])
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
-
-        /// <summary>
-        /// WithBody: func (json object)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<object, bool> func);
-
-        /// <summary>
-        /// WithBody: func (BodyData object)
-        /// </summary>
-        /// <param name="func">The function.</param>
-        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-        IRequestBuilder WithBody([NotNull] Func<IBodyData, bool> func);
-    }
+namespace WireMock.RequestBuilders
+{
+    /// <summary>
+    /// The BodyRequestBuilder interface.
+    /// </summary>
+    public interface IBodyRequestBuilder : IRequestMatcher
+    {
+        /// <summary>
+        /// WithBody: IMatcher
+        /// </summary>
+        /// <param name="matcher">The matcher.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] IMatcher matcher);
+
+        /// <summary>
+        /// WithBody: IMatcher[]
+        /// </summary>
+        /// <param name="matchers">The matchers.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] IMatcher[] matchers);
+
+        /// <summary>
+        /// WithBody: Body as string
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody(string body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithBody: Body as byte[]
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody(byte[] body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithBody: Body as object
+        /// </summary>
+        /// <param name="body">The body.</param>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+        /// <summary>
+        /// WithBody: func (string)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<string, bool> func);
+
+        /// <summary>
+        /// WithBody: func (byte[])
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<byte[], bool> func);
+
+        /// <summary>
+        /// WithBody: func (json object)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<object, bool> func);
+
+        /// <summary>
+        /// WithBody: func (BodyData object)
+        /// </summary>
+        /// <param name="func">The function.</param>
+        /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+        IRequestBuilder WithBody([NotNull] Func<IBodyData, bool> func);
+    }
 }

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/Serialization/MatcherMapper.cs

@@ -161,12 +161,12 @@ namespace WireMock.Serialization
 
                 // If the matcher is a IValueMatcher, get the value (can be string or object).
                 case IValueMatcher valueMatcher:
-                    model.Patterns = new[] { valueMatcher.Value };
+                    model.Pattern = valueMatcher.Value;
                     break;
 
                 // If the matcher is a ExactObjectMatcher, get the ValueAsObject or ValueAsBytes.
                 case ExactObjectMatcher exactObjectMatcher:
-                    model.Patterns = new[] { exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes };
+                    model.Pattern = exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes;
                     break;
             }
 

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)
@@ -293,7 +267,11 @@ namespace WireMock.Server
                 HandleRequestsSynchronously = _settings.HandleRequestsSynchronously,
                 ThrowExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails,
                 UseRegexExtended = _settings.UseRegexExtended,
-                SaveUnmatchedRequests = _settings.SaveUnmatchedRequests
+                SaveUnmatchedRequests = _settings.SaveUnmatchedRequests,
+
+#if USE_ASPNETCORE
+                CorsPolicyOptions = _settings.CorsPolicyOptions?.ToString()
+#endif
             };
 
             return ToJson(model);
@@ -315,6 +293,13 @@ namespace WireMock.Server
             _settings.UseRegexExtended = settings.UseRegexExtended;
             _settings.SaveUnmatchedRequests = settings.SaveUnmatchedRequests;
 
+#if USE_ASPNETCORE
+            if (Enum.TryParse<CorsPolicyOptions>(settings.CorsPolicyOptions, true, out var corsPolicyOptions))
+            {
+                _settings.CorsPolicyOptions = corsPolicyOptions;
+            }
+#endif
+
             return ResponseMessageBuilder.Create("Settings updated");
         }
         #endregion Settings
@@ -857,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))
@@ -929,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

@@ -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
@@ -243,6 +244,8 @@ namespace WireMock.Server
 
 #if USE_ASPNETCORE
             _options.AdditionalServiceRegistration = _settings.AdditionalServiceRegistration;
+            _options.CorsPolicyOptions = _settings.CorsPolicyOptions;
+
             _httpServer = new AspNetCoreSelfHost(_options, urlOptions);
 #else
             _httpServer = new OwinSelfHost(_options, urlOptions);

src/WireMock.Net/Settings/IWireMockServerSettings.cs

@@ -11,6 +11,7 @@ using WireMock.Matchers;
 using WireMock.RegularExpressions;
 #if USE_ASPNETCORE
 using Microsoft.Extensions.DependencyInjection;
+using WireMock.Types;
 #endif
 
 namespace WireMock.Settings
@@ -135,6 +136,12 @@ namespace WireMock.Settings
         /// </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>

src/WireMock.Net/Settings/WireMockCertificateSettings.cs

@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 
 namespace WireMock.Settings
 {
@@ -31,6 +31,6 @@ namespace WireMock.Settings
         [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

@@ -7,6 +7,7 @@ using WireMock.Admin.Mappings;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
+using WireMock.Types;
 #if USE_ASPNETCORE
 using Microsoft.Extensions.DependencyInjection;
 #endif
@@ -97,6 +98,10 @@ namespace WireMock.Settings
         [PublicAPI]
         [JsonIgnore]
         public Action<IServiceCollection> AdditionalServiceRegistration { get; set; }
+
+        /// <inheritdoc cref="IWireMockServerSettings.CorsPolicyOptions"/>
+        [PublicAPI]
+        public CorsPolicyOptions? CorsPolicyOptions { get; set; }
 #endif
 
         /// <inheritdoc cref="IWireMockServerSettings.Logger"/>

src/WireMock.Net/Settings/WireMockServerSettingsParser.cs

@@ -1,6 +1,9 @@
+using System;
+using System.Linq;
 using JetBrains.Annotations;
-using WireMock.Logging;
 using Stef.Validation;
+using WireMock.Logging;
+using WireMock.Types;
 
 namespace WireMock.Settings
 {
@@ -50,9 +53,18 @@ namespace WireMock.Settings
                 HandleRequestsSynchronously = parser.GetBoolValue("HandleRequestsSynchronously"),
                 ThrowExceptionWhenMatcherFails = parser.GetBoolValue("ThrowExceptionWhenMatcherFails"),
                 UseRegexExtended = parser.GetBoolValue(nameof(IWireMockServerSettings.UseRegexExtended), true),
-                SaveUnmatchedRequests = parser.GetBoolValue(nameof(IWireMockServerSettings.SaveUnmatchedRequests))
+                SaveUnmatchedRequests = parser.GetBoolValue(nameof(IWireMockServerSettings.SaveUnmatchedRequests)),
             };
 
+#if USE_ASPNETCORE
+            settings.CorsPolicyOptions = parser.GetValue(
+                nameof(IWireMockServerSettings.CorsPolicyOptions), values =>
+                {
+                    var value = string.Join(string.Empty, values);
+                    return Enum.TryParse<CorsPolicyOptions>(value, true, out var corsPolicyOptions) ? corsPolicyOptions : CorsPolicyOptions.None;
+                });
+#endif
+
             if (logger != null)
             {
                 settings.Logger = logger;

src/WireMock.Net/Transformers/Transformer.cs

@@ -124,6 +124,11 @@ namespace WireMock.Transformers
                     WalkNode(handlebarsContext, options, jToken, model);
                     break;
 
+                case JArray bodyAsJArray:
+                    jToken = bodyAsJArray.DeepClone();
+                    WalkNode(handlebarsContext, options, jToken, model);
+                    break;
+
                 case Array bodyAsArray:
                     jToken = JArray.FromObject(bodyAsArray);
                     WalkNode(handlebarsContext, options, jToken, model);

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="System.Linq.Dynamic.Core" Version="1.2.17" />
         <PackageReference Include="RandomDataGenerator.Net" Version="1.0.13" />
         <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>

src/WireMock.Org.RestClient/WireMock.Org.RestClient.csproj

@@ -9,7 +9,7 @@
         <AssemblyName>WireMock.Org.RestClient</AssemblyName>
         <PackageId>WireMock.Org.RestClient</PackageId>
         <PackageTags>wiremock;wiremock.org;rest;client;restclient;restease;rest;json</PackageTags>
-        <RootNamespace>WireMock.Org.Client</RootNamespace>
+        <RootNamespace>WireMock.Org.RestClient</RootNamespace>
         <ProjectGuid>{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F}</ProjectGuid>
         <PublishRepositoryUrl>true</PublishRepositoryUrl>
         <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

src/dotnet-WireMock.Net/dotnet-WireMock.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>dotnet-wiremock</ToolCommandName>
     <Description>A dotnet commandline tool for WireMock.Net (A Lightweight Http Mocking Server for .NET)</Description>
@@ -16,8 +16,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
-    <PackageReference Include="System.Text.Json" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="System.Text.Json" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>

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

@@ -5,6 +5,7 @@ using System.Threading.Tasks;
 using FluentAssertions;
 using Moq;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using NFluent;
 using WireMock.Handlers;
 using WireMock.Models;
@@ -385,6 +386,47 @@ namespace WireMock.Net.Tests.ResponseBuilders
             Check.That(JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson)).Equals("{\"x\":\"test /foo_object\"}");
         }
 
+        [Theory]
+        [InlineData(TransformerType.Handlebars)]
+        [InlineData(TransformerType.Scriban)]
+        [InlineData(TransformerType.ScribanDotLiquid)]
+        public async Task Response_ProvideResponse_Transformer_ResultAsArray(TransformerType transformerType)
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "GET", ClientIp);
+
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(new [] { new { x = "test" }})
+                .WithTransformer(transformerType);
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
+
+            // Assert
+            JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson).Should().Be("[{\"x\":\"test\"}]");
+        }
+
+        [Theory]
+        [InlineData(TransformerType.Handlebars)]
+        [InlineData(TransformerType.Scriban)]
+        [InlineData(TransformerType.ScribanDotLiquid)]
+        public async Task Response_ProvideResponse_Transformer_ResultAsJArray(TransformerType transformerType)
+        {
+            // Assign
+            var request = new RequestMessage(new UrlDetails("http://localhost/foo_object"), "GET", ClientIp);
+
+            var array = JArray.Parse("[{\"x\":\"test\"}]");
+            var responseBuilder = Response.Create()
+                .WithBodyAsJson(array)
+                .WithTransformer(transformerType);
+
+            // Act
+            var response = await responseBuilder.ProvideResponseAsync(request, _settings).ConfigureAwait(false);
+
+            // Assert
+            JsonConvert.SerializeObject(response.Message.BodyData.BodyAsJson).Should().Be("[{\"x\":\"test\"}]");
+        }
+
         //[Theory]
         //[InlineData(TransformerType.Handlebars, "a")]
         //[InlineData(TransformerType.Handlebars, "42")]

test/WireMock.Net.Tests/Serialization/MappingConverterTests.cs

@@ -164,7 +164,7 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void ToMappingModel_WithTimeSetrtings_ReturnsCorrectTimeSettings()
+        public void ToMappingModel_WithTimeSettings_ReturnsCorrectTimeSettings()
         {
             // Assign
             var start = DateTime.Now;

test/WireMock.Net.Tests/Serialization/MatcherMapperTests.cs

@@ -187,16 +187,36 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_As_String()
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_1_Value_As_String()
+        {
+            // Assign
+            var pattern = "{ \"post1\": \"value1\", \"post2\": \"value2\" }";
+            var patterns = new[] { pattern };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Patterns = patterns
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(patterns);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_2_Values_As_String()
         {
             // Assign
             var pattern1 = "{ \"AccountIds\": [ 1, 2, 3 ] }";
-            var pattern2 = "{ \"X\": \"x\" }";
+            var pattern2 = "{ \"post1\": \"value1\", \"post2\": \"value2\" }";
             var patterns = new[] { pattern1, pattern2 };
             var model = new MatcherModel
             {
                 Name = "JsonMatcher",
-                Pattern = patterns
+                Patterns = patterns
             };
 
             // Act
@@ -227,11 +247,31 @@ namespace WireMock.Net.Tests.Serialization
         }
 
         [Fact]
-        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_As_Object()
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_1_Value_As_Object()
+        {
+            // Assign
+            object pattern = new { post1 = "value1", post2 = "value2" };
+            var patterns = new[] { pattern };
+            var model = new MatcherModel
+            {
+                Name = "JsonMatcher",
+                Patterns = patterns
+            };
+
+            // Act
+            var matcher = (JsonMatcher)_sut.Map(model);
+
+            // Assert
+            matcher.MatchBehaviour.Should().Be(MatchBehaviour.AcceptOnMatch);
+            matcher.Value.Should().BeEquivalentTo(patterns);
+        }
+
+        [Fact]
+        public void MatcherMapper_Map_MatcherModel_JsonMatcher_Patterns_2_Values_As_Object()
         {
             // Assign
             object pattern1 = new { AccountIds = new[] { 1, 2, 3 } };
-            object pattern2 = new { X = "x" };
+            object pattern2 = new { post1 = "value1", post2 = "value2" };
             var patterns = new[] { pattern1, pattern2 };
             var model = new MatcherModel
             {

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

@@ -1,8 +1,9 @@
-using System;
+using System;
 using System.Linq;
+using System.Linq.Dynamic.Core;
+using FluentAssertions;
 using Newtonsoft.Json.Linq;
 using NFluent;
-using System.Linq.Dynamic.Core;
 using WireMock.Util;
 using Xunit;
 
@@ -41,7 +42,28 @@ namespace WireMock.Net.Tests.Util
         }
 
         [Fact]
-        public void JsonUtils_GenerateDynamicLinqStatement_JObject()
+        public void JsonUtils_GenerateDynamicLinqStatement_JArray_Indexer()
+        {
+            // Assign
+            var j = new JObject
+            {
+                { "Items", new JArray(new[] { new JValue(4), new JValue(8) }) }
+            };
+
+            // Act
+            string line = JsonUtils.GenerateDynamicLinqStatement(j);
+
+            // Assert 1
+            line.Should().Be("new ((new [] { long(Items[0]), long(Items[1])}) as Items)");
+
+            // Assert 2
+            var queryable = new[] { j }.AsQueryable().Select(line);
+            bool result = queryable.Any("Items != null");
+            result.Should().BeTrue();
+        }
+
+        [Fact]
+        public void JsonUtils_GenerateDynamicLinqStatement_JObject2()
         {
             // Assign
             var j = new JObject
@@ -52,7 +74,6 @@ namespace WireMock.Net.Tests.Util
                 {"Flt", new JValue(10.0f)},
                 {"Dbl", new JValue(Math.PI)},
                 {"Check", new JValue(true)},
-                {"Items", new JArray(new[] { new JValue(4), new JValue(8) })},
                 {
                     "Child", new JObject
                     {
@@ -69,12 +90,13 @@ namespace WireMock.Net.Tests.Util
             // Act
             string line = JsonUtils.GenerateDynamicLinqStatement(j);
 
-            // Assert
+            // Assert 1
+            line.Should().Be("new (Uri(U) as U, null as N, Guid(G) as G, double(Flt) as Flt, double(Dbl) as Dbl, bool(Check) as Check, new (long(Child.ChildId) as ChildId, DateTime(Child.ChildDateTime) as ChildDateTime, TimeSpan(Child.TS) as TS) as Child, long(I) as I, long(L) as L, string(Name) as Name)");
+
+            // Assert 2
             var queryable = new[] { j }.AsQueryable().Select(line);
             bool result = queryable.Any("I > 1 && L > 1");
-            Check.That(result).IsTrue();
-
-            Check.That(line).IsEqualTo("new (Uri(U) as U, null as N, Guid(G) as G, double(Flt) as Flt, double(Dbl) as Dbl, bool(Check) as Check, (new [] { long(Items[0]), long(Items[1])}) as Items, new (long(Child.ChildId) as ChildId, DateTime(Child.ChildDateTime) as ChildDateTime, TimeSpan(Child.TS) as TS) as Child, long(I) as I, long(L) as L, string(Name) as Name)");
+            result.Should().BeTrue();
         }
 
         [Fact]

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

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Authors>Stef Heyenrath</Authors>
-        <TargetFrameworks>net452;net461;netcoreapp3.1;net5.0</TargetFrameworks>
+        <TargetFrameworks>net452;net461;netcoreapp3.1;net5.0;net6.0</TargetFrameworks>
         <IsPackable>false</IsPackable>
         <DebugType>full</DebugType>
         <AssemblyName>WireMock.Net.Tests</AssemblyName>
@@ -33,7 +33,7 @@
 
     <ItemGroup>
         <PackageReference Include="Codecov" Version="1.13.0" />
-        <PackageReference Include="coverlet.msbuild" Version="3.1.0">
+        <PackageReference Include="coverlet.msbuild" Version="3.1.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -44,7 +44,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.1.0">
+        <PackageReference Include="coverlet.collector" Version="3.1.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -59,9 +59,9 @@
         <!--<PackageReference Include="OpenCover" Version="4.7.922" />-->
         <!--<PackageReference Include="ReportGenerator" Version="4.8.1" />-->
         <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
-        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
+        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.17" />
         <!--<PackageReference Include="StrongNamer" Version="0.2.5" />-->
-        <PackageReference Include="AnyOf" Version="0.2.0" />
+        <PackageReference Include="AnyOf" Version="0.3.0" />
         <!--<PackageReference Include="TinyMapper" Version="3.0.3" />-->
     </ItemGroup>
 
@@ -72,7 +72,7 @@
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net461'">
-        <PackageReference Include="FluentAssertions" Version="6.1.0" />
+        <PackageReference Include="FluentAssertions" Version="6.5.1" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' != 'net452'">

test/WireMock.Net.Tests/WireMockServerTests.cs

@@ -17,6 +17,7 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
+using WireMock.Types;
 using WireMock.Util;
 using Xunit;
 
@@ -97,6 +98,29 @@ namespace WireMock.Net.Tests
             server.Stop();
         }
 
+#if NETCOREAPP3_1 || NET5_0 || NET6_0
+        [Fact]
+        public async Task WireMockServer_WithCorsPolicyOptions_Should_Work_Correct()
+        {
+            // Arrange
+            var settings = new WireMockServerSettings
+            {
+                CorsPolicyOptions = CorsPolicyOptions.AllowAll
+            };
+            var server = WireMockServer.Start(settings);
+
+            server.Given(Request.Create().WithPath("/*")).RespondWith(Response.Create().WithBody("x"));
+
+            // Act
+            var response = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + "/foo").ConfigureAwait(false);
+
+            // Asser.
+            response.Should().Be("x");
+
+            server.Stop();
+        }
+#endif
+
         [Fact]
         public async Task WireMockServer_Should_delay_responses_for_a_given_route()
         {