1.4.24

Add support for AzureAD authentication for REST admin interface (#637 )
Add more tests for WithBody (Json and String) and WildcardMatcher
2026-01-13 13:53:34 +01:00 · 2021-10-20 20:40:02 +02:00 · 2021-10-20 16:39:51 +02:00 · 2021-10-19 09:28:52 +00:00 · 2021-10-15 12:59:03 +02:00 · 2021-10-15 08:54:12 +02:00
122 changed files with 9186 additions and 881 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,6 +1,6 @@
 # These are supported funding model platforms

-github: [StefH]
+github: # [StefH]
 patreon: # Replace with a single Patreon username
 open_collective: # wiremocknet
 ko_fi: # Replace with a single Ko-fi username
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -0,0 +1,15 @@
+name: CreateRelease
+
+on:
+  push:
+    tags:
+      - "*.*.*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Release
+        uses: softprops/action-gh-release@v1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,21 @@
+# 1.4.24 (20 October 2021)
+- [#637](https://github.com/WireMock-Net/WireMock.Net/pull/637) - Add support for AzureAD authentication for REST admin interface [feature] contributed by [StefH](https://github.com/StefH)
+- [#643](https://github.com/WireMock-Net/WireMock.Net/pull/643) - Support edge case: first object, next an array. [feature] contributed by [leolplex](https://github.com/leolplex)
+- [#644](https://github.com/WireMock-Net/WireMock.Net/pull/644) - Mapping headers in OpenAPI [feature] contributed by [leolplex](https://github.com/leolplex)
+- [#649](https://github.com/WireMock-Net/WireMock.Net/pull/649) - Refactor method name MapHeaders and httpStatusCode  contributed by [leolplex](https://github.com/leolplex)
+- [#651](https://github.com/WireMock-Net/WireMock.Net/pull/651) - Implement PatternAsFile for StringMatcher [feature] contributed by [StefH](https://github.com/StefH)
+- [#654](https://github.com/WireMock-Net/WireMock.Net/pull/654) - Update NotNullOrEmptyMatcher to also implement IStringMatcher [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.4.23 (27 September 2021)
+- [#635](https://github.com/WireMock-Net/WireMock.Net/pull/635) - WireMock.Net.FluentAssertions : upgrade to latest FluentAssertions [feature] contributed by [StefH](https://github.com/StefH)
+- [#634](https://github.com/WireMock-Net/WireMock.Net/issues/634) - Upgrade to latest FluentAssertions [bug]
+
+# 1.4.22 (22 September 2021)
+- [#633](https://github.com/WireMock-Net/WireMock.Net/pull/633) - Implement Random Delay [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.4.21 (16 September 2021)
+- [#631](https://github.com/WireMock-Net/WireMock.Net/pull/631) - Add WireMock.org RestClient [feature] contributed by [StefH](https://github.com/StefH)
+
 # 1.4.20 (06 August 2021)
 - [#628](https://github.com/WireMock-Net/WireMock.Net/pull/628) - Fix issue with FluentBuilder [bug] contributed by [StefH](https://github.com/StefH)
 - [#626](https://github.com/WireMock-Net/WireMock.Net/issues/626) - version 1.4.19 throws a lot of analyzer errors related to the BaseBuilder.cs [bug]
@@ -101,6 +119,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)
@@ -108,9 +127,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)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,30 +1,36 @@
 <Project>
-  <PropertyGroup>
-    <MsBuildAllProjects>$(MsBuildAllProjects);$(MsBuildThisFileFullPath)</MsBuildAllProjects>
-  </PropertyGroup>
+    <PropertyGroup>
+        <MsBuildAllProjects>$(MsBuildAllProjects);$(MsBuildThisFileFullPath)</MsBuildAllProjects>
+    </PropertyGroup>

-  <PropertyGroup>
-    <VersionPrefix>1.4.20</VersionPrefix>
-    <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
-    <PackageIconUrl>https://raw.githubusercontent.com/WireMock-Net/WireMock.Net/master/WireMock.Net-Logo.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
-    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
-  </PropertyGroup>
+    <PropertyGroup>
+        <VersionPrefix>1.4.24</VersionPrefix>
+        <PackageReleaseNotes>See CHANGELOG.md</PackageReleaseNotes>
+        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
+        <PackageProjectUrl>https://github.com/WireMock-Net/WireMock.Net</PackageProjectUrl>
+        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
+        <PackageReleaseNotes>$([System.IO.File]::ReadAllText("$(MSBuildProjectDirectory)/../../PackageReleaseNotes.txt"))</PackageReleaseNotes>
+        <RepositoryType>git</RepositoryType>
+        <RepositoryUrl>https://github.com/WireMock-Net/WireMock.Net</RepositoryUrl>
+        <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
+    </PropertyGroup>

-  <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
+        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+    </PropertyGroup>

-  <Choose>
-    <!-- The environment variable `Prerelease` is set in the azure-pipelines.yml file. -->
-    <When Condition=" '$(Prerelease)' != '' ">
-      <PropertyGroup>
-        <!-- Set the version to x.x.x.x-{Prerelease}-1{Build_BuildId} (this is same buildId as defined in the azure-pipelines.yml file). -->
-        <VersionSuffix>$(Prerelease)-1$(BUILD_BUILDID)</VersionSuffix>
-      </PropertyGroup>
-    </When>
-  </Choose>
+    <ItemGroup>
+        <None Include="../../resources/WireMock.Net-Logo.png" Pack="true" PackagePath="" />
+        <!--<None Include="../../PackageReadme.md" Pack="true" PackagePath=""/>-->
+    </ItemGroup>
+
+    <Choose>
+        <!-- The environment variable `Prerelease` is set in the azure-pipelines.yml file. -->
+        <When Condition=" '$(Prerelease)' != '' ">
+            <PropertyGroup>
+                <!-- Set the version to x.x.x.x-{Prerelease}-1{Build_BuildId} (this is same buildId as defined in the azure-pipelines.yml file). -->
+                <VersionSuffix>$(Prerelease)-1$(BUILD_BUILDID)</VersionSuffix>
+            </PropertyGroup>
+        </When>
+    </Choose>
 </Project>
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -0,0 +1,7 @@
+rem https://github.com/StefH/GitHubReleaseNotes
+
+SET version=1.4.24
+
+GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version %version% --token %GH_TOKEN%
+
+GitHubReleaseNotes --output PackageReleaseNotes.txt --skip-empty-releases --exclude-labels question invalid doc duplicate --template PackageReleaseNotes.template --version %version% --token %GH_TOKEN%
--- a/GitHubReleaseNotes.txt
+++ b/GitHubReleaseNotes.txt
@@ -1,3 +0,0 @@
-https://github.com/StefH/GitHubReleaseNotes
-
-GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels question invalid doc duplicate --version 1.4.20
--- a/PackageReleaseNotes.template
+++ b/PackageReleaseNotes.template
@@ -0,0 +1,6 @@
+# {{releaseInfos.0.FriendlyName}} ({{formatDate releaseInfos.0.When "dd MMMM yyyy"}})
+{{#each releaseInfos.0.issueInfos}}
+- #{{Number}} {{Title}}{{#if Labels}} [{{join Labels ", "}}]{{/if}}
+{{/each}}
+
+The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -0,0 +1,9 @@
+# 1.4.24 (20 October 2021)
+- #637 Add support for AzureAD authentication for REST admin interface [feature]
+- #643 Support edge case: first object, next an array. [feature]
+- #644 Mapping headers in OpenAPI [feature]
+- #649 Refactor method name MapHeaders and httpStatusCode 
+- #651 Implement PatternAsFile for StringMatcher [feature]
+- #654 Update NotNullOrEmptyMatcher to also implement IStringMatcher [feature]
+
+The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -34,9 +34,11 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
 | &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
 | &nbsp;&nbsp;**WireMock.Net.FluentAssertions** | [![NuGet Badge WireMock.Net.FluentAssertions](https://buildstats.info/nuget/WireMock.Net.FluentAssertions)](https://www.nuget.org/packages/WireMock.Net.FluentAssertions) | [![MyGet Badge WireMock.Net.FluentAssertions](https://buildstats.info/myget/wiremock-net/WireMock.Net.FluentAssertions?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.FluentAssertions)
-| &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
 | &nbsp;&nbsp;**WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://buildstats.info/nuget/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://buildstats.info/myget/wiremock-net/WireMock.Net.Matchers.CSharpCode?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
 | &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/nuget/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://buildstats.info/myget/wiremock-net/WireMock.Net.OpenApiParser?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
+| &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://buildstats.info/nuget/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Net.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
+| &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://buildstats.info/nuget/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://buildstats.info/myget/wiremock-net/WireMock.Org.RestClient?includePreReleases=true)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)
+

 ## Development
 For the supported frameworks and build information, see [this](https://github.com/WireMock-Net/WireMock.Net/wiki/Development-Information) page.
--- a/Solution.sln
+++ b/Solution.sln
@@ -23,15 +23,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
-		azure-pipelines-ci-linux.yml = azure-pipelines-ci-linux.yml
-		azure-pipelines-ci.yml = azure-pipelines-ci.yml
-		azure-pipelines-linux.yml = azure-pipelines-linux.yml
-		azure-pipelines-nuget.yml = azure-pipelines-nuget.yml
 		build-info.md = build-info.md
 		CHANGELOG.md = CHANGELOG.md
 		Directory.Build.props = Directory.Build.props
-		GitHubReleaseNotes.txt = GitHubReleaseNotes.txt
+		Generate-ReleaseNotes.cmd = Generate-ReleaseNotes.cmd
 		nuget.config = nuget.config
+		PackageReleaseNotes.template = PackageReleaseNotes.template
+		PackageReleaseNotes.txt = PackageReleaseNotes.txt
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -83,6 +81,23 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Matchers.CShar
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net472.Classic", "examples\WireMock.Net.Console.Net472.Classic\WireMock.Net.Console.Net472.Classic.csproj", "{6580580B-1EFD-4922-B0EC-FF290DB279EE}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Actions", "Actions", "{1DAEFF47-D117-4E95-8B3E-4F7C8B92011A}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\CreateRelease.yml = .github\workflows\CreateRelease.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Azure Pipelines", "Azure Pipelines", "{5B64F6CA-BF6B-4F67-BB2A-9C47E441703E}"
+	ProjectSection(SolutionItems) = preProject
+		azure-pipelines-ci-linux.yml = azure-pipelines-ci-linux.yml
+		azure-pipelines-ci.yml = azure-pipelines-ci.yml
+		azure-pipelines-linux.yml = azure-pipelines-linux.yml
+		azure-pipelines-nuget.yml = azure-pipelines-nuget.yml
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Org.RestClient", "src\WireMock.Org.RestClient\WireMock.Org.RestClient.csproj", "{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Org.Abstractions", "src\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj", "{3BA5109E-5F30-4CC2-B699-02EC82560AA6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -205,6 +220,14 @@ Global
 		{6580580B-1EFD-4922-B0EC-FF290DB279EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6580580B-1EFD-4922-B0EC-FF290DB279EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6580580B-1EFD-4922-B0EC-FF290DB279EE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3BA5109E-5F30-4CC2-B699-02EC82560AA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{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
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -239,6 +262,10 @@ Global
 		{3F8CF0AE-5F24-4A54-89E7-A3EE829DB5F8} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{B6269AAC-170A-4346-8B9A-444DED3D9A44} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{6580580B-1EFD-4922-B0EC-FF290DB279EE} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{1DAEFF47-D117-4E95-8B3E-4F7C8B92011A} = {7EFB2C5B-1BB2-4AAF-BC9F-216ED80C594D}
+		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/examples/WireMock.Net.Client/WireMock.Net.Client.csproj
+++ b/examples/WireMock.Net.Client/WireMock.Net.Client.csproj
@@ -3,12 +3,12 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="RestEase" Version="1.4.10" />
+    <PackageReference Include="RestEase" Version="1.5.5" />
  </ItemGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj
+++ b/examples/WireMock.Net.Console.NET5/WireMock.Net.Console.NET5.csproj
@@ -1,9 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>net5.0</TargetFramework>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp/WireMock.Net.Console.NETCoreApp.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp2/WireMock.Net.Console.NETCoreApp2.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp2.1</TargetFramework>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj
+++ b/examples/WireMock.Net.Console.NETCoreApp3/WireMock.Net.Console.NETCoreApp3.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.Net452.Classic/CustomFileSystemFileHandler.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/CustomFileSystemFileHandler.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using WireMock.Handlers;

@@ -80,6 +80,12 @@ namespace WireMock.Net.ConsoleApplication
            return File.ReadAllBytes(AdjustPath(path));
        }

+        /// <inheritdoc cref="IFileSystemHandler.ReadFileAsString"/>
+        public string ReadFileAsString(string path)
+        {
+            return File.ReadAllText(path);
+        }
+
        /// <summary>
        /// Adjusts the path to the MappingFolder.
        /// </summary>
--- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using HandlebarsDotNet;
 using System;
 using System.Collections.Generic;
@@ -59,7 +59,10 @@ namespace WireMock.Net.ConsoleApplication
                //},
                PreWireMockMiddlewareInit = app => { System.Console.WriteLine($"PreWireMockMiddlewareInit : {app.GetType()}"); },
                PostWireMockMiddlewareInit = app => { System.Console.WriteLine($"PostWireMockMiddlewareInit : {app.GetType()}"); },
+
+#if USE_ASPNETCORE
                AdditionalServiceRegistration = services => { System.Console.WriteLine($"AdditionalServiceRegistration : {services.GetType()}"); },
+#endif
                Logger = new WireMockConsoleLogger(),

                HandlebarsRegistrationCallback = (handlebarsContext, fileSystemHandler) =>
@@ -74,9 +77,17 @@ namespace WireMock.Net.ConsoleApplication
            System.Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));

            server.SetBasicAuthentication("a", "b");
+            //server.SetAzureADAuthentication("6c2a4722-f3b9-4970-b8fc-fac41e29stef", "8587fde1-7824-42c7-8592-faf92b04stef");

            // server.AllowPartialMapping();

+            server.Given(Request.Create().WithPath("/mypath").UsingPost())
+                .RespondWith(Response.Create()
+                        .WithHeader("Content-Type", "application/json")
+                        .WithBodyAsJson("{{JsonPath.SelectToken request.body \"..name\"}}")
+                        .WithTransformer()
+            );
+
            server
                .Given(Request.Create().WithPath(p => p.Contains("x")).UsingGet())
                .AtPriority(4)
--- a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
@@ -33,9 +33,12 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <PropertyGroup>
-    <ApplicationIcon>..\..\WireMock.Net-Logo.ico</ApplicationIcon>
+    <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>
    <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>
--- a/examples/WireMock.Net.Console.Net452.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/packages.config
@@ -1,5 +1,6 @@
 <?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" />
--- a/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj
@@ -35,6 +35,9 @@
    <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>
    <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>
@@ -47,6 +50,9 @@
    <Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
      <HintPath>..\..\packages\log4net.2.0.12\lib\net45\log4net.dll</HintPath>
    </Reference>
+    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+    </Reference>
    <Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
--- a/examples/WireMock.Net.Console.Net461.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net461.Classic/packages.config
@@ -1,9 +1,11 @@
 <?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="log4net" version="2.0.12" 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" />
--- a/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj
@@ -39,6 +39,9 @@
    <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>
    <Reference Include="Fare, Version=2.1.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Fare.2.1.1\lib\net35\Fare.dll</HintPath>
    </Reference>
--- a/examples/WireMock.Net.Console.Net472.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net472.Classic/packages.config
@@ -1,5 +1,6 @@
 <?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" />
--- a/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj
+++ b/examples/WireMock.Net.Console.Proxy.NETCoreApp2/WireMock.Net.Console.Proxy.NETCoreApp2.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFrameworks>netcoreapp2.1;netcoreapp3.1;net5.0</TargetFrameworks>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj
+++ b/examples/WireMock.Net.Console.Record.NETCoreApp/WireMock.Net.Console.Proxy.NETCoreApp.csproj
@@ -3,7 +3,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>net5.0</TargetFramework>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+    <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>

  <ItemGroup>
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj
@@ -1,9 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
-    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
    <StartupObject>WireMock.Net.StandAlone.NETCoreApp.Program</StartupObject>
  </PropertyGroup>

--- a/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
+++ b/examples/WireMock.Net.StandAlone.Net452/WireMock.Net.StandAlone.Net452.csproj
@@ -33,7 +33,7 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <PropertyGroup>
-    <ApplicationIcon>..\..\WireMock.Net-Logo.ico</ApplicationIcon>
+    <ApplicationIcon>..\..\resources\WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>
  <PropertyGroup>
    <StartupObject>WireMock.Net.StandAlone.Net452.Program</StartupObject>
--- a/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj
+++ b/examples/WireMock.Net.StandAlone.Net461/WireMock.Net.StandAlone.Net461.csproj
@@ -204,8 +204,8 @@
    <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
    </Reference>
-    <Reference Include="RestEase, Version=1.4.10.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\RestEase.1.4.10\lib\net45\RestEase.dll</HintPath>
+    <Reference Include="RestEase, Version=1.5.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\RestEase.1.5.5\lib\net45\RestEase.dll</HintPath>
    </Reference>
    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
--- a/examples/WireMock.Net.StandAlone.Net461/packages.config
+++ b/examples/WireMock.Net.StandAlone.Net461/packages.config
@@ -59,7 +59,7 @@
  <package id="MimeKitLite" version="2.0.7" targetFramework="net461" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
  <package id="Owin" version="1.0" targetFramework="net461" />
-  <package id="RestEase" version="1.4.10" targetFramework="net461" />
+  <package id="RestEase" version="1.5.5" targetFramework="net461" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />
  <package id="System.Buffers" version="4.5.0" targetFramework="net461" />
  <package id="System.Collections.Immutable" version="1.5.0" targetFramework="net461" />
--- a/resources/WireMock.Net-Logo.ico
+++ b/resources/WireMock.Net-Logo.ico
--- a/resources/WireMock.Net-Logo.png
+++ b/resources/WireMock.Net-Logo.png
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
@@ -1,4 +1,4 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings
 {
    /// <summary>
    /// MatcherModel
@@ -12,15 +12,20 @@
        public string Name { get; set; }

        /// <summary>
-        /// Gets or sets the pattern. Can be a string (default) or an object;
+        /// Gets or sets the pattern. Can be a string (default) or an object.
        /// </summary>
        public object Pattern { get; set; }

        /// <summary>
-        /// Gets or sets the patterns. Can be array of strings (default) or an array of objects;
+        /// Gets or sets the patterns. Can be array of strings (default) or an array of objects.
        /// </summary>
        public object[] Patterns { get; set; }

+        /// <summary>
+        /// Gets or sets the pattern as a file.
+        /// </summary>
+        public string PatternAsFile { get; set; }
+
        /// <summary>
        /// Gets or sets the ignore case.
        /// </summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs
@@ -83,6 +83,16 @@ namespace WireMock.Admin.Mappings
        /// </summary>
        public int? Delay { get; set; }

+        /// <summary>
+        /// Gets or sets the minimum random delay in milliseconds.
+        /// </summary>
+        public int? MinimumRandomDelay { get; set; }
+
+        /// <summary>
+        /// Gets or sets the maximum random delay in milliseconds.
+        /// </summary>
+        public int? MaximumRandomDelay { get; set; }
+
        /// <summary>
        /// Gets or sets the Proxy URL.
        /// </summary>
--- a/src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs
+++ b/src/WireMock.Net.Abstractions/Handlers/IFileSystemHandler.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using System.Collections.Generic;

 namespace WireMock.Handlers
@@ -89,5 +89,12 @@ namespace WireMock.Handlers
        /// <param name="filename">The filename.</param>
        /// <returns>The file content as bytes.</returns>
        byte[] ReadFile([NotNull] string filename);
+
+        /// <summary>
+        /// Read a file as string.
+        /// </summary>
+        /// <param name="filename">The filename.</param>
+        /// <returns>The file content as a string.</returns>
+        string ReadFileAsString([NotNull] string filename);
    }
 }
--- a/src/WireMock.Net.Abstractions/Server/IWireMockServer.cs
+++ b/src/WireMock.Net.Abstractions/Server/IWireMockServer.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using JetBrains.Annotations;
@@ -104,9 +104,9 @@ namespace WireMock.Server
        void ReadStaticMappings([CanBeNull] string folder = null);

        /// <summary>
-        /// Removes the basic authentication.
+        /// Removes the authentication.
        /// </summary>
-        void RemoveBasicAuthentication();
+        void RemoveAuthentication();

        /// <summary>
        /// Resets LogEntries and Mappings.
@@ -134,6 +134,13 @@ namespace WireMock.Server
        /// <param name="folder">The optional folder. If not defined, use {CurrentFolder}/__admin/mappings</param>
        void SaveStaticMappings([CanBeNull] string folder = null);

+        /// <summary>
+        /// Sets the basic authentication.
+        /// </summary>
+        /// <param name="tenant">The Tenant.</param>
+        /// <param name="audience">The Audience or Resource.</param>
+        void SetAzureADAuthentication([NotNull] string tenant, [NotNull] string audience);
+
        /// <summary>
        /// Sets the basic authentication.
        /// </summary>
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <Description>Commonly used interfaces, models, enumerations and types.</Description>
+        <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>
@@ -11,7 +11,7 @@

        <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
        <PackageId>WireMock.Net.Abstractions</PackageId>
-        <PackageTags>wiremock;interfaces;models;classes;enumerations;types</PackageTags>
+        <PackageTags>wiremock;wiremock.org;interfaces;models;classes;enumerations;types</PackageTags>
        <RootNamespace>WireMock</RootNamespace>
        <ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A94}</ProjectGuid>
        <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -33,11 +33,11 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
+        <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" PrivateAssets="All" />
        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />

        <!-- See also https://mstack.nl/blog/20210801-source-generators -->
-        <PackageReference Include="FluentBuilder" Version="0.0.7">
+        <PackageReference Include="FluentBuilder" Version="0.0.11">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs
@@ -36,7 +36,7 @@ namespace WireMock.FluentAssertions

        [CustomAssertion]
        public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string value, string because = "", params object[] becauseArgs)
-            => WithHeader(expectedKey, new[] {value}, because, becauseArgs);
+            => WithHeader(expectedKey, new[] { value }, because, becauseArgs);

        [CustomAssertion]
        public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
@@ -69,7 +69,7 @@ namespace WireMock.FluentAssertions

            return new AndConstraint<WireMockAssertions>(this);
        }
-        
+
        [CustomAssertion]
        public AndConstraint<WireMockAssertions> AtUrl(string url, string because = "", params object[] becauseArgs)
        {
@@ -85,10 +85,10 @@ namespace WireMock.FluentAssertions
                .FailWith(
                    "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but didn't find it among the calls to {1}.",
                    _ => url, requests => requests.Select(request => request.Url));
-                
+
            return new AndConstraint<WireMockAssertions>(this);
        }
-        
+
        [CustomAssertion]
        public AndConstraint<WireMockAssertions> WithProxyUrl(string proxyUrl, string because = "", params object[] becauseArgs)
        {
@@ -104,10 +104,10 @@ namespace WireMock.FluentAssertions
                .FailWith(
                    "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but didn't find it among the calls with {1}.",
                    _ => proxyUrl, requests => requests.Select(request => request.ProxyUrl));
-                
+
            return new AndConstraint<WireMockAssertions>(this);
        }
-        
+
        [CustomAssertion]
        public AndConstraint<WireMockAssertions> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
        {
@@ -123,7 +123,7 @@ namespace WireMock.FluentAssertions
                .FailWith(
                    "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but didn't find it among the calls from IP(s) {1}.",
                    _ => clientIP, requests => requests.Select(request => request.ClientIP));
-                
+
            return new AndConstraint<WireMockAssertions>(this);
        }
    }
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockReceivedAssertions.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockReceivedAssertions.cs
@@ -4,23 +4,39 @@ using WireMock.Server;
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions
 {
+    /// <summary>
+    /// Contains a number of methods to assert that the <see cref="IWireMockServer"/> is in the expected state.
+    /// </summary>
    public class WireMockReceivedAssertions : ReferenceTypeAssertions<IWireMockServer, WireMockReceivedAssertions>
    {
-        public WireMockReceivedAssertions(IWireMockServer server)
+        /// <summary>
+        /// Create a WireMockReceivedAssertions. 
+        /// </summary>
+        /// <param name="server">The <see cref="IWireMockServer"/>.</param>
+        public WireMockReceivedAssertions(IWireMockServer server) : base(server)
        {
-            Subject = server;
        }
-        
+
+        /// <summary>
+        /// Asserts if <see cref="IWireMockServer"/> has received a call.
+        /// </summary>
+        /// <returns><see cref="WireMockAssertions"/></returns>
        public WireMockAssertions HaveReceivedACall()
        {
            return new WireMockAssertions(Subject, null);
        }
-        
+
+        /// <summary>
+        /// Asserts if <see cref="IWireMockServer"/> has received n-calls.
+        /// </summary>
+        /// <param name="callsCount"></param>
+        /// <returns><see cref="WireMockANumberOfCallsAssertions"/></returns>
        public WireMockANumberOfCallsAssertions HaveReceived(int callsCount)
        {
            return new WireMockANumberOfCallsAssertions(Subject, callsCount);
        }

+        /// <inheritdoc cref="ReferenceTypeAssertions{IWireMockServer, WireMockReceivedAssertions}.Identifier"/>
        protected override string Identifier => "wiremockserver";
    }
 }
--- a/src/WireMock.Net.FluentAssertions/Extensions/WireMockExtensions.cs
+++ b/src/WireMock.Net.FluentAssertions/Extensions/WireMockExtensions.cs
@@ -3,8 +3,16 @@ using WireMock.Server;
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions
 {
+    /// <summary>
+    /// Contains extension methods for custom assertions in unit tests.
+    /// </summary>
    public static class WireMockExtensions
    {
+        /// <summary>
+        /// Returns a <see cref="WireMockReceivedAssertions"/> object that can be used to assert the current <see cref="IWireMockServer"/>.
+        /// </summary>
+        /// <param name="instance">The WireMockServer</param>
+        /// <returns><see cref="WireMockReceivedAssertions"/></returns>
        public static WireMockReceivedAssertions Should(this IWireMockServer instance)
        {
            return new WireMockReceivedAssertions(instance);
--- a/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
+++ b/src/WireMock.Net.FluentAssertions/WireMock.Net.FluentAssertions.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

 	<PropertyGroup>
 		<Description>FluentAssertions extensions for WireMock.Net</Description>
@@ -29,13 +29,20 @@
 	</PropertyGroup>

 	<ItemGroup>
-		<PackageReference Include="FluentAssertions" Version="5.10.3" />
 		<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
 	</ItemGroup>

+  <ItemGroup Condition="'$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'netstandard1.3'">
+    <PackageReference Include="FluentAssertions" Version="5.10.3" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'netstandard1.3'">
+    <PackageReference Include="FluentAssertions" Version="6.1.0" />
+  </ItemGroup>
+
 	<ItemGroup>
 	  <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
 	</ItemGroup>

-</Project>
+</Project>
--- a/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
+++ b/src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs
@@ -1,225 +1,228 @@
-using System;
-using System.Linq;
+using System;
+using System.Linq;
 using System.Reflection;
 using System.Text;
-using JetBrains.Annotations;
-using Newtonsoft.Json.Linq;
-using WireMock.Exceptions;
-using WireMock.Validation;
-
-namespace WireMock.Matchers
-{
-    /// <summary>
-    /// CSharpCode / CS-Script Matcher
-    /// </summary>
-    /// <inheritdoc cref="ICSharpCodeMatcher"/>
-    internal class CSharpCodeMatcher : ICSharpCodeMatcher
-    {
-        private const string TemplateForIsMatchWithString = "public class CodeHelper {{ public bool IsMatch(string it) {{ {0} }} }}";
-
-        private const string TemplateForIsMatchWithDynamic = "public class CodeHelper {{ public bool IsMatch(dynamic it) {{ {0} }} }}";
-
-        private readonly string[] _usings =
-        {
-            "System",
-            "System.Linq",
-            "System.Collections.Generic",
-            "Microsoft.CSharp",
-            "Newtonsoft.Json.Linq"
-        };
-
-        public MatchBehaviour MatchBehaviour { get; }
-
-        /// <inheritdoc cref="IMatcher.ThrowException"/>
-        public bool ThrowException { get; }
-
-        private readonly string[] _patterns;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CSharpCodeMatcher"/> class.
-        /// </summary>
-        /// <param name="patterns">The patterns.</param>
-        public CSharpCodeMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="CSharpCodeMatcher"/> class.
-        /// </summary>
-        /// <param name="matchBehaviour">The match behaviour.</param>
-        /// <param name="patterns">The patterns.</param>
-        public CSharpCodeMatcher(MatchBehaviour matchBehaviour, [NotNull] params string[] patterns)
-        {
-            Check.NotNull(patterns, nameof(patterns));
-
-            MatchBehaviour = matchBehaviour;
-            ThrowException = false;
-            _patterns = patterns;
-        }
-
-        public double IsMatch(string input)
-        {
-            return IsMatchInternal(input);
-        }
-
-        public double IsMatch(object input)
-        {
-            return IsMatchInternal(input);
-        }
-
-        public double IsMatchInternal(object input)
-        {
-            double match = MatchScores.Mismatch;
-
-            if (input != null)
-            {
-                match = MatchScores.ToScore(_patterns.Select(pattern => IsMatch(input, pattern)));
-            }
-
-            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
-        }
-
-        private bool IsMatch(dynamic input, string pattern)
-        {
-            bool isMatchWithString = input is string;
-            var inputValue = isMatchWithString ? input : JObject.FromObject(input);
-            string source = GetSourceForIsMatchWithString(pattern, isMatchWithString);
-
-            object result = null;
-
-#if (NET451 || NET452)
-            var compilerParams = new System.CodeDom.Compiler.CompilerParameters
-            {
-                GenerateInMemory = true,
-                GenerateExecutable = false,
-                ReferencedAssemblies =
-                {
-                    "System.dll",
-                    "System.Core.dll",
-                    "Microsoft.CSharp.dll",
-                    "Newtonsoft.Json.dll"
-                }
-            };
-
-            using (var codeProvider = new Microsoft.CSharp.CSharpCodeProvider())
-            {
-                var compilerResults = codeProvider.CompileAssemblyFromSource(compilerParams, source);
-
-                if (compilerResults.Errors.Count != 0)
-                {
-                    var errors = from System.CodeDom.Compiler.CompilerError er in compilerResults.Errors select er.ToString();
-                    throw new WireMockException(string.Join(", ", errors));
-                }
-
-                object helper = compilerResults.CompiledAssembly.CreateInstance("CodeHelper");
-                if (helper == null)
-                {
-                    throw new WireMockException("CSharpCodeMatcher: Unable to create instance from WireMock.CodeHelper");
-                }
-
-                var methodInfo = helper.GetType().GetMethod("IsMatch");
-                if (methodInfo == null)
-                {
-                    throw new WireMockException("CSharpCodeMatcher: Unable to find method 'IsMatch' in WireMock.CodeHelper");
-                }
-
-                try
-                {
-                    result = methodInfo.Invoke(helper, new[] { inputValue });
-                }
-                catch (Exception ex)
-                {
-                    throw new WireMockException("CSharpCodeMatcher: Unable to call method 'IsMatch' in WireMock.CodeHelper", ex);
-                }
-            }
-#elif (NET46 || NET461)
-            dynamic script;
-            try
-            {
-                script = CSScriptLibrary.CSScript.Evaluator.CompileCode(source).CreateObject("*");
-            }
-            catch (Exception ex)
-            {
-                throw new WireMockException("CSharpCodeMatcher: Unable to create compiler for WireMock.CodeHelper", ex);
-            }
-            
-            try
-            {
-                result = script.IsMatch(inputValue);
-            }
-            catch (Exception ex)
-            {
-                throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
-            }
-
-#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0)
-            Assembly assembly;
-            try
+using AnyOfTypes;
+using JetBrains.Annotations;
+using Newtonsoft.Json.Linq;
+using WireMock.Exceptions;
+using WireMock.Extensions;
+using WireMock.Models;
+using WireMock.Validation;
+
+namespace WireMock.Matchers
+{
+    /// <summary>
+    /// CSharpCode / CS-Script Matcher
+    /// </summary>
+    /// <inheritdoc cref="ICSharpCodeMatcher"/>
+    internal class CSharpCodeMatcher : ICSharpCodeMatcher
+    {
+        private const string TemplateForIsMatchWithString = "public class CodeHelper {{ public bool IsMatch(string it) {{ {0} }} }}";
+
+        private const string TemplateForIsMatchWithDynamic = "public class CodeHelper {{ public bool IsMatch(dynamic it) {{ {0} }} }}";
+
+        private readonly string[] _usings =
+        {
+            "System",
+            "System.Linq",
+            "System.Collections.Generic",
+            "Microsoft.CSharp",
+            "Newtonsoft.Json.Linq"
+        };
+
+        public MatchBehaviour MatchBehaviour { get; }
+
+        /// <inheritdoc cref="IMatcher.ThrowException"/>
+        public bool ThrowException { get; }
+
+        private readonly AnyOf<string, StringPattern>[] _patterns;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CSharpCodeMatcher"/> class.
+        /// </summary>
+        /// <param name="patterns">The patterns.</param>
+        public CSharpCodeMatcher([NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, patterns)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="CSharpCodeMatcher"/> class.
+        /// </summary>
+        /// <param name="matchBehaviour">The match behaviour.</param>
+        /// <param name="patterns">The patterns.</param>
+        public CSharpCodeMatcher(MatchBehaviour matchBehaviour, [NotNull] params AnyOf<string, StringPattern>[] patterns)
+        {
+            Check.NotNull(patterns, nameof(patterns));
+
+            MatchBehaviour = matchBehaviour;
+            ThrowException = false;
+            _patterns = patterns;
+        }
+
+        public double IsMatch(string input)
+        {
+            return IsMatchInternal(input);
+        }
+
+        public double IsMatch(object input)
+        {
+            return IsMatchInternal(input);
+        }
+
+        public double IsMatchInternal(object input)
+        {
+            double match = MatchScores.Mismatch;
+
+            if (input != null)
            {
-                assembly = CSScriptLib.CSScript.Evaluator.CompileCode(source);
-            }
-            catch (Exception ex)
-            {
-                throw new WireMockException($"CSharpCodeMatcher: Unable to compile code `{source}` for WireMock.CodeHelper", ex);
-            }
-
-            dynamic script;
+                match = MatchScores.ToScore(_patterns.Select(pattern => IsMatch(input, pattern.GetPattern())));
+            }
+
+            return MatchBehaviourHelper.Convert(MatchBehaviour, match);
+        }
+
+        private bool IsMatch(dynamic input, string pattern)
+        {
+            bool isMatchWithString = input is string;
+            var inputValue = isMatchWithString ? input : JObject.FromObject(input);
+            string source = GetSourceForIsMatchWithString(pattern, isMatchWithString);
+
+            object result = null;
+
+#if (NET451 || NET452)
+            var compilerParams = new System.CodeDom.Compiler.CompilerParameters
+            {
+                GenerateInMemory = true,
+                GenerateExecutable = false,
+                ReferencedAssemblies =
+                {
+                    "System.dll",
+                    "System.Core.dll",
+                    "Microsoft.CSharp.dll",
+                    "Newtonsoft.Json.dll"
+                }
+            };
+
+            using (var codeProvider = new Microsoft.CSharp.CSharpCodeProvider())
+            {
+                var compilerResults = codeProvider.CompileAssemblyFromSource(compilerParams, source);
+
+                if (compilerResults.Errors.Count != 0)
+                {
+                    var errors = from System.CodeDom.Compiler.CompilerError er in compilerResults.Errors select er.ToString();
+                    throw new WireMockException(string.Join(", ", errors));
+                }
+
+                object helper = compilerResults.CompiledAssembly.CreateInstance("CodeHelper");
+                if (helper == null)
+                {
+                    throw new WireMockException("CSharpCodeMatcher: Unable to create instance from WireMock.CodeHelper");
+                }
+
+                var methodInfo = helper.GetType().GetMethod("IsMatch");
+                if (methodInfo == null)
+                {
+                    throw new WireMockException("CSharpCodeMatcher: Unable to find method 'IsMatch' in WireMock.CodeHelper");
+                }
+
+                try
+                {
+                    result = methodInfo.Invoke(helper, new[] { inputValue });
+                }
+                catch (Exception ex)
+                {
+                    throw new WireMockException("CSharpCodeMatcher: Unable to call method 'IsMatch' in WireMock.CodeHelper", ex);
+                }
+            }
+#elif (NET46 || NET461)
+            dynamic script;
            try
            {
-#if NETSTANDARD2_0
-                script = csscript.GenericExtensions.CreateObject(assembly, "*");
-#else
-                script = CSScriptLib.ReflectionExtensions.CreateObject(assembly, "*");
+                script = CSScriptLibrary.CSScript.Evaluator.CompileCode(source).CreateObject("*");
+            }
+            catch (Exception ex)
+            {
+                throw new WireMockException("CSharpCodeMatcher: Unable to create compiler for WireMock.CodeHelper", ex);
+            }
+            
+            try
+            {
+                result = script.IsMatch(inputValue);
+            }
+            catch (Exception ex)
+            {
+                throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
+            }
+
+#elif (NETSTANDARD2_0 || NETSTANDARD2_1 || NETCOREAPP3_1 || NET5_0)
+            Assembly assembly;
+            try
+            {
+                assembly = CSScriptLib.CSScript.Evaluator.CompileCode(source);
+            }
+            catch (Exception ex)
+            {
+                throw new WireMockException($"CSharpCodeMatcher: Unable to compile code `{source}` for WireMock.CodeHelper", ex);
+            }
+
+            dynamic script;
+            try
+            {
+#if NETSTANDARD2_0
+                script = csscript.GenericExtensions.CreateObject(assembly, "*");
+#else
+                script = CSScriptLib.ReflectionExtensions.CreateObject(assembly, "*");
 #endif
-            }
-            catch (Exception ex)
+            }
+            catch (Exception ex)
            {
                throw new WireMockException("CSharpCodeMatcher: Unable to create object from assembly", ex);
-            }
-
-            try
-            {
-                result = script.IsMatch(inputValue);
-            }
-            catch (Exception ex)
-            {
-                throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
            }
-#else
-            throw new NotSupportedException("The 'CSharpCodeMatcher' cannot be used in netstandard 1.3");
-#endif
-            try
-            {
-                return (bool)result;
-            }
-            catch
-            {
-                throw new WireMockException($"Unable to cast result '{result}' to bool");
-            }
-        }
-
-        private string GetSourceForIsMatchWithString(string pattern, bool isMatchWithString)
-        {
-            string template = isMatchWithString ? TemplateForIsMatchWithString : TemplateForIsMatchWithDynamic;
-
-            var stringBuilder = new StringBuilder();
+
+            try
+            {
+                result = script.IsMatch(inputValue);
+            }
+            catch (Exception ex)
+            {
+                throw new WireMockException("CSharpCodeMatcher: Problem calling method 'IsMatch' in WireMock.CodeHelper", ex);
+            }
+#else
+            throw new NotSupportedException("The 'CSharpCodeMatcher' cannot be used in netstandard 1.3");
+#endif
+            try
+            {
+                return (bool)result;
+            }
+            catch
+            {
+                throw new WireMockException($"Unable to cast result '{result}' to bool");
+            }
+        }
+
+        private string GetSourceForIsMatchWithString(string pattern, bool isMatchWithString)
+        {
+            string template = isMatchWithString ? TemplateForIsMatchWithString : TemplateForIsMatchWithDynamic;
+
+            var stringBuilder = new StringBuilder();
            foreach (string @using in _usings)
            {
                stringBuilder.AppendLine($"using {@using};");
-            }
-            stringBuilder.AppendLine();
-            stringBuilder.AppendFormat(template, pattern);
-
-            return stringBuilder.ToString();
-        }
-
-        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public string[] GetPatterns()
-        {
-            return _patterns;
-        }
-
-        /// <inheritdoc cref="IMatcher.Name"/>
-        public string Name => "CSharpCodeMatcher";
-    }
+            }
+            stringBuilder.AppendLine();
+            stringBuilder.AppendFormat(template, pattern);
+
+            return stringBuilder.ToString();
+        }
+
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+        public AnyOf<string, StringPattern>[] GetPatterns()
+        {
+            return _patterns;
+        }
+
+        /// <inheritdoc cref="IMatcher.Name"/>
+        public string Name => "CSharpCodeMatcher";
+    }
 }
--- a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
+++ b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
@@ -45,6 +45,8 @@ namespace WireMock.Net.OpenApiParser.Mappers
        {
            var queryParameters = operation.Parameters.Where(p => p.In == ParameterLocation.Query);
            var pathParameters = operation.Parameters.Where(p => p.In == ParameterLocation.Path);
+            var headers = operation.Parameters.Where(p => p.In == ParameterLocation.Header);
+
            var response = operation.Responses.FirstOrDefault();

            TryGetContent(response.Value?.Content, out OpenApiMediaType responseContent, out string responseContentType);
@@ -53,7 +55,7 @@ namespace WireMock.Net.OpenApiParser.Mappers

            var body = responseExample != null ? MapOpenApiAnyToJToken(responseExample) : MapSchemaToObject(responseSchema);

-            if (int.TryParse(response.Key, out var httpStatusCode))
+            if (!int.TryParse(response.Key, out var httpStatusCode))
            {
                httpStatusCode = 200;
            }
@@ -65,7 +67,8 @@ namespace WireMock.Net.OpenApiParser.Mappers
                {
                    Methods = new[] { httpMethod },
                    Path = MapPathWithParameters(path, pathParameters),
-                    Params = MapQueryParameters(queryParameters)
+                    Params = MapQueryParameters(queryParameters),
+                    Headers = MapRequestHeaders(headers)
                },
                Response = new ResponseModel
                {
@@ -152,13 +155,17 @@ namespace WireMock.Net.OpenApiParser.Mappers
                    {
                        string propertyName = schemaProperty.Key;
                        var openApiSchema = schemaProperty.Value;
-                        if (openApiSchema.GetSchemaType() == SchemaType.Object)
+                        if (openApiSchema.GetSchemaType() == SchemaType.Object || openApiSchema.GetSchemaType() == SchemaType.Array)
                        {
                            var mapped = MapSchemaToObject(schemaProperty.Value, schemaProperty.Key);
                            if (mapped is JProperty jp)
                            {
                                propertyAsJObject.Add(jp);
                            }
+                            else
+                            {
+                                propertyAsJObject.Add(new JProperty(schemaProperty.Key, mapped));
+                            }
                        }
                        else
                        {
@@ -247,6 +254,26 @@ namespace WireMock.Net.OpenApiParser.Mappers
            return list.Any() ? list : null;
        }

+        private IList<HeaderModel> MapRequestHeaders(IEnumerable<OpenApiParameter> headers)
+        {
+            var list = headers
+                .Select(qp => new HeaderModel
+                {
+                    Name = qp.Name,
+                    Matchers = new[]
+                    {
+                        new MatcherModel
+                        {
+                            Name = "ExactMatcher",
+                            Pattern = GetDefaultValueAsStringForSchemaType(qp.Schema)
+                        }
+                    }
+                })
+                .ToList();
+
+            return list.Any() ? list : null;
+        }
+
        private string GetDefaultValueAsStringForSchemaType(OpenApiSchema schema)
        {
            var value = _exampleValueGenerator.GetExampleValue(schema);
--- a/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj
+++ b/src/WireMock.Net.RestClient/WireMock.Net.RestClient.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <Description>A RestClient using RestEase to access the admin interface.</Description>
@@ -31,7 +31,7 @@

  <ItemGroup>
    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="RestEase" Version="1.4.10" />
+    <PackageReference Include="RestEase" Version="1.5.5" />
  </ItemGroup>

  <ItemGroup>
--- a/src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs
+++ b/src/WireMock.Net/Authentication/AzureADAuthenticationMatcher.cs
@@ -0,0 +1,71 @@
+#if !NETSTANDARD1_3
+using System.Globalization;
+using System.IdentityModel.Tokens.Jwt;
+using System.Text.RegularExpressions;
+using AnyOfTypes;
+using Microsoft.IdentityModel.Protocols;
+using Microsoft.IdentityModel.Protocols.OpenIdConnect;
+using Microsoft.IdentityModel.Tokens;
+using WireMock.Matchers;
+using WireMock.Models;
+
+namespace WireMock.Authentication
+{
+    /// <summary>
+    /// https://www.c-sharpcorner.com/article/how-to-validate-azure-ad-token-using-console-application/
+    /// https://stackoverflow.com/questions/38684865/validation-of-an-azure-ad-bearer-token-in-a-console-application
+    /// </summary>
+    internal class AzureADAuthenticationMatcher : IStringMatcher
+    {
+        private const string BearerPrefix = "Bearer ";
+
+        private readonly string _audience;
+        private readonly string _stsDiscoveryEndpoint;
+
+        public AzureADAuthenticationMatcher(string tenant, string audience)
+        {
+            _audience = audience;
+            _stsDiscoveryEndpoint = string.Format(CultureInfo.InvariantCulture, "https://login.microsoftonline.com/{0}/.well-known/openid-configuration", tenant);
+        }
+
+        public string Name => nameof(AzureADAuthenticationMatcher);
+
+        public MatchBehaviour MatchBehaviour => MatchBehaviour.AcceptOnMatch;
+
+        public bool ThrowException => false;
+
+        public AnyOf<string, StringPattern>[] GetPatterns()
+        {
+            return new AnyOf<string, StringPattern>[0];
+        }
+
+        public double IsMatch(string input)
+        {
+            var token = Regex.Replace(input, BearerPrefix, string.Empty, RegexOptions.IgnoreCase);
+
+            try
+            {
+                var configManager = new ConfigurationManager<OpenIdConnectConfiguration>(_stsDiscoveryEndpoint, new OpenIdConnectConfigurationRetriever());
+                var config = configManager.GetConfigurationAsync().GetAwaiter().GetResult();
+
+                var validationParameters = new TokenValidationParameters
+                {
+                    ValidAudience = _audience,
+                    ValidIssuer = config.Issuer,
+                    IssuerSigningKeys = config.SigningKeys,
+                    ValidateLifetime = true
+                };
+
+                // Throws an Exception as the token is invalid (expired, invalid-formatted, etc.)
+                new JwtSecurityTokenHandler().ValidateToken(token, validationParameters, out var _);
+
+                return MatchScores.Perfect;
+            }
+            catch
+            {
+                return MatchScores.Mismatch;
+            }
+        }
+    }
+}
+#endif
--- a/src/WireMock.Net/Authentication/BasicAuthenticationMatcher.cs
+++ b/src/WireMock.Net/Authentication/BasicAuthenticationMatcher.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Text;
+using WireMock.Matchers;
+
+namespace WireMock.Authentication
+{
+    internal class BasicAuthenticationMatcher : RegexMatcher
+    {
+        public BasicAuthenticationMatcher(string username, string password) : base(BuildPattern(username, password))
+        {
+        }
+
+        public override string Name => nameof(BasicAuthenticationMatcher);
+
+        private static string BuildPattern(string username, string password)
+        {
+            return "^(?i)BASIC " + Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password)) + "$";
+        }
+    }
+}
--- a/src/WireMock.Net/Extensions/AnyOfExtensions.cs
+++ b/src/WireMock.Net/Extensions/AnyOfExtensions.cs
@@ -0,0 +1,25 @@
+using System.Collections.Generic;
+using System.Linq;
+using AnyOfTypes;
+using WireMock.Models;
+
+namespace WireMock.Extensions
+{
+    internal static class AnyOfExtensions
+    {
+        public static string GetPattern(this AnyOf<string, StringPattern> value)
+        {
+            return value.IsFirst ? value.First : value.Second.Pattern;
+        }
+
+        public static AnyOf<string, StringPattern>[] ToAnyOfPatterns(this IEnumerable<string> patterns)
+        {
+            return patterns.Select(p => p.ToAnyOfPattern()).ToArray();
+        }
+
+        public static AnyOf<string, StringPattern> ToAnyOfPattern(this string pattern)
+        {
+            return new AnyOf<string, StringPattern>(pattern);
+        }
+    }
+}
--- a/src/WireMock.Net/Handlers/LocalFileSystemHandler.cs
+++ b/src/WireMock.Net/Handlers/LocalFileSystemHandler.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using WireMock.Util;
 using WireMock.Validation;
@@ -130,6 +130,12 @@ namespace WireMock.Handlers
            return File.ReadAllBytes(AdjustPath(filename));
        }

+        /// <inheritdoc cref="IFileSystemHandler.ReadFileAsString"/>
+        public string ReadFileAsString(string filename)
+        {
+            return File.ReadAllText(AdjustPath(Check.NotNullOrEmpty(filename, nameof(filename))));
+        }
+
        /// <summary>
        /// Adjusts the path to the MappingFolder.
        /// </summary>
@@ -140,4 +146,4 @@ namespace WireMock.Handlers
            return Path.Combine(GetMappingFolder(), filename);
        }
    }
-}
+}
--- a/src/WireMock.Net/Matchers/ContentTypeMatcher.cs
+++ b/src/WireMock.Net/Matchers/ContentTypeMatcher.cs
@@ -1,5 +1,7 @@
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
+using AnyOfTypes;
 using JetBrains.Annotations;
+using WireMock.Models;

 namespace WireMock.Matchers
 {
@@ -9,14 +11,14 @@ namespace WireMock.Matchers
    /// <seealso cref="RegexMatcher" />
    public class ContentTypeMatcher : WildcardMatcher
    {
-        private readonly string[] _patterns;
+        private readonly AnyOf<string, StringPattern>[] _patterns;

        /// <summary>
        /// Initializes a new instance of the <see cref="ContentTypeMatcher"/> class.
        /// </summary>
        /// <param name="pattern">The pattern.</param>
        /// <param name="ignoreCase">IgnoreCase (default false)</param>
-        public ContentTypeMatcher([NotNull] string pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
+        public ContentTypeMatcher([NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
        {
        }

@@ -26,7 +28,7 @@ namespace WireMock.Matchers
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="pattern">The pattern.</param>
        /// <param name="ignoreCase">IgnoreCase (default false)</param>
-        public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] string pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
+        public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
        {
        }

@@ -35,7 +37,7 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="patterns">The patterns.</param>
        /// <param name="ignoreCase">IgnoreCase (default false)</param>
-        public ContentTypeMatcher([NotNull] string[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
+        public ContentTypeMatcher([NotNull] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
        {
        }

@@ -46,7 +48,7 @@ namespace WireMock.Matchers
        /// <param name="patterns">The patterns.</param>
        /// <param name="ignoreCase">IgnoreCase (default false)</param>
        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, bool ignoreCase = false, bool throwException = false) :
+        public ContentTypeMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false, bool throwException = false) :
            base(matchBehaviour, patterns, ignoreCase, throwException)
        {
            _patterns = patterns;
@@ -64,7 +66,7 @@ namespace WireMock.Matchers
        }

        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public override string[] GetPatterns()
+        public override AnyOf<string, StringPattern>[] GetPatterns()
        {
            return _patterns;
        }
--- a/src/WireMock.Net/Matchers/ExactMatcher.cs
+++ b/src/WireMock.Net/Matchers/ExactMatcher.cs
@@ -1,5 +1,8 @@
-using System.Linq;
+using System.Linq;
+using AnyOfTypes;
 using JetBrains.Annotations;
+using WireMock.Extensions;
+using WireMock.Models;
 using WireMock.Validation;

 namespace WireMock.Matchers
@@ -10,7 +13,7 @@ namespace WireMock.Matchers
    /// <seealso cref="IStringMatcher" />
    public class ExactMatcher : IStringMatcher
    {
-        private readonly string[] _values;
+        private readonly AnyOf<string, StringPattern>[] _values;

        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
        public MatchBehaviour MatchBehaviour { get; }
@@ -22,7 +25,7 @@ namespace WireMock.Matchers
        /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
        /// </summary>
        /// <param name="values">The values.</param>
-        public ExactMatcher([NotNull] params string[] values) : this(MatchBehaviour.AcceptOnMatch, false, values)
+        public ExactMatcher([NotNull] params AnyOf<string, StringPattern>[] values) : this(MatchBehaviour.AcceptOnMatch, false, values)
        {
        }

@@ -32,9 +35,9 @@ namespace WireMock.Matchers
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
        /// <param name="values">The values.</param>
-        public ExactMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params string[] values)
+        public ExactMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] values)
        {
-            Check.HasNoNulls(values, nameof(values));
+            Check.NotNull(values, nameof(values));

            MatchBehaviour = matchBehaviour;
            ThrowException = throwException;
@@ -46,14 +49,14 @@ namespace WireMock.Matchers
        {
            if (_values.Length == 1)
            {
-                return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_values[0] == input));
+                return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_values[0].GetPattern() == input));
            }

-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_values.Contains(input)));
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_values.Select(v => v.GetPattern()).Contains(input)));
        }

        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public string[] GetPatterns()
+        public AnyOf<string, StringPattern>[] GetPatterns()
        {
            return _values;
        }
--- a/src/WireMock.Net/Matchers/IStringMatcher.cs
+++ b/src/WireMock.Net/Matchers/IStringMatcher.cs
@@ -1,4 +1,7 @@
-namespace WireMock.Matchers
+using AnyOfTypes;
+using WireMock.Models;
+
+namespace WireMock.Matchers
 {
    /// <summary>
    /// IStringMatcher
@@ -17,6 +20,6 @@
        /// Gets the patterns.
        /// </summary>
        /// <returns>Patterns</returns>
-        string[] GetPatterns();
+        AnyOf<string, StringPattern>[] GetPatterns();
    }
 }
--- a/src/WireMock.Net/Matchers/JSONPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/JSONPathMatcher.cs
@@ -1,7 +1,10 @@
-using System.Linq;
+using System.Linq;
+using AnyOfTypes;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using WireMock.Extensions;
+using WireMock.Models;
 using WireMock.Validation;

 namespace WireMock.Matchers
@@ -13,7 +16,7 @@ namespace WireMock.Matchers
    /// <seealso cref="IObjectMatcher" />
    public class JsonPathMatcher : IStringMatcher, IObjectMatcher
    {
-        private readonly string[] _patterns;
+        private readonly AnyOf<string, StringPattern>[] _patterns;

        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
        public MatchBehaviour MatchBehaviour { get; }
@@ -25,7 +28,15 @@ namespace WireMock.Matchers
        /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
        /// </summary>
        /// <param name="patterns">The patterns.</param>
-        public JsonPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
+        public JsonPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns.ToAnyOfPatterns())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
+        /// </summary>
+        /// <param name="patterns">The patterns.</param>
+        public JsonPathMatcher([NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
        {
        }

@@ -35,7 +46,7 @@ namespace WireMock.Matchers
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
        /// <param name="patterns">The patterns.</param>
-        public JsonPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params string[] patterns)
+        public JsonPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] patterns)
        {
            Check.NotNull(patterns, nameof(patterns));

@@ -94,7 +105,7 @@ namespace WireMock.Matchers
        }

        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public string[] GetPatterns()
+        public AnyOf<string, StringPattern>[] GetPatterns()
        {
            return _patterns;
        }
@@ -104,7 +115,7 @@ namespace WireMock.Matchers

        private double IsMatch(JToken jtoken)
        {
-            return MatchScores.ToScore(_patterns.Select(pattern => jtoken.SelectToken(pattern) != null));
+            return MatchScores.ToScore(_patterns.Select(pattern => jtoken.SelectToken(pattern.GetPattern()) != null));
        }
    }
 }
--- a/src/WireMock.Net/Matchers/JmesPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/JmesPathMatcher.cs
@@ -1,7 +1,10 @@
-using DevLab.JmesPath;
+using AnyOfTypes;
+using DevLab.JmesPath;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using System.Linq;
+using WireMock.Extensions;
+using WireMock.Models;
 using WireMock.Validation;

 namespace WireMock.Matchers
@@ -11,7 +14,7 @@ namespace WireMock.Matchers
    /// </summary>
    public class JmesPathMatcher : IStringMatcher, IObjectMatcher
    {
-        private readonly string[] _patterns;
+        private readonly AnyOf<string, StringPattern>[] _patterns;

        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
        public MatchBehaviour MatchBehaviour { get; }
@@ -23,7 +26,15 @@ namespace WireMock.Matchers
        /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
        /// </summary>
        /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
+        public JmesPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns.ToAnyOfPatterns())
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="JmesPathMatcher"/> class.
+        /// </summary>
+        /// <param name="patterns">The patterns.</param>
+        public JmesPathMatcher([NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
        {
        }

@@ -32,7 +43,7 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
        /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher(bool throwException = false, [NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, throwException, patterns)
+        public JmesPathMatcher(bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, throwException, patterns)
        {
        }

@@ -42,7 +53,7 @@ namespace WireMock.Matchers
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
        /// <param name="patterns">The patterns.</param>
-        public JmesPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params string[] patterns)
+        public JmesPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] patterns)
        {
            Check.NotNull(patterns, nameof(patterns));

@@ -59,7 +70,7 @@ namespace WireMock.Matchers
            {
                try
                {
-                    match = MatchScores.ToScore(_patterns.Select(pattern => bool.Parse(new JmesPath().Transform(input, pattern))));
+                    match = MatchScores.ToScore(_patterns.Select(pattern => bool.Parse(new JmesPath().Transform(input, pattern.GetPattern()))));
                }
                catch (JsonException)
                {
@@ -89,7 +100,7 @@ namespace WireMock.Matchers
        }

        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public string[] GetPatterns()
+        public AnyOf<string, StringPattern>[] GetPatterns()
        {
            return _patterns;
        }
--- a/src/WireMock.Net/Matchers/LinqMatcher.cs
+++ b/src/WireMock.Net/Matchers/LinqMatcher.cs
@@ -1,8 +1,12 @@
-using System.Linq;
+using System.Linq;
 using System.Linq.Dynamic.Core;
+using AnyOfTypes;
 using JetBrains.Annotations;
 using Newtonsoft.Json.Linq;
+using WireMock.Extensions;
+using WireMock.Models;
 using WireMock.Util;
+using WireMock.Validation;

 namespace WireMock.Matchers
 {
@@ -13,7 +17,7 @@ namespace WireMock.Matchers
    /// <inheritdoc cref="IStringMatcher"/>
    public class LinqMatcher : IObjectMatcher, IStringMatcher
    {
-        private readonly string[] _patterns;
+        private readonly AnyOf<string, StringPattern>[] _patterns;

        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
        public MatchBehaviour MatchBehaviour { get; }
@@ -24,7 +28,7 @@ namespace WireMock.Matchers
        /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
        /// </summary>
        /// <param name="pattern">The pattern.</param>
-        public LinqMatcher([NotNull] string pattern) : this(new[] { pattern })
+        public LinqMatcher([NotNull] AnyOf<string, StringPattern> pattern) : this(new[] { pattern })
        {
        }

@@ -32,7 +36,7 @@ namespace WireMock.Matchers
        /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
        /// </summary>
        /// <param name="patterns">The patterns.</param>
-        public LinqMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
+        public LinqMatcher([NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
        {
        }

@@ -41,7 +45,7 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="pattern">The pattern.</param>
-        public LinqMatcher(MatchBehaviour matchBehaviour, [NotNull] string pattern) : this(matchBehaviour, false, pattern)
+        public LinqMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern> pattern) : this(matchBehaviour, false, pattern)
        {
        }

@@ -51,8 +55,10 @@ namespace WireMock.Matchers
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="patterns">The patterns.</param>
        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public LinqMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params string[] patterns)
+        public LinqMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] patterns)
        {
+            Check.NotNull(patterns, nameof(patterns));
+
            MatchBehaviour = matchBehaviour;
            ThrowException = throwException;
            _patterns = patterns;
@@ -69,7 +75,7 @@ namespace WireMock.Matchers
            try
            {
                // Use the Any(...) method to check if the result matches
-                match = MatchScores.ToScore(_patterns.Select(pattern => queryable.Any(pattern)));
+                match = MatchScores.ToScore(_patterns.Select(pattern => queryable.Any(pattern.GetPattern())));

                return MatchBehaviourHelper.Convert(MatchBehaviour, match);
            }
@@ -129,7 +135,7 @@ namespace WireMock.Matchers
        }

        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public string[] GetPatterns()
+        public AnyOf<string, StringPattern>[] GetPatterns()
        {
            return _patterns;
        }
--- a/src/WireMock.Net/Matchers/NotNullOrEmptyMatcher.cs
+++ b/src/WireMock.Net/Matchers/NotNullOrEmptyMatcher.cs
@@ -1,4 +1,6 @@
 using System.Linq;
+using AnyOfTypes;
+using WireMock.Models;

 namespace WireMock.Matchers
 {
@@ -6,7 +8,7 @@ namespace WireMock.Matchers
    /// NotNullOrEmptyMatcher
    /// </summary>
    /// <seealso cref="IObjectMatcher" />
-    public class NotNullOrEmptyMatcher : IObjectMatcher
+    public class NotNullOrEmptyMatcher : IObjectMatcher, IStringMatcher
    {
        /// <inheritdoc cref="IMatcher.Name"/>
        public string Name => "NotNullOrEmptyMatcher";
@@ -48,5 +50,19 @@ namespace WireMock.Matchers

            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
        }
+
+        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
+        public double IsMatch(string input)
+        {
+            var match = !string.IsNullOrEmpty(input);
+
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(match));
+        }
+
+        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
+        public AnyOf<string, StringPattern>[] GetPatterns()
+        {
+            return new AnyOf<string, StringPattern>[0];
+        }
    }
 }
--- a/src/WireMock.Net/Matchers/RegexMatcher.cs
+++ b/src/WireMock.Net/Matchers/RegexMatcher.cs
@@ -1,7 +1,10 @@
-using System;
+using System;
 using System.Linq;
 using System.Text.RegularExpressions;
+using AnyOfTypes;
 using JetBrains.Annotations;
+using WireMock.Extensions;
+using WireMock.Models;
 using WireMock.Validation;

 namespace WireMock.Matchers
@@ -13,7 +16,7 @@ namespace WireMock.Matchers
    /// <inheritdoc cref="IIgnoreCaseMatcher"/>
    public class RegexMatcher : IStringMatcher, IIgnoreCaseMatcher
    {
-        private readonly string[] _patterns;
+        private readonly AnyOf<string, StringPattern>[] _patterns;
        private readonly Regex[] _expressions;

        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
@@ -27,7 +30,7 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="pattern">The pattern.</param>
        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        public RegexMatcher([NotNull, RegexPattern] string pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
+        public RegexMatcher([NotNull, RegexPattern] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
        {
        }

@@ -37,7 +40,7 @@ namespace WireMock.Matchers
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="pattern">The pattern.</param>
        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] string pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
+        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
        {
        }

@@ -46,7 +49,7 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="patterns">The patterns.</param>
        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
-        public RegexMatcher([NotNull, RegexPattern] string[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
+        public RegexMatcher([NotNull, RegexPattern] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
        {
        }

@@ -57,7 +60,7 @@ namespace WireMock.Matchers
        /// <param name="patterns">The patterns.</param>
        /// <param name="ignoreCase">Ignore the case from the pattern.</param>
        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] string[] patterns, bool ignoreCase = false, bool throwException = false)
+        public RegexMatcher(MatchBehaviour matchBehaviour, [NotNull, RegexPattern] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false, bool throwException = false)
        {
            Check.NotNull(patterns, nameof(patterns));

@@ -73,7 +76,7 @@ namespace WireMock.Matchers
                options |= RegexOptions.IgnoreCase;
            }

-            _expressions = patterns.Select(p => new Regex(p, options)).ToArray();
+            _expressions = patterns.Select(p => new Regex(p.GetPattern(), options)).ToArray();
        }

        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
@@ -99,7 +102,7 @@ namespace WireMock.Matchers
        }

        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public virtual string[] GetPatterns()
+        public virtual AnyOf<string, StringPattern>[] GetPatterns()
        {
            return _patterns;
        }
--- a/src/WireMock.Net/Matchers/SimMetricsMatcher.cs
+++ b/src/WireMock.Net/Matchers/SimMetricsMatcher.cs
@@ -1,8 +1,11 @@
-using System.Linq;
+using System.Linq;
+using AnyOfTypes;
 using JetBrains.Annotations;
 using SimMetrics.Net;
 using SimMetrics.Net.API;
 using SimMetrics.Net.Metric;
+using WireMock.Extensions;
+using WireMock.Models;
 using WireMock.Validation;

 namespace WireMock.Matchers
@@ -13,7 +16,7 @@ namespace WireMock.Matchers
    /// <seealso cref="IStringMatcher" />
    public class SimMetricsMatcher : IStringMatcher
    {
-        private readonly string[] _patterns;
+        private readonly AnyOf<string, StringPattern>[] _patterns;
        private readonly SimMetricType _simMetricType;

        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
@@ -27,7 +30,7 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="pattern">The pattern.</param>
        /// <param name="simMetricType">The SimMetric Type</param>
-        public SimMetricsMatcher([NotNull] string pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(new[] { pattern }, simMetricType)
+        public SimMetricsMatcher([NotNull] AnyOf<string, StringPattern> pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(new[] { pattern }, simMetricType)
        {
        }

@@ -37,7 +40,7 @@ namespace WireMock.Matchers
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="pattern">The pattern.</param>
        /// <param name="simMetricType">The SimMetric Type</param>
-        public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] string pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(matchBehaviour, new[] { pattern }, simMetricType)
+        public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern> pattern, SimMetricType simMetricType = SimMetricType.Levenstein) : this(matchBehaviour, new[] { pattern }, simMetricType)
        {
        }

@@ -46,7 +49,16 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="patterns">The patterns.</param>
        /// <param name="simMetricType">The SimMetric Type</param>
-        public SimMetricsMatcher([NotNull] string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein) : this(MatchBehaviour.AcceptOnMatch, patterns, simMetricType)
+        public SimMetricsMatcher([NotNull] string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein) : this(MatchBehaviour.AcceptOnMatch, patterns.ToAnyOfPatterns(), simMetricType)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="SimMetricsMatcher"/> class.
+        /// </summary>
+        /// <param name="patterns">The patterns.</param>
+        /// <param name="simMetricType">The SimMetric Type</param>
+        public SimMetricsMatcher([NotNull] AnyOf<string, StringPattern>[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein) : this(MatchBehaviour.AcceptOnMatch, patterns, simMetricType)
        {
        }

@@ -57,9 +69,9 @@ namespace WireMock.Matchers
        /// <param name="patterns">The patterns.</param>
        /// <param name="simMetricType">The SimMetric Type</param>
        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein, bool throwException = false)
+        public SimMetricsMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern>[] patterns, SimMetricType simMetricType = SimMetricType.Levenstein, bool throwException = false)
        {
-            Check.NotNullOrEmpty(patterns, nameof(patterns));
+            Check.NotNull(patterns, nameof(patterns));

            MatchBehaviour = matchBehaviour;
            ThrowException = throwException;
@@ -71,9 +83,9 @@ namespace WireMock.Matchers
        /// <inheritdoc cref="IStringMatcher.IsMatch"/>
        public double IsMatch(string input)
        {
-            IStringMetric m = GetStringMetricType();
+            IStringMetric stringmetricType = GetStringMetricType();

-            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_patterns.Select(p => m.GetSimilarity(p, input))));
+            return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(_patterns.Select(p => stringmetricType.GetSimilarity(p.GetPattern(), input))));
        }

        private IStringMetric GetStringMetricType()
@@ -120,7 +132,7 @@ namespace WireMock.Matchers
        }

        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public string[] GetPatterns()
+        public AnyOf<string, StringPattern>[] GetPatterns()
        {
            return _patterns;
        }
--- a/src/WireMock.Net/Matchers/WildcardMatcher.cs
+++ b/src/WireMock.Net/Matchers/WildcardMatcher.cs
@@ -1,6 +1,9 @@
-using System.Linq;
+using System.Linq;
 using System.Text.RegularExpressions;
+using AnyOfTypes;
 using JetBrains.Annotations;
+using WireMock.Extensions;
+using WireMock.Models;

 namespace WireMock.Matchers
 {
@@ -10,14 +13,14 @@ namespace WireMock.Matchers
    /// <seealso cref="RegexMatcher" />
    public class WildcardMatcher : RegexMatcher
    {
-        private readonly string[] _patterns;
+        private readonly AnyOf<string, StringPattern>[] _patterns;

        /// <summary>
        /// Initializes a new instance of the <see cref="WildcardMatcher"/> class.
        /// </summary>
        /// <param name="pattern">The pattern.</param>
        /// <param name="ignoreCase">IgnoreCase</param>
-        public WildcardMatcher([NotNull] string pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
+        public WildcardMatcher([NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(new[] { pattern }, ignoreCase)
        {
        }

@@ -27,7 +30,7 @@ namespace WireMock.Matchers
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="pattern">The pattern.</param>
        /// <param name="ignoreCase">IgnoreCase</param>
-        public WildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] string pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
+        public WildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern> pattern, bool ignoreCase = false) : this(matchBehaviour, new[] { pattern }, ignoreCase)
        {
        }

@@ -36,7 +39,7 @@ namespace WireMock.Matchers
        /// </summary>
        /// <param name="patterns">The patterns.</param>
        /// <param name="ignoreCase">IgnoreCase</param>
-        public WildcardMatcher([NotNull] string[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
+        public WildcardMatcher([NotNull] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, patterns, ignoreCase)
        {
        }

@@ -47,19 +50,30 @@ namespace WireMock.Matchers
        /// <param name="patterns">The patterns.</param>
        /// <param name="ignoreCase">IgnoreCase</param>
        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
-        public WildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] string[] patterns, bool ignoreCase = false, bool throwException = false) : 
-            base(matchBehaviour, patterns.Select(pattern => "^" + Regex.Escape(pattern).Replace(@"\*", ".*").Replace(@"\?", ".") + "$").ToArray(), ignoreCase, throwException)
+        public WildcardMatcher(MatchBehaviour matchBehaviour, [NotNull] AnyOf<string, StringPattern>[] patterns, bool ignoreCase = false, bool throwException = false) :
+            base(matchBehaviour, CreateArray(patterns), ignoreCase, throwException)
        {
            _patterns = patterns;
        }

        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public override string[] GetPatterns()
+        public override AnyOf<string, StringPattern>[] GetPatterns()
        {
            return _patterns;
        }

        /// <inheritdoc cref="IMatcher.Name"/>
        public override string Name => "WildcardMatcher";
+
+        private static AnyOf<string, StringPattern>[] CreateArray(AnyOf<string, StringPattern>[] patterns)
+        {
+            return patterns.Select(pattern => new AnyOf<string, StringPattern>(
+                new StringPattern
+                {
+                    Pattern = "^" + Regex.Escape(pattern.GetPattern()).Replace(@"\*", ".*").Replace(@"\?", ".") + "$",
+                    PatternAsFile = pattern.IsSecond ? pattern.Second.PatternAsFile : null
+                }))
+                .ToArray();
+        }
    }
 }
--- a/src/WireMock.Net/Matchers/XPathMatcher.cs
+++ b/src/WireMock.Net/Matchers/XPathMatcher.cs
@@ -1,7 +1,10 @@
-using System;
+using System;
 using System.Linq;
 using System.Xml;
+using AnyOfTypes;
 using JetBrains.Annotations;
+using WireMock.Extensions;
+using WireMock.Models;
 using WireMock.Validation;
 #if !NETSTANDARD1_3
 using Wmhelp.XPath2;
@@ -15,7 +18,7 @@ namespace WireMock.Matchers
    /// <seealso cref="IStringMatcher" />
    public class XPathMatcher : IStringMatcher
    {
-        private readonly string[] _patterns;
+        private readonly AnyOf<string, StringPattern>[] _patterns;

        /// <inheritdoc cref="IMatcher.MatchBehaviour"/>
        public MatchBehaviour MatchBehaviour { get; }
@@ -27,7 +30,7 @@ namespace WireMock.Matchers
        /// Initializes a new instance of the <see cref="XPathMatcher"/> class.
        /// </summary>
        /// <param name="patterns">The patterns.</param>
-        public XPathMatcher([NotNull] params string[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
+        public XPathMatcher([NotNull] params AnyOf<string, StringPattern>[] patterns) : this(MatchBehaviour.AcceptOnMatch, false, patterns)
        {
        }

@@ -37,7 +40,7 @@ namespace WireMock.Matchers
        /// <param name="matchBehaviour">The match behaviour.</param>
        /// <param name="throwException">Throw an exception when the internal matching fails because of invalid input.</param>
        /// <param name="patterns">The patterns.</param>
-        public XPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params string[] patterns)
+        public XPathMatcher(MatchBehaviour matchBehaviour, bool throwException = false, [NotNull] params AnyOf<string, StringPattern>[] patterns)
        {
            Check.NotNull(patterns, nameof(patterns));

@@ -56,9 +59,9 @@ namespace WireMock.Matchers
                {
                    var nav = new XmlDocument { InnerXml = input }.CreateNavigator();
 #if NETSTANDARD1_3
-                    match = MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.Evaluate($"boolean({p})"))));
+                    match = MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.Evaluate($"boolean({p.GetPattern()})"))));
 #else
