1.4.26

Support basepath from servers (#675 )
* Support basepath from servers * Refactor BasePath * Comments applied
2026-01-11 22:30:41 +01:00 · 2021-11-04 07:10:56 +00:00 · 2021-11-02 15:28:02 +01:00 · 2021-11-01 18:53:44 +01:00 · 2021-10-30 09:26:33 +02:00 · 2021-10-30 09:15:43 +02:00
243 changed files with 18254 additions and 4725 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,6 @@
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = crlf
+charset = utf-8
+trim_trailing_whitespace = true
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,8 +1,8 @@
 # These are supported funding model platforms

-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: # [StefH]
 patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
+open_collective: # wiremocknet
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
 community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
--- 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
--- 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.3</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.26</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.26
+
+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 --version 1.4.3
--- 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,7 @@
+# 1.4.26 (04 November 2021)
+- #670 Improve method MapSchemaToObject to support array and object [feature]
+- #673 Support examples random data generation
+- #675 Support basepath from servers
+- #676 Fix random generate data in url no spaces [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,8 +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
@@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31521.260
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{8F890C6F-9ACC-438D-928A-AD61CDA862F2}"
 EndProject
@@ -21,16 +21,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "examples", "examples", "{98
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{7EFB2C5B-1BB2-4AAF-BC9F-216ED80C594D}"
 	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
@@ -82,7 +81,22 @@ 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("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.XamarinUI.Tests", "test\WireMock.Net.XamarinUI.Tests\WireMock.Net.XamarinUI.Tests.csproj", "{0DE14F1B-A51E-4B59-A87C-C6012DCD2844}"
+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
@@ -206,14 +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
-		{0DE14F1B-A51E-4B59-A87C-C6012DCD2844}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0DE14F1B-A51E-4B59-A87C-C6012DCD2844}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0DE14F1B-A51E-4B59-A87C-C6012DCD2844}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0DE14F1B-A51E-4B59-A87C-C6012DCD2844}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B6269AAC-170A-4346-8B9A-444DED3D9A44}.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
@@ -247,9 +261,11 @@ Global
 		{40BF24B5-12E6-4610-9489-138798632E28} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{3F8CF0AE-5F24-4A54-89E7-A3EE829DB5F8} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{B6269AAC-170A-4346-8B9A-444DED3D9A44} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