-                    match = MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.XPath2Evaluate($"boolean({p})"))));
+                    match = MatchScores.ToScore(_patterns.Select(p => true.Equals(nav.XPath2Evaluate($"boolean({p.GetPattern()})"))));
 #endif
                }
                catch (Exception)
@@ -74,7 +77,7 @@ namespace WireMock.Matchers
        }

        /// <inheritdoc cref="IStringMatcher.GetPatterns"/>
-        public string[] GetPatterns()
+        public AnyOf<string, StringPattern>[] GetPatterns()
        {
            return _patterns;
        }
--- a/src/WireMock.Net/Models/StringPattern.cs
+++ b/src/WireMock.Net/Models/StringPattern.cs
@@ -0,0 +1,18 @@
+namespace WireMock.Models
+{
+    /// <summary>
+    /// StringPattern which defines the Pattern as a string, and optionally the filepath pattern file.
+    /// </summary>
+    public struct StringPattern
+    {
+        /// <summary>
+        /// The pattern as string.
+        /// </summary>
+        public string Pattern { get; set; }
+
+        /// <summary>
+        /// The filepath (optionally)
+        /// </summary>
+        public string PatternAsFile { get; set; }
+    }
+}
--- a/src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs
+++ b/src/WireMock.Net/Owin/IWireMockMiddlewareOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using WireMock.Handlers;
 using WireMock.Logging;
@@ -19,7 +19,7 @@ namespace WireMock.Owin

        TimeSpan? RequestProcessingDelay { get; set; }

-        IStringMatcher AuthorizationMatcher { get; set; }
+        IStringMatcher AuthenticationMatcher { get; set; }

        bool? AllowPartialMapping { get; set; }

--- a/src/WireMock.Net/Owin/WireMockMiddleware.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddleware.cs
@@ -113,10 +113,10 @@ namespace WireMock.Owin

                logRequest = targetMapping.LogMapping;

-                if (targetMapping.IsAdminInterface && _options.AuthorizationMatcher != null)
+                if (targetMapping.IsAdminInterface && _options.AuthenticationMatcher != null)
                {
                    bool present = request.Headers.TryGetValue(HttpKnownHeaderNames.Authorization, out WireMockList<string> authorization);
-                    if (!present || _options.AuthorizationMatcher.IsMatch(authorization.ToString()) < MatchScores.Perfect)
+                    if (!present || _options.AuthenticationMatcher.IsMatch(authorization.ToString()) < MatchScores.Perfect)
                    {
                        _options.Logger.Error("HttpStatusCode set to 401");
                        response = ResponseMessageBuilder.Create(null, 401);
--- a/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
+++ b/src/WireMock.Net/Owin/WireMockMiddlewareOptions.cs
@@ -19,7 +19,7 @@ namespace WireMock.Owin

        public TimeSpan? RequestProcessingDelay { get; set; }

-        public IStringMatcher AuthorizationMatcher { get; set; }
+        public IStringMatcher AuthenticationMatcher { get; set; }

        public bool? AllowPartialMapping { get; set; }

--- a/src/WireMock.Net/ResponseBuilders/IDelayResponseBuilder.cs
+++ b/src/WireMock.Net/ResponseBuilders/IDelayResponseBuilder.cs
@@ -20,5 +20,13 @@ namespace WireMock.ResponseBuilders
        /// <param name="milliseconds">The milliseconds to delay.</param>
        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
        IResponseBuilder WithDelay(int milliseconds);
+
+        /// <summary>
+        /// Introduce random delay
+        /// </summary>
+        /// <param name="minimumMilliseconds">Minimum milliseconds to delay</param>
+        /// <param name="maximumMilliseconds">Maximum milliseconds to delay</param>
+        /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+        IResponseBuilder WithRandomDelay(int minimumMilliseconds = 0, int maximumMilliseconds = 60_000);
    }
 }