-		{B6269AAC-170A-4346-8B9A-444DED3D9A44} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{6580580B-1EFD-4922-B0EC-FF290DB279EE} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{0DE14F1B-A51E-4B59-A87C-C6012DCD2844} = {0BB8B634-407A-4610-A91F-11586990767A}
+		{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/Solution.sln.DotSettings
+++ b/Solution.sln.DotSettings
@@ -13,6 +13,9 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=funcs/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Raml/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=randomizer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stef/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhook/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Webhooks/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -28,6 +28,7 @@ jobs:
  
  - task: SonarCloudPrepare@1
    displayName: 'Prepare analysis on SonarCloud'
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
    inputs:
      SonarCloud: SonarCloud
      organization: wiremock-net
@@ -52,9 +53,11 @@ jobs:
  
  - task: SonarCloudAnalyze@1
    displayName: 'SonarCloud: Run Code Analysis'
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
  
  - task: SonarCloudPublish@1
    displayName: 'SonarCloud: Publish Quality Gate Result'
+    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
  
  - task: whitesource.ws-bolt.bolt.wss.WhiteSource Bolt@19
    displayName: 'WhiteSource Bolt'
--- a/examples/WireMock.Net.Client/Program.cs
+++ b/examples/WireMock.Net.Client/Program.cs
@@ -22,6 +22,11 @@ namespace WireMock.Net.Client
            var settings1 = await api.GetSettingsAsync();
            Console.WriteLine($"settings1 = {JsonConvert.SerializeObject(settings1)}");

+            var settingsViaBuilder = new FluentBuilder.SettingsModelBuilder()
+                .WithGlobalProcessingDelay(1077)
+                .WithoutGlobalProcessingDelay()
+                .Build();
+
            settings1.GlobalProcessingDelay = 1077;
            api.PostSettingsAsync(settings1).Wait();

--- 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,6 +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) =>
@@ -73,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.OpenApiParser.ConsoleApp/OpenApiFiles/Swagger_Petstore_V2.0.json
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/OpenApiFiles/Swagger_Petstore_V2.0.json
@@ -0,0 +1,269 @@
+{
+    "swagger": "2.0",
+    "info": {
+        "version": "1.0.0",
+        "title": "Swagger Petstore",
+        "description": "A sample API that uses a petstore as an example to demonstrate features in the swagger-2.0 specification",
+        "termsOfService": "http://swagger.io/terms/",
+        "contact": {
+            "name": "Swagger API Team"
+        },
+        "license": {
+            "name": "MIT"
+        }
+    },
+    "host": "petstore.swagger.io",
+    "basePath": "/api",
+    "schemes": [
+        "http"
+    ],
+    "consumes": [
+        "application/json"
+    ],
+    "produces": [
+        "application/json"
+    ],
+    "paths": {
+        "/pets": {
+            "get": {
+                "description": "Returns all pets from the system that the user has access to",
+                "operationId": "findPets",
+                "produces": [
+                    "application/json",
+                    "application/xml",
+                    "text/xml",
+                    "text/html"
+                ],
+                "parameters": [{
+                        "name": "tags",
+                        "in": "query",
+                        "description": "tags to filter by",
+                        "required": false,
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        },
+                        "collectionFormat": "csv"
+                    },
+                    {
+                        "name": "limit",
+                        "in": "query",
+                        "description": "maximum number of results to return",
+                        "required": false,
+                        "type": "integer",
+                        "format": "int32"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "pet response",
+                        "schema": {
+                            "example": [{
+                                "name": "MEXAMPLE",
+                                "tag": "MEXAMPLE",
+                                "id": 9988
+                            }, {
+                                "name": "OtherExample",
+                                "tag": "OtherExample",
+                                "id": 8877
+                            }],
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/Pet"
+                            }
+                        }
+                    },
+                    "default": {
+                        "description": "unexpected error",
+                        "schema": {
+                            "$ref": "#/definitions/ErrorModel"
+                        }
+                    }
+                }
+            },
+            "post": {
+                "description": "Creates a new pet in the store.  Duplicates are allowed",
+                "operationId": "addPet",
+                "produces": [
+                    "application/json"
+                ],
+                "parameters": [{
+                    "name": "pet",
+                    "in": "body",
+                    "description": "Pet to add to the store",
+                    "required": true,
+                    "schema": {
+                        "$ref": "#/definitions/NewPet"
+                    }
+                }],
+                "responses": {
+                    "200": {
+                        "description": "pet response",
+                        "schema": {
+                            "$ref": "#/definitions/Pet"
+                        }
+                    },
+                    "default": {
+                        "description": "unexpected error",
+                        "schema": {
+                            "$ref": "#/definitions/ErrorModel"
+                        }
+                    }
+                }
+            }
+        },
+        "/pet": {
+            "get": {
+                "description": "Returns a pet from the system that the user has access to",
+                "operationId": "findPet",
+                "produces": [
+                    "application/json",
+                    "application/xml",
+                    "text/xml",
+                    "text/html"
+                ],
+                "parameters": [{
+                        "name": "tags",
+                        "in": "query",
+                        "description": "tags to filter by",
+                        "required": false,
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        },
+                        "collectionFormat": "csv"
+                    },
+                    {
+                        "name": "limit",
+                        "in": "query",
+                        "description": "maximum number of results to return",
+                        "required": false,
+                        "type": "integer",
+                        "format": "int32"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "pet response",
+                        "schema": {
+                            "$ref": "#/definitions/Pet"
+                        }
+                    },
+                    "default": {
+                        "description": "unexpected error",
+                        "schema": {
+                            "$ref": "#/definitions/ErrorModel"
+                        }
+                    }
+                }
+            }
+        },
+        "/pets/{id}": {
+            "get": {
+                "description": "Returns a user based on a single ID, if the user does not have access to the pet",
+                "operationId": "findPetById",
+                "produces": [
+                    "application/json",
+                    "application/xml",
+                    "text/xml",
+                    "text/html"
+                ],
+                "parameters": [{
+                    "name": "id",
+                    "in": "path",
+                    "description": "ID of pet to fetch",
+                    "required": true,
+                    "type": "integer",
+                    "format": "int64"
+                }],
+                "responses": {
+                    "200": {
+                        "description": "pet response",
+                        "schema": {
+                            "$ref": "#/definitions/Pet"
+                        }
+                    },
+                    "default": {
+                        "description": "unexpected error",
+                        "schema": {
+                            "$ref": "#/definitions/ErrorModel"
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "description": "deletes a single pet based on the ID supplied",
+                "operationId": "deletePet",
+                "parameters": [{
+                    "name": "id",
+                    "in": "path",
+                    "description": "ID of pet to delete",
+                    "required": true,
+                    "type": "integer",
+                    "format": "int64"
+                }],
+                "responses": {
+                    "204": {
+                        "description": "pet deleted"
+                    },
+                    "default": {
+                        "description": "unexpected error",
+                        "schema": {
+                            "$ref": "#/definitions/ErrorModel"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "definitions": {
+        "Pet": {
+            "type": "object",
+            "allOf": [{
+                    "$ref": "#/definitions/NewPet"
+                },
+                {
+                    "required": [
+                        "id"
+                    ],
+                    "properties": {
+                        "id": {
+                            "type": "integer",
+                            "format": "int64"
+                        }
+                    }
+                }
+            ]
+        },
+        "NewPet": {
+            "type": "object",
+            "required": [
+                "name"
+            ],
+            "properties": {
+                "name": {
+                    "type": "string"
+                },
+                "tag": {
+                    "type": "string"
+                }
+            }
+        },
+        "ErrorModel": {
+            "type": "object",
+            "required": [
+                "code",
+                "message"
+            ],
+            "properties": {
+                "code": {
+                    "type": "integer",
+                    "format": "int32"
+                },
+                "message": {
+                    "type": "string"
+                }
+            }
+        }
+    }
+}
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/OpenApiFiles/Swagger_Petstore_V2.0.yaml
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/OpenApiFiles/Swagger_Petstore_V2.0.yaml
@@ -0,0 +1,732 @@
+swagger: '2.0'
+info:
+  description: 'This is a sample server Petstore server. Copied from https://github.com/swagger-api/swagger-codegen/blob/master/modules/swagger-codegen/src/test/resources/2_0/petstore.yaml.'
+  version: 1.0.0
+  title: Swagger Petstore
+  termsOfService: 'http://swagger.io/terms/'
+  contact:
+    email: apiteam@swagger.io
+  license:
+    name: Apache-2.0
+    url: 'http://www.apache.org/licenses/LICENSE-2.0.html'
+host: petstore.swagger.io
+basePath: /v2
+tags:
+  - name: pet
+    description: Everything about your Pets
+    externalDocs:
+      description: Find out more
+      url: 'http://swagger.io'
+  - name: store
+    description: Access to Petstore orders
+  - name: user
+    description: Operations about user
+    externalDocs:
+      description: Find out more about our store
+      url: 'http://swagger.io'
+schemes:
+  - http
+paths:
+  /pet:
+    post:
+      tags:
+        - pet
+      summary: Add a new pet to the store
+      description: ''
+      operationId: addPet
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: Pet object that needs to be added to the store
+          required: true
+          schema:
+            $ref: '#/definitions/Pet'
+      responses:
+        '405':
+          description: Invalid input
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+    put:
+      tags:
+        - pet
+      summary: Update an existing pet
+      description: ''
+      operationId: updatePet
+      consumes:
+        - application/json
+        - application/xml
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: Pet object that needs to be added to the store
+          required: true
+          schema:
+            $ref: '#/definitions/Pet'
+      responses:
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Pet not found
+        '405':
+          description: Validation exception
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  /pet/findByStatus:
+    get:
+      tags:
+        - pet
+      summary: Finds Pets by status
+      description: Multiple status values can be provided with comma separated strings
+      operationId: findPetsByStatus
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: status
+          in: query
+          description: Status values that need to be considered for filter
+          required: true
+          type: array
+          items:
+            type: string
+            enum:
+              - available
+              - pending
+              - sold
+            default: available
+          collectionFormat: csv
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/Pet'
+        '400':
+          description: Invalid status value
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  /pet/findByTags:
+    get:
+      tags:
+        - pet
+      summary: Finds Pets by tags
+      description: 'Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.'
+      operationId: findPetsByTags
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: tags
+          in: query
+          description: Tags to filter by
+          required: true
+          type: array
+          items:
+            type: string
+          collectionFormat: csv
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/Pet'
+        '400':
+          description: Invalid tag value
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+      deprecated: true
+  '/pet/{petId}':
+    get:
+      tags:
+        - pet
+      summary: Find pet by ID
+      description: Returns a single pet
+      operationId: getPetById
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to return
+          required: true
+          type: integer
+          format: int64
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Pet'
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Pet not found
+      security:
+        - api_key: []
+    post:
+      tags:
+        - pet
+      summary: Updates a pet in the store with form data
+      description: ''
+      operationId: updatePetWithForm
+      consumes:
+        - application/x-www-form-urlencoded
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet that needs to be updated
+          required: true
+          type: integer
+          format: int64
+        - name: name
+          in: formData
+          description: Updated name of the pet
+          required: false
+          type: string
+        - name: status
+          in: formData
+          description: Updated status of the pet
+          required: false
+          type: string
+      responses:
+        '405':
+          description: Invalid input
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+    delete:
+      tags:
+        - pet
+      summary: Deletes a pet
+      description: ''
+      operationId: deletePet
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: api_key
+          in: header
+          required: false
+          type: string
+        - name: petId
+          in: path
+          description: Pet id to delete
+          required: true
+          type: integer
+          format: int64
+      responses:
+        '200':
+           description: successful operation
+        '400':
+          description: Invalid pet value
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  '/pet/{petId}/uploadImage':
+    post:
+      tags:
+        - pet
+      summary: uploads an image
+      description: ''
+      operationId: uploadFile
+      consumes:
+        - multipart/form-data
+      produces:
+        - application/json
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to update
+          required: true
+          type: integer
+          format: int64
+        - name: additionalMetadata
+          in: formData
+          description: Additional data to pass to server
+          required: false
+          type: string
+        - name: file
+          in: formData
+          description: file to upload
+          required: false
+          type: file
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/ApiResponse'
+      security:
+        - petstore_auth:
+            - 'write:pets'
+            - 'read:pets'
+  /store/inventory:
+    get:
+      tags:
+        - store
+      summary: Returns pet inventories by status
+      description: Returns a map of status codes to quantities
+      operationId: getInventory
+      produces:
+        - application/json
+      parameters: []
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            type: object
+            additionalProperties:
+              type: integer
+              format: int32
+      security:
+        - api_key: []
+  /store/order:
+    post:
+      tags:
+        - store
+      summary: Place an order for a pet
+      description: ''
+      operationId: placeOrder
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: order placed for purchasing the pet
+          required: true
+          schema:
+            $ref: '#/definitions/Order'
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Order'
+        '400':
+          description: Invalid Order
+  '/store/order/{orderId}':
+    get:
+      tags:
+        - store
+      summary: Find purchase order by ID
+      description: 'For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions'
+      operationId: getOrderById
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: orderId
+          in: path
+          description: ID of pet that needs to be fetched
+          required: true
+          type: integer
+          maximum: 5
+          minimum: 1
+          format: int64
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/Order'
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Order not found
+    delete:
+      tags:
+        - store
+      summary: Delete purchase order by ID
+      description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+      operationId: deleteOrder
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: orderId
+          in: path
+          description: ID of the order that needs to be deleted
+          required: true
+          type: string
+      responses:
+        '400':
+          description: Invalid ID supplied
+        '404':
+          description: Order not found
+  /user:
+    post:
+      tags:
+        - user
+      summary: Create user
+      description: This can only be done by the logged in user.
+      operationId: createUser
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: Created user object
+          required: true
+          schema:
+            $ref: '#/definitions/User'
+      responses:
+        default:
+          description: successful operation
+  /user/createWithArray:
+    post:
+      tags:
+        - user
+      summary: Creates list of users with given input array
+      description: ''
+      operationId: createUsersWithArrayInput
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: List of user object
+          required: true
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/User'
+      responses:
+        default:
+          description: successful operation
+  /user/createWithList:
+    post:
+      tags:
+        - user
+      summary: Creates list of users with given input array
+      description: ''
+      operationId: createUsersWithListInput
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - in: body
+          name: body
+          description: List of user object
+          required: true
+          schema:
+            type: array
+            items:
+              $ref: '#/definitions/User'
+      responses:
+        default:
+          description: successful operation
+  /user/login:
+    get:
+      tags:
+        - user
+      summary: Logs user into the system
+      description: ''
+      operationId: loginUser
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: username
+          in: query
+          description: The user name for login
+          required: true
+          type: string
+        - name: password
+          in: query
+          description: The password for login in clear text
+          required: true
+          type: string
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            type: string
+          headers:
+            X-Rate-Limit:
+              type: integer
+              format: int32
+              description: calls per hour allowed by the user
+            X-Expires-After:
+              type: string
+              format: date-time
+              description: date in UTC when toekn expires
+        '400':
+          description: Invalid username/password supplied
+  /user/logout:
+    get:
+      tags:
+        - user
+      summary: Logs out current logged in user session
+      description: ''
+      operationId: logoutUser
+      produces:
+        - application/xml
+        - application/json
+      parameters: []
+      responses:
+        default:
+          description: successful operation
+  '/user/{username}':
+    get:
+      tags:
+        - user
+      summary: Get user by user name
+      description: ''
+      operationId: getUserByName
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: username
+          in: path
+          description: 'The name that needs to be fetched. Use user1 for testing.'
+          required: true
+          type: string
+      responses:
+        '200':
+          description: successful operation
+          schema:
+            $ref: '#/definitions/User'
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+    put:
+      tags:
+        - user
+      summary: Updated user
+      description: This can only be done by the logged in user.
+      operationId: updateUser
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: username
+          in: path
+          description: name that need to be deleted
+          required: true
+          type: string
+        - in: body
+          name: body
+          description: Updated user object
+          required: true
+          schema:
+            $ref: '#/definitions/User'
+      responses:
+        '400':
+          description: Invalid user supplied
+        '404':
+          description: User not found
+    delete:
+      tags:
+        - user
+      summary: Delete user
+      description: This can only be done by the logged in user.
+      operationId: deleteUser
+      produces:
+        - application/xml
+        - application/json
+      parameters:
+        - name: username
+          in: path
+          description: The name that needs to be deleted
+          required: true
+          type: string
+      responses:
+        '400':
+          description: Invalid username supplied
+        '404':
+          description: User not found
+securityDefinitions:
+  petstore_auth:
+    type: oauth2
+    authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog'
+    flow: implicit
+    scopes:
+      'write:pets': modify pets in your account
+      'read:pets': read your pets
+  api_key:
+    type: apiKey
+    name: api_key
+    in: header
+definitions:
+  Order:
+    title: Pet Order
+    description: An order for a pets from the pet store
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      petId:
+        type: integer
+        format: int64
+      quantity:
+        type: integer
+        format: int32
+      shipDate:
+        type: string
+        format: date-time
+      status:
+        type: string
+        description: Order Status
+        enum:
+          - placed
+          - approved
+          - delivered
+      complete:
+        type: boolean
+        default: false
+    xml:
+      name: Order
+  Category:
+    title: Pet category
+    description: A category for a pet
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+    xml:
+      name: Category
+  User:
+    title: a User
+    description: A User who is purchasing from the pet store
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      username:
+        type: string
+      firstName:
+        type: string
+      lastName:
+        type: string
+      email:
+        type: string
+      password:
+        type: string
+      phone:
+        type: string
+      userStatus:
+        type: integer
+        format: int32
+        description: User Status
+    xml:
+      name: User
+  Tag:
+    title: Pet Tag
+    description: A tag for a pet
+    type: object
+    properties:
+      id:
+        type: integer
+        format: int64
+      name:
+        type: string
+    xml:
+      name: Tag
+  Pet:
+    title: a Pet
+    description: A pet for sale in the pet store
+    type: object
+    required:
+      - name
+      - photoUrls
+    properties:
+      id:
+        type: integer
+        format: int64
+      category:
+        $ref: '#/definitions/Category'
+      name:
+        type: string
+        example: doggie
+      photoUrls:
+        type: array
+        xml:
+          name: photoUrl
+          wrapped: true
+        items:
+          type: string
+      tags:
+        type: array
+        xml:
+          name: tag
+          wrapped: true
+        items:
+          $ref: '#/definitions/Tag'
+      status:
+        type: string
+        description: pet status in the store
+        enum:
+          - available
+          - pending
+          - sold
+    xml:
+      name: Pet
+  ApiResponse:
+    title: An uploaded response
+    description: Describes the result of uploading an image resource
+    type: object
+    properties:
+      code:
+        type: integer
+        format: int32
+      type:
+        type: string
+      message:
+        type: string
+  #issue: https://github.com/swagger-api/swagger-codegen/issues/7980
+  Amount:
+    type: object
+    description: >
+      some description
+    properties:
+      value:
+        format: double
+        type: number
+        minimum: 0.01
+        maximum: 1000000000000000
+        description: >
+          some description
+      currency:
+        $ref: '#/definitions/Currency'
+    required:
+      - value
+      - currency
+  Currency:
+    type: string
+    pattern: '^[A-Z]{3,3}$'
+    description: >
+      some description
+externalDocs:
+  description: Find out more about Swagger
+  url: 'http://swagger.io'
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/OpenApiFiles/Swagger_Petstore_V3.0.0.yaml
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/OpenApiFiles/Swagger_Petstore_V3.0.0.yaml
@@ -0,0 +1,109 @@
+openapi: "3.0.0"
+info:
+  version: 1.0.0
+  title: Swagger Petstore
+  license:
+    name: MIT
+servers:
+  - url: http://petstore.swagger.io/v1
+paths:
+  /pets:
+    get:
+      summary: List all pets
+      operationId: listPets
+      tags:
+        - pets
+      parameters:
+        - name: limit
+          in: query
+          description: How many items to return at one time (max 100)
+          required: false
+          schema:
+            type: integer
+            format: int32
+      responses:
+        200:
+          description: An paged array of pets
+          headers:
+            x-next:
+              description: A link to the next page of responses
+              schema:
+                type: string
+          content:
+            application/json:    
+              schema:
+                $ref: "#/components/schemas/Pets"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+    post:
+      summary: Create a pet
+      operationId: createPets
+      tags:
+        - pets
+      responses:
+        201:
+          description: Null response
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+  /pets/{petId}:
+    get:
+      summary: Info for a specific pet
+      operationId: showPetById
+      tags:
+        - pets
+      parameters:
+        - name: petId
+          in: path
+          required: true
+          description: The id of the pet to retrieve
+          schema:
+            type: string
+      responses:
+        200:
+          description: Expected response to a valid request
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Pets"
+        default:
+          description: unexpected error
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/Error"
+components:
+  schemas:
+    Pet:
+      required:
+        - id
+        - name
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+        tag:
+          type: string
+    Pets:
+      type: array
+      items:
+        $ref: "#/components/schemas/Pet"
+    Error:
+      required:
+        - code
+        - message
+      properties:
+        code:
+          type: integer
+          format: int32
+        message:
+          type: string
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/OpenApiFiles/Swagger_Petstore_V3.0.2.json
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/OpenApiFiles/Swagger_Petstore_V3.0.2.json
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/OpenApiFiles/openAPIExamples.yaml
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/OpenApiFiles/openAPIExamples.yaml
@@ -0,0 +1,96 @@
+openapi: 3.0.1
+info:
+  title: API_Test
+  version: v1
+paths:
+  /WeatherForecast:
+    get:
+      tags:
+        - WeatherForecast
+      parameters:
+      - in: "header"
+        name: X-Correlation-ID
+        type: "string"
+        required: true
+      responses:
+        '200':
+          description: Success
+          content:           
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/WeatherForecast'
+  /leolplex:
+    get:
+      tags:
+        - WeatherForecast
+      parameters:
+      - in: "header"
+        name: X-Correlation-ID
+        type: "string"
+        required: true
+      responses:
+        '200':
+          description: Success
+          content:           
+            application/json:
+              example:
+                - date: 2021-10-21T09:13:00.552+00:00
+                  temperatureC: 111
+                  temperatureF: 111
+                  summary: Just-summary
+                - date: 2021-10-21T09:13:00.000+00:00
+                  temperatureC: 222
+                  temperatureF: 222
+                  summary: Just-summary2 
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/WeatherForecast'
+  /exampleop:
+    get:
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              example:
+                id: 1
+                name: get food
+                completed: false
+              schema:
+                properties:
+                  id:
+                    type: integer
+                  name:
+                    type: string
+                  completed:
+                    type: boolean
+                  completed_at:
+                    type: string
+                    format: date-time
+                    nullable: true
+                required:
+                  - id
+                  - name
+                  - completed
+components:
+  schemas:
+    WeatherForecast:
+      type: object
+      properties:
+        date:
+          type: string
+          format: date-time
+        temperatureC:
+          type: integer
+          format: int32
+        temperatureF:
+          type: integer
+          format: int32
+          readOnly: true
+        summary:
+          type: string
+          nullable: true
+      additionalProperties: false
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/Program.cs
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/Program.cs
@@ -1,5 +1,3 @@
-using Microsoft.OpenApi.Readers;
-using Newtonsoft.Json;
 using System;
 using System.IO;

@@ -7,15 +5,23 @@ namespace WireMock.Net.OpenApiParser.ConsoleApp
 {
    class Program
    {
-        private static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
-        {
-            NullValueHandling = NullValueHandling.Ignore,
-            Formatting = Formatting.Indented
-        };
-
+        private const string Folder = "OpenApiFiles";
        static void Main(string[] args)
        {
-            Run.RunServer("petstore-openapi3.json");
+            var serverOpenAPIExamples = Run.RunServer(Path.Combine(Folder, "openAPIExamples.yaml"), "http://localhost:9091/");
+            var serverPetstore_V2_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.json"), "http://localhost:9092/");
+            var serverPetstore_V2_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V2.0.yaml"), "http://localhost:9093/");
+            var serverPetstore_V300_yaml = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.0.yaml"), "http://localhost:9094/");
+            var serverPetstore_V302_json = Run.RunServer(Path.Combine(Folder, "Swagger_Petstore_V3.0.2.json"), "http://localhost:9095/");
+
+            Console.WriteLine("Press any key to stop the servers");
+            Console.ReadKey();
+
+            serverOpenAPIExamples.Stop();
+            serverPetstore_V2_json.Stop();
+            serverPetstore_V2_yaml.Stop();
+            serverPetstore_V300_yaml.Stop();
+            serverPetstore_V302_json.Stop();

            //IWireMockOpenApiParser parser = new WireMockOpenApiParser();

--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/Run.cs
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/Run.cs
@@ -1,39 +1,42 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using WireMock.Admin.Mappings;
 using WireMock.Logging;
+using WireMock.Net.OpenApiParser.Extensions;
+using WireMock.Net.OpenApiParser.Settings;
+using WireMock.Net.OpenApiParser.Types;
 using WireMock.Server;
 using WireMock.Settings;
-using WireMock.Net.OpenApiParser.Extensions;

 namespace WireMock.Net.OpenApiParser.ConsoleApp
 {
    public static class Run
    {
-        public static void RunServer(string path)
+        public static WireMockServer RunServer(string path, string url)
        {
-            string url1 = "http://localhost:9091/";
-
            var server = WireMockServer.Start(new WireMockServerSettings
            {
                AllowCSharpCodeMatcher = true,
-                Urls = new[] { url1 },
+                Urls = new[] { url },
                StartAdminInterface = true,
                ReadStaticMappings = false,
                WatchStaticMappings = false,
                WatchStaticMappingsInSubdirectories = false,
-                Logger = new WireMockConsoleLogger(),
+                Logger = new WireMockConsoleLogger()
            });
            Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));

            server.SetBasicAuthentication("a", "b");

-            server.WithMappingFromOpenApiFile(path, out var diag);
+            var settings = new WireMockOpenApiParserSettings
+            {
+                PathPatternToUse = ExampleValueType.Wildcard
+            };

-            Console.WriteLine("Press any key to stop the server");
-            System.Console.ReadKey();
-            server.Stop();
+            server.WithMappingFromOpenApiFile(path, settings, out var diag);
+
+            return server;
        }

        public static void RunServer(IEnumerable<MappingModel> mappings)
--- a/examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj
+++ b/examples/WireMock.Net.OpenApiParser.ConsoleApp/WireMock.Net.OpenApiParser.ConsoleApp.csproj
@@ -15,6 +15,21 @@
    <None Update="infura.yaml">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
+    <None Update="OpenApiFiles\openAPIExamples.yaml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="OpenApiFiles\Swagger_Petstore_V2.0.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="OpenApiFiles\Swagger_Petstore_V2.0.yaml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="OpenApiFiles\Swagger_Petstore_V3.0.0.yaml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="OpenApiFiles\Swagger_Petstore_V3.0.2.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
    <None Update="petstore-openapi3.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
--- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
+++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
@@ -32,11 +32,8 @@
    <WarningLevel>4</WarningLevel>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="Handlebars, Version=1.9.5.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.1.9.5\lib\net452\Handlebars.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    <Reference 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.Owin, Version=2.0.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.2.0.2\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -57,6 +54,7 @@
      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Configuration.Install" />
    <Reference Include="System.Core" />
    <Reference Include="System.Management" />
--- a/examples/WireMock.Net.Service/packages.config
+++ b/examples/WireMock.Net.Service/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Handlebars.Net" version="1.9.5" targetFramework="net452" />
-  <package id="log4net" version="2.0.10" targetFramework="net452" />
+  <package id="log4net" version="2.0.12" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Owin" version="5.2.3" targetFramework="net452" />
@@ -12,6 +11,6 @@
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
  <package id="Owin" version="1.0" targetFramework="net452" />
  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
-  <package id="System.Net.Http" version="4.3.3" targetFramework="net452" />
+  <package id="System.Net.Http" version="4.3.4" targetFramework="net452" />
  <package id="XPath2" version="1.1.0" targetFramework="net452" />
 </packages>
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/Program.cs
@@ -10,6 +10,7 @@ using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
 using WireMock.Server;
 using WireMock.Settings;
+using WireMock.Util;

 namespace WireMock.Net.StandAlone.NETCoreApp
 {
@@ -34,6 +35,14 @@ namespace WireMock.Net.StandAlone.NETCoreApp

            _server = WireMockServer.Start(settings);

+            _server.Given(Request.Create().WithPath("/api/sap")
+                .UsingPost()
+                .WithBody((IBodyData xmlData) => {
+                    //xmlData is always null
+                    return true;
+                }))
+                .RespondWith(Response.Create().WithStatusCode(System.Net.HttpStatusCode.OK));
+
            _server
                .Given(Request.Create()
                    .UsingAnyMethod())
--- a/examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json
+++ b/examples/WireMock.Net.StandAlone.NETCoreApp/Properties/launchSettings.json
@@ -2,7 +2,7 @@
  "profiles": {
    "WireMock.Net.StandAlone.NETCoreApp": {
      "commandName": "Project",
-      "commandLineArgs": "--Urls https://localhost:10080 --WireMockLogger WireMockConsoleLogger"
+      "commandLineArgs": "--Urls http://localhost:9091 --WireMockLogger WireMockConsoleLogger"
    }
  }
 }
--- 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,14 +33,14 @@
    <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>
  </PropertyGroup>
  <ItemGroup>
-    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.8\lib\net45-full\log4net.dll</HintPath>
+    <Reference 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.Owin.Host.HttpListener, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.4.0.0\lib\net451\Microsoft.Owin.Host.HttpListener.dll</HintPath>
@@ -49,12 +49,14 @@
      <HintPath>..\..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
    </Reference>
    <Reference Include="System" />
+    <Reference Include="System.Configuration" />
    <Reference Include="System.Core" />
    <Reference Include="System.Net.Http" />
    <Reference Include="System.Net.Http.Formatting, Version=5.2.6.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
      <HintPath>..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.6\lib\net45\System.Net.Http.Formatting.dll</HintPath>
    </Reference>
    <Reference Include="System.Numerics" />
+    <Reference Include="System.Web" />
    <Reference Include="System.Xml" />
    <Reference Include="System.Xml.Linq" />
  </ItemGroup>
--- a/examples/WireMock.Net.StandAlone.Net452/packages.config
+++ b/examples/WireMock.Net.StandAlone.Net452/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.10" targetFramework="net452" />
+  <package id="log4net" version="2.0.12" targetFramework="net452" />
  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.6" targetFramework="net452" />
  <package id="Microsoft.Owin.Host.HttpListener" version="4.0.0" targetFramework="net452" />
  <package id="Newtonsoft.Json" version="11.0.2" targetFramework="net452" />
--- 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" />
@@ -76,7 +76,7 @@
  <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net461" />
  <package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net461" />
  <package id="System.Security.Principal.Windows" version="4.5.1" targetFramework="net461" />
-  <package id="System.Text.Encodings.Web" version="4.5.0" targetFramework="net461" />
+  <package id="System.Text.Encodings.Web" version="4.5.1" targetFramework="net461" />
  <package id="System.Threading.Tasks.Extensions" version="4.5.1" targetFramework="net461" />
  <package id="XPath2" version="1.1.0" targetFramework="net461" />
 </packages>
--- 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/BodyModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/BodyModel.cs
@@ -3,6 +3,7 @@
    /// <summary>
    /// Body Model
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class BodyModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ClientIPModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ClientIPModel.cs
@@ -3,6 +3,7 @@
    /// <summary>
    /// ClientIPModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class ClientIPModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/CookieModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/CookieModel.cs
@@ -5,6 +5,7 @@ namespace WireMock.Admin.Mappings
    /// <summary>
    /// Cookie Model
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class CookieModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/EncodingModel.cs
@@ -3,6 +3,7 @@
    /// <summary>
    /// EncodingModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class EncodingModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/FaultModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/FaultModel.cs
@@ -3,6 +3,7 @@
    /// <summary>
    /// Fault Model
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class FaultModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/HeaderModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/HeaderModel.cs
@@ -5,6 +5,7 @@ namespace WireMock.Admin.Mappings
    /// <summary>
    /// Header Model
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class HeaderModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs
@@ -1,10 +1,12 @@
-using System;
+using System;
+using WireMock.Models;

 namespace WireMock.Admin.Mappings
 {
    /// <summary>
    /// MappingModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class MappingModel
    {
        /// <summary>
@@ -12,6 +14,11 @@ namespace WireMock.Admin.Mappings
        /// </summary>
        public Guid? Guid { get; set; }

+        /// <summary>
+        /// Gets or sets the TimeSettings when which this mapping should be used.
+        /// </summary>
+        public TimeSettingsModel TimeSettings { get; set; }
+
        /// <summary>
        /// The unique title.
        /// </summary>
@@ -52,5 +59,15 @@ namespace WireMock.Admin.Mappings
        /// Saves this mapping as a static mapping file.
        /// </summary>
        public bool? SaveToFile { get; set; }
+
+        /// <summary>
+        /// The Webhook.
+        /// </summary>
+        public WebhookModel Webhook { get; set; }
+
+        /// <summary>
+        /// The Webhooks.
+        /// </summary>
+        public WebhookModel[] Webhooks { get; set; }
    }
 }
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs
@@ -1,8 +1,9 @@
-namespace WireMock.Admin.Mappings
+namespace WireMock.Admin.Mappings
 {
    /// <summary>
    /// MatcherModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class MatcherModel
    {
        /// <summary>
@@ -11,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/ParamModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ParamModel.cs
@@ -3,6 +3,7 @@
    /// <summary>
    /// Param Model
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class ParamModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/PathModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/PathModel.cs
@@ -3,6 +3,7 @@
    /// <summary>
    /// PathModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class PathModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/RequestModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/RequestModel.cs
@@ -5,6 +5,7 @@ namespace WireMock.Admin.Mappings
    /// <summary>
    /// RequestModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class RequestModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
-using WireMock.Types;

 namespace WireMock.Admin.Mappings
 {
    /// <summary>
    /// ResponseModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class ResponseModel
    {
        /// <summary>
@@ -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/Admin/Mappings/StatusModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/StatusModel.cs
@@ -5,6 +5,7 @@ namespace WireMock.Admin.Mappings
    /// <summary>
    /// Status
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class StatusModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/TimeSettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/TimeSettingsModel.cs
@@ -0,0 +1,26 @@
+using System;
+
+namespace WireMock.Models
+{
+    /// <summary>
+    /// TimeSettingsModel: Start, End and TTL
+    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
+    public class TimeSettingsModel
+    {
+        /// <summary>
+        /// Gets or sets the DateTime from which this mapping should be used. In case this is not defined, it's used (default behavior).
+        /// </summary>
+        public DateTime? Start { get; set; }
+
+        /// <summary>
+        /// Gets or sets the DateTime from until this mapping should be used. In case this is not defined, it's used forever (default behavior).
+        /// </summary>
+        public DateTime? End { get; set; }
+
+        /// <summary>
+        /// Gets or sets the TTL (Time To Live) in seconds for this mapping. In case this is not defined, it's used (default behavior).
+        /// </summary>
+        public int? TTL { get; set; }
+    }
+}
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/UrlModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/UrlModel.cs
@@ -3,6 +3,7 @@
    /// <summary>
    /// UrlModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class UrlModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/WebProxyModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/WebProxyModel.cs
@@ -3,6 +3,7 @@
    /// <summary>
    /// WebProxy settings
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class WebProxyModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/WebhookModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/WebhookModel.cs
@@ -0,0 +1,14 @@
+namespace WireMock.Admin.Mappings
+{
+    /// <summary>
+    /// The Webhook
+    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
+    public class WebhookModel
+    {
+        /// <summary>
+        /// The Webhook Request.
+        /// </summary>
+        public WebhookRequestModel Request { get; set; }
+    }
+}
--- a/src/WireMock.Net.Abstractions/Admin/Mappings/WebhookRequestModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Mappings/WebhookRequestModel.cs
@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+
+namespace WireMock.Admin.Mappings
+{
+    /// <summary>
+    /// RequestModel
+    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
+    public class WebhookRequestModel
+    {
+        /// <summary>
+        /// Gets or sets the Url.
+        /// </summary>
+        public string Url { get; set; }
+
+        /// <summary>
+        /// The methods
+        /// </summary>
+        public string Method { get; set; }
+
+        /// <summary>
+        /// Gets or sets the headers.
+        /// </summary>
+        public IDictionary<string, string> Headers { get; set; }
+
+        /// <summary>
+        /// Gets or sets the body.
+        /// </summary>
+        public string Body { get; set; }
+
+        /// <summary>
+        /// Gets or sets the body (as JSON object).
+        /// </summary>
+        public object BodyAsJson { get; set; }
+
+        /// <summary>
+        /// Use ResponseMessage Transformer.
+        /// </summary>
+        public bool? UseTransformer { get; set; }
+
+        /// <summary>
+        /// Gets the type of the transformer.
+        /// </summary>
+        public string TransformerType { get; set; }
+    }
+}
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogEntryModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogEntryModel.cs
@@ -5,6 +5,7 @@ namespace WireMock.Admin.Requests
    /// <summary>
    /// Request Log Model
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class LogEntryModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestMatchModel.cs
@@ -5,6 +5,7 @@ namespace WireMock.Admin.Requests
    /// <summary>
    /// LogRequestMatchModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class LogRequestMatchModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs
@@ -8,6 +8,7 @@ namespace WireMock.Admin.Requests
    /// <summary>
    /// RequestMessage Model
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class LogRequestModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Requests/LogResponseModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Requests/LogResponseModel.cs
@@ -7,6 +7,7 @@ namespace WireMock.Admin.Requests
    /// <summary>
    /// Response MessageModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class LogResponseModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateModel.cs
@@ -3,6 +3,7 @@
    /// <summary>
    /// ScenarioStateModel
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class ScenarioStateModel
    {
        /// <summary>
--- a/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs
@@ -3,6 +3,7 @@
    /// <summary>
    /// Settings
    /// </summary>
+    [FluentBuilder.AutoGenerateBuilder]
    public class SettingsModel
    {
        /// <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/Models/IBodyData.cs
+++ b/src/WireMock.Net.Abstractions/Models/IBodyData.cs
--- a/src/WireMock.Net.Abstractions/Models/ITimeSettings.cs
+++ b/src/WireMock.Net.Abstractions/Models/ITimeSettings.cs
@@ -0,0 +1,25 @@
+using System;
+
+namespace WireMock.Models
+{
+    /// <summary>
+    /// TimeSettings: Start, End and TTL
+    /// </summary>
+    public interface ITimeSettings
+    {
+        /// <summary>
+        /// Gets or sets the DateTime from which this mapping should be used. In case this is not defined, it's used (default behavior).
+        /// </summary>
+        DateTime? Start { get; set; }
+
+        /// <summary>
+        /// Gets or sets the DateTime from until this mapping should be used. In case this is not defined, it's used forever (default behavior).
+        /// </summary>
+        DateTime? End { get; set; }
+
+        /// <summary>
+        /// Gets or sets the TTL (Time To Live) in seconds for this mapping. In case this is not defined, it's used (default behavior).
+        /// </summary>
+        int? TTL { get; set; }
+    }
+}
--- a/src/WireMock.Net.Abstractions/Models/IWebhook.cs
+++ b/src/WireMock.Net.Abstractions/Models/IWebhook.cs
@@ -0,0 +1,13 @@
+namespace WireMock.Models
+{
+    /// <summary>
+    /// IWebhook
+    /// </summary>
+    public interface IWebhook
+    {
+        /// <summary>
+        /// Request
+        /// </summary>
+        IWebhookRequest Request { get; set; }
+    }
+}
--- a/src/WireMock.Net.Abstractions/Models/IWebhookRequest.cs
+++ b/src/WireMock.Net.Abstractions/Models/IWebhookRequest.cs
@@ -0,0 +1,42 @@
+using System.Collections.Generic;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.Models
+{
+    /// <summary>
+    /// IWebhookRequest
+    /// </summary>
+    public interface IWebhookRequest
+    {
+        /// <summary>
+        /// The Webhook Url.
+        /// </summary>
+        string Url { get; set; }
+
+        /// <summary>
+        /// The method to use.
+        /// </summary>
+        string Method { get; set; }
+
+        /// <summary>
+        /// The Headers to send.
+        /// </summary>
+        IDictionary<string, WireMockList<string>> Headers { get; }
+
+        /// <summary>
+        /// The body to send.
+        /// </summary>
+        IBodyData BodyData { get; set; }
+
+        /// <summary>
+        /// Use Transformer.
+        /// </summary>
+        bool? UseTransformer { get; set; }
+
+        /// <summary>
+        /// The transformer type.
+        /// </summary>
+        TransformerType TransformerType { get; set; }
+    }
+}
--- 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,37 +1,46 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

-  <PropertyGroup>
-    <Description>Commonly used interfaces, models, enumerations and types.</Description>
-    <AssemblyTitle>WireMock.Net.Abstractions</AssemblyTitle>
-    <Authors>Stef Heyenrath</Authors>
-    <TargetFrameworks>net45;netstandard1.0;netstandard2.0;netstandard2.1</TargetFrameworks>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
-    <PackageId>WireMock.Net.Abstractions</PackageId>
-    <PackageTags>wiremock;interfaces;models;classes;enumerations;types</PackageTags>
-    <RootNamespace>WireMock</RootNamespace>
-    <ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A94}</ProjectGuid>
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
-    <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
-    <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>
+        <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>

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

-  <ItemGroup>
-    <PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-  </ItemGroup>
+        <AssemblyName>WireMock.Net.Abstractions</AssemblyName>
+        <PackageId>WireMock.Net.Abstractions</PackageId>
+        <PackageTags>wiremock;wiremock.org;interfaces;models;classes;enumerations;types</PackageTags>
+        <RootNamespace>WireMock</RootNamespace>
+        <ProjectGuid>{B6269AAC-170A-4346-8B9A-579DED3D9A94}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+        <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="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.11">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>

 </Project>
--- 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/Extensions/WireMockServerExtensions.cs
+++ b/src/WireMock.Net.OpenApiParser/Extensions/WireMockServerExtensions.cs
@@ -1,12 +1,19 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices.ComTypes;
+using JetBrains.Annotations;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
+using SharpYaml.Model;
+using Stef.Validation;
+using WireMock.Net.OpenApiParser.Settings;
 using WireMock.Server;

 namespace WireMock.Net.OpenApiParser.Extensions
 {
+    /// <summary>
+    /// Some extension methods for <see cref="IWireMockServer"/>.
+    /// </summary>
    public static class WireMockServerExtensions
    {
        /// <summary>
@@ -15,18 +22,26 @@ namespace WireMock.Net.OpenApiParser.Extensions
        /// <param name="server">The WireMockServer instance</param>
        /// <param name="path">Path containing OpenAPI file to parse and use the mappings.</param>
        /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
+        [PublicAPI]
        public static IWireMockServer WithMappingFromOpenApiFile(this IWireMockServer server, string path, out OpenApiDiagnostic diagnostic)
        {
-            if (server == null)
-            {
-                throw new ArgumentNullException(nameof(server));
-            }
-            if (string.IsNullOrEmpty(path))
-            {
-                throw new ArgumentNullException(nameof(path));
-            }
+            return WithMappingFromOpenApiFile(server, path, null, out diagnostic);
+        }

-            var mappings = new WireMockOpenApiParser().FromFile(path, out diagnostic);
+        /// <summary>
+        /// Register the mappings via an OpenAPI (swagger) V2 or V3 file.
+        /// </summary>
+        /// <param name="server">The WireMockServer instance</param>
+        /// <param name="path">Path containing OpenAPI file to parse and use the mappings.</param>
+        /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
+        /// <param name="settings">Additional settings</param>
+        [PublicAPI]
+        public static IWireMockServer WithMappingFromOpenApiFile(this IWireMockServer server, string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+        {
+            Guard.NotNull(server, nameof(server));
+            Guard.NotNullOrEmpty(path, nameof(path));
+
+            var mappings = new WireMockOpenApiParser().FromFile(path, settings, out diagnostic);

            return server.WithMapping(mappings.ToArray());
        }
@@ -37,9 +52,27 @@ namespace WireMock.Net.OpenApiParser.Extensions
        /// <param name="server">The WireMockServer instance</param>
        /// <param name="stream">Stream containing OpenAPI description to parse and use the mappings.</param>
        /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
+        [PublicAPI]
        public static IWireMockServer WithMappingFromOpenApiStream(this IWireMockServer server, Stream stream, out OpenApiDiagnostic diagnostic)
        {
-            var mappings = new WireMockOpenApiParser().FromStream(stream, out diagnostic);
+            return WithMappingFromOpenApiStream(server, stream, null, out diagnostic);
+        }
+
+        /// <summary>
+        /// Register the mappings via an OpenAPI (swagger) V2 or V3 stream.
+        /// </summary>
+        /// <param name="server">The WireMockServer instance</param>
+        /// <param name="stream">Stream containing OpenAPI description to parse and use the mappings.</param>
+        /// <param name="settings">Additional settings</param>
+        /// <param name="diagnostic">Returns diagnostic object containing errors detected during parsing</param>
+        [PublicAPI]
+        public static IWireMockServer WithMappingFromOpenApiStream(this IWireMockServer server, Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
+        {
+            Guard.NotNull(server, nameof(server));
+            Guard.NotNull(stream, nameof(stream));
+            Guard.NotNull(settings, nameof(settings));
+
+            var mappings = new WireMockOpenApiParser().FromStream(stream, settings, out diagnostic);

            return server.WithMapping(mappings.ToArray());
        }
@@ -49,9 +82,14 @@ namespace WireMock.Net.OpenApiParser.Extensions
        /// </summary>
        /// <param name="server">The WireMockServer instance</param>
        /// <param name="document">The OpenAPI document to use as mappings.</param>
-        public static IWireMockServer WithMappingFromOpenApiDocument(this IWireMockServer server, OpenApiDocument document)
+        /// <param name="settings">Additional settings [optional]</param>
+        [PublicAPI]
+        public static IWireMockServer WithMappingFromOpenApiDocument(this IWireMockServer server, OpenApiDocument document, WireMockOpenApiParserSettings settings = null)
        {
-            var mappings = new WireMockOpenApiParser().FromDocument(document);
+            Guard.NotNull(server, nameof(server));
+            Guard.NotNull(document, nameof(document));
+
+            var mappings = new WireMockOpenApiParser().FromDocument(document, settings);

            return server.WithMapping(mappings.ToArray());
        }
--- a/src/WireMock.Net.OpenApiParser/IWireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/IWireMockOpenApiParser.cs
@@ -1,37 +1,57 @@
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.OpenApi.Models;
-using Microsoft.OpenApi.Readers;
-using WireMock.Admin.Mappings;
-
-namespace WireMock.Net.OpenApiParser
-{
-    /// <summary>
-    /// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock MappingModels.
-    /// </summary>
-    public interface IWireMockOpenApiParser
-    {
-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from an <seealso cref="OpenApiDocument"/>.
-        /// </summary>
-        /// <param name="document">The source OpenApiDocument</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromDocument(OpenApiDocument document);
-
-        /// <summary>
-        /// Generate <see cref="IEnumerable{MappingModel}"/> from a <seealso cref="Stream"/>.
-        /// </summary>
-        /// <param name="stream">The source stream</param>
-        /// <param name="diagnostic">OpenApiDiagnostic output</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic);
-
+using System.Collections.Generic;
+using System.IO;
+using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Readers;
+using WireMock.Admin.Mappings;
+using WireMock.Net.OpenApiParser.Settings;
+
+namespace WireMock.Net.OpenApiParser
+{
+    /// <summary>
+    /// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock MappingModels.
+    /// </summary>
+    public interface IWireMockOpenApiParser
+    {
        /// <summary>
        /// Generate <see cref="IEnumerable{MappingModel}"/> from a file-path.
        /// </summary>
        /// <param name="path">The path to read the OpenApi/Swagger/V2/V3 or Raml file.</param>
        /// <param name="diagnostic">OpenApiDiagnostic output</param>
-        /// <returns>MappingModel</returns>
-        IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic);
-    }
+        /// <returns>MappingModel</returns>
+        IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic);
+
+        /// <summary>
+        /// Generate <see cref="IEnumerable{MappingModel}"/> from a file-path.
+        /// </summary>
+        /// <param name="path">The path to read the OpenApi/Swagger/V2/V3 or Raml file.</param>
+        /// <param name="settings">Additional settings</param>
+        /// <param name="diagnostic">OpenApiDiagnostic output</param>
+        /// <returns>MappingModel</returns>
+        IEnumerable<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
+
+        /// <summary>
+        /// Generate <see cref="IEnumerable{MappingModel}"/> from an <seealso cref="OpenApiDocument"/>.
+        /// </summary>
+        /// <param name="document">The source OpenApiDocument</param>
+        /// <param name="settings">Additional settings [optional]</param>
+        /// <returns>MappingModel</returns>
+        IEnumerable<MappingModel> FromDocument(OpenApiDocument document, WireMockOpenApiParserSettings settings = null);
+
+        /// <summary>
+        /// Generate <see cref="IEnumerable{MappingModel}"/> from a <seealso cref="Stream"/>.
+        /// </summary>
+        /// <param name="stream">The source stream</param>
+        /// <param name="diagnostic">OpenApiDiagnostic output</param>
+        /// <returns>MappingModel</returns>
+        IEnumerable<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic);
+
+        /// <summary>
+        /// Generate <see cref="IEnumerable{MappingModel}"/> from a <seealso cref="Stream"/>.
+        /// </summary>
+        /// <param name="stream">The source stream</param>
+        /// <param name="settings">Additional settings</param>
+        /// <param name="diagnostic">OpenApiDiagnostic output</param>
+        /// <returns>MappingModel</returns>
+        IEnumerable<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic);
+    }
 }
--- a/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
+++ b/src/WireMock.Net.OpenApiParser/Mappers/OpenApiPathsMapper.cs
@@ -0,0 +1,358 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using Microsoft.OpenApi;
+using Microsoft.OpenApi.Any;
+using Microsoft.OpenApi.Models;
+using Microsoft.OpenApi.Writers;
+using Newtonsoft.Json.Linq;
+using WireMock.Admin.Mappings;
+using WireMock.Net.OpenApiParser.Extensions;
+using WireMock.Net.OpenApiParser.Settings;
+using WireMock.Net.OpenApiParser.Types;
+using WireMock.Net.OpenApiParser.Utils;
+
+namespace WireMock.Net.OpenApiParser.Mappers
+{
+    internal class OpenApiPathsMapper
+    {
+        private readonly WireMockOpenApiParserSettings _settings;
+        private readonly ExampleValueGenerator _exampleValueGenerator;
+
+        public OpenApiPathsMapper(WireMockOpenApiParserSettings settings)
+        {
+            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            _exampleValueGenerator = new ExampleValueGenerator(settings);
+        }
+
+        public IEnumerable<MappingModel> ToMappingModels(OpenApiPaths paths, IList<OpenApiServer> servers)
+        {
+            return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
+        }
+
+        private IEnumerable<MappingModel> MapPaths(OpenApiPaths paths, IList<OpenApiServer> servers)
+        {
+            return paths.Select(p => MapPath(p.Key, p.Value, servers)).SelectMany(x => x);
+        }
+
+        private IEnumerable<MappingModel> MapPath(string path, OpenApiPathItem pathItem, IList<OpenApiServer> servers)
+        {
+            return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value, servers));
+        }
+
+        private MappingModel MapOperationToMappingModel(string path, string httpMethod, OpenApiOperation operation, IList<OpenApiServer> servers)
+        {
+            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);
+            var responseSchema = response.Value?.Content?.FirstOrDefault().Value?.Schema;
+            var responseExample = responseContent?.Example;
+            var responseSchemaExample = responseContent?.Schema?.Example;
+
+            var body = responseExample != null ? MapOpenApiAnyToJToken(responseExample) :
+                                   responseSchemaExample != null ? MapOpenApiAnyToJToken(responseSchemaExample) :
+                                   MapSchemaToObject(responseSchema);
+
+            if (!int.TryParse(response.Key, out var httpStatusCode))
+            {
+                httpStatusCode = 200;
+            }
+
+            return new MappingModel
+            {
+                Guid = Guid.NewGuid(),
+                Request = new RequestModel
+                {
+                    Methods = new[] { httpMethod },
+                    Path = MapBasePath(servers) + MapPathWithParameters(path, pathParameters),
+                    Params = MapQueryParameters(queryParameters),
+                    Headers = MapRequestHeaders(headers)
+                },
+                Response = new ResponseModel
+                {
+                    StatusCode = httpStatusCode,
+                    Headers = MapHeaders(responseContentType, response.Value?.Headers),
+                    BodyAsJson = body
+                }
+            };
+        }
+
+        private bool TryGetContent(IDictionary<string, OpenApiMediaType> contents, out OpenApiMediaType openApiMediaType, out string contentType)
+        {
+            openApiMediaType = null;
+            contentType = null;
+
+            if (contents == null || contents.Values.Count == 0)
+            {
+                return false;
+            }
+
+            if (contents.TryGetValue("application/json", out var content))
+            {
+                openApiMediaType = content;
+                contentType = "application/json";
+            }
+            else
+            {
+                var first = contents.FirstOrDefault();
+                openApiMediaType = first.Value;
+                contentType = first.Key;
+            }
+
+            return true;
+        }
+
+        private object MapSchemaToObject(OpenApiSchema schema, string name = null)
+        {
+            if (schema == null)
+            {
+                return null;
+            }
+
+            switch (schema.GetSchemaType())
+            {
+                case SchemaType.Array:
+                    var jArray = new JArray();
+                    for (int i = 0; i < _settings.NumberOfArrayItems; i++)
+                    {
+                        if (schema.Items.Properties.Count > 0)
+                        {
+                            var arrayItem = new JObject();
+                            foreach (var property in schema.Items.Properties)
+                            {
+                                var objectValue = MapSchemaToObject(property.Value, property.Key);
+                                if (objectValue is JProperty jp)
+                                {
+                                    arrayItem.Add(jp);
+                                }
+                                else
+                                {
+                                    arrayItem.Add(new JProperty(property.Key, objectValue));
+                                }
+                            }
+
+                            jArray.Add(arrayItem);
+                        }
+                        else
+                        {
+                            jArray.Add(MapSchemaToObject(schema.Items, name));
+                        }
+                    }
+
+                    if (schema.AllOf.Count > 0)
+                    {
+                        jArray.Add(MapSchemaAllOfToObject(schema));
+                    }
+
+                    return jArray;
+
+                case SchemaType.Boolean:
+                case SchemaType.Integer:
+                case SchemaType.Number:
+                case SchemaType.String:
+                    return _exampleValueGenerator.GetExampleValue(schema);
+
+                case SchemaType.Object:
+                    var propertyAsJObject = new JObject();
+                    foreach (var schemaProperty in schema.Properties)
+                    {
+                        propertyAsJObject.Add(MapPropertyAsJObject(schemaProperty.Value, schemaProperty.Key));
+                    }
+                    if (schema.AllOf.Count > 0)
+                    {
+                        foreach (var property in schema.AllOf)
+                        {
+                            foreach (var item in property.Properties)
+                            {
+                                propertyAsJObject.Add(MapPropertyAsJObject(item.Value, item.Key));
+                            }
+                        }
+                    }
+
+                    return name != null ? new JProperty(name, propertyAsJObject) : (JToken)propertyAsJObject;
+
+                default:
+                    return null;
+            }
+        }
+
+        private JObject MapSchemaAllOfToObject(OpenApiSchema schema)
+        {
+            var arrayItem = new JObject();
+            foreach (var property in schema.AllOf)
+            {
+                foreach (var item in property.Properties)
+                {
+                    arrayItem.Add(MapPropertyAsJObject(item.Value, item.Key));
+                }
+            }
+            return arrayItem;
+        }
+
+        private object MapPropertyAsJObject(OpenApiSchema openApiSchema, string key)
+        {
+            if (openApiSchema.GetSchemaType() == SchemaType.Object || openApiSchema.GetSchemaType() == SchemaType.Array)
+            {
+                var mapped = MapSchemaToObject(openApiSchema, key);
+                if (mapped is JProperty jp)
+                {
+                    return jp;
+                }
+                else
+                {
+                    return new JProperty(key, mapped);
+                }
+            }
+            else
+            {
+                bool propertyIsNullable = openApiSchema.Nullable || (openApiSchema.TryGetXNullable(out bool x) && x);
+                return new JProperty(key, _exampleValueGenerator.GetExampleValue(openApiSchema));
+            }
+        }
+        private string MapPathWithParameters(string path, IEnumerable<OpenApiParameter> parameters)
+        {
+            if (parameters == null)
+            {
+                return path;
+            }
+
+            string newPath = path;
+            foreach (var parameter in parameters)
+            {
+                newPath = newPath.Replace($"{{{parameter.Name}}}", GetExampleValue(parameter.Schema, _settings.PathPatternToUse));
+            }
+
+            return newPath;
+        }
+
+        private string MapBasePath(IList<OpenApiServer> servers)
+        {
+            if (servers == null || servers.Count == 0)
+            {
+                return string.Empty;
+            }
+
+            OpenApiServer server = servers.First();
+            Uri uriResult;
+            if (Uri.TryCreate(server.Url, UriKind.RelativeOrAbsolute, out uriResult))
+            {
+                return uriResult.IsAbsoluteUri ? uriResult.AbsolutePath : uriResult.ToString();
+            }
+            return string.Empty;
+        }
+
+        private JToken MapOpenApiAnyToJToken(IOpenApiAny any)
+        {
+            if (any == null)
+            {
+                return null;
+            }
+
+            using var outputString = new StringWriter();
+            var writer = new OpenApiJsonWriter(outputString);
+            any.Write(writer, OpenApiSpecVersion.OpenApi3_0);
+
+            if (any.AnyType == AnyType.Array)
+            {
+                return JArray.Parse(outputString.ToString());
+            }
+            else
+            {
+                return JObject.Parse(outputString.ToString());
+            }
+        }
+
+        private IDictionary<string, object> MapHeaders(string responseContentType, IDictionary<string, OpenApiHeader> headers)
+        {
+            var mappedHeaders = headers.ToDictionary(
+                item => item.Key,
+                item => GetExampleValue(null, _settings.HeaderPatternToUse) as object
+            );
+
+            if (!string.IsNullOrEmpty(responseContentType))
+            {
+                if (!mappedHeaders.ContainsKey("Content-Type"))
+                {
+                    mappedHeaders.Add("Content-Type", responseContentType);
+                }
+                else
+                {
+                    mappedHeaders["Content-Type"] = responseContentType;
+                }
+            }
+
+            return mappedHeaders.Keys.Any() ? mappedHeaders : null;
+        }
+
+        private IList<ParamModel> MapQueryParameters(IEnumerable<OpenApiParameter> queryParameters)
+        {
+            var list = queryParameters
+                .Select(qp => new ParamModel
+                {
+                    Name = qp.Name,
+                    Matchers = new[]
+                    {
+                        new MatcherModel
+                        {
+                            Name = "ExactMatcher",
+                            Pattern = GetDefaultValueAsStringForSchemaType(qp.Schema)
+                        }
+                    }
+                })
+                .ToList();
+
+            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);
+
+            switch (value)
+            {
+                case string valueAsString:
+                    return valueAsString;
+
+                default:
+                    return value.ToString();
+            }
+        }
+
+        private string GetExampleValue(OpenApiSchema schema, ExampleValueType type)
+        {
+            switch (type)
+            {
+                case ExampleValueType.Value:
+                    return GetDefaultValueAsStringForSchemaType(schema);
+
+                default:
+                    return "*";
+            }
+        }
+    }
+}
--- a/src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs
@@ -0,0 +1,52 @@
+using System;
+
+namespace WireMock.Net.OpenApiParser.Settings
+{
+    /// <summary>
+    /// A interface defining the example values to use for the different types.
+    /// </summary>
+    public interface IWireMockOpenApiParserExampleValues
+    {
+        /// <summary>
+        /// An example value for a Boolean.
+        /// </summary>
+        bool Boolean { get; set; }
+        /// <summary>
+        /// An example value for an Integer.
+        /// </summary>
+        int Integer { get; set; }
+        /// <summary>
+        /// An example value for a Float.
+        /// </summary>
+        float Float { get; set; }
+        /// <summary>
+        /// An example value for a Double.
+        /// </summary>
+        double Double { get; set; }
+
+        /// <summary>
+        /// An example value for a Date.
+        /// </summary>
+        Func<DateTime> Date { get; set; }
+
+        /// <summary>
+        /// An example value for a DateTime.
+        /// </summary>
+        Func<DateTime> DateTime { get; set; }
+
+        /// <summary>
+        /// An example value for Bytes.
+        /// </summary>
+        byte[] Bytes { get; set; }
+
+        /// <summary>
+        /// An example value for a Object.
+        /// </summary>
+        object Object { get; set; }
+
+        /// <summary>
+        /// An example value for a String.
+        /// </summary>
+        string String { get; set; }
+    }
+}
--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs
@@ -0,0 +1,31 @@
+using System;
+using RandomDataGenerator.FieldOptions;
+using RandomDataGenerator.Randomizers;
+
+namespace WireMock.Net.OpenApiParser.Settings
+{
+    /// <summary>
+    /// A class defining the random example values to use for the different types.
+    /// </summary>
+    public class WireMockOpenApiParserDynamicExampleValues : IWireMockOpenApiParserExampleValues
+    {
+        /// <inheritdoc />
+        public bool Boolean { get { return RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true; } set { } }
+        /// <inheritdoc />
+        public int Integer { get { return RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42; } set { } }
+        /// <inheritdoc />
+        public float Float { get { return RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f; } set { } }
+        /// <inheritdoc />
+        public double Double { get { return RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d; } set { } }
+        /// <inheritdoc />
+        public Func<DateTime> Date { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow.Date; } set { } }
+        /// <inheritdoc />
+        public Func<DateTime> DateTime { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow; } set { } }
+        /// <inheritdoc />
+        public byte[] Bytes { get { return RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate(); } set { } }
+        /// <inheritdoc />
+        public object Object { get; set; } = "example-object";
+        /// <inheritdoc />
+        public string String { get { return RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string"; } set { } }
+    }
+}
--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs
@@ -0,0 +1,29 @@
+using System;
+
+namespace WireMock.Net.OpenApiParser.Settings
+{
+    /// <summary>
+    /// A class defining the example values to use for the different types.
+    /// </summary>
+    public class WireMockOpenApiParserExampleValues : IWireMockOpenApiParserExampleValues
+    {
+        /// <inheritdoc />
+        public bool Boolean { get; set; } = true;
+        /// <inheritdoc />
+        public int Integer { get; set; } = 42;
+        /// <inheritdoc />
+        public float Float { get; set; } = 4.2f;
+        /// <inheritdoc />
+        public double Double { get; set; } = 4.2d;
+        /// <inheritdoc />
+        public Func<DateTime> Date { get; set; } = () => System.DateTime.UtcNow.Date;
+        /// <inheritdoc />
+        public Func<DateTime> DateTime { get; set; } = () => System.DateTime.UtcNow;
+        /// <inheritdoc />
+        public byte[] Bytes { get; set; } = { 48, 49, 50 };
+        /// <inheritdoc />
+        public object Object { get; set; } = "example-object";
+        /// <inheritdoc />
+        public string String { get; set; } = "example-string";
+    }
+}
--- a/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserSettings.cs
+++ b/src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserSettings.cs
@@ -0,0 +1,35 @@
+using WireMock.Net.OpenApiParser.Types;
+
+namespace WireMock.Net.OpenApiParser.Settings
+{
+    /// <summary>
+    /// The WireMockOpenApiParser Settings
+    /// </summary>
+    public class WireMockOpenApiParserSettings
+    {
+        /// <summary>
+        /// The number of array items to generate (default is 3).
+        /// </summary>
+        public int NumberOfArrayItems { get; set; } = 3;
+
+        /// <summary>
+        /// The example value type to use when generating a Path
+        /// </summary>
+        public ExampleValueType PathPatternToUse { get; set; } = ExampleValueType.Value;
+
+        /// <summary>
+        /// The example value type to use when generating a Header
+        /// </summary>
+        public ExampleValueType HeaderPatternToUse { get; set; } = ExampleValueType.Value;
+
+        /// <summary>
+        /// The example values to use
+        /// </summary>
+        public IWireMockOpenApiParserExampleValues ExampleValues { get; set; } = new WireMockOpenApiParserExampleValues();
+
+        /// <summary>
+        /// Are examples generated dynamically?
+        /// </summary>
+        public bool DynamicExamples { get; set; } = false;
+    }
+}
--- a/src/WireMock.Net.OpenApiParser/Types/ExampleValueType.cs
+++ b/src/WireMock.Net.OpenApiParser/Types/ExampleValueType.cs
@@ -0,0 +1,18 @@
+namespace WireMock.Net.OpenApiParser.Types
+{
+    /// <summary>
+    /// The example value to use
+    /// </summary>
+    public enum ExampleValueType
+    {
+        /// <summary>
+        /// Use a generated example value based on the SchemaType (default).
+        /// </summary>
+        Value,
+
+        /// <summary>
+        /// Just use a Wildcard (*) character.
+        /// </summary>
+        Wildcard
+    }
+}
--- a/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
+++ b/src/WireMock.Net.OpenApiParser/Utils/ExampleValueGenerator.cs
@@ -1,49 +1,65 @@
 using System;
 using Microsoft.OpenApi.Models;
 using WireMock.Net.OpenApiParser.Extensions;
+using WireMock.Net.OpenApiParser.Settings;
 using WireMock.Net.OpenApiParser.Types;

 namespace WireMock.Net.OpenApiParser.Utils
 {
-    internal static class ExampleValueGenerator
+    internal class ExampleValueGenerator
    {
-        public static object GetExampleValue(OpenApiSchema schema)
+        private readonly WireMockOpenApiParserSettings _settings;
+
+        public ExampleValueGenerator(WireMockOpenApiParserSettings settings)
+        {
+            _settings = settings ?? throw new ArgumentNullException(nameof(settings));
+            if (_settings.DynamicExamples)
+            {
+                _settings.ExampleValues = new WireMockOpenApiParserDynamicExampleValues();
+            }
+            else
+            {
+                _settings.ExampleValues = new WireMockOpenApiParserExampleValues();
+            }
+        }
+
+        public object GetExampleValue(OpenApiSchema schema)
        {
            switch (schema?.GetSchemaType())
            {
                case SchemaType.Boolean:
-                    return true;
+                    return _settings.ExampleValues.Boolean;

                case SchemaType.Integer:
-                    return 42;
+                    return _settings.ExampleValues.Integer;

                case SchemaType.Number:
                    switch (schema?.GetSchemaFormat())
                    {
                        case SchemaFormat.Float:
-                            return 4.2f;
+                            return _settings.ExampleValues.Float;

                        default:
-                            return 4.2d;
+                            return _settings.ExampleValues.Double;
                    }

                default:
                    switch (schema?.GetSchemaFormat())
                    {
                        case SchemaFormat.Date:
-                            return DateTimeUtils.ToRfc3339Date(DateTime.UtcNow);
+                            return DateTimeUtils.ToRfc3339Date(_settings.ExampleValues.Date());

                        case SchemaFormat.DateTime:
-                            return DateTimeUtils.ToRfc3339DateTime(DateTime.UtcNow);
+                            return DateTimeUtils.ToRfc3339DateTime(_settings.ExampleValues.DateTime());

                        case SchemaFormat.Byte:
-                            return new byte[] { 48, 49, 50 };
+                            return _settings.ExampleValues.Bytes;

                        case SchemaFormat.Binary:
-                            return "example-object";
+                            return _settings.ExampleValues.Object;

                        default:
-                            return "example-string";
+                            return _settings.ExampleValues.String;
                    }
            }
        }
--- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
+++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
@@ -12,6 +12,7 @@
 		<AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
 		<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <LangVersion>8.0</LangVersion>
 	</PropertyGroup>

 	<PropertyGroup Condition="'$(Configuration)' == 'Release'">
@@ -24,14 +25,12 @@
 		<PackageReference Include="RamlToOpenApiConverter" Version="0.1.1" />
 		<PackageReference Include="JetBrains.Annotations" Version="2020.1.0" PrivateAssets="All" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+		<PackageReference Include="RandomDataGenerator.Net" Version="1.0.13" />
+		<PackageReference Include="Stef.Validation" Version="0.0.3" />
 	</ItemGroup>

 	<ItemGroup>
 		<ProjectReference Include="..\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj" />
 	</ItemGroup>

-	<ItemGroup>
-		<Folder Include="Options\" />
-	</ItemGroup>
-
 </Project>
--- a/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
+++ b/src/WireMock.Net.OpenApiParser/WireMockOpenApiParser.cs
@@ -1,34 +1,33 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using JetBrains.Annotations;
-using Microsoft.OpenApi;
-using Microsoft.OpenApi.Any;
 using Microsoft.OpenApi.Models;
 using Microsoft.OpenApi.Readers;
-using Microsoft.OpenApi.Writers;
-using Newtonsoft.Json.Linq;
 using RamlToOpenApiConverter;
 using WireMock.Admin.Mappings;
-using WireMock.Net.OpenApiParser.Extensions;
-using WireMock.Net.OpenApiParser.Types;
-using WireMock.Net.OpenApiParser.Utils;
+using WireMock.Net.OpenApiParser.Mappers;
+using WireMock.Net.OpenApiParser.Settings;

 namespace WireMock.Net.OpenApiParser
 {
    /// <summary>
-    /// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock MappingModels.
+    /// Parse a OpenApi/Swagger/V2/V3 or Raml to WireMock.Net MappingModels.
    /// </summary>
    public class WireMockOpenApiParser : IWireMockOpenApiParser
    {
-        private const int ArrayItems = 3;
-
        private readonly OpenApiStreamReader _reader = new OpenApiStreamReader();

-        /// <inheritdoc cref="IWireMockOpenApiParser.FromFile" />
+        /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, out OpenApiDiagnostic)" />
        [PublicAPI]
        public IEnumerable<MappingModel> FromFile(string path, out OpenApiDiagnostic diagnostic)
+        {
+            return FromFile(path, new WireMockOpenApiParserSettings(), out diagnostic);
+        }
+
+        /// <inheritdoc cref="IWireMockOpenApiParser.FromFile(string, WireMockOpenApiParserSettings, out OpenApiDiagnostic)" />
+        [PublicAPI]
+        public IEnumerable<MappingModel> FromFile(string path, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
        {
            OpenApiDocument document;
            if (Path.GetExtension(path).EndsWith("raml", StringComparison.OrdinalIgnoreCase))
@@ -42,248 +41,28 @@ namespace WireMock.Net.OpenApiParser
                document = reader.Read(File.OpenRead(path), out diagnostic);
            }

-            return FromDocument(document);
+            return FromDocument(document, settings);
        }

-        /// <inheritdoc cref="IWireMockOpenApiParser.FromStream" />
+        /// <inheritdoc cref="IWireMockOpenApiParser.FromStream(Stream, out OpenApiDiagnostic)" />
        [PublicAPI]
        public IEnumerable<MappingModel> FromStream(Stream stream, out OpenApiDiagnostic diagnostic)
        {
            return FromDocument(_reader.Read(stream, out diagnostic));
        }

-        /// <inheritdoc cref="IWireMockOpenApiParser.FromDocument" />
+        /// <inheritdoc cref="IWireMockOpenApiParser.FromStream(Stream, WireMockOpenApiParserSettings, out OpenApiDiagnostic)" />
        [PublicAPI]
-        public IEnumerable<MappingModel> FromDocument(OpenApiDocument openApiDocument)
+        public IEnumerable<MappingModel> FromStream(Stream stream, WireMockOpenApiParserSettings settings, out OpenApiDiagnostic diagnostic)
        {
-            return MapPaths(openApiDocument.Paths);
+            return FromDocument(_reader.Read(stream, out diagnostic), settings);
        }

-        private static IEnumerable<MappingModel> MapPaths(OpenApiPaths paths)
+        /// <inheritdoc cref="IWireMockOpenApiParser.FromDocument(OpenApiDocument, WireMockOpenApiParserSettings)" />
+        [PublicAPI]
+        public IEnumerable<MappingModel> FromDocument(OpenApiDocument openApiDocument, WireMockOpenApiParserSettings settings = null)
        {
-            return paths.Select(p => MapPath(p.Key, p.Value)).SelectMany(x => x);
-        }
-
-        private static IEnumerable<MappingModel> MapPath(string path, OpenApiPathItem pathItem)
-        {
-            return pathItem.Operations.Select(o => MapOperationToMappingModel(path, o.Key.ToString().ToUpperInvariant(), o.Value));
-        }
-
-        private static MappingModel MapOperationToMappingModel(string path, string httpMethod, OpenApiOperation operation)
-        {
-            var queryParameters = operation.Parameters.Where(p => p.In == ParameterLocation.Query);
-            var pathParameters = operation.Parameters.Where(p => p.In == ParameterLocation.Path);
-            var response = operation.Responses.FirstOrDefault();
-            TryGetContent(response.Value?.Content, out OpenApiMediaType responseContent, out string responseContentType);
-            var responseSchema = response.Value?.Content?.FirstOrDefault().Value?.Schema;
-            var responseExample = responseContent?.Example;
-
-            var body = responseExample != null ? MapOpenApiAnyToJToken(responseExample) : MapSchemaToObject(responseSchema);
-
-            if (int.TryParse(response.Key, out var httpStatusCode))
-            {
-                httpStatusCode = 200;
-            }
-
-            return new MappingModel
-            {
-                Guid = Guid.NewGuid(),
-                Request = new RequestModel
-                {
-                    Methods = new[] { httpMethod },
-                    Path = MapPathWithParameters(path, pathParameters),
-                    Params = MapQueryParameters(queryParameters)
-                },
-                Response = new ResponseModel
-                {
-                    StatusCode = httpStatusCode,
-                    Headers = MapHeaders(responseContentType, response.Value?.Headers),
-                    BodyAsJson = body
-                }
-            };
-        }
-
-        private static bool TryGetContent(IDictionary<string, OpenApiMediaType> contents, out OpenApiMediaType openApiMediaType, out string contentType)
-        {
-            openApiMediaType = null;
-            contentType = null;
-
-            if (contents == null || contents.Values.Count == 0)
-            {
-                return false;
-            }
-
-            if (contents.TryGetValue("application/json", out var content))
-            {
-                openApiMediaType = content;
-                contentType = "application/json";
-            }
-            else
-            {
-                var first = contents.FirstOrDefault();
-                openApiMediaType = first.Value;
-                contentType = first.Key;
-            }
-
-            return true;
-        }
-
-        private static object MapSchemaToObject(OpenApiSchema schema, string name = null)
-        {
-            if (schema == null)
-            {
-                return null;
-            }
-
-            switch (schema.GetSchemaType())
-            {
-                case SchemaType.Array:
-                    var jArray = new JArray();
-                    for (int i = 0; i < ArrayItems; i++)
-                    {
-                        if (schema.Items.Properties.Count > 0)
-                        {
-                            var arrayItem = new JObject();
-                            foreach (var property in schema.Items.Properties)
-                            {
-                                var objectValue = MapSchemaToObject(property.Value, property.Key);
-                                if (objectValue is JProperty jp)
-                                {
-                                    arrayItem.Add(jp);
-                                }
-                                else
-                                {
-                                    arrayItem.Add(new JProperty(property.Key, objectValue));
-                                }
-                            }
-
-                            jArray.Add(arrayItem);
-                        }
-                        else
-                        {
-                            jArray.Add(MapSchemaToObject(schema.Items, name));
-                        }
-                    }
-
-                    return jArray;
-
-                case SchemaType.Boolean:
-                case SchemaType.Integer:
-                case SchemaType.Number:
-                case SchemaType.String:
-                    return ExampleValueGenerator.GetExampleValue(schema);
-
-                case SchemaType.Object:
-                    var propertyAsJObject = new JObject();
-                    foreach (var schemaProperty in schema.Properties)
-                    {
-                        string propertyName = schemaProperty.Key;
-                        var openApiSchema = schemaProperty.Value;
-                        if (openApiSchema.GetSchemaType() == SchemaType.Object)
-                        {
-                            var mapped = MapSchemaToObject(schemaProperty.Value, schemaProperty.Key);
-                            if (mapped is JProperty jp)
-                            {
-                                propertyAsJObject.Add(jp);
-                            }
-                        }
-                        else
-                        {
-                            bool propertyIsNullable = openApiSchema.Nullable || (openApiSchema.TryGetXNullable(out bool x) && x);
-
-                            propertyAsJObject.Add(new JProperty(propertyName, ExampleValueGenerator.GetExampleValue(openApiSchema)));
-                        }
-                    }
-
-                    return name != null ? new JProperty(name, propertyAsJObject) : (JToken)propertyAsJObject;
-
-                default:
-                    return null;
-            }
-        }
-
-        private static string MapPathWithParameters(string path, IEnumerable<OpenApiParameter> parameters)
-        {
-            if (parameters == null)
-            {
-                return path;
-            }
-
-            string newPath = path;
-            foreach (var parameter in parameters)
-            {
-                newPath = newPath.Replace($"{{{parameter.Name}}}", ExampleValueGenerator.GetExampleValue(parameter.Schema).ToString());
-            }
-
-            return newPath;
-        }
-
-        private static JToken MapOpenApiAnyToJToken(IOpenApiAny any)
-        {
-            if (any == null)
-            {
-                return null;
-            }
-
-            using (var outputString = new StringWriter())
-            {
-                var writer = new OpenApiJsonWriter(outputString);
-                any.Write(writer, OpenApiSpecVersion.OpenApi3_0);
-
-                return JObject.Parse(outputString.ToString());
-            }
-        }
-
-        private static IDictionary<string, object> MapHeaders(string responseContentType, IDictionary<string, OpenApiHeader> headers)
-        {
-            var mappedHeaders = headers.ToDictionary(item => item.Key, item => ExampleValueGenerator.GetExampleValue(null));
-            if (!string.IsNullOrEmpty(responseContentType))
-            {
-                if (!mappedHeaders.ContainsKey("Content-Type"))
-                {
-                    mappedHeaders.Add("Content-Type", responseContentType);
-                }
-                else
-                {
-                    mappedHeaders["Content-Type"] = responseContentType;
-                }
-            }
-
-            return mappedHeaders.Keys.Any() ? mappedHeaders : null;
-        }
-
-        private static IList<ParamModel> MapQueryParameters(IEnumerable<OpenApiParameter> queryParameters)
-        {
-            var list = queryParameters
-                .Select(qp => new ParamModel
-                {
-                    Name = qp.Name,
-                    Matchers = new[]
-                    {
-                        new MatcherModel
-                        {
-                            Name = "ExactMatcher",
-                            Pattern = GetDefaultValueAsStringForSchemaType(qp.Schema)
-                        }
-                    }
-                })
-                .ToList();
-
-            return list.Any() ? list : null;
-        }
-
-        private static string GetDefaultValueAsStringForSchemaType(OpenApiSchema schema)
-        {
-            var value = ExampleValueGenerator.GetExampleValue(schema);
-
-            switch (value)
-            {
-                case string valueAsString:
-                    return valueAsString;
-
-                default:
-                    return value.ToString();
-            }
+            return new OpenApiPathsMapper(settings).ToMappingModels(openApiDocument.Paths, openApiDocument.Servers);
        }
    }
 }
--- 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.StandAlone/StandAloneApp.cs
+++ b/src/WireMock.Net.StandAlone/StandAloneApp.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System.Linq;
+using System.Reflection;
 using JetBrains.Annotations;
 using WireMock.Logging;
 using WireMock.Server;
@@ -12,6 +13,8 @@ namespace WireMock.Net.StandAlone
    /// </summary>
    public static class StandAloneApp
    {
+        private static readonly string Version = typeof(StandAloneApp).GetTypeInfo().Assembly.GetName().Version.ToString();
+
        /// <summary>
        /// Start WireMock.Net standalone Server based on the IWireMockServerSettings.
        /// </summary>
@@ -23,7 +26,8 @@ namespace WireMock.Net.StandAlone

            var server = WireMockServer.Start(settings);

-            settings.Logger?.Info("WireMock.Net server listening at {0}", string.Join(",", server.Urls));
+            settings.Logger?.Info("Version [{0}]", Version);
+            settings.Logger?.Info("Server listening at {0}", string.Join(",", server.Urls));

            return server;
        }
@@ -40,7 +44,8 @@ namespace WireMock.Net.StandAlone

            if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger))
            {
-                settings.Logger?.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+                settings.Logger?.Info("Version [{0}]", Version);
+                settings.Logger?.Debug("Server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));

                return Start(settings);
            }
@@ -61,7 +66,8 @@ namespace WireMock.Net.StandAlone

            if (WireMockServerSettingsParser.TryParseArguments(args, out var settings, logger))
            {
-                settings.Logger?.Debug("WireMock.Net server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));
+                settings.Logger?.Info("Version [{0}]", Version);
+                settings.Logger?.Debug("Server arguments [{0}]", string.Join(", ", args.Select(a => $"'{a}'")));

                server = Start(settings);
                return true;
--- 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,26 @@
+using System.Collections.Generic;
+using System.Linq;
+using AnyOfTypes;
+using JetBrains.Annotations;
+using WireMock.Models;
+
+namespace WireMock.Extensions
+{
+    internal static class AnyOfExtensions
+    {
+        public static string GetPattern([NotNull] this AnyOf<string, StringPattern> value)
+        {
+            return value.IsFirst ? value.First : value.Second.Pattern;
+        }
+
+        public static AnyOf<string, StringPattern>[] ToAnyOfPatterns([NotNull] this IEnumerable<string> patterns)
+        {
+            return patterns.Select(p => p.ToAnyOfPattern()).ToArray();
+        }
+
+        public static AnyOf<string, StringPattern> ToAnyOfPattern([CanBeNull] this string pattern)
+        {
+            return new AnyOf<string, StringPattern>(pattern);
+        }
+    }
+}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Stef Heyenrath	1e968106d1	1.4.26	2021-11-04 07:10:56 +00:00
Daniel L. Romero	49e10ed20f	Support basepath from servers (#675 ) * Support basepath from servers * Refactor BasePath * Comments applied	2021-11-02 15:28:02 +01:00
Daniel L. Romero	c3ec3a66b3	Fix random generate data in url no spaces (#676 ) * Fix random generate data in url no spaces * Format class	2021-11-01 18:53:44 +01:00
Stef Heyenrath	5644491942	1.4.26	2021-10-30 09:26:33 +02:00
Stef Heyenrath	6e5e629525	"RandomDataGenerator.Net" Version="1.0.13"	2021-10-30 09:15:43 +02:00
Daniel L. Romero	77ee123340	Support examples random data generation (#673 ) * Add Support Random Generation in Examples, this commit add the bool property DynamicExamples. * Comments applied * Remove '#pragma warning disable 1591'	2021-10-30 09:13:24 +02:00
Daniel L. Romero	ae2a05e86b	Improve method MapSchemaToObject to support array and object (#670 )	2021-10-28 08:21:30 +02:00
Stef Heyenrath	0e06cf6346	1.4.25	2021-10-27 19:22:46 +02:00
Stef Heyenrath	e9db520cc3	Add TimeSettings (Start, End and TTL) (#661 ) * time * . * UT * using JetBrains.Annotations;	2021-10-27 18:57:13 +02:00
Stef Heyenrath	a0e661fae9	Support Schema Example and Support AllOf in definitions (#669 ) * Support an Example within a Schema * Support AllOf in definitions * Refactor MapSchemaAllOfToObject method and add test files * Include schema examples * Refactor duplicate code, create method MapPropertyAsJObject * Remove commented code * Merge from master + update WireMock.Net.OpenApiParser.ConsoleApp Co-authored-by: Daniel <raiga1234@gmail.com>	2021-10-27 09:40:12 +02:00
Stef Heyenrath	25666152bb	Add JsonPartialWildcardMatcher (#667 ) * JsonPartialWildcardMatcher * . * more tests	2021-10-27 08:16:18 +02:00
Stef Heyenrath	6f5eeb5359	Use IWireMockLogger in example	2021-10-26 18:40:34 +02:00
Stef Heyenrath	7ca2095576	Update logging (add version)	2021-10-24 10:44:39 +02:00
Daniel L. Romero	74edad517b	Support Array in OpenApi Examples (#664 )	2021-10-21 22:12:59 +02:00
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
Stef Heyenrath	b5a5f5e464	1.4.20	2021-08-06 10:20:28 +00:00
Stef Heyenrath	f5d624eeed	Fix issue with FluentBuilder (#628 )	2021-08-06 12:17:05 +02:00
Stef Heyenrath	799ea2d219	1.4.19	2021-08-04 14:38:41 +00:00
Stef Heyenrath	0f99e06acc	Add NotNullOrEmptyMatcher (#625 )	2021-08-04 16:22:22 +02:00
Stef Heyenrath	9d0682bff6	Add FluentBuilder for client models (#622 )	2021-08-04 15:40:35 +02:00
Stef Heyenrath	cb1d2a5294	1.4.18	2021-07-10 11:48:54 +02:00
Stef Heyenrath	4b435faf0b	Update Handlebars.Net.Helpers.XPath to fix issue with 'xml version' (#619 ) Update Handlebars.Net.Helpers.XPath to fix issue with 'xml version'	2021-07-10 11:43:59 +02:00
Stef Heyenrath	5e7cb44525	Update FUNDING.yml	2021-07-07 20:07:40 +02:00
Stef Heyenrath	444298c28c	1.4.17	2021-07-07 18:31:07 +02:00
Stef Heyenrath	6f42aa99bc	Handlebars.Net.Helpers.Humanizer (#617 )	2021-07-07 17:02:15 +02:00
Stef Heyenrath	8a9ea1b843	Update FUNDING.yml	2021-07-06 12:13:13 +02:00
Stef Heyenrath	dade24de37	Update FUNDING.yml	2021-07-06 12:12:48 +02:00
Stef Heyenrath	6beaa631f4	Update FUNDING.yml	2021-07-03 09:44:33 +02:00
Stef Heyenrath	282281aa7f	1.4.16	2021-06-05 11:00:51 +02:00
Stef Heyenrath	4052a0ef3b	Upgrade Handlebars.Net.Helpers to 2.19 (#616 ) * Upgrade Handlebars.Net.Helpers to 2.19 * fix ut	2021-06-05 10:59:09 +02:00
Stef Heyenrath	2ca394b7f6	1.4.15	2021-05-19 12:01:19 +00:00
Stef Heyenrath	b04000bfdd	Add support for multiple webhooks (#615 )	2021-05-19 13:58:48 +02:00
Stef Heyenrath	93ab4e1853	1.4.14	2021-05-11 05:45:07 +00:00
starkpl	80b5eaac6e	Add AdditionalServiceRegistration action for custom ASP.NET Core DI setup (#611 )	2021-05-11 07:37:20 +02:00
Stef Heyenrath	a1dc2ba646	condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests (#612 )	2021-05-10 22:06:42 +02:00
Stef Heyenrath	934c444902	Fix some SonarCloud issues in UnitTests (#610 )	2021-05-07 18:23:23 +02:00
Stef Heyenrath	83d178bdb5	1.4.13	2021-04-26 14:53:15 +00:00
Stef Heyenrath	d91b5d5831	Add possibility to use settings to generate MappingModel models with wildcard path parameters. (#609 ) * Add optional settings for WithMappingFromOpenApi * . * . * cleanup	2021-04-26 14:44:45 +02:00
Stef Heyenrath	43b96ce340	Add OpenApiParser NuGet to readme	2021-04-23 17:51:45 +02:00
dependabot[bot]	4d8cf43357	Bump System.Text.Encodings.Web (#607 ) Bumps [System.Text.Encodings.Web](https://github.com/dotnet/corefx) from 4.5.0 to 4.5.1. - [Release notes](https://github.com/dotnet/corefx/releases) - [Commits](https://github.com/dotnet/corefx/commits) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-04-22 18:11:30 +02:00
Stef Heyenrath	328e9090b1	1.4.12	2021-04-22 06:46:24 +00:00
dependabot[bot]	a22b3bfbc5	Bump System.Net.Http in /examples/WireMock.Net.Service (#606 ) Bumps System.Net.Http from 4.3.3 to 4.3.4. Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-04-22 07:49:32 +02:00
dependabot[bot]	29974c7ad4	Bump System.Net.Http from 4.3.3 to 4.3.4 in /src/WireMock.Net (#605 ) Bumps System.Net.Http from 4.3.3 to 4.3.4. Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2021-04-22 07:48:39 +02:00
Stef Heyenrath	660a09e656	1.4.11	2021-04-18 21:32:42 +02:00
Stef Heyenrath	fbecd3b119	Fix match logic (#604 )	2021-04-18 21:30:03 +02:00
Stef Heyenrath	b17840cea9	1.4.10	2021-04-15 19:46:41 +02:00
Stef Heyenrath	969b0da8e2	Fix callback with Headers (#603 )	2021-04-15 19:41:45 +02:00
Stef Heyenrath	dc078b57ea	1.4.9	2021-03-31 18:23:49 +02:00
Stef Heyenrath	8140b37095	WithProxy() should save the new mapping (#600 ) * WithProxy should save the new mapping * fix ut * .	2021-03-31 18:17:27 +02:00
Stef Heyenrath	2ad060bbd4	1.4.8	2021-03-24 17:20:31 +00:00
Stef Heyenrath	d758301e4f	Webhook (#591 ) Webhook	2021-03-24 18:15:31 +01:00
Stef Heyenrath	cee73023c7	1.4.7	2021-03-21 09:22:18 +01:00
Ben Arnold	6f7d2c83f5	Remove an approximate two second delay in response to the first request from a new socket connection, only occuring on some Windows 10 machines. (#597 ) A side-effect of this fix is that is also allows connections to IPv6 addresses.	2021-03-21 09:12:19 +01:00
Stef Heyenrath	2fb0f92a2d	Use Handlebars.Net.Helpers Version="2.1.2" (#595 )	2021-03-19 15:17:39 +01:00
Stef Heyenrath	ddf2b49240	wip (#594 )	2021-03-18 14:29:13 +01:00
Stef Heyenrath	3617e95db6	1.4.6	2021-02-26 12:37:54 +00:00
Stef Heyenrath	aa8510fab3	Fix WithCallback logic when using other fluent builder statements (#587 )	2021-02-26 13:10:25 +01:00
Stef Heyenrath	e23249c144	1.4.5	2021-02-11 11:03:09 +00:00
Roman Vovk	7a8f4c3630	Fix response date header (#585 )	2021-02-11 11:49:24 +01:00
Stef Heyenrath	ddcf2b29a3	coverlet	2021-02-09 20:43:24 +01:00