--- a/src/WireMock.Net/ResponseBuilders/Response.cs
+++ b/src/WireMock.Net/ResponseBuilders/Response.cs
@@ -5,6 +5,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using WireMock.Proxy;
@@ -24,10 +25,40 @@ namespace WireMock.ResponseBuilders
    /// </summary>
    public partial class Response : IResponseBuilder
    {
+        private static readonly ThreadLocal<Random> Random = new ThreadLocal<Random>(() => new Random(DateTime.UtcNow.Millisecond));
+
+        private TimeSpan? _delay;
+
+        /// <summary>
+        /// The minimum random delay in milliseconds.
+        /// </summary>
+        public int? MinimumDelayMilliseconds { get; private set; }
+
+        /// <summary>
+        /// The maximum random delay in milliseconds.
+        /// </summary>
+        public int? MaximumDelayMilliseconds { get; private set; }
+
        /// <summary>
        /// The delay
        /// </summary>
-        public TimeSpan? Delay { get; private set; }
+        public TimeSpan? Delay
+        {
+            get
+            {
+                if (MinimumDelayMilliseconds != null && MaximumDelayMilliseconds != null)
+                {
+                    return TimeSpan.FromMilliseconds(Random.Value.Next(MinimumDelayMilliseconds.Value, MaximumDelayMilliseconds.Value));
+                }
+
+                return _delay;
+            }
+
+            private set
+            {
+                _delay = value;
+            }
+        }

        /// <summary>
        /// Gets a value indicating whether [use transformer].
@@ -334,6 +365,18 @@ namespace WireMock.ResponseBuilders
            return WithDelay(TimeSpan.FromMilliseconds(milliseconds));
        }

+        /// <inheritdoc cref="IDelayResponseBuilder.WithRandomDelay(int, int)"/>
+        public IResponseBuilder WithRandomDelay(int minimumMilliseconds = 0, int maximumMilliseconds = 60_000)
+        {
+            Check.Condition(minimumMilliseconds, min => min >= 0, nameof(minimumMilliseconds));
+            Check.Condition(maximumMilliseconds, max => max > minimumMilliseconds, nameof(maximumMilliseconds));
+
+            MinimumDelayMilliseconds = minimumMilliseconds;
+            MaximumDelayMilliseconds = maximumMilliseconds;
+
+            return this;
+        }
+
        /// <inheritdoc cref="IResponseProvider.ProvideResponseAsync(RequestMessage, IWireMockServerSettings)"/>
        public async Task<(ResponseMessage Message, IMapping Mapping)> ProvideResponseAsync(RequestMessage requestMessage, IWireMockServerSettings settings)
        {
--- a/src/WireMock.Net/Serialization/MappingConverter.cs
+++ b/src/WireMock.Net/Serialization/MappingConverter.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using WireMock.Admin.Mappings;
 using WireMock.Matchers.Request;
@@ -6,7 +7,6 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Settings;
 using WireMock.Types;
-using WireMock.Validation;

 namespace WireMock.Serialization
 {
@@ -16,9 +16,7 @@ namespace WireMock.Serialization

        public MappingConverter(MatcherMapper mapper)
        {
-            Check.NotNull(mapper, nameof(mapper));
-
-            _mapper = mapper;
+            _mapper = mapper ?? throw new ArgumentNullException(nameof(mapper));
        }

        public MappingModel ToMappingModel(IMapping mapping)
@@ -81,12 +79,19 @@ namespace WireMock.Serialization
                        Matchers = _mapper.Map(pm.Matchers)
                    }).ToList() : null
                },
-                Response = new ResponseModel
-                {
-                    Delay = (int?)response.Delay?.TotalMilliseconds
-                }
+                Response = new ResponseModel()
            };

+            if (response.MinimumDelayMilliseconds >= 0 || response.MaximumDelayMilliseconds > 0)
+            {
+                mappingModel.Response.MinimumRandomDelay = response.MinimumDelayMilliseconds;
+                mappingModel.Response.MaximumRandomDelay = response.MaximumDelayMilliseconds;
+            }
+            else
+            {
+                mappingModel.Response.Delay = (int?)response.Delay?.TotalMilliseconds;
+            }
+
            if (mapping.Webhooks?.Length == 1)
            {
                mappingModel.Webhook = WebhookMapper.Map(mapping.Webhooks[0]);
--- a/src/WireMock.Net/Serialization/MatcherMapper.cs
+++ b/src/WireMock.Net/Serialization/MatcherMapper.cs
@@ -1,167 +1,207 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using JetBrains.Annotations;
-using SimMetrics.Net;
-using WireMock.Admin.Mappings;
-using WireMock.Matchers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AnyOfTypes;
+using JetBrains.Annotations;
+using SimMetrics.Net;
+using WireMock.Admin.Mappings;
+using WireMock.Extensions;
+using WireMock.Matchers;
+using WireMock.Models;
 using WireMock.Plugin;
-using WireMock.Settings;
-using WireMock.Validation;
-
-namespace WireMock.Serialization
-{
-    internal class MatcherMapper
-    {
-        private readonly IWireMockServerSettings _settings;
-
-        public MatcherMapper(IWireMockServerSettings settings)
-        {
-            Check.NotNull(settings, nameof(settings));
-            _settings = settings;
-        }
-
-        public IMatcher[] Map([CanBeNull] IEnumerable<MatcherModel> matchers)
-        {
-            return matchers?.Select(Map).Where(m => m != null).ToArray();
-        }
-
-        public IMatcher Map([CanBeNull] MatcherModel matcher)
-        {
-            if (matcher == null)
-            {
-                return null;
-            }
-
-            string[] parts = matcher.Name.Split('.');
-            string matcherName = parts[0];
-            string matcherType = parts.Length > 1 ? parts[1] : null;
-
-            string[] stringPatterns = (matcher.Patterns != null ? matcher.Patterns : new[] { matcher.Pattern }).OfType<string>().ToArray();
-            MatchBehaviour matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
-            bool ignoreCase = matcher.IgnoreCase == true;
-            bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
-
-            switch (matcherName)
+using WireMock.Settings;
+
+namespace WireMock.Serialization
+{
+    internal class MatcherMapper
+    {
+        private readonly IWireMockServerSettings _settings;
+
+        public MatcherMapper(IWireMockServerSettings settings)
+        {
+            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+        }
+
+        public IMatcher[] Map([CanBeNull] IEnumerable<MatcherModel> matchers)
+        {
+            return matchers?.Select(Map).Where(m => m != null).ToArray();
+        }
+
+        public IMatcher Map([CanBeNull] MatcherModel matcher)
+        {
+            if (matcher == null)
            {
-                case "NotNullOrEmptyMatcher":
+                return null;
+            }
+
+            string[] parts = matcher.Name.Split('.');
+            string matcherName = parts[0];
+            string matcherType = parts.Length > 1 ? parts[1] : null;
+            var stringPatterns = ParseStringPatterns(matcher);
+            var matchBehaviour = matcher.RejectOnMatch == true ? MatchBehaviour.RejectOnMatch : MatchBehaviour.AcceptOnMatch;
+            bool ignoreCase = matcher.IgnoreCase == true;
+            bool throwExceptionWhenMatcherFails = _settings.ThrowExceptionWhenMatcherFails == true;
+
+            switch (matcherName)
+            {
+                case "NotNullOrEmptyMatcher":
                    return new NotNullOrEmptyMatcher(matchBehaviour);
-
-                case "CSharpCodeMatcher":
-                    if (_settings.AllowCSharpCodeMatcher == true)
-                    {
-                        return PluginLoader.Load<ICSharpCodeMatcher>(matchBehaviour, stringPatterns);
-                    }
-
-                    throw new NotSupportedException("It's not allowed to use the 'CSharpCodeMatcher' because IWireMockServerSettings.AllowCSharpCodeMatcher is not set to 'true'.");
-
-                case "LinqMatcher":
-                    return new LinqMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
-
-                case "ExactMatcher":
-                    return new ExactMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
-
-                case "ExactObjectMatcher":
-                    return CreateExactObjectMatcher(matchBehaviour, stringPatterns[0], throwExceptionWhenMatcherFails);
-
-                case "RegexMatcher":
-                    return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
-
-                case "JsonMatcher":
-                    object value = matcher.Pattern ?? matcher.Patterns;
-                    return new JsonMatcher(matchBehaviour, value, ignoreCase, throwExceptionWhenMatcherFails);
-
-                case "JsonPartialMatcher":
-                    object matcherValue = matcher.Pattern ?? matcher.Patterns;
-                    return new JsonPartialMatcher(matchBehaviour, matcherValue, ignoreCase, throwExceptionWhenMatcherFails);
-
-                case "JsonPathMatcher":
-                    return new JsonPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
-
-                case "JmesPathMatcher":
-                    return new JmesPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
-
-                case "XPathMatcher":
-                    return new XPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
-
-                case "WildcardMatcher":
-                    return new WildcardMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
-
-                case "ContentTypeMatcher":
-                    return new ContentTypeMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
-
-                case "SimMetricsMatcher":
-                    SimMetricType type = SimMetricType.Levenstein;
-                    if (!string.IsNullOrEmpty(matcherType) && !Enum.TryParse(matcherType, out type))
-                    {
-                        throw new NotSupportedException($"Matcher '{matcherName}' with Type '{matcherType}' is not supported.");
-                    }
-
-                    return new SimMetricsMatcher(matchBehaviour, stringPatterns, type, throwExceptionWhenMatcherFails);
-
-                default:
-                    throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");
-            }
-        }
-
-        public MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
-        {
-            return matchers?.Select(Map).Where(m => m != null).ToArray();
-        }
-
-        public MatcherModel Map([CanBeNull] IMatcher matcher)
-        {
-            if (matcher == null)
-            {
-                return null;
-            }
-
-            object[] patterns = new object[0]; // Default empty array
-            switch (matcher)
-            {
-                // If the matcher is a IStringMatcher, get the patterns.
-                case IStringMatcher stringMatcher:
-                    patterns = stringMatcher.GetPatterns().Cast<object>().ToArray();
-                    break;
-
-                // If the matcher is a IValueMatcher, get the value (can be string or object).
-                case IValueMatcher valueMatcher:
-                    patterns = new[] { valueMatcher.Value };
-                    break;
-
-                // If the matcher is a ExactObjectMatcher, get the ValueAsObject or ValueAsBytes.
-                case ExactObjectMatcher exactObjectMatcher:
-                    patterns = new[] { exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes };
-                    break;
-            }
-
-            bool? ignoreCase = matcher is IIgnoreCaseMatcher ignoreCaseMatcher ? ignoreCaseMatcher.IgnoreCase : (bool?)null;
-
-            bool? rejectOnMatch = matcher.MatchBehaviour == MatchBehaviour.RejectOnMatch ? true : (bool?)null;
-
-            return new MatcherModel
-            {
-                RejectOnMatch = rejectOnMatch,
-                IgnoreCase = ignoreCase,
-                Name = matcher.Name,
-                Pattern = patterns.Length == 1 ? patterns.First() : null,
-                Patterns = patterns.Length > 1 ? patterns : null
-            };
-        }
-
-        private ExactObjectMatcher CreateExactObjectMatcher(MatchBehaviour matchBehaviour, string stringPattern, bool throwException)
-        {
-            byte[] bytePattern;
-            try
-            {
-                bytePattern = Convert.FromBase64String(stringPattern);
-            }
-            catch
-            {
-                throw new ArgumentException($"Matcher 'ExactObjectMatcher' has invalid pattern. The pattern value '{stringPattern}' is not a Base64String.", nameof(stringPattern));
-            }
-
-            return new ExactObjectMatcher(matchBehaviour, bytePattern, throwException);
-        }
-    }
+
+                case "CSharpCodeMatcher":
+                    if (_settings.AllowCSharpCodeMatcher == true)
+                    {
+                        return PluginLoader.Load<ICSharpCodeMatcher>(matchBehaviour, stringPatterns);
+                    }
+
+                    throw new NotSupportedException("It's not allowed to use the 'CSharpCodeMatcher' because IWireMockServerSettings.AllowCSharpCodeMatcher is not set to 'true'.");
+
+                case "LinqMatcher":
+                    return new LinqMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
+
+                case "ExactMatcher":
+                    return new ExactMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
+
+                case "ExactObjectMatcher":
+                    return CreateExactObjectMatcher(matchBehaviour, stringPatterns[0], throwExceptionWhenMatcherFails);
+
+                case "RegexMatcher":
+                    return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
+
+                case "JsonMatcher":
+                    object valueForJsonMatcher = matcher.Pattern ?? matcher.Patterns;
+                    return new JsonMatcher(matchBehaviour, valueForJsonMatcher, ignoreCase, throwExceptionWhenMatcherFails);
+
+                case "JsonPartialMatcher":
+                    object valueForJsonPartialMatcher = matcher.Pattern ?? matcher.Patterns;
+                    return new JsonPartialMatcher(matchBehaviour, valueForJsonPartialMatcher, ignoreCase, throwExceptionWhenMatcherFails);
+
+                case "JsonPathMatcher":
+                    return new JsonPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
+
+                case "JmesPathMatcher":
+                    return new JmesPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
+
+                case "XPathMatcher":
+                    return new XPathMatcher(matchBehaviour, throwExceptionWhenMatcherFails, stringPatterns);
+
+                case "WildcardMatcher":
+                    return new WildcardMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
+
+                case "ContentTypeMatcher":
+                    return new ContentTypeMatcher(matchBehaviour, stringPatterns, ignoreCase, throwExceptionWhenMatcherFails);
+
+                case "SimMetricsMatcher":
+                    SimMetricType type = SimMetricType.Levenstein;
+                    if (!string.IsNullOrEmpty(matcherType) && !Enum.TryParse(matcherType, out type))
+                    {
+                        throw new NotSupportedException($"Matcher '{matcherName}' with Type '{matcherType}' is not supported.");
+                    }
+
+                    return new SimMetricsMatcher(matchBehaviour, stringPatterns, type, throwExceptionWhenMatcherFails);
+
+                default:
+                    throw new NotSupportedException($"Matcher '{matcherName}' is not supported.");
+            }
+        }
+
+        public MatcherModel[] Map([CanBeNull] IEnumerable<IMatcher> matchers)
+        {
+            return matchers?.Select(Map).Where(m => m != null).ToArray();
+        }
+
+        public MatcherModel Map([CanBeNull] IMatcher matcher)
+        {
+            if (matcher == null)
+            {
+                return null;
+            }
+
+            bool? ignoreCase = matcher is IIgnoreCaseMatcher ignoreCaseMatcher ? ignoreCaseMatcher.IgnoreCase : (bool?)null;
+            bool? rejectOnMatch = matcher.MatchBehaviour == MatchBehaviour.RejectOnMatch ? true : (bool?)null;
+
+            var model = new MatcherModel
+            {
+                RejectOnMatch = rejectOnMatch,
+                IgnoreCase = ignoreCase,
+                Name = matcher.Name
+            };
+
+            switch (matcher)
+            {
+                // If the matcher is a IStringMatcher, get the patterns.
+                case IStringMatcher stringMatcher:
+                    var stringPatterns = stringMatcher.GetPatterns();
+                    if (stringPatterns.Length == 1)
+                    {
+                        if (stringPatterns[0].IsFirst)
+                        {
+                            model.Pattern = stringPatterns[0].First;
+                        }
+                        else
+                        {
+                            model.Pattern = stringPatterns[0].Second.Pattern;
+                            model.PatternAsFile = stringPatterns[0].Second.PatternAsFile;
+                        }
+                    }
+                    else
+                    {
+                        model.Patterns = stringPatterns.Select(p => p.GetPattern()).Cast<object>().ToArray();
+                    }
+                    break;
+
+                // If the matcher is a IValueMatcher, get the value (can be string or object).
+                case IValueMatcher valueMatcher:
+                    model.Patterns = new[] { valueMatcher.Value };
+                    break;
+
+                // If the matcher is a ExactObjectMatcher, get the ValueAsObject or ValueAsBytes.
+                case ExactObjectMatcher exactObjectMatcher:
+                    model.Patterns = new[] { exactObjectMatcher.ValueAsObject ?? exactObjectMatcher.ValueAsBytes };
+                    break;
+            }
+
+            return model;
+        }
+
+        private AnyOf<string, StringPattern>[] ParseStringPatterns(MatcherModel matcher)
+        {
+            if (matcher.Pattern is string patternAsString)
+            {
+                return new[] { new AnyOf<string, StringPattern>(patternAsString) };
+            }
+
+            if (matcher.Pattern is IEnumerable<string> patternAsStringArray)
+            {
+                return patternAsStringArray.ToAnyOfPatterns();
+            }
+
+            if (matcher.Patterns?.OfType<string>() is IEnumerable<string> patternsAsStringArray)
+            {
+                return patternsAsStringArray.ToAnyOfPatterns();
+            }
+
+            if (!string.IsNullOrEmpty(matcher.PatternAsFile))
+            {
+                var pattern = _settings.FileSystemHandler.ReadFileAsString(matcher.PatternAsFile);
+                return new[] { new AnyOf<string, StringPattern>(new StringPattern { Pattern = pattern, PatternAsFile = matcher.PatternAsFile }) };
+            }
+
+            return new AnyOf<string, StringPattern>[0];
+        }
+
+        private ExactObjectMatcher CreateExactObjectMatcher(MatchBehaviour matchBehaviour, AnyOf<string, StringPattern> stringPattern, bool throwException)
+        {
+            byte[] bytePattern;
+            try
+            {
+                bytePattern = Convert.FromBase64String(stringPattern.GetPattern());
+            }
+            catch
+            {
+                throw new ArgumentException($"Matcher 'ExactObjectMatcher' has invalid pattern. The pattern value '{stringPattern}' is not a Base64String.", nameof(stringPattern));
+            }
+
+            return new ExactObjectMatcher(matchBehaviour, bytePattern, throwException);
+        }
+    }
 }
--- a/src/WireMock.Net/Server/WireMockServer.Admin.cs
+++ b/src/WireMock.Net/Server/WireMockServer.Admin.cs
@@ -39,6 +39,7 @@ namespace WireMock.Server
        private const string ContentTypeJson = "application/json";
        private const string AdminFiles = "/__admin/files";
        private const string AdminMappings = "/__admin/mappings";
+        private const string AdminMappingsWireMockOrg = "/__admin/mappings/wiremock.org";
        private const string AdminRequests = "/__admin/requests";
        private const string AdminSettings = "/__admin/settings";
        private const string AdminScenarios = "/__admin/scenarios";
@@ -58,6 +59,7 @@ namespace WireMock.Server
            // __admin/mappings
            Given(Request.Create().WithPath(AdminMappings).UsingGet()).AtPriority(AdminPriority).RespondWith(new DynamicResponseProvider(MappingsGet));
            Given(Request.Create().WithPath(AdminMappings).UsingPost().WithHeader(HttpKnownHeaderNames.ContentType, _adminRequestContentTypeJson)).AtPriority(AdminPriority).RespondWith(new DynamicResponseProvider(MappingsPost));
+            Given(Request.Create().WithPath(AdminMappingsWireMockOrg).UsingPost().WithHeader(HttpKnownHeaderNames.ContentType, _adminRequestContentTypeJson)).AtPriority(AdminPriority).RespondWith(new DynamicResponseProvider(MappingsPostWireMockOrg));
            Given(Request.Create().WithPath(AdminMappings).UsingDelete()).AtPriority(AdminPriority).RespondWith(new DynamicResponseProvider(MappingsDelete));

            // __admin/mappings/reset
@@ -780,6 +782,10 @@ namespace WireMock.Server
            {
                responseBuilder = responseBuilder.WithDelay(responseModel.Delay.Value);
            }
+            else if (responseModel.MinimumRandomDelay >= 0 || responseModel.MaximumRandomDelay > 0)
+            {
+                responseBuilder = responseBuilder.WithRandomDelay(responseModel.MinimumRandomDelay ?? 0, responseModel.MaximumRandomDelay ?? 60_000);
+            }

            if (responseModel.UseTransformer == true)
            {
--- a/src/WireMock.Net/Server/WireMockServer.ImportWireMockOrg.cs
+++ b/src/WireMock.Net/Server/WireMockServer.ImportWireMockOrg.cs
@@ -0,0 +1,308 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using JetBrains.Annotations;
+using Newtonsoft.Json.Linq;
+using WireMock.Matchers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Util;
+using WireMock.Validation;
+using OrgMapping = WireMock.Org.Abstractions.Mapping;
+
+namespace WireMock.Server
+{
+    public partial class WireMockServer
+    {
+        /// <summary>
+        /// Read WireMock.org mapping json file.
+        /// </summary>
+        /// <param name="path">The path to the WireMock.org mapping json file.</param>
+        [PublicAPI]
+        public void ReadStaticWireMockOrgMappingAndAddOrUpdate([NotNull] string path)
+        {
+            Check.NotNull(path, nameof(path));
+
+            string filenameWithoutExtension = Path.GetFileNameWithoutExtension(path);
+
+            if (FileHelper.TryReadMappingFileWithRetryAndDelay(_settings.FileSystemHandler, path, out string value))
+            {
+                var mappings = DeserializeJsonToArray<OrgMapping>(value);
+                foreach (var mapping in mappings)
+                {
+                    if (mappings.Length == 1 && Guid.TryParse(filenameWithoutExtension, out Guid guidFromFilename))
+                    {
+                        ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mapping, guidFromFilename, path);
+                    }
+                    else
+                    {
+                        ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mapping, null, path);
+                    }
+                }
+            }
+        }
+
+        private ResponseMessage MappingsPostWireMockOrg(RequestMessage requestMessage)
+        {
+            try
+            {
+                var mappingModels = DeserializeRequestMessageToArray<OrgMapping>(requestMessage);
+                if (mappingModels.Length == 1)
+                {
+                    Guid? guid = ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mappingModels[0]);
+                    return ResponseMessageBuilder.Create("Mapping added", 201, guid);
+                }
+
+                foreach (var mappingModel in mappingModels)
+                {
+                    ConvertWireMockOrgMappingAndRegisterAsRespondProvider(mappingModel);
+                }
+
+                return ResponseMessageBuilder.Create("Mappings added", 201);
+            }
+            catch (ArgumentException a)
+            {
+                _settings.Logger.Error("HttpStatusCode set to 400 {0}", a);
+                return ResponseMessageBuilder.Create(a.Message, 400);
+            }
+            catch (Exception e)
+            {
+                _settings.Logger.Error("HttpStatusCode set to 500 {0}", e);
+                return ResponseMessageBuilder.Create(e.ToString(), 500);
+            }
+        }
+
+        private Guid? ConvertWireMockOrgMappingAndRegisterAsRespondProvider(OrgMapping mapping, Guid? guid = null, string path = null)
+        {
+            var requestBuilder = Request.Create();
+
+            var request = mapping.Request;
+            if (request != null)
+            {
+                if (request.Url != null)
+                {
+                    requestBuilder = requestBuilder.WithUrl(request.Url);
+                }
+                else if (request.UrlPattern != null)
+                {
+                    requestBuilder = requestBuilder.WithUrl(new RegexMatcher(request.UrlPattern));
+                }
+                else if (request.UrlPath != null)
+                {
+                    requestBuilder = requestBuilder.WithPath(request.Url);
+                }
+                else if (request.UrlPathPattern != null)
+                {
+                    requestBuilder = requestBuilder.WithPath(new RegexMatcher(request.UrlPathPattern));
+                }
+
+                if (request.Method != null)
+                {
+                    requestBuilder = requestBuilder.UsingMethod(request.Method);
+                }
+
+                /*
+                "headers" : {
+                  "Accept" : {
+                    "contains" : "xml"
+                  }
+                }
+                */
+                if (request.Headers is JObject headers)
+                {
+                    ProcessWireMockOrgJObjectAndUseStringMatcher(headers, (key, match) =>
+                    {
+                        requestBuilder = requestBuilder.WithHeader(key, match as IStringMatcher);
+                    });
+                }
+
+                if (request.Cookies is JObject cookies)
+                {
+                    ProcessWireMockOrgJObjectAndUseStringMatcher(cookies, (key, match) =>
+                    {
+                        requestBuilder = requestBuilder.WithCookie(key, match as IStringMatcher);
+                    });
+                }
+
+                /*
+                "queryParameters" : {
+                  "search_term" : {
+                    "equalTo" : "WireMock"
+                  }
+                }
+                */
+                if (request.QueryParameters is JObject queryParameters)
+                {
+                    ProcessWireMockOrgJObjectAndUseStringMatcher(queryParameters, (key, match) =>
+                    {
+                        requestBuilder = requestBuilder.WithParam(key, match);
+                    });
+                }
+
+                /*
+                 "bodyPatterns" : [ {
+                  "equalToJson" : "{ "cityName": "São Paulo", "cityCode": 5001 },
+                  "ignoreArrayOrder" : true,
+                  "ignoreExtraElements" : true
+                } ]
+                */
+                if (request.BodyPatterns?.Any() == true)
+                {
+                    var jObjectArray = request.BodyPatterns.Cast<JObject>();
+                    var bodyPattern = jObjectArray.First();
+                    ProcessWireMockOrgJObjectAndUseIMatcher(bodyPattern, (match) =>
+                    {
+                        requestBuilder = requestBuilder.WithBody(match);
+                    });
+                }
+            }
+
+            IResponseBuilder responseBuilder = Response.Create();
+
+            var response = mapping.Response;
+            if (response != null)
+            {
+                responseBuilder = responseBuilder.WithStatusCode(response.Status);
+
+                if (response.Headers is JObject responseHeaders)
+                {
+                    ProcessWireMockOrgJObjectAndConvertToIDictionary(responseHeaders, (headers) =>
+                    {
+                        responseBuilder = responseBuilder.WithHeaders(headers);
+                    });
+                }
+
+                if (response.Transformers != null)
+                {
+                    responseBuilder = responseBuilder.WithTransformer();
+                }
+
+                if (response.Body != null)
+                {
+                    responseBuilder = responseBuilder.WithBody(response.Body);
+                }
+
+                if (response.JsonBody != null)
+                {
+                    responseBuilder = responseBuilder.WithBodyAsJson(response.JsonBody);
+                }
+
+                if (response.Base64Body != null)
+                {
+                    responseBuilder = responseBuilder.WithBody(Encoding.UTF8.GetString(Convert.FromBase64String(response.Base64Body)));
+                }
+
+                if (response.BodyFileName != null)
+                {
+                    responseBuilder = responseBuilder.WithBodyFromFile(response.BodyFileName);
+                }
+            }
+
+            var respondProvider = Given(requestBuilder);
+            if (guid != null)
+            {
+                respondProvider = respondProvider.WithGuid(guid.Value);
+            }
+            else if (!string.IsNullOrEmpty(mapping.Uuid))
+            {
+                respondProvider = respondProvider.WithGuid(new Guid(mapping.Uuid));
+            }
+
+            if (mapping.Name != null)
+            {
+                respondProvider = respondProvider.WithTitle(mapping.Name);
+            }
+
+            if (path != null)
+            {
+                respondProvider = respondProvider.WithPath(path);
+            }
+
+            respondProvider.RespondWith(responseBuilder);
+
+            return respondProvider.Guid;
+        }
+
+        private void ProcessWireMockOrgJObjectAndConvertToIDictionary(JObject items, Action<IDictionary<string, string>> action)
+        {
+            var dict = new Dictionary<string, string>();
+            foreach (var item in items)
+            {
+                var key = item.Key;
+                var valueAsString = item.Value.Value<string>();
+                dict.Add(key, valueAsString);
+            }
+
+            action(dict);
+        }
+
+        private void ProcessWireMockOrgJObjectAndUseStringMatcher(JObject items, Action<string, IStringMatcher> action)
+        {
+            foreach (var item in items)
+            {
+                var key = item.Key;
+                var match = item.Value.First as JProperty;
+                var valueAsString = match?.Value.Value<string>();
+                if (string.IsNullOrEmpty(valueAsString))
+                {
+                    continue;
+                }
+
+                var matcher = ProcessAsStringMatcher(match, valueAsString);
+                if (matcher != null)
+                {
+                    action(key, matcher);
+                }
+            }
+        }
+
+        private void ProcessWireMockOrgJObjectAndUseIMatcher(JObject items, Action<IMatcher> action)
+        {
+            if (!(items.First is JProperty firstItem))
+            {
+                return;
+            }
+
+            IMatcher matcher;
+            if (firstItem.Name == "equalToJson")
+            {
+                matcher = new JsonMatcher(firstItem.Value);
+            }
+            else
+            {
+                var valueAsString = (firstItem.Value as JValue)?.Value as string;
+                if (valueAsString == null)
+                {
+                    return;
+                }
+
+                matcher = ProcessAsStringMatcher(firstItem, valueAsString);
+            }
+
+            if (matcher != null)
+            {
+                action(matcher);
+            }
+        }
+
+        private static IStringMatcher ProcessAsStringMatcher(JProperty match, string valueAsString)
+        {
+            switch (match?.Name)
+            {
+                case "contains":
+                    return new WildcardMatcher(valueAsString);
+
+                case "matches":
+                    return new RegexMatcher(valueAsString);
+
+                case "equalTo":
+                    return new ExactMatcher(valueAsString);
+
+                default:
+                    return null;
+            }
+        }
+    }
+}
--- a/src/WireMock.Net/Server/WireMockServer.cs
+++ b/src/WireMock.Net/Server/WireMockServer.cs
@@ -9,6 +9,7 @@ using System.Threading;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
 using WireMock.Admin.Mappings;
+using WireMock.Authentication;
 using WireMock.Exceptions;
 using WireMock.Handlers;
 using WireMock.Logging;
@@ -302,6 +303,11 @@ namespace WireMock.Server
                    SetBasicAuthentication(settings.AdminUsername, settings.AdminPassword);
                }

+                if (!string.IsNullOrEmpty(settings.AdminAzureADTenant) && !string.IsNullOrEmpty(settings.AdminAzureADAudience))
+                {
+                    SetAzureADAuthentication(settings.AdminAzureADTenant, settings.AdminAzureADAudience);
+                }
+
                InitAdmin();
            }

@@ -404,22 +410,35 @@ namespace WireMock.Server
            _options.AllowPartialMapping = allow;
        }

-        /// <inheritdoc cref="IWireMockServer.SetBasicAuthentication" />
+        /// <inheritdoc cref="IWireMockServer.SetAzureADAuthentication(string, string)" />
+        [PublicAPI]
+        public void SetAzureADAuthentication([NotNull] string tenant, [NotNull] string audience)
+        {
+            Check.NotNull(tenant, nameof(tenant));
+            Check.NotNull(audience, nameof(audience));
+
+#if NETSTANDARD1_3
+            throw new NotSupportedException("AzureADAuthentication is not supported for NETStandard 1.3");
+#else
+            _options.AuthenticationMatcher = new AzureADAuthenticationMatcher(tenant, audience);
+#endif
+        }
+
+        /// <inheritdoc cref="IWireMockServer.SetBasicAuthentication(string, string)" />
        [PublicAPI]
        public void SetBasicAuthentication([NotNull] string username, [NotNull] string password)
        {
            Check.NotNull(username, nameof(username));
            Check.NotNull(password, nameof(password));

-            string authorization = Convert.ToBase64String(Encoding.GetEncoding("ISO-8859-1").GetBytes(username + ":" + password));
-            _options.AuthorizationMatcher = new RegexMatcher(MatchBehaviour.AcceptOnMatch, "^(?i)BASIC " + authorization + "$");
+            _options.AuthenticationMatcher = new BasicAuthenticationMatcher(username, password);
        }

-        /// <inheritdoc cref="IWireMockServer.RemoveBasicAuthentication" />
+        /// <inheritdoc cref="IWireMockServer.RemoveAuthentication" />
        [PublicAPI]
-        public void RemoveBasicAuthentication()
+        public void RemoveAuthentication()
        {
-            _options.AuthorizationMatcher = null;
+            _options.AuthenticationMatcher = null;
        }

        /// <inheritdoc cref="IWireMockServer.SetMaxRequestLogCount" />
--- a/src/WireMock.Net/Settings/IWireMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/IWireMockServerSettings.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using HandlebarsDotNet;
 using JetBrains.Annotations;
 using WireMock.Handlers;
@@ -88,6 +88,18 @@ namespace WireMock.Settings
        [PublicAPI]
        string AdminPassword { get; set; }

+        /// <summary>
+        /// The AzureAD Tenant needed for __admin access.
+        /// </summary>
+        [PublicAPI]
+        string AdminAzureADTenant { get; set; }
+
+        /// <summary>
+        /// The AzureAD Audience / Resource for __admin access.
+        /// </summary>
+        [PublicAPI]
+        string AdminAzureADAudience { get; set; }
+
        /// <summary>
        /// The RequestLog expiration in hours (optional).
        /// </summary>
--- a/src/WireMock.Net/Settings/WireMockServerSettings.cs
+++ b/src/WireMock.Net/Settings/WireMockServerSettings.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using HandlebarsDotNet;
 using JetBrains.Annotations;
 using Newtonsoft.Json;
@@ -64,6 +64,14 @@ namespace WireMock.Settings
        [PublicAPI]
        public string AdminPassword { get; set; }

+        /// <inheritdoc cref="IWireMockServerSettings.AdminAzureADTenant"/>
+        [PublicAPI]
+        public string AdminAzureADTenant { get; set; }
+
+        /// <inheritdoc cref="IWireMockServerSettings.AdminAzureADAudience"/>
+        [PublicAPI]
+        public string AdminAzureADAudience { get; set; }
+
        /// <inheritdoc cref="IWireMockServerSettings.RequestLogExpirationDuration"/>
        [PublicAPI]
        public int? RequestLogExpirationDuration { get; set; }
--- a/src/WireMock.Net/Settings/WireMockServerSettingsParser.cs
+++ b/src/WireMock.Net/Settings/WireMockServerSettingsParser.cs
@@ -1,4 +1,4 @@
-using JetBrains.Annotations;
+using JetBrains.Annotations;
 using WireMock.Logging;
 using WireMock.Validation;

@@ -39,6 +39,8 @@ namespace WireMock.Settings
                WatchStaticMappingsInSubdirectories = parser.GetBoolValue("WatchStaticMappingsInSubdirectories"),
                AdminUsername = parser.GetStringValue("AdminUsername"),
                AdminPassword = parser.GetStringValue("AdminPassword"),
+                AdminAzureADTenant = parser.GetStringValue(nameof(IWireMockServerSettings.AdminAzureADTenant)),
+                AdminAzureADAudience = parser.GetStringValue(nameof(IWireMockServerSettings.AdminAzureADAudience)),
                MaxRequestLogCount = parser.GetIntValue("MaxRequestLogCount"),
                RequestLogExpirationDuration = parser.GetIntValue("RequestLogExpirationDuration"),
                AllowCSharpCodeMatcher = parser.GetBoolValue("AllowCSharpCodeMatcher"),
--- a/src/WireMock.Net/WireMock.Net.csproj
+++ b/src/WireMock.Net/WireMock.Net.csproj
@@ -1,136 +1,140 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <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>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>WireMock.Net</AssemblyName>
-    <PackageId>WireMock.Net</PackageId>
-    <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
-    <RootNamespace>WireMock</RootNamespace>
-    <ProjectGuid>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <!--<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+<Project Sdk="Microsoft.NET.Sdk">
+    <PropertyGroup>
+        <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>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <AssemblyName>WireMock.Net</AssemblyName>
+        <PackageId>WireMock.Net</PackageId>
+        <PackageTags>tdd;mock;http;wiremock;test;server;unittest</PackageTags>
+        <RootNamespace>WireMock</RootNamespace>
+        <ProjectGuid>{D3804228-91F4-4502-9595-39584E5A01AD}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <!--<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>-->
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>WireMock.Net.snk</AssemblyOriginatorKeyFile>
-    <!--<DelaySign>true</DelaySign>-->
-    <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
-  </PropertyGroup>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <!--<DelaySign>true</DelaySign>-->
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+    </PropertyGroup>

-  <!--<ItemGroup>
+    <!--<ItemGroup>
    <None Include="WireMock.Net-Logo.png" Pack="true" PackagePath="../../"/>
  </ItemGroup>-->

-  <!-- https://github.com/aspnet/RoslynCodeDomProvider/issues/51 -->
-  <!-- This is needed else we cannot build net452 in Azure DevOps Pipeline -->
-  <!--<Target Name="CheckIfShouldKillVBCSCompiler" />-->
+    <!-- https://github.com/aspnet/RoslynCodeDomProvider/issues/51 -->
+    <!-- This is needed else we cannot build net452 in Azure DevOps Pipeline -->
+    <!--<Target Name="CheckIfShouldKillVBCSCompiler" />-->

-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>

-  <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
-    <CodeAnalysisRuleSet>WireMock.Net.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+        <CodeAnalysisRuleSet>WireMock.Net.ruleset</CodeAnalysisRuleSet>
+    </PropertyGroup>

-  <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-    <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
+        <DefineConstants>NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+    </PropertyGroup>

-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
-    <DefineConstants>USE_ASPNETCORE</DefineConstants>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
+        <DefineConstants>USE_ASPNETCORE</DefineConstants>
+    </PropertyGroup>

-  <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
-    <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
-  </PropertyGroup>
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+        <DefineConstants>USE_ASPNETCORE;NET46</DefineConstants>
+    </PropertyGroup>

 	<ItemGroup>
    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
    <PackageReference Include="SimMetrics.Net" Version="1.0.5" />
+    <!--<PackageReference Include="Stef.Validation" Version="0.0.3" />-->
    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.12" />
    <PackageReference Include="RandomDataGenerator.Net" Version="1.0.12" />
    <PackageReference Include="JmesPath.Net" Version="1.0.125" />
+    <PackageReference Include="AnyOf" Version="0.2.0" />
  </ItemGroup>

-  <ItemGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
+    <ItemGroup Condition="'$(Configuration)' == 'Debug - Sonar'">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="7.8.0.7320">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>

  <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">
    <PackageReference Include="XPath2.Extensions" Version="1.1.0" />
+    <PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="6.12.2" />
  </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
-    <!-- Required for WebRequestHandler -->
-    <Reference Include="System.Net.Http.WebRequest" />
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net452' ">
+        <!-- Required for WebRequestHandler -->
+        <Reference Include="System.Net.Http.WebRequest" />

-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-  </ItemGroup>
+        <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
+        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+        <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+    </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
-    <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
-    <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
-    <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
-    <PackageReference Include="System.Net.Http" Version="4.3.4" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-  </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net46' ">
+        <PackageReference Include="Microsoft.AspNet.WebApi.OwinSelfHost" Version="5.2.6" />
+        <PackageReference Include="Microsoft.Owin" Version="4.0.0" />
+        <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="4.0.0" />
+        <PackageReference Include="Microsoft.Owin.Hosting" Version="4.0.0" />
+        <PackageReference Include="System.Net.Http" Version="4.3.4" />
+        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+        <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+    </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+    <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
+        <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+        <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />

-    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
-    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
-  </ItemGroup>
+        <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
+        <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
+    </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.3" />
-    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
-    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="Scriban.Signed" Version="2.1.4" />
-  </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+        <PackageReference Include="Microsoft.AspNetCore" Version="1.1.7" />
+        <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel.Https" Version="1.1.3" />
+        <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
+        <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
+        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
+        <PackageReference Include="Scriban.Signed" Version="2.1.4" />
+    </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
-    <PackageReference Include="Scriban.Signed" Version="3.3.2" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' ">
+        <PackageReference Include="Scriban.Signed" Version="3.3.2" />
+        <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />

-    <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
-    <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
-  </ItemGroup>
+        <!-- https://github.com/WireMock-Net/WireMock.Net/issues/507 -->
+        <PackageReference Include="Microsoft.AspNetCore.Server.IIS" Version="2.2.6" />
+    </ItemGroup>

-  <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0'">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Scriban.Signed" Version="3.3.2" />
-  </ItemGroup>
+    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.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" />
-  </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" />
+    </ItemGroup>

-  <ItemGroup>
-    <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
-  </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
+        <ProjectReference Include="..\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj" />
+    </ItemGroup>
 </Project>
--- a/src/WireMock.Org.Abstractions/BasicAuthCredentials.cs
+++ b/src/WireMock.Org.Abstractions/BasicAuthCredentials.cs
@@ -0,0 +1,12 @@
+namespace WireMock.Org.Abstractions
+{
+    /// <summary>
+    /// Pre-emptive basic auth credentials to match against
+    /// </summary>
+    public class BasicAuthCredentials
+    {
+        public string Password { get; set; }
+
+        public string Username { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/GetAdminMappingsResponse.cs
+++ b/src/WireMock.Org.Abstractions/GetAdminMappingsResponse.cs
@@ -0,0 +1,9 @@
+namespace WireMock.Org.Abstractions
+{
+    public class GetAdminMappingsResponse
+    {
+        public Mapping[] Mappings { get; set; }
+
+        public Meta Meta { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/GetAdminRecordingsStatusResponse.cs
+++ b/src/WireMock.Org.Abstractions/GetAdminRecordingsStatusResponse.cs
@@ -0,0 +1,7 @@
+namespace WireMock.Org.Abstractions
+{
+    public class GetAdminRecordingsStatusResponse
+    {
+        public string Status { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/GetAdminRequestsUnmatchedNearMissesResponse.cs
+++ b/src/WireMock.Org.Abstractions/GetAdminRequestsUnmatchedNearMissesResponse.cs
@@ -0,0 +1,7 @@
+namespace WireMock.Org.Abstractions
+{
+    public class GetAdminRequestsUnmatchedNearMissesResponse
+    {
+        public NearMiss[] NearMisses { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/GetAdminScenariosResponse.cs
+++ b/src/WireMock.Org.Abstractions/GetAdminScenariosResponse.cs
@@ -0,0 +1,7 @@
+namespace WireMock.Org.Abstractions
+{
+    public class GetAdminScenariosResponse
+    {
+        public Scenario[] Scenarios { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/Mapping.cs
+++ b/src/WireMock.Org.Abstractions/Mapping.cs
@@ -0,0 +1,59 @@
+namespace WireMock.Org.Abstractions
+{
+    public class Mapping
+    {
+        /// <summary>
+        /// This stub mapping's unique identifier
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// Alias for the id
+        /// </summary>
+        public string Uuid { get; set; }
+
+        /// <summary>
+        /// The stub mapping's name
+        /// </summary>
+        public string Name { get; set; }
+
+        public Request Request { get; set; }
+
+        public Response Response { get; set; }
+
+        /// <summary>
+        /// Indicates that the stub mapping should be persisted immediately on create/update/delete and survive resets to default.
+        /// </summary>
+        public bool Persistent { get; set; }
+
+        /// <summary>
+        /// This stub mapping's priority relative to others. 1 is highest.
+        /// </summary>
+        public int Priority { get; set; }
+
+        /// <summary>
+        /// The name of the scenario that this stub mapping is part of
+        /// </summary>
+        public string ScenarioName { get; set; }
+
+        /// <summary>
+        /// The required state of the scenario in order for this stub to be matched.
+        /// </summary>
+        public string RequiredScenarioState { get; set; }
+
+        /// <summary>
+        /// The new state for the scenario to be updated to after this stub is served.
+        /// </summary>
+        public string NewScenarioState { get; set; }
+
+        /// <summary>
+        /// A map of the names of post serve action extensions to trigger and their parameters.
+        /// </summary>
+        public object PostServeActions { get; set; }
+
+        /// <summary>
+        /// Arbitrary metadata to be used for e.g. tagging, documentation. Can also be used to find and remove stubs.
+        /// </summary>
+        public object Metadata { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/Meta.cs
+++ b/src/WireMock.Org.Abstractions/Meta.cs
@@ -0,0 +1,7 @@
+namespace WireMock.Org.Abstractions
+{
+    public class Meta
+    {
+        public int Total { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/NearMiss.cs
+++ b/src/WireMock.Org.Abstractions/NearMiss.cs
@@ -0,0 +1,35 @@
+namespace WireMock.Org.Abstractions
+{
+    public class NearMiss
+    {
+        /// <summary>
+        /// The HTTP request method
+        /// </summary>
+        public string Method { get; set; }
+
+        /// <summary>
+        /// The path and query to match exactly against
+        /// </summary>
+        public string Url { get; set; }
+
+        /// <summary>
+        /// The full URL to match against
+        /// </summary>
+        public string AbsoluteUrl { get; set; }
+
+        /// <summary>
+        /// Header patterns to match against in the &lt;key&gt;: { "&lt;predicate&gt;": "&lt;value&gt;" } form
+        /// </summary>
+        public object Headers { get; set; }
+
+        /// <summary>
+        /// Cookie patterns to match against in the &lt;key&gt;: { "&lt;predicate&gt;": "&lt;value&gt;" } form
+        /// </summary>
+        public object Cookies { get; set; }
+
+        /// <summary>
+        /// Body string to match against
+        /// </summary>
+        public string Body { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/PostAdminRequestsCountResponse.cs
+++ b/src/WireMock.Org.Abstractions/PostAdminRequestsCountResponse.cs
@@ -0,0 +1,7 @@
+namespace WireMock.Org.Abstractions
+{
+    public class PostAdminRequestsCountResponse
+    {
+        public int Count { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/Request.cs
+++ b/src/WireMock.Org.Abstractions/Request.cs
@@ -0,0 +1,55 @@
+namespace WireMock.Org.Abstractions
+{
+    public class Request
+    {
+        /// <summary>
+        /// The HTTP request method e.g. GET
+        /// </summary>
+        public string Method { get; set; }
+
+        /// <summary>
+        /// The path and query to match exactly against. Only one of url, urlPattern, urlPath or urlPathPattern may be specified.
+        /// </summary>
+        public string Url { get; set; }
+
+        /// <summary>
+        /// The path to match exactly against. Only one of url, urlPattern, urlPath or urlPathPattern may be specified.
+        /// </summary>
+        public string UrlPath { get; set; }
+
+        /// <summary>
+        /// The path regex to match against. Only one of url, urlPattern, urlPath or urlPathPattern may be specified.
+        /// </summary>
+        public string UrlPathPattern { get; set; }
+
+        /// <summary>
+        /// The path and query regex to match against. Only one of url, urlPattern, urlPath or urlPathPattern may be specified.
+        /// </summary>
+        public string UrlPattern { get; set; }
+
+        /// <summary>
+        /// Query parameter patterns to match against in the &lt;key&gt;: { "&lt;predicate&gt;": "&lt;value&gt;" } form
+        /// </summary>
+        public object QueryParameters { get; set; }
+
+        /// <summary>
+        /// Header patterns to match against in the &lt;key&gt;: { "&lt;predicate&gt;": "&lt;value&gt;" } form
+        /// </summary>
+        public object Headers { get; set; }
+
+        /// <summary>
+        /// Pre-emptive basic auth credentials to match against
+        /// </summary>
+        public BasicAuthCredentials BasicAuthCredentials { get; set; }
+
+        /// <summary>
+        /// Cookie patterns to match against in the &lt;key&gt;: { "&lt;predicate&gt;": "&lt;value&gt;" } form
+        /// </summary>
+        public object Cookies { get; set; }
+
+        /// <summary>
+        /// Request body patterns to match against in the &lt;key&gt;: { "&lt;predicate&gt;": "&lt;value&gt;" } form
+        /// </summary>
+        public object[] BodyPatterns { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/Response.cs
+++ b/src/WireMock.Org.Abstractions/Response.cs
@@ -0,0 +1,75 @@
+namespace WireMock.Org.Abstractions
+{
+    public class Response
+    {
+        /// <summary>
+        /// The HTTP status code to be returned
+        /// </summary>
+        public int Status { get; set; }
+
+        /// <summary>
+        /// The HTTP status message to be returned
+        /// </summary>
+        public string StatusMessage { get; set; }
+
+        /// <summary>
+        /// Map of response headers to send
+        /// </summary>
+        public object Headers { get; set; }
+
+        /// <summary>
+        /// Extra request headers to send when proxying to another host.
+        /// </summary>
+        public object AdditionalProxyRequestHeaders { get; set; }
+
+        /// <summary>
+        /// The response body as a string. Only one of body, base64Body, jsonBody or bodyFileName may be specified.
+        /// </summary>
+        public string Body { get; set; }
+
+        /// <summary>
+        /// The response body as a base64 encoded string (useful for binary content). Only one of body, base64Body, jsonBody or bodyFileName may be specified.
+        /// </summary>
+        public string Base64Body { get; set; }
+
+        /// <summary>
+        /// The response body as a JSON object. Only one of body, base64Body, jsonBody or bodyFileName may be specified.
+        /// </summary>
+        public object JsonBody { get; set; }
+
+        /// <summary>
+        /// The path to the file containing the response body, relative to the configured file root. Only one of body, base64Body, jsonBody or bodyFileName may be specified.
+        /// </summary>
+        public string BodyFileName { get; set; }
+
+        /// <summary>
+        /// The fault to apply (instead of a full, valid response).
+        /// </summary>
+        public string Fault { get; set; }
+
+        /// <summary>
+        /// Number of milliseconds to delay be before sending the response.
+        /// </summary>
+        public int FixedDelayMilliseconds { get; set; }
+
+        /// <summary>
+        /// Read-only flag indicating false if this was the default, unmatched response. Not present otherwise.
+        /// </summary>
+        public bool FromConfiguredStub { get; set; }
+
+        /// <summary>
+        /// The base URL of the target to proxy matching requests to.
+        /// </summary>
+        public string ProxyBaseUrl { get; set; }
+
+        /// <summary>
+        /// Parameters to apply to response transformers.
+        /// </summary>
+        public object TransformerParameters { get; set; }
+
+        /// <summary>
+        /// List of names of transformers to apply to this response.
+        /// </summary>
+        public string Transformers { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/ResponseLogNormal.cs
+++ b/src/WireMock.Org.Abstractions/ResponseLogNormal.cs
@@ -0,0 +1,14 @@
+namespace WireMock.Org.Abstractions
+{
+    /// <summary>
+    /// Log normal randomly distributed response delay.
+    /// </summary>
+    public class ResponseLogNormal
+    {
+        public int Median { get; set; }
+
+        public double Sigma { get; set; }
+
+        public string Type { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/ResponseLogUniformlyDistributed.cs
+++ b/src/WireMock.Org.Abstractions/ResponseLogUniformlyDistributed.cs
@@ -0,0 +1,14 @@
+namespace WireMock.Org.Abstractions
+{
+    /// <summary>
+    /// Uniformly distributed random response delay.
+    /// </summary>
+    public class ResponseLogUniformlyDistributed
+    {
+        public int Lower { get; set; }
+
+        public string Type { get; set; }
+
+        public int Upper { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/Scenario.cs
+++ b/src/WireMock.Org.Abstractions/Scenario.cs
@@ -0,0 +1,22 @@
+namespace WireMock.Org.Abstractions
+{
+    public class Scenario
+    {
+        /// <summary>
+        /// The scenario ID
+        /// </summary>
+        public string Id { get; set; }
+
+        /// <summary>
+        /// The scenario name
+        /// </summary>
+        public string Name { get; set; }
+
+        public string PossibleStates { get; set; }
+
+        /// <summary>
+        /// The current state of this scenario
+        /// </summary>
+        public string State { get; set; }
+    }
+}
--- a/src/WireMock.Org.Abstractions/WireMock.Org.Abstractions.csproj
+++ b/src/WireMock.Org.Abstractions/WireMock.Org.Abstractions.csproj
@@ -0,0 +1,41 @@
+<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>
+
+        <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>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <!--<DelaySign>true</DelaySign>-->
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <!--<PackageReference Include="AnyOf" Version="0.1.0" />-->
+        <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    </ItemGroup>
+
+</Project>
--- a/src/WireMock.Org.Abstractions/wiremock.org.json
+++ b/src/WireMock.Org.Abstractions/wiremock.org.json
--- a/src/WireMock.Org.RestClient/IWireMockOrgApi.cs
+++ b/src/WireMock.Org.RestClient/IWireMockOrgApi.cs
@@ -0,0 +1,232 @@
+using System.IO;
+using System.Threading.Tasks;
+using RestEase;
+using WireMock.Org.Abstractions;
+
+namespace WireMock.Org.RestClient
+{
+    /// <summary>
+    /// WireMockOrg
+    /// </summary>
+    public interface IWireMockOrgApi
+    {
+        /// <summary>
+        /// Get all stub mappings
+        /// </summary>
+        /// <param name="limit">The maximum number of results to return</param>
+        /// <param name="offset">The start index of the results to return</param>
+        [Get("/__admin/mappings")]
+        Task<GetAdminMappingsResponse> GetAdminMappingsAsync([Query] int? limit, [Query] int? offset);
+
+        /// <summary>
+        /// Create a new stub mapping
+        /// </summary>
+        /// <param name="request"></param>
+        [Post("/__admin/mappings")]
+        [Header("Content-Type", "application/json")]
+        Task<Mapping> PostAdminMappingsAsync([Body] Mapping request);
+
+        /// <summary>
+        /// Delete all stub mappings
+        /// </summary>
+        [Delete("/__admin/mappings")]
+        Task DeleteAdminMappingsAsync();
+
+        /// <summary>
+        /// Reset stub mappings
+        /// </summary>
+        [Post("/__admin/mappings/reset")]
+        Task PostAdminMappingsResetAsync();
+
+        /// <summary>
+        /// Persist stub mappings
+        /// </summary>
+        [Post("/__admin/mappings/save")]
+        Task PostAdminMappingsSaveAsync();
+
+        /// <summary>
+        /// Get stub mapping by ID
+        /// </summary>
+        [Get("/__admin/mappings/{stubMappingId}")]
+        Task<Mapping> GetAdminMappingsByStubMappingIdAsync();
+
+        /// <summary>
+        /// Update a stub mapping
+        /// </summary>
+        /// <param name="request"></param>
+        [Put("/__admin/mappings/{stubMappingId}")]
+        [Header("Content-Type", "application/json")]
+        Task<Mapping> PutAdminMappingsByStubMappingIdAsync([Body] Mapping request);
+
+        /// <summary>
+        /// Delete a stub mapping
+        /// </summary>
+        [Delete("/__admin/mappings/{stubMappingId}")]
+        Task DeleteAdminMappingsByStubMappingIdAsync();
+
+        /// <summary>
+        /// PostAdminMappingsFindByMetadata (/__admin/mappings/find-by-metadata)
+        /// </summary>
+        [Post("/__admin/mappings/find-by-metadata")]
+        [Header("Content-Type", "application/json")]
+        Task<GetAdminMappingsResponse> PostAdminMappingsFindByMetadataAsync();
+
+        /// <summary>
+        /// Delete stub mappings matching metadata
+        /// </summary>
+        [Post("/__admin/mappings/remove-by-metadata")]
+        [Header("Content-Type", "application/json")]
+        Task PostAdminMappingsRemoveByMetadataAsync();
+
+        /// <summary>
+        /// Get all requests in journal
+        /// </summary>
+        /// <param name="limit">The maximum number of results to return</param>
+        /// <param name="since">Only return logged requests after this date</param>
+        [Get("/__admin/requests")]
+        Task GetAdminRequestsAsync([Query] string limit, [Query] string since);
+
+        /// <summary>
+        /// Delete all requests in journal
+        /// </summary>
+        [Delete("/__admin/requests")]
+        Task DeleteAdminRequestsAsync();
+
+        /// <summary>
+        /// Get request by ID
+        /// </summary>
+        /// <param name="requestId">The UUID of the logged request</param>
+        [Get("/__admin/requests/{requestId}")]
+        Task GetAdminRequestsByRequestIdAsync([Path] string requestId);
+
+        /// <summary>
+        /// Delete request by ID
+        /// </summary>
+        /// <param name="requestId">The UUID of the logged request</param>
+        [Delete("/__admin/requests/{requestId}")]
+        Task DeleteAdminRequestsByRequestIdAsync([Path] string requestId);
+
+        /// <summary>
+        /// Empty the request journal
+        /// </summary>
+        [Post("/__admin/requests/reset")]
+        Task PostAdminRequestsResetAsync();
+
+        /// <summary>
+        /// Count requests by criteria
+        /// </summary>
+        /// <param name="request"></param>
+        [Post("/__admin/requests/count")]
+        [Header("Content-Type", "application/json")]
+        Task<PostAdminRequestsCountResponse> PostAdminRequestsCountAsync([Body] Request request);
+
+        /// <summary>
+        /// Remove requests by criteria
+        /// </summary>
+        /// <param name="request"></param>
+        [Post("/__admin/requests/remove")]
+        [Header("Content-Type", "application/json")]
+        Task PostAdminRequestsRemoveAsync([Body] Request request);
+
+        /// <summary>
+        /// Delete requests mappings matching metadata
+        /// </summary>
+        [Post("/__admin/requests/remove-by-metadata")]
+        [Header("Content-Type", "application/json")]
+        Task PostAdminRequestsRemoveByMetadataAsync();
+
+        /// <summary>
+        /// Find requests by criteria
+        /// </summary>
+        /// <param name="request"></param>
+        [Post("/__admin/requests/find")]
+        [Header("Content-Type", "application/json")]
+        Task PostAdminRequestsFindAsync([Body] Request request);
+
+        /// <summary>
+        /// Find unmatched requests
+        /// </summary>
+        [Get("/__admin/requests/unmatched")]
+        Task GetAdminRequestsUnmatchedAsync();
+
+        /// <summary>
+        /// GetAdminRequestsUnmatchedNearMisses (/__admin/requests/unmatched/near-misses)
+        /// </summary>
+        [Get("/__admin/requests/unmatched/near-misses")]
+        Task<GetAdminRequestsUnmatchedNearMissesResponse> GetAdminRequestsUnmatchedNearMissesAsync();
+
+        /// <summary>
+        /// Find near misses matching specific request
+        /// </summary>
+        /// <param name="request"></param>
+        [Post("/__admin/near-misses/request")]
+        [Header("Content-Type", "application/json")]
+        Task<GetAdminRequestsUnmatchedNearMissesResponse> PostAdminNearMissesRequestAsync([Body] NearMiss request);
+
+        /// <summary>
+        /// Find near misses matching request pattern
+        /// </summary>
+        /// <param name="request"></param>
+        [Post("/__admin/near-misses/request-pattern")]
+        [Header("Content-Type", "application/json")]
+        Task<GetAdminRequestsUnmatchedNearMissesResponse> PostAdminNearMissesRequestPatternAsync([Body] Request request);
+
+        /// <summary>
+        /// Start recording
+        /// </summary>
+        [Post("/__admin/recordings/start")]
+        [Header("Content-Type", "application/json")]
+        Task PostAdminRecordingsStartAsync();
+
+        /// <summary>
+        /// Stop recording
+        /// </summary>
+        [Post("/__admin/recordings/stop")]
+        Task<GetAdminMappingsResponse> PostAdminRecordingsStopAsync();
+
+        /// <summary>
+        /// Get recording status
+        /// </summary>
+        [Get("/__admin/recordings/status")]
+        Task<GetAdminRecordingsStatusResponse> GetAdminRecordingsStatusAsync();
+
+        /// <summary>
+        /// Take a snapshot recording
+        /// </summary>
+        /// <param name="request"></param>
+        [Post("/__admin/recordings/snapshot")]
+        [Header("Content-Type", "application/json")]
+        Task<GetAdminMappingsResponse> PostAdminRecordingsSnapshotAsync([Body] object request);
+
+        /// <summary>
+        /// Get all scenarios
+        /// </summary>
+        [Get("/__admin/scenarios")]
+        Task<GetAdminScenariosResponse> GetAdminScenariosAsync();
+
+        /// <summary>
+        /// Reset the state of all scenarios
+        /// </summary>
+        [Post("/__admin/scenarios/reset")]
+        Task PostAdminScenariosResetAsync();
+
+        /// <summary>
+        /// Update global settings
+        /// </summary>
+        [Post("/__admin/settings")]
+        [Header("Content-Type", "application/json")]
+        Task PostAdminSettingsAsync();
+
+        /// <summary>
+        /// Reset mappings and request journal
+        /// </summary>
+        [Post("/__admin/reset")]
+        Task PostAdminResetAsync();
+
+        /// <summary>
+        /// PostAdminShutdown (/__admin/shutdown)
+        /// </summary>
+        [Post("/__admin/shutdown")]
+        Task PostAdminShutdownAsync();
+    }
+}
--- a/src/WireMock.Org.RestClient/WireMock.Org.RestClient.csproj
+++ b/src/WireMock.Org.RestClient/WireMock.Org.RestClient.csproj
@@ -0,0 +1,41 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>A WireMock.org RestClient using RestEase to access the admin interface.</Description>
+        <AssemblyTitle>WireMock.Org.RestClient</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>net45;netstandard1.1;netstandard2.0;netstandard2.1</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <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>
+        <ProjectGuid>{08B29DB1-FEFE-408A-AD0A-6BA6DDC8D70F}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <!--<DelaySign>true</DelaySign>-->
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <!--<PathMap>$(MSBuildProjectDirectory)=/</PathMap>-->
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+        <PackageReference Include="RestEase" Version="1.5.5" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Org.Abstractions\WireMock.Org.Abstractions.csproj" />
+    </ItemGroup>
+
+</Project>
--- a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs
+++ b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs
@@ -1,15 +1,15 @@
-using FluentAssertions;
 using System;
 using System.Linq;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using System.Threading.Tasks;
+using FluentAssertions;
+using WireMock.FluentAssertions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
-using Xunit;
-using WireMock.FluentAssertions;
-using System.Threading.Tasks;
 using WireMock.Settings;
+using Xunit;
 using static System.Environment;

 namespace WireMock.Net.Tests.FluentAssertions
@@ -100,16 +100,9 @@ namespace WireMock.Net.Tests.FluentAssertions
                .HaveReceivedACall()
                .WithHeader("Authorization", "value");

-            var sentHeaders = _server.LogEntries.SelectMany(x => x.RequestMessage.Headers)
-                .ToDictionary(x => x.Key, x => x.Value)
-                .ToList();
-
-            var sentHeaderString = "{" + string.Join(", ", sentHeaders) + "}";
-
            act.Should().Throw<Exception>()
                .And.Message.Should()
-                .Be(
-                    $"Expected headers from requests sent {sentHeaderString} to contain key \"Authorization\".{NewLine}");
+                .Contain("to contain key \"Authorization\".");
        }

        [Fact]
@@ -156,7 +149,7 @@ namespace WireMock.Net.Tests.FluentAssertions
                .And.Message.Should()
                .Be($"{string.Join(NewLine, missingValue1Message, missingValue2Message)}{NewLine}");
        }
-        
+
        [Fact]
        public async Task AtUrl_WhenACallWasMadeToUrl_Should_BeOK()
        {
@@ -200,7 +193,7 @@ namespace WireMock.Net.Tests.FluentAssertions
        {
            _server.ResetMappings();
            _server.Given(Request.Create().UsingAnyMethod())
-                .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings {Url = "http://localhost:9999"}));
+                .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" }));

            await _httpClient.GetAsync("");

@@ -214,8 +207,8 @@ namespace WireMock.Net.Tests.FluentAssertions
        {
            _server.ResetMappings();
            _server.Given(Request.Create().UsingAnyMethod())
-                .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings {Url = "http://localhost:9999"}));
-        
+                .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" }));
+
            Action act = () => _server.Should()
                .HaveReceivedACall()
                .WithProxyUrl("anyurl");
@@ -231,8 +224,8 @@ namespace WireMock.Net.Tests.FluentAssertions
        {
            _server.ResetMappings();
            _server.Given(Request.Create().UsingAnyMethod())
-                .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings {Url = "http://localhost:9999"}));
-        
+                .RespondWith(Response.Create().WithProxy(new ProxyAndRecordSettings { Url = "http://localhost:9999" }));
+
            await _httpClient.GetAsync("");

            Action act = () => _server.Should()
@@ -244,7 +237,7 @@ namespace WireMock.Net.Tests.FluentAssertions
                .Be(
                    $"Expected _server to have been called with proxy url \"anyurl\", but didn't find it among the calls with {{\"http://localhost:9999\"}}.");
        }
-        
+
        [Fact]
        public async Task FromClientIP_whenACallWasMadeFromClientIP_Should_BeOK()
        {
--- a/test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs
+++ b/test/WireMock.Net.Tests/Handlers/LocalFileSystemHandlerTests.cs
@@ -1,6 +1,6 @@
-using NFluent;
 using System;
 using System.IO;
+using NFluent;
 using WireMock.Handlers;
 using Xunit;

@@ -65,6 +65,13 @@ namespace WireMock.Net.Tests.Handlers
            Check.ThatCode(() => _sut.ReadFile(null)).Throws<ArgumentNullException>();
        }

+        [Fact]
+        public void LocalFileSystemHandler_ReadFileAsString_ThrowsArgumentNullException()
+        {
+            // Act
+            Check.ThatCode(() => _sut.ReadFileAsString(null)).Throws<ArgumentNullException>();
+        }
+
        [Fact]
        public void LocalFileSystemHandler_WriteFile_ThrowsArgumentNullException()
        {
--- a/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Matchers/CSharpCodeMatcherTests.cs
@@ -1,4 +1,4 @@
-using NFluent;
+using NFluent;
 using WireMock.Matchers;
 using Xunit;

@@ -83,7 +83,7 @@ namespace WireMock.Net.Tests.Matchers
            var matcher = new CSharpCodeMatcher("x");

            // Act
-            string[] patterns = matcher.GetPatterns();
+            var patterns = matcher.GetPatterns();

            // Assert
            Check.That(patterns).ContainsExactly("x");
--- a/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Matchers/ContentTypeMatcherTests.cs
@@ -1,4 +1,5 @@
-using NFluent;
+using AnyOfTypes;
+using NFluent;
 using WireMock.Matchers;
 using Xunit;

@@ -49,7 +50,7 @@ namespace WireMock.Net.Tests.Matchers
            var matcher = new ContentTypeMatcher("x");

            // Act
-            string[] patterns = matcher.GetPatterns();
+            var patterns = matcher.GetPatterns();

            // Assert
            Check.That(patterns).ContainsExactly("x");
--- a/test/WireMock.Net.Tests/Matchers/ExactMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Matchers/ExactMatcherTests.cs
@@ -1,4 +1,4 @@
-using NFluent;
+using NFluent;
 using WireMock.Matchers;
 using Xunit;

@@ -26,7 +26,7 @@ namespace WireMock.Net.Tests.Matchers
            var matcher = new ExactMatcher("X");

            // Act
-            string[] patterns = matcher.GetPatterns();
+            var patterns = matcher.GetPatterns();

            // Assert
            Check.That(patterns).ContainsExactly("X");
--- a/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Matchers/JmesPathMatcherTests.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using NFluent;
 using WireMock.Matchers;
 using Xunit;
@@ -27,7 +27,7 @@ namespace WireMock.Net.Tests.Matchers
            var matcher = new JmesPathMatcher("X");

            // Act
-            string[] patterns = matcher.GetPatterns();
+            var patterns = matcher.GetPatterns();

            // Assert
            Check.That(patterns).ContainsExactly("X");
--- a/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Matchers/JsonPathMatcherTests.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using NFluent;
 using WireMock.Matchers;
 using Xunit;
@@ -27,7 +27,7 @@ namespace WireMock.Net.Tests.Matchers
            var matcher = new JsonPathMatcher("X");

            // Act
-            string[] patterns = matcher.GetPatterns();
+            var patterns = matcher.GetPatterns();

            // Assert
            Check.That(patterns).ContainsExactly("X");
--- a/test/WireMock.Net.Tests/Matchers/LinqMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Matchers/LinqMatcherTests.cs
@@ -1,4 +1,4 @@
-using Newtonsoft.Json.Linq;
+using Newtonsoft.Json.Linq;
 using NFluent;
 using WireMock.Matchers;
 using Xunit;
@@ -103,7 +103,7 @@ namespace WireMock.Net.Tests.Matchers
            var matcher = new LinqMatcher("x");

            // Act
-            string[] patterns = matcher.GetPatterns();
+            var patterns = matcher.GetPatterns();

            // Assert
            Check.That(patterns).ContainsExactly("x");
--- a/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs
+++ b/test/WireMock.Net.Tests/Matchers/NotNullOrEmptyMatcherTests.cs
@@ -36,11 +36,25 @@ namespace WireMock.Net.Tests.Matchers
        [InlineData(null, 0.0)]
        [InlineData("", 0.0)]
        [InlineData("x", 1.0)]
-        public void NotNullOrEmptyMatcher_IsMatch_String(string data, double expected)
+        public void NotNullOrEmptyMatcher_IsMatch_String(string @string, double expected)
        {
            // Act
            var matcher = new NotNullOrEmptyMatcher();
-            double result = matcher.IsMatch(data);
+            double result = matcher.IsMatch(@string);
+
+            // Assert
+            result.Should().Be(expected);
+        }
+
+        [Theory]
+        [InlineData(null, 0.0)]
+        [InlineData("", 0.0)]
+        [InlineData("x", 1.0)]
+        public void NotNullOrEmptyMatcher_IsMatch_StringAsObject(string @string, double expected)
+        {
+            // Act
+            var matcher = new NotNullOrEmptyMatcher();
+            double result = matcher.IsMatch((object)@string);

            // Assert
            result.Should().Be(expected);
@@ -56,5 +70,15 @@ namespace WireMock.Net.Tests.Matchers
            // Assert
            result.Should().Be(1.0);
        }
+
+        [Fact]
+        public void NotNullOrEmptyMatcher_GetPatterns_Should_Return_EmptyArray()
+        {
+            // Act
+            var patterns = new NotNullOrEmptyMatcher().GetPatterns();
+
+            // Assert
+            patterns.Should().BeEmpty();
+        }
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	6c65dfcff6	1.4.24	2021-10-20 20:40:02 +02:00
Stef Heyenrath	affe388e30	Add support for AzureAD authentication for REST admin interface (#637 )	2021-10-20 16:39:51 +02:00
Stef Heyenrath	48b3e7a305	Add more tests for WithBody (Json and String) and WildcardMatcher	2021-10-19 09:28:52 +00:00
Stef Heyenrath	6194f4e460	Update NotNullOrEmptyMatcher to also implement IStringMatcher (#654 ) * Update NotNullOrEmptyMatcher to also implement IStringMatcher * NotNullOrEmptyMatcher_GetPatterns_Should_Return_EmptyArray * 24	2021-10-15 12:59:03 +02:00
Stef Heyenrath	57cc616aa3	Implement PatternAsFile for StringMatcher (#651 )	2021-10-15 08:54:12 +02:00
Daniel L. Romero	a2a581c84b	Refactor method name MapHeaders and httpStatusCode (#649 ) * Support edge case: first object, next an array. * Add mapping to header parameters. * Refactor the method MapHeadersParameters to MapHeaders * Refactor method name 'cause is duplicate, only pass httpStatusCode when fail	2021-10-10 19:22:28 +02:00
Stef Heyenrath	e64ed45fcf	Fix build from .NET452 and .NET461 example projects	2021-10-09 18:25:18 +02:00
Daniel L. Romero	267f0b7b6d	Mapping headers in OpenAPI (#644 ) * Support edge case: first object, next an array. * Add mapping to header parameters. * Refactor the method MapHeadersParameters to MapHeaders	2021-10-07 19:15:26 +02:00
Daniel L. Romero	34083d826e	Support edge case: first object, next an array. (#643 )	2021-10-06 17:18:46 +02:00
Stef Heyenrath	72eec7140b	WireMock.FluentAssertions	2021-09-29 15:33:06 +00:00
Stef Heyenrath	6fa0f893e7	1.4.23	2021-09-27 21:06:05 +02:00
Stef Heyenrath	2ab075ee09	WireMock.Net.FluentAssertions : upgrade to latest FluentAssertions (#635 ) * . * #634 * fix UT	2021-09-27 21:03:54 +02:00
Stef Heyenrath	772398bea1	1.4.22	2021-09-22 11:39:36 +00:00
Stef Heyenrath	ba0b9d9fd8	Implement Random Delay (#633 ) * implement random delays * fixing CodeFactor issue * fix code comments * ... * UT Co-authored-by: Michael Yarichuk <michael.yarichuk@gmail.com>	2021-09-22 13:37:41 +02:00
Stef Heyenrath	c67bf75a4b	Update FUNDING.yml	2021-09-16 22:25:23 +02:00
Stef Heyenrath	ed74871a26	1.4.21	2021-09-16 13:06:56 +00:00
Stef Heyenrath	cb66c04199	Add WireMock.org RestClient (#631 ) * wip... * x * . * . * . * r * 1.4.21-preview-02 * 1.4.21-preview-03 * . * usings * wip * . * ut * . * . * . * tests * . * comments * readme	2021-09-16 14:35:08 +02:00
Stef Heyenrath	fd28ebdffa	update 'Solution Items' folder	2021-08-14 13:47:18 +02:00
Stef Heyenrath	ce36daa326	Create CreateRelease.yml	2021-08-14 13:45:54 +02:00