wip

2026-02-13 22:07:41 +01:00 · 2018-11-22 16:44:14 +01:00
1345 changed files with 56742 additions and 193995 deletions
--- a/.axoCover/settings.json
+++ b/.axoCover/settings.json
@@ -0,0 +1,15 @@
+{
+  "TestRunner": "",
+  "TestPlatform": "x86",
+  "TestApartmentState": "STA",
+  "TestSettings": "",
+  "ExcludeAttributes": "System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute",
+  "ExcludeFiles": "",
+  "ExcludeDirectories": "",
+  "Filters": "+[*]*",
+  "IsIncludingSolutionAssemblies": true,
+  "IsExcludingTestAssemblies": false,
+  "IsCoveringByTest": true,
+  "IsMergingByHash": true,
+  "IsSkippingAutoProps": true
+}
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,10 +0,0 @@
-[*]
-indent_style = space
-indent_size = 4
-end_of_line = crlf
-charset = utf-8
-trim_trailing_whitespace = true
-
-# C# files
-[*.cs]
-file_header_template=Copyright © WireMock.Net
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,12 +0,0 @@
-# These are supported funding model platforms
-
-github: [StefH]
-patreon: # Replace with a single Patreon 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
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: https://www.paypal.me/stefheyenrath
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,21 +0,0 @@
---
-name: Bug report
-about: Create a report
-title: ''
-labels: bug
-assignees: ''
-
---
-
-### Describe the bug
-A clear and concise description of what the bug is.
-
-### Expected behavior:
-A clear and concise description of what you expected to happen.
-
-### Test to reproduce
- 1
- 2
-
-### Other related info
-Provide additional information if any.
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,23 +0,0 @@
---
-name: Feature request
-about: Suggest an idea or new feature
-title: ''
-labels: feature
-assignees: ''
-
---
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is.
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Is your feature request supported by [WireMock (java version)](https://www.wiremock.org)? Please provide details.**
-Provide relevant information if requested feature is supported but is missing in this implementation.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,14 +0,0 @@
---
-name: Question
-about: Ask a question
-title: ''
-labels: question
-assignees: ''
-
---
-
-Ask question related to the repo, e.g:
- How to achieve ... ?
- How does ... work?
-
-Please be specific so we can provide the best answer possible.
--- a/.github/copilot-instructions.md
+++ b/.github/copilot-instructions.md
@@ -1,4 +0,0 @@
-# Copilot Instructions
-
-## Project Guidelines
- All new byte[xx] calls should use using var data = ArrayPool<byte>.Shared.Lease(xx); instead of directly allocating byte arrays
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -1,21 +0,0 @@
-name: CreateRelease
-
-permissions:
-  contents: write
-
-on:
-  push:
-    tags:
-      - "*.*.*"
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Release
-        uses: softprops/action-gh-release@v2
-        with:
-          generate_release_notes: true
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,70 +0,0 @@
-name: Run Tests
-
-on: 
-  pull_request:
-    branches:
-      - '**'
-  push:
-    branches:
-      - 'main'
-
-jobs:
-  windows-build-and-run:
-    name: Run Tests on Windows 
-    runs-on: windows-2022
-
-    env:
-      IsRunningOnGitHubActions: 'true'
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Setup .NET 8
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '8.0.x'
-
-    - name: 'WireMock.Net.Tests'
-      run: dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0
-
-    - name: 'WireMock.Net.Tests.UsingNuGet'
-      run: dotnet test './test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj' -c Release
-
-    - name: 'WireMock.Net.TUnitTests'
-      run: dotnet test './test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj' -c Release --framework net8.0
-
-    - name: 'WireMock.Net.Middleware.Tests'
-      run: dotnet test './test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj' -c Release --framework net8.0
-
-  linux-build-and-run:
-    name: Run Tests on Linux
-    runs-on: ubuntu-latest
-
-    env:
-        IsRunningOnGitHubActions: 'true'
-
-    steps:
-    - uses: actions/checkout@v4
-
-    - name: Setup .NET 8
-      uses: actions/setup-dotnet@v4
-      with:
-        dotnet-version: '8.0.x'
-
-    - name: 'WireMock.Net.Tests'
-      run: dotnet test './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj' -c Release --framework net8.0
-
-    - name: 'WireMock.Net.Tests.UsingNuGet'
-      run: dotnet test './test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj' -c Release
-
-    - name: 'WireMock.Net.TUnitTests'
-      run: dotnet test './test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj' -c Release --framework net8.0
-
-    - name: 'WireMock.Net.Middleware.Tests'
-      run: dotnet test './test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj' -c Release --framework net8.0
-
-    - name: Install .NET Aspire workload
-      run: dotnet workload install aspire
-
-    - name: 'WireMock.Net.Aspire.Tests'
-      run: dotnet test './test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj' -c Release
--- a/.github/workflows/copilot-setup-steps.yml
+++ b/.github/workflows/copilot-setup-steps.yml
@@ -1,36 +0,0 @@
-name: "Copilot Setup Steps"
-
-# Automatically run the setup steps when they are changed to allow for easy validation, and
-# allow manual testing through the repository's "Actions" tab
-on:
-  workflow_dispatch:
-  push:
-    paths:
-      - .github/workflows/copilot-setup-steps.yml
-  pull_request:
-    paths:
-      - .github/workflows/copilot-setup-steps.yml
-
-jobs:
-  # The job MUST be called `copilot-setup-steps` or it will not be picked up by Copilot.
-  copilot-setup-steps:
-    runs-on: ubuntu-latest
-
-    # Set the permissions to the lowest permissions possible needed for your steps.
-    # Copilot will be given its own token for its operations.
-    permissions:
-      # If you want to clone the repository as part of your setup steps, for example to install dependencies, you'll need the `contents: read` permission. If you don't clone the repository in your setup steps, Copilot will do this for you automatically after the steps complete.
-      contents: read
-
-    # You can define any steps you want, and they will run before the agent starts.
-    # If you do not check out your code, Copilot will do this for you.
-    steps:
-      - name: Install .NET 10.x
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: |
-            10.x
-          dotnet-quality: preview
-
-      - name: dotnet --info
-        run: dotnet --info
--- a/.gitignore
+++ b/.gitignore
@@ -250,10 +250,3 @@ paket-files/
 # JetBrains Rider
 .idea/
 *.sln.iml
-
-./report/coverlet/
-/test/WireMock.Net.Tests/coverage.opencover.xml
-/test/WireMock.Net.Tests/coverage.netcoreapp3.1.opencover.xml
-/test/WireMock.Net.Tests/coverage.net8.0.opencover.xml
-
-*.received.*
--- a/.runsettings
+++ b/.runsettings
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RunSettings>
+  <DataCollectionRunSettings>
+    <DataCollectors>
+      <DataCollector friendlyName="Code Coverage" 
+                     uri="datacollector://Microsoft/CodeCoverage/2.0" 
+                     assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+        <Configuration>
+          <CodeCoverage>
+            <ModulePaths>
+              <Include>
+                <ModulePath>.*\.dll$</ModulePath>
+              </Include>
+              <Exclude>
+                <ModulePath>.*Validation.*</ModulePath>
+                <ModulePath>.*\.tests.dll$</ModulePath>
+                <ModulePath>.*simmetrics.*</ModulePath>
+              </Exclude>
+            </ModulePaths>
+            <UseVerifiableInstrumentation>True</UseVerifiableInstrumentation>
+            <AllowLowIntegrityProcesses>True</AllowLowIntegrityProcesses>
+            <CollectFromChildProcesses>True</CollectFromChildProcesses>
+            <CollectAspDotNet>False</CollectAspDotNet>
+          </CodeCoverage>
+        </Configuration>
+      </DataCollector>
+    </DataCollectors>
+  </DataCollectionRunSettings>
+</RunSettings>
--- a/.sonarlint/WireMock.Net
+++ b/.sonarlint/WireMock.Net
@@ -0,0 +1,14 @@
+{
+  "ServerUri": "https://sonarcloud.io",
+  "Organization": {
+    "Key": "stefh-github",
+    "Name": "Stef Heyenrath (Organization)"
+  },
+  "ProjectKey": "wiremock",
+  "Profiles": {
+    "CSharp": {
+      "ProfileKey": "AWRupN8iowGp6EI3lYmF",
+      "ProfileTimestamp": "2018-09-06T11:06:47+02:00"
+    }
+  }
+}
--- a/.sonarlint/wiremockCSharp.ruleset
+++ b/.sonarlint/wiremockCSharp.ruleset
@@ -0,0 +1,362 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="SonarQube - wiremock Sonar way" Description="This rule set was automatically generated from SonarQube.&#xD;&#xA;https://sonarcloud.io/profiles/show?key=AWRupN8iowGp6EI3lYmF" ToolsVersion="15.0">
+  <Rules AnalyzerId="SonarAnalyzer.CSharp" RuleNamespace="SonarAnalyzer.CSharp">
+    <Rule Id="S100" Action="None" />
+    <Rule Id="S1006" Action="Warning" />
+    <Rule Id="S101" Action="Warning" />
+    <Rule Id="S103" Action="None" />
+    <Rule Id="S104" Action="None" />
+    <Rule Id="S1048" Action="Warning" />
+    <Rule Id="S105" Action="None" />
+    <Rule Id="S106" Action="None" />
+    <Rule Id="S1066" Action="Warning" />
+    <Rule Id="S1067" Action="None" />
+    <Rule Id="S107" Action="Warning" />
+    <Rule Id="S1075" Action="Warning" />
+    <Rule Id="S108" Action="Warning" />
+    <Rule Id="S109" Action="None" />
+    <Rule Id="S110" Action="Warning" />
+    <Rule Id="S1104" Action="Warning" />
+    <Rule Id="S1109" Action="None" />
+    <Rule Id="S1110" Action="Warning" />
+    <Rule Id="S1116" Action="Warning" />
+    <Rule Id="S1117" Action="Warning" />
+    <Rule Id="S1118" Action="Warning" />
+    <Rule Id="S112" Action="Warning" />
+    <Rule Id="S1121" Action="Warning" />
+    <Rule Id="S1123" Action="Warning" />
+    <Rule Id="S1125" Action="Warning" />
+    <Rule Id="S113" Action="None" />
+    <Rule Id="S1134" Action="Warning" />
+    <Rule Id="S1135" Action="Warning" />
+    <Rule Id="S1144" Action="Warning" />
+    <Rule Id="S1145" Action="None" />
+    <Rule Id="S1147" Action="None" />
+    <Rule Id="S1151" Action="None" />
+    <Rule Id="S1155" Action="Warning" />
+    <Rule Id="S1163" Action="Warning" />
+    <Rule Id="S1168" Action="Warning" />
+    <Rule Id="S1172" Action="Warning" />
+    <Rule Id="S1185" Action="Warning" />
+    <Rule Id="S1186" Action="Warning" />
+    <Rule Id="S1192" Action="None" />
+    <Rule Id="S1200" Action="None" />
+    <Rule Id="S1206" Action="Warning" />
+    <Rule Id="S121" Action="None" />
+    <Rule Id="S1210" Action="Warning" />
+    <Rule Id="S1215" Action="Warning" />
+    <Rule Id="S122" Action="None" />
+    <Rule Id="S1226" Action="None" />
+    <Rule Id="S1227" Action="None" />
+    <Rule Id="S1244" Action="None" />
+    <Rule Id="S125" Action="Warning" />
+    <Rule Id="S126" Action="None" />
+    <Rule Id="S1264" Action="Warning" />
+    <Rule Id="S127" Action="None" />
+    <Rule Id="S1301" Action="None" />
+    <Rule Id="S1309" Action="None" />
+    <Rule Id="S131" Action="None" />
+    <Rule Id="S1313" Action="None" />
+    <Rule Id="S134" Action="None" />
+    <Rule Id="S138" Action="None" />
+    <Rule Id="S1449" Action="None" />
+    <Rule Id="S1450" Action="Warning" />
+    <Rule Id="S1451" Action="None" />
+    <Rule Id="S1479" Action="Warning" />
+    <Rule Id="S1481" Action="Warning" />
+    <Rule Id="S1541" Action="None" />
+    <Rule Id="S1607" Action="Warning" />
+    <Rule Id="S1643" Action="Warning" />
+    <Rule Id="S1656" Action="Warning" />
+    <Rule Id="S1659" Action="None" />
+    <Rule Id="S1694" Action="None" />
+    <Rule Id="S1696" Action="None" />
+    <Rule Id="S1697" Action="None" />
+    <Rule Id="S1698" Action="None" />
+    <Rule Id="S1699" Action="Warning" />
+    <Rule Id="S1751" Action="Warning" />
+    <Rule Id="S1764" Action="Warning" />
+    <Rule Id="S1821" Action="None" />
+    <Rule Id="S1848" Action="Warning" />
+    <Rule Id="S1854" Action="Warning" />
+    <Rule Id="S1858" Action="None" />
+    <Rule Id="S1862" Action="Warning" />
+    <Rule Id="S1871" Action="Warning" />
+    <Rule Id="S1905" Action="Warning" />
+    <Rule Id="S1939" Action="Warning" />
+    <Rule Id="S1940" Action="Warning" />
+    <Rule Id="S1944" Action="Warning" />
+    <Rule Id="S1994" Action="None" />
+    <Rule Id="S2068" Action="Warning" />
+    <Rule Id="S2070" Action="None" />
+    <Rule Id="S2092" Action="None" />
+    <Rule Id="S2114" Action="Warning" />
+    <Rule Id="S2123" Action="Warning" />
+    <Rule Id="S2148" Action="None" />
+    <Rule Id="S2156" Action="None" />
+    <Rule Id="S2178" Action="Warning" />
+    <Rule Id="S2183" Action="Warning" />
+    <Rule Id="S2184" Action="Warning" />
+    <Rule Id="S2187" Action="Warning" />
+    <Rule Id="S2190" Action="Warning" />
+    <Rule Id="S2197" Action="None" />
+    <Rule Id="S2201" Action="Warning" />
+    <Rule Id="S2219" Action="Warning" />
+    <Rule Id="S2221" Action="None" />
+    <Rule Id="S2223" Action="Warning" />
+    <Rule Id="S2225" Action="Warning" />
+    <Rule Id="S2228" Action="None" />
+    <Rule Id="S2234" Action="Warning" />
+    <Rule Id="S2245" Action="Warning" />
+    <Rule Id="S2255" Action="Warning" />
+    <Rule Id="S2259" Action="Warning" />
+    <Rule Id="S2275" Action="Warning" />
+    <Rule Id="S2278" Action="Warning" />
+    <Rule Id="S2290" Action="Warning" />
+    <Rule Id="S2291" Action="Warning" />
+    <Rule Id="S2292" Action="Warning" />
+    <Rule Id="S2302" Action="None" />
+    <Rule Id="S2306" Action="Warning" />
+    <Rule Id="S2325" Action="None" />
+    <Rule Id="S2326" Action="Warning" />
+    <Rule Id="S2327" Action="Warning" />
+    <Rule Id="S2328" Action="Warning" />
+    <Rule Id="S2330" Action="None" />
+    <Rule Id="S2333" Action="None" />
+    <Rule Id="S2339" Action="None" />
+    <Rule Id="S2342" Action="Warning" />
+    <Rule Id="S2344" Action="Warning" />
+    <Rule Id="S2345" Action="Warning" />
+    <Rule Id="S2346" Action="Warning" />
+    <Rule Id="S2357" Action="None" />
+    <Rule Id="S2360" Action="None" />
+    <Rule Id="S2365" Action="Warning" />
+    <Rule Id="S2368" Action="Warning" />
+    <Rule Id="S2372" Action="Warning" />
+    <Rule Id="S2376" Action="Warning" />
+    <Rule Id="S2386" Action="Warning" />
+    <Rule Id="S2387" Action="None" />
+    <Rule Id="S2436" Action="Warning" />
+    <Rule Id="S2437" Action="Warning" />
+    <Rule Id="S2486" Action="Warning" />
+    <Rule Id="S2551" Action="Warning" />
+    <Rule Id="S2583" Action="Warning" />
+    <Rule Id="S2589" Action="Warning" />
+    <Rule Id="S2674" Action="None" />
+    <Rule Id="S2681" Action="Warning" />
+    <Rule Id="S2688" Action="Warning" />
+    <Rule Id="S2692" Action="Warning" />
+    <Rule Id="S2696" Action="Warning" />
+    <Rule Id="S2699" Action="None" />
+    <Rule Id="S2701" Action="None" />
+    <Rule Id="S2737" Action="Warning" />
+    <Rule Id="S2743" Action="Warning" />
+    <Rule Id="S2757" Action="Warning" />
+    <Rule Id="S2758" Action="Warning" />
+    <Rule Id="S2760" Action="None" />
+    <Rule Id="S2761" Action="Warning" />
+    <Rule Id="S2930" Action="Warning" />
+    <Rule Id="S2931" Action="None" />
+    <Rule Id="S2933" Action="Warning" />
+    <Rule Id="S2934" Action="Warning" />
+    <Rule Id="S2952" Action="None" />
+    <Rule Id="S2953" Action="Warning" />
+    <Rule Id="S2955" Action="None" />
+    <Rule Id="S2971" Action="Warning" />
+    <Rule Id="S2995" Action="Warning" />
+    <Rule Id="S2996" Action="Warning" />
+    <Rule Id="S2997" Action="Warning" />
+    <Rule Id="S3005" Action="Warning" />
+    <Rule Id="S3010" Action="Warning" />
+    <Rule Id="S3052" Action="None" />
+    <Rule Id="S3060" Action="Warning" />
+    <Rule Id="S3168" Action="Warning" />
+    <Rule Id="S3169" Action="Warning" />
+    <Rule Id="S3172" Action="Warning" />
+    <Rule Id="S3215" Action="None" />
+    <Rule Id="S3216" Action="None" />
+    <Rule Id="S3217" Action="Warning" />
+    <Rule Id="S3218" Action="Warning" />
+    <Rule Id="S3220" Action="Warning" />
+    <Rule Id="S3234" Action="None" />
+    <Rule Id="S3235" Action="None" />
+    <Rule Id="S3236" Action="Warning" />
+    <Rule Id="S3237" Action="Warning" />
+    <Rule Id="S3240" Action="None" />
+    <Rule Id="S3241" Action="Warning" />
+    <Rule Id="S3242" Action="None" />
+    <Rule Id="S3244" Action="Warning" />
+    <Rule Id="S3246" Action="Warning" />
+    <Rule Id="S3247" Action="Warning" />
+    <Rule Id="S3249" Action="Warning" />
+    <Rule Id="S3251" Action="Warning" />
+    <Rule Id="S3253" Action="None" />
+    <Rule Id="S3254" Action="None" />
+    <Rule Id="S3256" Action="Warning" />
+    <Rule Id="S3257" Action="None" />
+    <Rule Id="S3261" Action="Warning" />
+    <Rule Id="S3262" Action="Warning" />
+    <Rule Id="S3263" Action="Warning" />
+    <Rule Id="S3264" Action="Warning" />
+    <Rule Id="S3265" Action="Warning" />
+    <Rule Id="S3330" Action="None" />
+    <Rule Id="S3343" Action="Warning" />
+    <Rule Id="S3346" Action="Warning" />
+    <Rule Id="S3353" Action="None" />
+    <Rule Id="S3358" Action="Warning" />
+    <Rule Id="S3366" Action="None" />
+    <Rule Id="S3376" Action="Warning" />
+    <Rule Id="S3397" Action="Warning" />
+    <Rule Id="S3400" Action="Warning" />
+    <Rule Id="S3415" Action="Warning" />
+    <Rule Id="S3427" Action="Warning" />
+    <Rule Id="S3431" Action="None" />
+    <Rule Id="S3433" Action="Warning" />
+    <Rule Id="S3440" Action="Warning" />
+    <Rule Id="S3441" Action="None" />
+    <Rule Id="S3442" Action="Warning" />
+    <Rule Id="S3443" Action="Warning" />
+    <Rule Id="S3444" Action="Warning" />
+    <Rule Id="S3445" Action="Warning" />
+    <Rule Id="S3447" Action="Warning" />
+    <Rule Id="S3449" Action="Warning" />
+    <Rule Id="S3450" Action="Warning" />
+    <Rule Id="S3451" Action="Warning" />
+    <Rule Id="S3453" Action="Warning" />
+    <Rule Id="S3456" Action="Warning" />
+    <Rule Id="S3457" Action="Warning" />
+    <Rule Id="S3458" Action="Warning" />
+    <Rule Id="S3459" Action="Warning" />
+    <Rule Id="S3464" Action="Warning" />
+    <Rule Id="S3466" Action="Warning" />
+    <Rule Id="S3532" Action="None" />
+    <Rule Id="S3597" Action="Warning" />
+    <Rule Id="S3598" Action="Warning" />
+    <Rule Id="S3600" Action="Warning" />
+    <Rule Id="S3603" Action="Warning" />
+    <Rule Id="S3604" Action="Warning" />
+    <Rule Id="S3610" Action="Warning" />
+    <Rule Id="S3626" Action="Warning" />
+    <Rule Id="S3655" Action="Warning" />
+    <Rule Id="S3693" Action="Warning" />
+    <Rule Id="S3717" Action="None" />
+    <Rule Id="S3776" Action="Warning" />
+    <Rule Id="S3869" Action="Warning" />
+    <Rule Id="S3871" Action="Warning" />
+    <Rule Id="S3872" Action="None" />
+    <Rule Id="S3874" Action="None" />
+    <Rule Id="S3875" Action="Warning" />
+    <Rule Id="S3876" Action="None" />
+    <Rule Id="S3877" Action="Warning" />
+    <Rule Id="S3880" Action="None" />
+    <Rule Id="S3881" Action="Warning" />
+    <Rule Id="S3884" Action="Warning" />
+    <Rule Id="S3885" Action="Warning" />
+    <Rule Id="S3887" Action="Warning" />
+    <Rule Id="S3889" Action="Warning" />
+    <Rule Id="S3897" Action="Warning" />
+    <Rule Id="S3898" Action="None" />
+    <Rule Id="S3900" Action="None" />
+    <Rule Id="S3902" Action="None" />
+    <Rule Id="S3903" Action="Warning" />
+    <Rule Id="S3904" Action="Warning" />
+    <Rule Id="S3906" Action="None" />
+    <Rule Id="S3908" Action="None" />
+    <Rule Id="S3909" Action="None" />
+    <Rule Id="S3923" Action="Warning" />
+    <Rule Id="S3925" Action="Warning" />
+    <Rule Id="S3926" Action="Warning" />
+    <Rule Id="S3927" Action="Warning" />
+    <Rule Id="S3928" Action="Warning" />
+    <Rule Id="S3937" Action="None" />
+    <Rule Id="S3956" Action="None" />
+    <Rule Id="S3962" Action="None" />
+    <Rule Id="S3963" Action="Warning" />
+    <Rule Id="S3966" Action="Warning" />
+    <Rule Id="S3967" Action="None" />
+    <Rule Id="S3971" Action="Warning" />
+    <Rule Id="S3972" Action="Warning" />
+    <Rule Id="S3973" Action="Warning" />
+    <Rule Id="S3981" Action="Warning" />
+    <Rule Id="S3984" Action="Warning" />
+    <Rule Id="S3990" Action="None" />
+    <Rule Id="S3992" Action="None" />
+    <Rule Id="S3993" Action="None" />
+    <Rule Id="S3994" Action="None" />
+    <Rule Id="S3995" Action="None" />
+    <Rule Id="S3996" Action="None" />
+    <Rule Id="S3997" Action="None" />
+    <Rule Id="S3998" Action="Warning" />
+    <Rule Id="S4000" Action="None" />
+    <Rule Id="S4002" Action="None" />
+    <Rule Id="S4004" Action="None" />
+    <Rule Id="S4005" Action="None" />
+    <Rule Id="S4015" Action="Warning" />
+    <Rule Id="S4016" Action="Warning" />
+    <Rule Id="S4017" Action="None" />
+    <Rule Id="S4018" Action="None" />
+    <Rule Id="S4019" Action="Warning" />
+    <Rule Id="S4022" Action="None" />
+    <Rule Id="S4023" Action="None" />
+    <Rule Id="S4025" Action="None" />
+    <Rule Id="S4026" Action="None" />
+    <Rule Id="S4027" Action="None" />
+    <Rule Id="S4035" Action="Warning" />
+    <Rule Id="S4039" Action="None" />
+    <Rule Id="S4040" Action="None" />
+    <Rule Id="S4041" Action="None" />
+    <Rule Id="S4047" Action="None" />
+    <Rule Id="S4049" Action="None" />
+    <Rule Id="S4050" Action="None" />
+    <Rule Id="S4052" Action="None" />
+    <Rule Id="S4055" Action="None" />
+    <Rule Id="S4056" Action="None" />
+    <Rule Id="S4057" Action="None" />
+    <Rule Id="S4058" Action="None" />
+    <Rule Id="S4059" Action="None" />
+    <Rule Id="S4060" Action="None" />
+    <Rule Id="S4061" Action="Warning" />
+    <Rule Id="S4069" Action="None" />
+    <Rule Id="S4070" Action="None" />
+    <Rule Id="S4142" Action="None" />
+    <Rule Id="S4143" Action="Warning" />
+    <Rule Id="S4144" Action="Warning" />
+    <Rule Id="S4158" Action="Warning" />
+    <Rule Id="S4159" Action="Warning" />
+    <Rule Id="S4200" Action="Warning" />
+    <Rule Id="S4210" Action="Warning" />
+    <Rule Id="S4211" Action="Warning" />
+    <Rule Id="S4212" Action="None" />
+    <Rule Id="S4214" Action="Warning" />
+    <Rule Id="S4220" Action="Warning" />
+    <Rule Id="S4225" Action="None" />
+    <Rule Id="S4226" Action="None" />
+    <Rule Id="S4260" Action="Warning" />
+    <Rule Id="S4261" Action="None" />
+    <Rule Id="S4275" Action="Warning" />
+    <Rule Id="S4277" Action="Warning" />
+    <Rule Id="S4426" Action="Warning" />
+    <Rule Id="S4428" Action="Warning" />
+    <Rule Id="S4432" Action="None" />
+    <Rule Id="S4433" Action="Warning" />
+    <Rule Id="S4456" Action="Warning" />
+    <Rule Id="S4457" Action="Warning" />
+    <Rule Id="S4462" Action="None" />
+    <Rule Id="S4524" Action="Warning" />
+    <Rule Id="S4564" Action="None" />
+    <Rule Id="S4581" Action="Warning" />
+    <Rule Id="S4586" Action="Warning" />
+    <Rule Id="S818" Action="Warning" />
+    <Rule Id="S881" Action="None" />
+    <Rule Id="S907" Action="Warning" />
+    <Rule Id="S927" Action="Warning" />
+  </Rules>
+  <Rules AnalyzerId="SonarAnalyzer.Security" RuleNamespace="SonarAnalyzer.Security">
+    <Rule Id="S2076" Action="Warning" />
+    <Rule Id="S2078" Action="Warning" />
+    <Rule Id="S2083" Action="Warning" />
+    <Rule Id="S2091" Action="Warning" />
+    <Rule Id="S2631" Action="Warning" />
+    <Rule Id="S3649" Action="Warning" />
+  </Rules>
+</RuleSet>
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Launch (WireMock.Net.StandAlone.NETCoreApp)",
+            "type": "coreclr",
+            "request": "launch",
+            "preLaunchTask": "build_WireMock.Net.StandAlone.NETCoreApp",
+            "program": "${workspaceRoot}/examples/WireMock.Net.StandAlone.NETCoreApp/bin/Debug/netcoreapp2.0/WireMock.Net.StandAlone.NETCoreApp.dll",
+            "args": [],
+            "cwd": "${workspaceRoot}",
+            "stopAtEntry": false,
+            "console": "internalConsole"
+        },
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -0,0 +1,17 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "taskName": "build_WireMock.Net.StandAlone.NETCoreApp",
+            "command": "dotnet build ${workspaceRoot}/examples/WireMock.Net.StandAlone.NETCoreApp/WireMock.Net.StandAlone.NETCoreApp.csproj -f netcoreapp2.0 ",
+            "type": "shell",
+            "group": "build",
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,68 +1,19 @@
 <Project>
-    <PropertyGroup>
-        <MsBuildAllProjects>$(MsBuildAllProjects);$(MsBuildThisFileFullPath)</MsBuildAllProjects>
-    </PropertyGroup>
+  <PropertyGroup>
+    <MsBuildAllProjects>$(MsBuildAllProjects);$(MsBuildThisFileFullPath)</MsBuildAllProjects>
+  </PropertyGroup>

-    <PropertyGroup>
-        <VersionPrefix>1.25.0</VersionPrefix>
-        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
-        <PackageProjectUrl>https://github.com/wiremock/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/WireMock.Net</RepositoryUrl>
-        <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
-        <PackageReadmeFile>PackageReadme.md</PackageReadmeFile>
-        <LangVersion>latest</LangVersion>
-        <Nullable>enable</Nullable>
-        <ImplicitUsings>enable</ImplicitUsings>
-    </PropertyGroup>
+  <PropertyGroup>
+    <VersionPrefix>1.0.4.20</VersionPrefix>
+  </PropertyGroup>

-    <PropertyGroup Condition="'$(TF_BUILD)' == 'true'">
-        <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-    </PropertyGroup>
-
-    <!-- https://github.com/coverlet-coverage/coverlet/issues/1391 -->
-    <PropertyGroup Condition="$(MSBuildProjectName.Contains('.Tests'))">
-        <CollectCoverage>true</CollectCoverage>
-        <ExcludeByAttribute>GeneratedCodeAttribute</ExcludeByAttribute>
-        <CoverletOutputFormat>opencover</CoverletOutputFormat>
-    </PropertyGroup>
-
-    <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>
-
-    <PropertyGroup>
-        <NuGetAudit>true</NuGetAudit>
-        <NuGetAuditLevel>low</NuGetAuditLevel>
-        <NuGetAuditMode>all</NuGetAuditMode>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
-    </ItemGroup>
-
-    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-        <!--<PackageReference Include="SonarAnalyzer.CSharp" Version="10.15.0.120848">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>-->
-        <!-- <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference> -->
-    </ItemGroup>
-</Project>
+  <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
@@ -1,7 +0,0 @@
-rem https://github.com/StefH/GitHubReleaseNotes
-
-SET version=1.25.0
-
-GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels wontfix test question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%
-
-GitHubReleaseNotes --output PackageReleaseNotes.txt --skip-empty-releases --exclude-labels test question invalid doc duplicate example environment --template PackageReleaseNotes.template --version %version% --token %GH_TOKEN%
--- a/GitHubReleaseNotes.txt
+++ b/GitHubReleaseNotes.txt
@@ -0,0 +1,3 @@
+https://github.com/StefH/GitHubReleaseNotes
+
+GitHubReleaseNotes.exe --output CHANGELOG.md --skip-empty-releases --version 1.0.4.21
--- a/PackageReadme.md
+++ b/PackageReadme.md
@@ -1,62 +0,0 @@
-## WireMock.Net
-Lightweight Http Mocking Server for .NET, inspired by WireMock.org (from the Java landscape).
-
-### :star: Key Features
-* HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
-* Library can be used in unit tests and integration tests
-* Runs as a standalone process, as windows service, as Azure/IIS or as docker
-* Configurable via a fluent C# .NET API, JSON files and JSON over HTTP
-* Record/playback of stubs (proxying)
-* Per-request conditional proxying
-* Stateful behaviour simulation
-* Response templating / transformation using Handlebars and extensions
-* Can be used locally or in CI/CD scenarios
-* Can be used for Aspire Distributed Application testing 
-
-### :star: Stubbing
-A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
-See [Stubbing](https://wiremock.org/dotnet/stubbing).
-
-### :star: Request Matching
-WireMock.Net support advanced request-matching logic, see [Request Matching](https://wiremock.org/dotnet/request-matching).
-
-### :star: Response Templating
-The response which is returned WireMock.Net can be changed using templating. This is described here [Response Templating](https://wiremock.org/dotnet/response-templating).
-
-### :star: Admin API Reference
-The WireMock admin API provides functionality to define the mappings via a http interface see [Admin API Reference](https://wiremock.org/dotnet/admin-api-reference).
-
-### :star: Using
-WireMock.Net can be used in several ways:
-
-#### UnitTesting
-You can use your favorite test framework and use WireMock within your tests, see
-[UnitTesting](https://wiremock.org/dotnet/using-wiremock-in-unittests).
-
-### Unit/Integration Testing using Testcontainers.DotNet
-See [WireMock.Net.Testcontainers](https://wiremock.org/dotnet/using-wiremock-net-testcontainers/) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
-
-### Unit/Integration Testing using an an Aspire Distributed Application
-See [WireMock.Net.Aspire](https://wiremock.org/dotnet/using-wiremock-net-Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.
-
-#### As a dotnet tool
-It's simple to install WireMock.Net as (global) dotnet tool, see [dotnet tool](https://wiremock.org/dotnet/wiremock-as-dotnet-tool).
-
-#### As standalone process / console application
-This is quite straight forward to launch a mock server within a console application, see [Standalone Process](https://wiremock.org/dotnet/wiremock-as-a-standalone-process).
-
-#### As a Windows Service
-You can also run WireMock.Net as a Windows Service, follow this [Windows Service](https://wiremock.org/dotnet/wiremock-as-a-windows-service).
-
-#### As a Web Job in Azure or application in IIS
-See this link [WireMock-as-a-(Azure)-Web-App](https://wiremock.org/dotnet/wiremock-as-a-azure-web-app/)
-
-#### In a docker container
-There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
-For more details see also [Docker](https://github.com/wiremock/WireMock.Net-docker).
-
-#### HTTPS / SSL
-More details on using HTTPS (SSL) can be found here [HTTPS](https://wiremock.org/dotnet/using-https-ssl/)
-
-## :books: Documentation
-For more info, see also this documentation page: [What is WireMock.Net](https://wiremock.org/dotnet/what-is-wiremock-net/).
--- a/PackageReleaseNotes.template
+++ b/PackageReleaseNotes.template
@@ -1,6 +0,0 @@
-# {{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/WireMock.Net/blob/master/CHANGELOG.md
--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,5 +0,0 @@
-# 1.25.0 (25 January 2026)
- #1389 Fix MimePartMatcher and add more tests [bug]
- #1371 MimePartMatcher does not match multipart/form-data request body (possible bug?) [bug]
-
-The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -1,152 +1,74 @@
-# ![Project Icon](./resources/logo_32x32.png) WireMock.Net
-A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics functionality from the original Java based WireMock.
+# WireMock.Net
+A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock.org](http://WireMock.org).

---
-
-### :books: Full documentation can now be found at [wiremock.org](https://wiremock.org/dotnet)
-
---
-
-## :star: Key Features
+## Key Features
 * HTTP response stubbing, matchable on URL/Path, headers, cookies and body content patterns
-* Library can be used in unit tests and integration tests
-* Runs as a standalone process, as windows service, as Azure/IIS or as docker
-* Configurable via a fluent C# .NET API, JSON files and JSON over HTTP
-* Record/playback of stubs (proxying)
+* Runs in unit tests, as a standalone process, as windows service, as Azure or IIS or as docker
+* Configurable via a fluent DotNet API, JSON files and JSON over HTTP
+* Record/playback of stubs
 * Per-request conditional proxying
 * Stateful behaviour simulation
-* Response templating / transformation using Handlebars and extensions
-* Can be used locally or in CI/CD scenarios
-* Can be used for Aspire Distributed Application testing
+* Configurable response delays

-## :memo: Blogs
- [mstack.nl : Generate C# Code from Mapping(s)](https://mstack.nl/blog/20230201-wiremock.net-tocode)
- [mstack.nl : Chaos Engineering with Fault Injections](https://mstack.nl/blogs/wiremock-net-chaos-engineering-with-fault-injections)
- [mstack.nl : gRPC / ProtoBuf Support](https://mstack.nl/blogs/wiremock-net-grpc)
- [mstack.nl : Build and test your own .NET Aspire component](https://mstack.nl/blogs/wiremock-net-aspire-component/)
-
-## :computer: Project Info
+## Info
 | | |
 | --- | --- |
 | ***Project*** | &nbsp; |
-| &nbsp;&nbsp;**Chat** | [![Slack](https://badgen.net/badge/icon/slack?icon=slack&label)](https://slack.wiremock.org/) [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
-| &nbsp;&nbsp;**Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/wiremock/WireMock.Net/issues) |
+| &nbsp;&nbsp;**Chat** | [![Gitter](https://img.shields.io/gitter/room/wiremock_dotnet/Lobby.svg)](https://gitter.im/wiremock_dotnet/Lobby) |
+| &nbsp;&nbsp;**Issues** | [![GitHub issues](https://img.shields.io/github/issues/WireMock-Net/WireMock.Net.svg)](https://github.com/WireMock-Net/WireMock.Net/issues) |
 | | |
 | ***Quality*** | &nbsp; |
-| &nbsp;&nbsp;**Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=61) |
-| &nbsp;&nbsp;**Quality** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=alert_status)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net) [![CodeFactor](https://www.codefactor.io/repository/github/wiremock/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock/wiremock.net) |
-| &nbsp;&nbsp;**Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=bugs)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=BUG) [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=code_smells)](https://sonarcloud.io/project/issues?id=WireMock-Net_WireMock.Net&resolved=false&types=CODE_SMELL) |
-| &nbsp;&nbsp;**Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=WireMock-Net_WireMock.Net&metric=coverage)](https://sonarcloud.io/component_measures?id=WireMock-Net_WireMock.Net&metric=coverage) [![codecov](https://codecov.io/gh/wiremock/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/wiremock/WireMock.Net)|
-| &nbsp;&nbsp;**TIOBE** | [TIOBE Quality Indicator](https://ticsdemo.tiobe.com/tiobeweb/DEMO/TqiDashboard.html#axes=Project(WireMock.Net),Sub()&metric=tqi)
+| &nbsp;&nbsp;**Build Azure** | [![Build Status Azure](https://stef.visualstudio.com/WireMock.Net/_apis/build/status/WireMock.Net)](https://stef.visualstudio.com/WireMock.Net/_build/latest?definitionId=7) |
+| &nbsp;&nbsp;**CodeFactor** | [![CodeFactor](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net/badge)](https://www.codefactor.io/repository/github/wiremock-net/wiremock.net)
+| &nbsp;&nbsp;**Sonar Quality Gate** | [![Sonar Quality Gate](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=alert_status)](https://sonarcloud.io/project/issues?id=wiremock) |
+| &nbsp;&nbsp;**Sonar Bugs** | [![Sonar Bugs](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=bugs)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=BUG) |
+| &nbsp;&nbsp;**Sonar Code Smells** | [![Sonar Code Smells](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=code_smells)](https://sonarcloud.io/project/issues?id=wiremock&resolved=false&types=CODE_SMELL) |
+| &nbsp;&nbsp;**Sonar Coverage** | [![Sonar Coverage](https://sonarcloud.io/api/project_badges/measure?project=wiremock&metric=coverage)](https://sonarcloud.io/component_measures?id=wiremock&metric=coverage) |
+| &nbsp;&nbsp;**Codecov** | [![codecov](https://codecov.io/gh/WireMock-Net/WireMock.Net/branch/master/graph/badge.svg)](https://codecov.io/gh/WireMock-Net/WireMock.Net) |
+| &nbsp;&nbsp;**Coveralls** | [![Coverage Status](https://coveralls.io/repos/github/WireMock-Net/WireMock.Net/badge.svg?branch=master)](https://coveralls.io/github/WireMock-Net/WireMock.Net?branch=master) |
+| |
+| ***NuGet*** | &nbsp; |
+| &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://buildstats.info/nuget/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |
+| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net.StandAlone](https://buildstats.info/nuget/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |
+| ***MyGet (previews)*** | &nbsp; |
+| &nbsp;&nbsp;**WireMock.Net** | [![MyGet Badge WireMock.Net](https://buildstats.info/myget/wiremock-net/WireMock.Net)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net) |
+| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![MyGet Badge WireMock.Net.StandAlone](https://buildstats.info/myget/wiremock-net/WireMock.Net.StandAlone)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone) |

-### :package: NuGet packages
+## Development
+For the supported frameworks and build information, see [this](https://github.com/WireMock-Net/WireMock.Net/wiki/Development-Information) page.

-| | Official | Preview [:information_source:](https://wiremock.org/dotnet/MyGet-preview-versions) |
-| - | - | - |
-| &nbsp;&nbsp;**WireMock.Net** | [![NuGet Badge WireMock.Net](https://img.shields.io/nuget/v/WireMock.Net)](https://www.nuget.org/packages/WireMock.Net) |  [![MyGet Badge WireMock.Net](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net)
-| &nbsp;&nbsp;**WireMock.Net.Minimal** 🔺| [![NuGet Badge WireMock.Net.Minimal](https://img.shields.io/nuget/v/WireMock.Net.Minimal)](https://www.nuget.org/packages/WireMock.Net.Minimal) |  [![MyGet Badge WireMock.Net](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Minimal?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Minimal)
-| &nbsp;&nbsp;**WireMock.Net.StandAlone** | [![NuGet Badge WireMock.Net](https://img.shields.io/nuget/v/WireMock.Net.StandAlone)](https://www.nuget.org/packages/WireMock.Net.StandAlone) |  [![MyGet Badge WireMock.Net.StandAlone](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.StandAlone?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.StandAlone)
-| &nbsp;&nbsp;**WireMock.Net.Testcontainers** | [![NuGet Badge WireMock.Net.Testcontainers](https://img.shields.io/nuget/v/WireMock.Net.Testcontainers)](https://www.nuget.org/packages/WireMock.Net.Testcontainers) | [![MyGet Badge WireMock.Net.Testcontainers](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Testcontainers?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Testcontainers)
-| &nbsp;&nbsp;**WireMock.Net.Aspire** | [![NuGet Badge WireMock.Net.Aspire](https://img.shields.io/nuget/v/WireMock.Net.Aspire)](https://www.nuget.org/packages/WireMock.Net.Aspire) | [![MyGet Badge WireMock.Net.Aspire](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Aspire?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Aspire)
-| &nbsp;&nbsp;**WireMock.Net.AspNetCore.Middleware** | [![NuGet Badge WireMock.Net.AspNetCore.Middleware](https://img.shields.io/nuget/v/WireMock.Net.AspNetCore.Middleware)](https://www.nuget.org/packages/WireMock.Net.AspNetCore.Middleware) | [![MyGet Badge WireMock.Net.AspNetCore.Middleware](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.AspNetCore.Middleware?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.AspNetCore.Middleware)
-| | | |
-| &nbsp;&nbsp;**WireMock.Net.AwesomeAssertions** | [![NuGet Badge WireMock.Net.AwesomeAssertions](https://img.shields.io/nuget/v/WireMock.Net.AwesomeAssertions)](https://www.nuget.org/packages/WireMock.Net.AwesomeAssertions) | [![MyGet Badge WireMock.Net.AwesomeAssertions](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.AwesomeAssertions?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.AwesomeAssertions)
-| &nbsp;&nbsp;**WireMock.Net.FluentAssertions** | [![NuGet Badge WireMock.Net.FluentAssertions](https://img.shields.io/nuget/v/WireMock.Net.FluentAssertions)](https://www.nuget.org/packages/WireMock.Net.FluentAssertions) | [![MyGet Badge WireMock.Net.FluentAssertions](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.FluentAssertions?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.FluentAssertions)
-| &nbsp;&nbsp;**WireMock.Net.xUnit** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit)](https://www.nuget.org/packages/WireMock.Net.xUnit) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit)
-| &nbsp;&nbsp;**WireMock.Net.xUnit.v3** | [![NuGet Badge WireMock.Net.xUnit](https://img.shields.io/nuget/v/WireMock.Net.xUnit.v3)](https://www.nuget.org/packages/WireMock.Net.xUnit.v3) | [![MyGet Badge WireMock.Net.xUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.xUnit.v3?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.xUnit.v3)
-| &nbsp;&nbsp;**WireMock.Net.TUnit** | [![NuGet Badge WireMock.Net.TUnit](https://img.shields.io/nuget/v/WireMock.Net.TUnit)](https://www.nuget.org/packages/WireMock.Net.TUnit) | [![MyGet Badge WireMock.Net.TUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.TUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.TUnit)
-| &nbsp;&nbsp;**WireMock.Net.NUnit** | [![NuGet Badge WireMock.Net.NUnit](https://img.shields.io/nuget/v/WireMock.Net.NUnit)](https://www.nuget.org/packages/WireMock.Net.NUnit) | [![MyGet Badge WireMock.Net.TUnit](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.NUnit?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.NUnit)
-| | | |
-| &nbsp;&nbsp;**WireMock.Net.Extensions.Routing** | [![NuGet Badge WireMock.Net.Extensions.Routing](https://img.shields.io/nuget/v/WireMock.Net.Extensions.Routing)](https://www.nuget.org/packages/WireMock.Net.Extensions.Routing) | [![MyGet Badge WireMock.Net.Extensions.Routing](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Extensions.Routing?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Extensions.Routing)
-| &nbsp;&nbsp;**WireMock.Net.Matchers.CSharpCode** | [![NuGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/nuget/v/WireMock.Net.Matchers.CSharpCode)](https://www.nuget.org/packages/WireMock.Net.Matchers.CSharpCode) | [![MyGet Badge WireMock.Net.Matchers.CSharpCode](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.Matchers.CSharpCode?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.Matchers.CSharpCode)
-| &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/nuget/v/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.OpenApiParser?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
-| &nbsp;&nbsp;**WireMock.Net.MimePart** | [![NuGet Badge WireMock.Net.MimePart](https://img.shields.io/nuget/v/WireMock.Net.MimePart)](https://www.nuget.org/packages/WireMock.Net.MimePart) | [![MyGet Badge WireMock.Net.MimePart](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.MimePart?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.MimePart)
-| &nbsp;&nbsp;**WireMock.Net.GraphQL** | [![NuGet Badge WireMock.Net.GraphQL](https://img.shields.io/nuget/v/WireMock.Net.GraphQL)](https://www.nuget.org/packages/WireMock.Net.GraphQL) | [![MyGet Badge WireMock.Net.GraphQL](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.GraphQL?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.GraphQL)
-| &nbsp;&nbsp;**WireMock.Net.ProtoBuf** | [![NuGet Badge WireMock.Net.ProtoBuf](https://img.shields.io/nuget/v/WireMock.Net.ProtoBuf)](https://www.nuget.org/packages/WireMock.Net.ProtoBuf) | [![MyGet Badge WireMock.Net.ProtoBuf](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.ProtoBuf?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.ProtoBuf)
-| &nbsp;&nbsp;**WireMock.Net.OpenTelemetry** | [![NuGet Badge WireMock.Net.OpenTelemetry](https://img.shields.io/nuget/v/WireMock.Net.OpenTelemetry)](https://www.nuget.org/packages/WireMock.Net.ProtoBuf) | [![MyGet Badge WireMock.Net.OpenTelemetry](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.OpenTelemetry?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenTelemetry)
-| | | |
-| &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://img.shields.io/nuget/v/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
-| &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://img.shields.io/nuget/v/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Org.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)
-
-<br />
-
-🔺 **WireMock.Net.Minimal** does not include *WireMock.Net.MimePart*, *WireMock.Net.GraphQL*, *WireMock.Net.ProtoBuf* and *WireMock.Net.OpenTelemetry*.
-
---
-
-## :exclamation: Breaking changes
-
-### 1.7.0
-A breaking change is introduced which is related to System.Linq.Dynamic.Core DynamicLinq ([CVE](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/867)).
- The `LinqMatcher` is not allowed.
- The [Handlebars.Net.Helpers.DynamicLinq](https://www.nuget.org/packages/Handlebars.Net.Helpers.DynamicLinq) package is not included anymore.
-
-
-### 1.8.0
-Some breaking changes are introduced in this version:
-
-#### Handlebars.Net `File`-helper
-By default, the internal Handlebars.Net `File`-helper is not allowed anymore because of potential security issues.
-To still enable this feature, you need to set the `AllowedCustomHandlebarHelpers` property to `File` in the `HandlebarsSettings` property in `WireMockServerSettings`.
-
-#### Handlebars.Net `Environment`-helper
-By default, the Handlebars.Net `Environment`-helper is not automatically allowed anymore because of potential security issues.
-To still enable this feature, you need to add the `Environment` category to the `AllowedHandlebarsHelpers` list-property in the `HandlebarsSettings` property in `WireMockServerSettings`.
-
---
-
-## :memo: Development
-For the supported frameworks and build information, see [this](https://wiremock.org/dotnet/development-information) page.
-
-## :star: Stubbing
+## Stubbing
 A core feature of WireMock.Net is the ability to return predefined HTTP responses for requests matching criteria.
-See [Stubbing](https://wiremock.org/dotnet/stubbing).
+See [Wiki : Stubbing](https://github.com/WireMock-Net/WireMock.Net/wiki/Stubbing).

-## :star: Request Matching
-WireMock.Net support advanced request-matching logic, see [Request Matching](https://wiremock.org/dotnet/request-matching).
+## Request Matching
+WireMock.Net support advanced request-matching logic, see [Wiki : Request Matching](https://github.com/WireMock-Net/WireMock.Net/wiki/Request-Matching).

-## :star: Response Templating
-The response which is returned WireMock.Net can be changed using templating. This is described here [Response Templating](https://wiremock.org/dotnet/response-templating).
+## Response Templating
+The response which is returned WireMock.Net can be changed using templating. This is described here [Wiki : Response Templating](https://github.com/WireMock-Net/WireMock.Net/wiki/Response-Templating).

-## :star: Admin API Reference
-The WireMock admin API provides functionality to define the mappings via a http interface see [Admin API Reference](https://wiremock.org/dotnet/admin-api-reference).
+## Admin API Reference
+The WireMock admin API provides functionality to define the mappings via a http interface see [Wiki : Admin API Reference](https://github.com/StefH/WireMock.Net/wiki/Admin-API-Reference).

-## :star: Using
+## Using
 WireMock.Net can be used in several ways:

 ### UnitTesting
 You can use your favorite test framework and use WireMock within your tests, see
-[UnitTesting](https://wiremock.org/dotnet/using-wiremock-in-unittests).
-
-### Unit/Integration Testing using Testcontainers.DotNet
-See [WireMock.Net.Testcontainers](https://wiremock.org/dotnet/using-wiremock-net-testcontainers/) on how to build a WireMock.Net Docker container which can be used in Unit/Integration testing.
-
-### Unit/Integration Testing using an an Aspire Distributed Application
-See [WireMock.Net.Aspire](https://wiremock.org/dotnet/using-wiremock-net-Aspire) on how to use WireMock.Net as an Aspire Hosted application to do Unit/Integration testing.
-
-### As a dotnet tool
-It's simple to install WireMock.Net as (global) dotnet tool, see [dotnet tool](https://wiremock.org/dotnet/wiremock-as-dotnet-tool).
+[Wiki : UnitTesting](https://github.com/StefH/WireMock.Net/wiki/Using-WireMock-in-UnitTests).

 ### As standalone process / console application
-This is quite straight forward to launch a mock server within a console application, see [Standalone Process](https://wiremock.org/dotnet/wiremock-as-a-standalone-process).
+This is quite straight forward to launch a mock server within a console application, see [Wiki : Standalone Process](https://github.com/StefH/WireMock.Net/wiki/WireMock-as-a-standalone-process).

 ### As a Windows Service
-You can also run WireMock.Net as a Windows Service, follow this [Windows Service](https://wiremock.org/dotnet/wiremock-as-a-windows-service).
+You can also run WireMock.Net as a Windows Service, follow this [WireMock-as-a-Windows-Service](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-Windows-Service).

 ### As a Web Job in Azure or application in IIS
-See this link [WireMock-as-a-(Azure)-Web-App](https://wiremock.org/dotnet/wiremock-as-a-azure-web-app/)
+See this link [WireMock-as-a-(Azure)-Web-App](https://github.com/WireMock-Net/WireMock.Net/wiki/WireMock-as-a-(Azure)-Web-App)

 ### In a docker container
 There is also a Linux and Windows-Nano container available at [hub.docker.com](https://hub.docker.com/r/sheyenrath).
-For more details see also [Docker](https://github.com/wiremock/WireMock.Net-docker).
+For more details see also [Docker](https://github.com/WireMock-Net/WireMock.Net-docker).

-### HTTPS / SSL
-More details on using HTTPS (SSL) can be found here [HTTPS](https://wiremock.org/dotnet/using-https-ssl/)
-
-## :books: Documentation
-For more info, see also this documentation page: [What is WireMock.Net](https://wiremock.org/dotnet/what-is-wiremock-net/).
-
---
-
-## Powered by
-[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://jb.gg/OpenSource)
+#### HTTPS / SSL
+More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/WireMock-Net/WireMock.Net/wiki/Using-HTTPS-(SSL))
--- a/Solution.sln
+++ b/Solution.sln
--- a/Solution.sln.DotSettings
+++ b/Solution.sln.DotSettings
@@ -1,56 +1,15 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=AD/@EntryIndexedValue">AD</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CONNECT/@EntryIndexedValue">CONNECT</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CS/@EntryIndexedValue">CS</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DELETE/@EntryIndexedValue">DELETE</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=EC/@EntryIndexedValue">EC</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GET/@EntryIndexedValue">GET</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=HEAD/@EntryIndexedValue">HEAD</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=ID/@EntryIndexedValue">ID</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=IP/@EntryIndexedValue">IP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=MD/@EntryIndexedValue">MD5</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OK/@EntryIndexedValue">OK</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OPTIONS/@EntryIndexedValue">OPTIONS</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=OS/@EntryIndexedValue">OS</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PATCH/@EntryIndexedValue">PATCH</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=POST/@EntryIndexedValue">POST</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=PUT/@EntryIndexedValue">PUT</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=QL/@EntryIndexedValue">QL</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=RSA/@EntryIndexedValue">RSA</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SSL/@EntryIndexedValue">SSL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TE/@EntryIndexedValue">TE</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TSV/@EntryIndexedValue">TSV</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=TTL/@EntryIndexedValue">TTL</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WWW/@EntryIndexedValue">WWW</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XMS/@EntryIndexedValue">XMS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XUA/@EntryIndexedValue">XUA</s:String>
-	<s:Boolean x:Key="/Default/GrammarAndSpelling/GrammarChecking/Exceptions/=mock4net/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Dlls/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Flurl/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=funcs/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Grpc/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=guidb/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Guids/@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/=Levenstein/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=openapi/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=opentelemetry/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pacticipant/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=protobuf/@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/=Scriban/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=sheyenrath/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Sigil/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Stef/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=templated/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Testcontainers/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Victoor/@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>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=wiremock/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=wiremockserver/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Xeger/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=xunit/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>
--- a/resources/WireMock.Net-Logo.ico
+++ b/resources/WireMock.Net-Logo.ico
--- a/WireMock.Net-Logo.png
+++ b/WireMock.Net-Logo.png
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -1,187 +0,0 @@
-variables:
-  Prerelease: 'ci'
-  buildId: "1$(Build.BuildId)"
-  buildProjects: '**/src/**/*.csproj'
-
-jobs:
- job: Linux_Build_Test_SonarCloud
-
-  pool:
-    vmImage: 'ubuntu-22.04'
-
-  steps:
-  - script: |
-      echo "BuildId = $(buildId)"
-    displayName: 'Print buildId'
-
-  - script: |
-      dotnet tool install --global dotnet-sonarscanner
-      dotnet tool install --global dotnet-coverage
-    displayName: 'Install dotnet tools'
-
-  - task: PowerShell@2
-    displayName: "Use JDK17 by default"
-    inputs:
-      targetType: 'inline'
-      script: |
-        $jdkPath = $env:JAVA_HOME_17_X64
-        Write-Host "##vso[task.setvariable variable=JAVA_HOME]$jdkPath"
-
-  - script: |
-      dotnet dev-certs https --trust || true
-    displayName: 'dotnet dev-certs https'
-
-  # See: https://docs.sonarsource.com/sonarcloud/enriching/test-coverage/dotnet-test-coverage
-  - script: |
-      dotnet sonarscanner begin /k:"WireMock-Net_WireMock.Net" /o:"wiremock-net" /d:sonar.branch.name=$(Build.SourceBranchName) /d:sonar.host.url="https://sonarcloud.io" /d:sonar.token="$(SONAR_TOKEN)" /d:sonar.pullrequest.provider=github /d:sonar.cs.vscoveragexml.reportsPaths=**/wiremock-coverage-*.xml /d:sonar.verbose=true
-    displayName: 'Begin analysis on SonarCloud'
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-
-  - task: DotNetCoreCLI@2
-    displayName: 'Build Unit tests'
-    inputs:
-      command: 'build'
-      projects: '**/test/**/*.csproj'
-      arguments: '--configuration Debug --framework net8.0'
-
-  - task: CmdLine@2
-    inputs:
-      script: |
-          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-xunit.xml"
-    displayName: 'WireMock.Net.Tests with Coverage'
-
-  - task: CmdLine@2
-    inputs:
-      script: |
-          dotnet-coverage collect "dotnet test ./test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-tunit.xml"
-    displayName: 'WireMock.Net.TUnitTests with Coverage'
-
-  - task: CmdLine@2
-    inputs:
-      script: |
-          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj --configuration Debug --no-build --framework net8.0" -f xml -o "wiremock-coverage-middleware.xml"
-    displayName: 'WireMock.Net.Middleware.Tests with Coverage'
-
-  - task: CmdLine@2
-    inputs:
-      script: |
-          dotnet-coverage collect "dotnet test ./test/WireMock.Net.Aspire.Tests/WireMock.Net.Aspire.Tests.csproj --configuration Debug --no-build" -f xml -o "wiremock-coverage-aspire.xml"
-    displayName: 'WireMock.Net.Aspire.Tests with Coverage'
-
-  - task: CmdLine@2
-    displayName: 'Merge coverage files'
-    inputs:
-      script: 'dotnet coverage merge **/wiremock-coverage-*.xml --output ./test/wiremock-coverage.xml --output-format xml'
-
-  - script: |
-      dotnet sonarscanner end /d:sonar.token="$(SONAR_TOKEN)"
-    displayName: 'End analysis on SonarCloud'
-    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'
-    condition: and(succeeded(), eq(variables['RUN_WHITESOURCE'], 'yes'))
-
-  - script: |
-      bash <(curl https://codecov.io/bash) -t $(CODECOV_TOKEN) -f ./test/wiremock-coverage.xml
-    displayName: 'Upload coverage results to codecov'
-
-  - task: PublishTestResults@2
-    condition: and(succeeded(), eq(variables['PUBLISH_TESTRESULTS'], 'yes'))
-    inputs:
-      testRunner: VSTest
-      testResultsFiles: '**/*.trx'
-
-  - task: PublishBuildArtifacts@1
-    displayName: Publish coverage files
-    inputs:
-      PathtoPublish: './test/WireMock.Net.Tests/coverage.net8.0.opencover.xml'
-
- job: Windows_Build_Test
-
-  pool:
-    vmImage: 'windows-2025'
-
-  steps:
-  - task: UseDotNet@2
-    displayName: Use .NET 8.0
-    inputs:
-      packageType: 'sdk'
-      version: '8.0.x'
-
-  - task: DotNetCoreCLI@2
-    displayName: 'WireMock.Net.Tests.UsingNuGet'
-    inputs:
-      command: 'test'
-      projects: './test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj'
-      arguments: '--configuration Release'
-
-  - task: DotNetCoreCLI@2
-    displayName: 'WireMock.Net.Tests with Coverage'
-    inputs:
-      command: 'test'
-      projects: './test/WireMock.Net.Tests/WireMock.Net.Tests.csproj'
-      arguments: '--configuration Debug --framework net8.0 --collect:"XPlat Code Coverage" --logger trx'
-
-  - task: DotNetCoreCLI@2
-    displayName: 'WireMock.Net.TUnitTests with Coverage'
-    inputs:
-      command: 'test'
-      projects: './test/WireMock.Net.TUnitTests/WireMock.Net.TUnitTests.csproj'
-      arguments: '--configuration Debug --framework net8.0 --collect:"XPlat Code Coverage" --logger trx'
-
-  - task: DotNetCoreCLI@2
-    displayName: 'WireMock.Net.Middleware.Tests with Coverage'
-    inputs:
-      command: 'test'
-      projects: './test/WireMock.Net.Middleware.Tests/WireMock.Net.Middleware.Tests.csproj'
-      arguments: '--configuration Debug --framework net8.0 --collect:"XPlat Code Coverage" --logger trx'
-
- job: Windows_Release_to_MyGet
-  dependsOn: Windows_Build_Test
-
-  pool:
-    vmImage: 'windows-2025'
-
-  steps:
-  - script: |
-      echo "BuildId = $(buildId)"
-    displayName: 'Print buildId'
-
-  - task: UseDotNet@2
-    displayName: Use .NET 8.0
-    inputs:
-      packageType: 'sdk'
-      version: '8.0.x'
-
-  - task: DotNetCoreCLI@2
-    displayName: Build Release
-    inputs:
-      command: 'build'
-      arguments: /p:Configuration=Release
-      projects: $(buildProjects)
-
-  - task: DotNetCoreCLI@2
-    displayName: Pack
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-    inputs:
-      command: pack
-      configuration: 'Release'
-      packagesToPack: $(buildProjects)
-      nobuild: true
-      packDirectory: '$(Build.ArtifactStagingDirectory)/packages'
-      verbosityPack: 'normal'
-
-  - task: PublishBuildArtifacts@1
-    displayName: Publish Artifacts
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-    inputs:
-      PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-
-  - task: DotNetCoreCLI@2
-    displayName: Push to MyGet
-    condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-    inputs:
-      command: custom
-      custom: nuget
-      arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg -n -s https://www.myget.org/F/wiremock-net/api/v3/index.json -k $(MyGetKey)
--- a/azure-pipelines-linux.yml
+++ b/azure-pipelines-linux.yml
@@ -0,0 +1,13 @@
+pool:
+  vmImage: 'Ubuntu 16.04'
+
+variables:
+  buildConfiguration: 'Release'
+
+steps:
+- script: |
+    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration $(buildConfiguration) --framework netcoreapp2.1 --logger trx
+- task: PublishTestResults@2
+  inputs:
+    testRunner: VSTest
+    testResultsFiles: '**/*.trx'
--- a/azure-pipelines-nuget.yml
+++ b/azure-pipelines-nuget.yml
@@ -1,52 +0,0 @@
-pool:
-  vmImage: 'windows-2025'
-
-variables:
-  Prerelease: ''
-  buildId: "1$(Build.BuildId)"
-  buildProjects: '**/src/**/*.csproj'
-
-steps:
-# Print buildId
- script: |
-    echo "BuildId = $(buildId)"
-  displayName: 'Print buildId'
-
- task: UseDotNet@2
-  displayName: 'Use .NET 8'
-  inputs:
-    packageType: sdk
-    version: 8.0.x
-
-# Based on https://whereslou.com/2018/09/versioning-and-publishing-nuget-packages-automatically-using-azure-devops-pipelines/
- task: DotNetCoreCLI@2
-  displayName: Build Release
-  inputs:
-    command: 'build'
-    arguments: /p:Configuration=Release # https://github.com/MicrosoftDocs/vsts-docs/issues/1976
-    projects: $(buildProjects)
-
- task: DotNetCoreCLI@2
-  displayName: Pack
-  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-  inputs:
-    command: pack
-    configuration: 'Release'
-    packagesToPack: $(buildProjects)
-    nobuild: true
-    packDirectory: '$(Build.ArtifactStagingDirectory)/packages'
-    verbosityPack: 'normal'
-
- task: PublishBuildArtifacts@1
-  displayName: Publish Artifacts
-  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-  inputs:
-    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
-
- task: DotNetCoreCLI@2
-  displayName: Push to NuGet
-  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
-  inputs:
-    command: custom
-    custom: nuget
-    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg -n -s https://api.nuget.org/v3/index.json -k $(NuGetKey) --skip-duplicate
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -0,0 +1,82 @@
+pool:
+  vmImage: 'vs2017-win2016'
+
+variables:
+  Prerelease: 'ci'
+  buildId: "1$(Build.BuildId)"
+  buildProjects: '**/src/**/*.csproj'
+
+steps:
+# Print buildId
+- script: |
+    echo "BuildId = $(buildId)"
+  displayName: 'Print buildId'
+
+# Install Tools (SonarScanner)
+- script: |
+    dotnet tool install --global dotnet-sonarscanner
+  displayName: Install Tools (SonarScanner)
+
+# Begin SonarScanner
+# See also
+# - https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools, else you get this error: `Since you just installed the .NET Core SDK, you will need to reopen the Command Prompt window before running the tool you installed.`
+# - https://github.com/dotnet/cli/issues/8368
+# - https://github.com/Microsoft/vsts-tasks/issues/8291
+#
+- script: |
+    %USERPROFILE%\.dotnet\tools\dotnet-sonarscanner begin /k:"wiremock" /d:sonar.organization="stefh-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$(SONAR_TOKEN)" /v:"$(buildId)" /d:sonar.cs.opencover.reportsPaths="**\coverage.opencover.xml"
+  displayName: Begin SonarScanner
+
+# Build source, tests and run tests for net452 and netcoreapp2.1 (with coverage)
+- script: |
+    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --framework net452
+    dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --framework netcoreapp2.1 --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
+  displayName: 'Build source, tests and run tests for net452 and netcoreapp2.1 (with coverage)'
+
+# End SonarScanner
+- script: |
+    %USERPROFILE%\.dotnet\tools\dotnet-sonarscanner end /d:sonar.login="$(SONAR_TOKEN)"
+  displayName: End SonarScanner
+
+# Upload coverage to codecov.io
+- script: |
+    %USERPROFILE%\.nuget\packages\codecov\1.1.0\tools\codecov.exe -f "./test/WireMock.Net.Tests/coverage.opencover.xml" -t $(CODECOV_TOKEN)
+  displayName: Upload coverage to codecov.io
+
+- task: PublishTestResults@2
+  inputs:
+    testRunner: VSTest
+    testResultsFiles: '**/*.trx'
+
+# Based on https://whereslou.com/2018/09/versioning-and-publishing-nuget-packages-automatically-using-azure-devops-pipelines/
+- task: DotNetCoreCLI@2
+  displayName: Build Release
+  inputs:
+    command: 'build'
+    arguments: /p:Configuration=Release # https://github.com/MicrosoftDocs/vsts-docs/issues/1976
+    projects: $(buildProjects)
+
+- task: DotNetCoreCLI@2
+  displayName: Pack
+  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+  inputs:
+    command: pack
+    configuration: 'Release'
+    packagesToPack: $(buildProjects)
+    nobuild: true
+    packDirectory: '$(Build.ArtifactStagingDirectory)/packages'
+    verbosityPack: 'normal'
+
+- task: PublishBuildArtifacts@1
+  displayName: Publish Artifacts
+  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+  inputs:
+    PathtoPublish: '$(Build.ArtifactStagingDirectory)'
+
+- task: DotNetCoreCLI@2
+  displayName: Push to MyGet
+  condition: and(succeeded(), ne(variables['Build.Reason'], 'PullRequest')) # Do not run for PullRequests
+  inputs:
+    command: custom
+    custom: nuget
+    arguments: push $(Build.ArtifactStagingDirectory)\packages\*.nupkg --source https://www.myget.org/F/wiremock-net/api/v3/index.json --no-service-endpoint --api-key $(MyGetKey)
--- a/build-info.md
+++ b/build-info.md
@@ -0,0 +1,11 @@
+# Build info
+For building and running all code in VSCode:
+
+- download nuget.exe from https://www.nuget.org/downloads
+- copy nuget.exe to a folder which is listed in the path or just in c:\Windows
+- go to the root from this project and run `nuget restore`
+- all packages are now restored into the `WireMock.Net\packages` folder
+
+### Note
+An example project like `WireMock.Net.Console.Net452.Classic` still shows some red errors in VSCode, but you can just run `dotnet build`.
+But you can just execute `.\bin\Debug\WireMock.Net.ConsoleApplication.exe` to run the application
--- a/examples-Aspire/AspireApp1.ApiService/AspireApp1.ApiService.csproj
+++ b/examples-Aspire/AspireApp1.ApiService/AspireApp1.ApiService.csproj
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AspireApp1.ServiceDefaults\AspireApp1.ServiceDefaults.csproj" />
-  </ItemGroup>
-
-</Project>
--- a/examples-Aspire/AspireApp1.ApiService/Program.cs
+++ b/examples-Aspire/AspireApp1.ApiService/Program.cs
@@ -1,52 +0,0 @@
-var builder = WebApplication.CreateBuilder(args);
-
-// Add service defaults & Aspire components.
-builder.AddServiceDefaults();
-
-// Add services to the container.
-builder.Services.AddProblemDetails();
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-app.UseExceptionHandler();
-
-var summaries = new[]
-{
-    "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-};
-
-app.MapGet("/weatherforecast", () =>
-{
-    var forecast = Enumerable.Range(1, 5).Select(index =>
-        new WeatherForecast
-        (
-            DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
-            Random.Shared.Next(-20, 55),
-            summaries[Random.Shared.Next(summaries.Length)]
-        ))
-        .ToArray();
-    return forecast;
-});
-
-app.MapGet("/weatherforecast2", () =>
-{
-    var forecast = Enumerable.Range(1, 5).Select(index =>
-            new WeatherForecast
-            (
-                DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
-                Random.Shared.Next(-20, 55),
-                summaries[Random.Shared.Next(summaries.Length)]
-            ))
-        .ToArray();
-    return forecast;
-});
-
-app.MapDefaultEndpoints();
-
-app.Run();
-
-record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary)
-{
-    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-}
--- a/examples-Aspire/AspireApp1.ApiService/Properties/launchSettings.json
+++ b/examples-Aspire/AspireApp1.ApiService/Properties/launchSettings.json
@@ -1,25 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "weatherforecast",
-      "applicationUrl": "http://localhost:5433",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "launchUrl": "weatherforecast",
-      "applicationUrl": "https://localhost:7365;http://localhost:5433",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
--- a/examples-Aspire/AspireApp1.ApiService/appsettings.Development.json
+++ b/examples-Aspire/AspireApp1.ApiService/appsettings.Development.json
@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/examples-Aspire/AspireApp1.ApiService/appsettings.json
+++ b/examples-Aspire/AspireApp1.ApiService/appsettings.json
@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}
--- a/examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
+++ b/examples-Aspire/AspireApp1.AppHost/AspireApp1.AppHost.csproj
@@ -1,33 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\AspireApp1.ApiService\AspireApp1.ApiService.csproj" />
-        <ProjectReference Include="..\AspireApp1.Web\AspireApp1.Web.csproj" />
-
-        <!-- https://learn.microsoft.com/en-us/dotnet/aspire/extensibility/custom-resources?tabs=windows#create-library-for-resource-extension -->
-        <ProjectReference Include="..\..\src\WireMock.Net.Aspire\WireMock.Net.Aspire.csproj" IsAspireProjectResource="false" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Update="__admin\mappings\*.proto">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-        <None Update="__admin\mappings\*.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
-</Project>
--- a/examples-Aspire/AspireApp1.AppHost/Program.cs
+++ b/examples-Aspire/AspireApp1.AppHost/Program.cs
@@ -1,65 +0,0 @@
-using AspireApp1.AppHost;
-
-var builder = DistributedApplication.CreateBuilder(args);
-
-// IResourceBuilder<ProjectResource> apiService = builder.AddProject<Projects.AspireApp1_ApiService>("apiservice");
-
-var mappingsPath = Path.Combine(Directory.GetCurrentDirectory(), "__admin", "mappings");
-
-//IResourceBuilder<WireMockServerResource> apiService1 = builder
-//    //.AddWireMock("apiservice", WireMockServerArguments.DefaultPort)
-//    .AddWireMock("apiservice1", "http://*:8081", "grpc://*:9091")
-//    .AsHttp2Service()
-//    .WithMappingsPath(mappingsPath)
-//    .WithReadStaticMappings()
-//    .WithWatchStaticMappings()
-//    .WithApiMappingBuilder(WeatherForecastApiMock.BuildAsync);
-
-IResourceBuilder<WireMockServerResource> apiService2 = builder
-    .AddWireMock("apiservice", async args =>
-    {
-        args.WithAdditionalUrls("http://*:8081", "grpc://*:9093");
-        args.WithProtoDefinition("my-greeter", await File.ReadAllTextAsync(Path.Combine(mappingsPath, "greet.proto")));
-    })
-    .AsHttp2Service()
-    .WithMappingsPath(mappingsPath)
-    .WithWatchStaticMappings()
-    .WithApiMappingBuilder(WeatherForecastApiMock.BuildAsync)
-    .WithOpenTelemetry(); // Enable OpenTelemetry tracing for Aspire dashboard
-
-//var apiServiceUsedForDocs = builder
-//    .AddWireMock("apiservice1", WireMockServerArguments.DefaultPort)
-//    .WithApiMappingBuilder(adminApiBuilder =>
-//    {
-//        var summaries = new[]
-//        {
-//            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-//        };
-
-//        adminApiBuilder.Given(b => b
-//            .WithRequest(request => request
-//                .UsingGet()
-//                .WithPath("/weatherforecast2")
-//            )
-//            .WithResponse(response => response
-//                .WithHeaders(h => h.Add("Content-Type", "application/json"))
-//                .WithBodyAsJson(() => Enumerable.Range(1, 5).Select(index =>
-//                        new WeatherForecast
-//                        (
-//                            DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
-//                            Random.Shared.Next(-20, 55),
-//                            "WireMock.Net : " + summaries[Random.Shared.Next(summaries.Length)]
-//                        ))
-//                    .ToArray())
-//            )
-//        );
-
-//        return Task.CompletedTask;
-//    });
-
-builder.AddProject<Projects.AspireApp1_Web>("webfrontend")
-    .WithExternalHttpEndpoints()
-    .WithReference(apiService2)
-    .WaitFor(apiService2);
-
-await builder.Build().RunAsync();
--- a/examples-Aspire/AspireApp1.AppHost/Properties/launchSettings.json
+++ b/examples-Aspire/AspireApp1.AppHost/Properties/launchSettings.json
@@ -1,29 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:17194;http://localhost:15256",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21232",
-        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22019"
-      }
-    },
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:15256",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19163",
-        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20086"
-      }
-    }
-  }
-}
--- a/examples-Aspire/AspireApp1.AppHost/WeatherForecastApiMock.cs
+++ b/examples-Aspire/AspireApp1.AppHost/WeatherForecastApiMock.cs
@@ -1,36 +0,0 @@
-using WireMock.Client.Builders;
-
-namespace AspireApp1.AppHost;
-
-internal class WeatherForecastApiMock
-{
-    public static async Task BuildAsync(AdminApiMappingBuilder builder, CancellationToken cancellationToken)
-    {
-        var summaries = new[]
-        {
-            "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching"
-        };
-
-        builder.Given(b => b
-            .WithRequest(request => request
-                .UsingGet()
-                .WithPath("/weatherforecast2")
-            )
-            .WithResponse(response => response
-                .WithHeaders(h => h.Add("Content-Type", "application/json"))
-                .WithBodyAsJson(() => Enumerable.Range(1, 5).Select(index =>
-                        new WeatherForecast
-                        (
-                            DateOnly.FromDateTime(DateTime.Now.AddDays(index)),
-                            Random.Shared.Next(-20, 55),
-                            "WireMock.Net 2 : " + summaries[Random.Shared.Next(summaries.Length)]
-                        ))
-                    .ToArray())
-            )
-        );
-
-        await builder.BuildAndPostAsync(cancellationToken);
-    }
-}
-
-internal record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary);
--- a/examples-Aspire/AspireApp1.AppHost/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json
+++ b/examples-Aspire/AspireApp1.AppHost/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json
@@ -1,41 +0,0 @@
-{
-    "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
-    "Request": {
-        "Path": "/weatherforecast",
-        "Methods": [
-            "get"
-        ]
-    },
-    "Response": {
-        "BodyAsJson": [
-            {
-                "date": "2024-05-24",
-                "temperatureC": -17,
-                "summary": "WireMock.Net 1 : Balmy"
-            },
-            {
-                "date": "2024-05-25",
-                "temperatureC": -13,
-                "summary": "WireMock.Net 1 : Mild"
-            },
-            {
-                "date": "2024-05-26",
-                "temperatureC": 31,
-                "summary": "WireMock.Net 1 : Bracing"
-            },
-            {
-                "date": "2024-05-27",
-                "temperatureC": 6,
-                "summary": "WireMock.Net 1 : Hot"
-            },
-            {
-                "date": "2024-05-28",
-                "temperatureC": -2,
-                "summary": "WireMock.Net 1 : Mild"
-            }
-        ],
-        "Headers": {
-            "Content-Type": "application/json"
-        }
-    }
-}
--- a/examples-Aspire/AspireApp1.AppHost/__admin/mappings/greet.proto
+++ b/examples-Aspire/AspireApp1.AppHost/__admin/mappings/greet.proto
@@ -1,21 +0,0 @@
-syntax = "proto3";
-
-package greet;
-
-service Greeter {
-  rpc SayHello (HelloRequest) returns (HelloReply);
-}
-
-message HelloRequest {
-  string name = 1;
-}
-
-message HelloReply {
-  string message = 1;
-  enum PhoneType {
-    none = 0;
-    mobile = 1;
-    home = 2;
-  }
-  PhoneType phoneType = 2;
-}
--- a/examples-Aspire/AspireApp1.AppHost/__admin/mappings/protobuf-mapping-4.json
+++ b/examples-Aspire/AspireApp1.AppHost/__admin/mappings/protobuf-mapping-4.json
@@ -1,40 +0,0 @@
-{
-  "Guid": "351f0240-bba0-4bcb-93c6-1feba0fe0004",
-  "Title": "ProtoBuf Mapping 4",
-  "Request": {
-    "Path": {
-      "Matchers": [
-        {
-          "Name": "WildcardMatcher",
-          "Pattern": "/greet.Greeter/SayHello",
-          "IgnoreCase": false
-        }
-      ]
-    },
-    "Methods": [
-      "POST"
-    ],
-    "Body": {
-      "Matcher": {
-        "Name": "ProtoBufMatcher",
-        "ProtoBufMessageType": "greet.HelloRequest"
-      }
-    }
-  },
-  "Response": {
-    "BodyAsJson": {
-      "message": "hello {{request.BodyAsJson.name}} {{request.method}}"
-    },
-    "UseTransformer": true,
-    "TransformerType": "Handlebars",
-    "TransformerReplaceNodeOptions": "EvaluateAndTryToConvert",
-    "Headers": {
-      "Content-Type": "application/grpc"
-    },
-    "TrailingHeaders": {
-      "grpc-status": "0"
-    },
-    "ProtoBufMessageType": "greet.HelloReply"
-  },
-  "ProtoDefinition": "my-greeter"
-}
--- a/examples-Aspire/AspireApp1.AppHost/appsettings.Development.json
+++ b/examples-Aspire/AspireApp1.AppHost/appsettings.Development.json
@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/examples-Aspire/AspireApp1.AppHost/appsettings.json
+++ b/examples-Aspire/AspireApp1.AppHost/appsettings.json
@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning",
-      "Aspire.Hosting.Dcp": "Warning"
-    }
-  }
-}
--- a/examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj
+++ b/examples-Aspire/AspireApp1.AppHostOriginal/AspireApp1.AppHostOriginal.csproj
@@ -1,21 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <Sdk Name="Aspire.AppHost.Sdk" Version="13.1.0" />
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\AspireApp1.ApiService\AspireApp1.ApiService.csproj" />
-        <ProjectReference Include="..\AspireApp1.Web\AspireApp1.Web.csproj" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.0" />
-    </ItemGroup>
-
-</Project>
--- a/examples-Aspire/AspireApp1.AppHostOriginal/Program.cs
+++ b/examples-Aspire/AspireApp1.AppHostOriginal/Program.cs
@@ -1,9 +0,0 @@
-var builder = DistributedApplication.CreateBuilder(args);
-
-IResourceBuilder<ProjectResource> apiService = builder.AddProject<Projects.AspireApp1_ApiService>("apiservice");
-
-builder.AddProject<Projects.AspireApp1_Web>("webfrontend")
-    .WithExternalHttpEndpoints()
-    .WithReference(apiService);
-
-await builder.Build().RunAsync();
--- a/examples-Aspire/AspireApp1.AppHostOriginal/Properties/launchSettings.json
+++ b/examples-Aspire/AspireApp1.AppHostOriginal/Properties/launchSettings.json
@@ -1,29 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:17194;http://localhost:15256",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21232",
-        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22019"
-      }
-    },
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:15256",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development",
-        "DOTNET_ENVIRONMENT": "Development",
-        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "http://localhost:19163",
-        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "http://localhost:20086"
-      }
-    }
-  }
-}
--- a/examples-Aspire/AspireApp1.AppHostOriginal/appsettings.Development.json
+++ b/examples-Aspire/AspireApp1.AppHostOriginal/appsettings.Development.json
@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/examples-Aspire/AspireApp1.AppHostOriginal/appsettings.json
+++ b/examples-Aspire/AspireApp1.AppHostOriginal/appsettings.json
@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning",
-      "Aspire.Hosting.Dcp": "Warning"
-    }
-  }
-}
--- a/examples-Aspire/AspireApp1.ServiceDefaults/AspireApp1.ServiceDefaults.csproj
+++ b/examples-Aspire/AspireApp1.ServiceDefaults/AspireApp1.ServiceDefaults.csproj
@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsAspireSharedProject>true</IsAspireSharedProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="8.3.0" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.8.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.8.1" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.8.0" />
-  </ItemGroup>
-
-</Project>
--- a/examples-Aspire/AspireApp1.ServiceDefaults/Extensions.cs
+++ b/examples-Aspire/AspireApp1.ServiceDefaults/Extensions.cs
@@ -1,112 +0,0 @@
-using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Diagnostics.HealthChecks;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Diagnostics.HealthChecks;
-using Microsoft.Extensions.Logging;
-using OpenTelemetry;
-using OpenTelemetry.Metrics;
-using OpenTelemetry.Trace;
-
-// ReSharper disable once CheckNamespace
-namespace Microsoft.Extensions.Hosting;
-
-// Adds common .NET Aspire services: service discovery, resilience, health checks, and OpenTelemetry.
-// This project should be referenced by each service project in your solution.
-// To learn more about using this project, see https://aka.ms/dotnet/aspire/service-defaults
-public static class Extensions
-{
-    public static IHostApplicationBuilder AddServiceDefaults(this IHostApplicationBuilder builder)
-    {
-        builder.ConfigureOpenTelemetry();
-
-        builder.AddDefaultHealthChecks();
-
-        builder.Services.AddServiceDiscovery();
-
-        builder.Services.ConfigureHttpClientDefaults(http =>
-        {
-            // Turn on resilience by default
-            http.AddStandardResilienceHandler();
-
-            // Turn on service discovery by default
-            http.AddServiceDiscovery();
-        });
-
-        return builder;
-    }
-
-    public static IHostApplicationBuilder ConfigureOpenTelemetry(this IHostApplicationBuilder builder)
-    {
-        builder.Logging.AddOpenTelemetry(logging =>
-        {
-            logging.IncludeFormattedMessage = true;
-            logging.IncludeScopes = true;
-        });
-
-        builder.Services.AddOpenTelemetry()
-            .WithMetrics(metrics =>
-            {
-                metrics.AddAspNetCoreInstrumentation()
-                    .AddHttpClientInstrumentation()
-                    .AddRuntimeInstrumentation();
-            })
-            .WithTracing(tracing =>
-            {
-                tracing.AddAspNetCoreInstrumentation()
-                    // Uncomment the following line to enable gRPC instrumentation (requires the OpenTelemetry.Instrumentation.GrpcNetClient package)
-                    //.AddGrpcClientInstrumentation()
-                    .AddHttpClientInstrumentation();
-            });
-
-        builder.AddOpenTelemetryExporters();
-
-        return builder;
-    }
-
-    private static IHostApplicationBuilder AddOpenTelemetryExporters(this IHostApplicationBuilder builder)
-    {
-        var useOtlpExporter = !string.IsNullOrWhiteSpace(builder.Configuration["OTEL_EXPORTER_OTLP_ENDPOINT"]);
-
-        if (useOtlpExporter)
-        {
-            builder.Services.AddOpenTelemetry().UseOtlpExporter();
-        }
-
-        // Uncomment the following lines to enable the Azure Monitor exporter (requires the Azure.Monitor.OpenTelemetry.AspNetCore package)
-        //if (!string.IsNullOrEmpty(builder.Configuration["APPLICATIONINSIGHTS_CONNECTION_STRING"]))
-        //{
-        //    builder.Services.AddOpenTelemetry()
-        //       .UseAzureMonitor();
-        //}
-
-        return builder;
-    }
-
-    public static IHostApplicationBuilder AddDefaultHealthChecks(this IHostApplicationBuilder builder)
-    {
-        builder.Services.AddHealthChecks()
-            // Add a default liveness check to ensure app is responsive
-            .AddCheck("self", () => HealthCheckResult.Healthy(), ["live"]);
-
-        return builder;
-    }
-
-    public static WebApplication MapDefaultEndpoints(this WebApplication app)
-    {
-        // Adding health checks endpoints to applications in non-development environments has security implications.
-        // See https://aka.ms/dotnet/aspire/healthchecks for details before enabling these endpoints in non-development environments.
-        if (app.Environment.IsDevelopment())
-        {
-            // All health checks must pass for app to be considered ready to accept traffic after starting
-            app.MapHealthChecks("/health");
-
-            // Only health checks tagged with the "live" tag must pass for app to be considered alive
-            app.MapHealthChecks("/alive", new HealthCheckOptions
-            {
-                Predicate = r => r.Tags.Contains("live")
-            });
-        }
-
-        return app;
-    }
-}
--- a/examples-Aspire/AspireApp1.Tests/AspireApp1.Tests.csproj
+++ b/examples-Aspire/AspireApp1.Tests/AspireApp1.Tests.csproj
@@ -1,28 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.Testing" Version="13.1.0" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="xunit" Version="2.5.3" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.3" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AspireApp1.AppHost\AspireApp1.AppHost.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Aspire.Hosting.Testing" />
-    <Using Include="Xunit" />
-  </ItemGroup>
-
-</Project>
--- a/examples-Aspire/AspireApp1.Tests/WebTests.cs
+++ b/examples-Aspire/AspireApp1.Tests/WebTests.cs
@@ -1,22 +0,0 @@
-using System.Net;
-
-namespace AspireApp1.Tests;
-
-public class WebTests
-{
-    [Fact]
-    public async Task GetWebResourceRootReturnsOkStatusCode()
-    {
-        // Arrange
-        var appHost = await DistributedApplicationTestingBuilder.CreateAsync<Projects.AspireApp1_AppHost>();
-        await using var app = await appHost.BuildAsync();
-        await app.StartAsync();
-
-        // Act
-        var httpClient = app.CreateHttpClient("webfrontend");
-        var response = await httpClient.GetAsync("/");
-
-        // Assert
-        Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-    }
-}
--- a/examples-Aspire/AspireApp1.Web/AspireApp1.Web.csproj
+++ b/examples-Aspire/AspireApp1.Web/AspireApp1.Web.csproj
@@ -1,13 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\AspireApp1.ServiceDefaults\AspireApp1.ServiceDefaults.csproj" />
-  </ItemGroup>
-
-</Project>
--- a/examples-Aspire/AspireApp1.Web/Components/App.razor
+++ b/examples-Aspire/AspireApp1.Web/Components/App.razor
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-    <meta charset="utf-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <base href="/" />
-    <link rel="stylesheet" href="bootstrap/bootstrap.min.css" />
-    <link rel="stylesheet" href="app.css" />
-    <link rel="stylesheet" href="AspireApp1.Web.styles.css" />
-    <link rel="icon" type="image/png" href="favicon.png" />
-    <HeadOutlet />
-</head>
-
-<body>
-    <Routes />
-    <script src="_framework/blazor.web.js"></script>
-</body>
-
-</html>
--- a/examples-Aspire/AspireApp1.Web/Components/Layout/MainLayout.razor
+++ b/examples-Aspire/AspireApp1.Web/Components/Layout/MainLayout.razor
@@ -1,23 +0,0 @@
-@inherits LayoutComponentBase
-
-<div class="page">
-    <div class="sidebar">
-        <NavMenu />
-    </div>
-
-    <main>
-        <div class="top-row px-4">
-            <a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
-        </div>
-
-        <article class="content px-4">
-            @Body
-        </article>
-    </main>
-</div>
-
-<div id="blazor-error-ui">
-    An unhandled error has occurred.
-    <a href="" class="reload">Reload</a>
-    <a class="dismiss">🗙</a>
-</div>
--- a/examples-Aspire/AspireApp1.Web/Components/Layout/MainLayout.razor.css
+++ b/examples-Aspire/AspireApp1.Web/Components/Layout/MainLayout.razor.css
@@ -1,96 +0,0 @@
-.page {
-    position: relative;
-    display: flex;
-    flex-direction: column;
-}
-
-main {
-    flex: 1;
-}
-
-.sidebar {
-    background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
-}
-
-.top-row {
-    background-color: #f7f7f7;
-    border-bottom: 1px solid #d6d5d5;
-    justify-content: flex-end;
-    height: 3.5rem;
-    display: flex;
-    align-items: center;
-}
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        white-space: nowrap;
-        margin-left: 1.5rem;
-        text-decoration: none;
-    }
-
-    .top-row ::deep a:hover, .top-row ::deep .btn-link:hover {
-        text-decoration: underline;
-    }
-
-    .top-row ::deep a:first-child {
-        overflow: hidden;
-        text-overflow: ellipsis;
-    }
-
-@media (max-width: 640.98px) {
-    .top-row {
-        justify-content: space-between;
-    }
-
-    .top-row ::deep a, .top-row ::deep .btn-link {
-        margin-left: 0;
-    }
-}
-
-@media (min-width: 641px) {
-    .page {
-        flex-direction: row;
-    }
-
-    .sidebar {
-        width: 250px;
-        height: 100vh;
-        position: sticky;
-        top: 0;
-    }
-
-    .top-row {
-        position: sticky;
-        top: 0;
-        z-index: 1;
-    }
-
-    .top-row.auth ::deep a:first-child {
-        flex: 1;
-        text-align: right;
-        width: 0;
-    }
-
-    .top-row, article {
-        padding-left: 2rem !important;
-        padding-right: 1.5rem !important;
-    }
-}
-
-#blazor-error-ui {
-    background: lightyellow;
-    bottom: 0;
-    box-shadow: 0 -1px 2px rgba(0, 0, 0, 0.2);
-    display: none;
-    left: 0;
-    padding: 0.6rem 1.25rem 0.7rem;
-    position: fixed;
-    width: 100%;
-    z-index: 1000;
-}
-
-    #blazor-error-ui .dismiss {
-        cursor: pointer;
-        position: absolute;
-        right: 0.75rem;
-        top: 0.5rem;
-    }
--- a/examples-Aspire/AspireApp1.Web/Components/Layout/NavMenu.razor
+++ b/examples-Aspire/AspireApp1.Web/Components/Layout/NavMenu.razor
@@ -1,23 +0,0 @@
-<div class="top-row ps-3 navbar navbar-dark">
-    <div class="container-fluid">
-        <a class="navbar-brand" href="">AspireApp1</a>
-    </div>
-</div>
-
-<input type="checkbox" title="Navigation menu" class="navbar-toggler" />
-
-<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
-    <nav class="flex-column">
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="" Match="NavLinkMatch.All">
-                <span class="bi bi-house-door-fill" aria-hidden="true"></span> Home
-            </NavLink>
-        </div>
-
-        <div class="nav-item px-3">
-            <NavLink class="nav-link" href="weather">
-                <span class="bi bi-list-nested" aria-hidden="true"></span> Weather
-            </NavLink>
-        </div>
-    </nav>
-</div>
--- a/examples-Aspire/AspireApp1.Web/Components/Layout/NavMenu.razor.css
+++ b/examples-Aspire/AspireApp1.Web/Components/Layout/NavMenu.razor.css
@@ -1,102 +0,0 @@
-.navbar-toggler {
-    appearance: none;
-    cursor: pointer;
-    width: 3.5rem;
-    height: 2.5rem;
-    color: white;
-    position: absolute;
-    top: 0.5rem;
-    right: 1rem;
-    border: 1px solid rgba(255, 255, 255, 0.1);
-    background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
-}
-
-.navbar-toggler:checked {
-    background-color: rgba(255, 255, 255, 0.5);
-}
-
-.top-row {
-    height: 3.5rem;
-    background-color: rgba(0,0,0,0.4);
-}
-
-.navbar-brand {
-    font-size: 1.1rem;
-}
-
-.bi {
-    display: inline-block;
-    position: relative;
-    width: 1.25rem;
-    height: 1.25rem;
-    margin-right: 0.75rem;
-    top: -1px;
-    background-size: cover;
-}
-
-.bi-house-door-fill {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
-}
-
-.bi-plus-square-fill {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
-}
-
-.bi-list-nested {
-    background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
-}
-
-.nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
-}
-
-    .nav-item:first-of-type {
-        padding-top: 1rem;
-    }
-
-    .nav-item:last-of-type {
-        padding-bottom: 1rem;
-    }
-
-    .nav-item ::deep a {
-        color: #d7d7d7;
-        border-radius: 4px;
-        height: 3rem;
-        display: flex;
-        align-items: center;
-        line-height: 3rem;
-    }
-
-.nav-item ::deep a.active {
-    background-color: rgba(255,255,255,0.37);
-    color: white;
-}
-
-.nav-item ::deep a:hover {
-    background-color: rgba(255,255,255,0.1);
-    color: white;
-}
-
-.nav-scrollable {
-    display: none;
-}
-
-.navbar-toggler:checked ~ .nav-scrollable {
-    display: block;
-}
-
-@media (min-width: 641px) {
-    .navbar-toggler {
-        display: none;
-    }
-
-    .nav-scrollable {
-        /* Never collapse the sidebar for wide screens */
-        display: block;
-
-        /* Allow sidebar to scroll for tall menus */
-        height: calc(100vh - 3.5rem);
-        overflow-y: auto;
-    }
-}
--- a/examples-Aspire/AspireApp1.Web/Components/Pages/Error.razor
+++ b/examples-Aspire/AspireApp1.Web/Components/Pages/Error.razor
@@ -1,38 +0,0 @@
-@page "/Error"
-@using System.Diagnostics
-
-<PageTitle>Error</PageTitle>
-
-<h1 class="text-danger">Error.</h1>
-<h2 class="text-danger">An error occurred while processing your request.</h2>
-
-@if (ShowRequestId)
-{
-    <p>
-        <strong>Request ID:</strong> <code>@requestId</code>
-    </p>
-}
-
-<h3>Development Mode</h3>
-<p>
-    Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
-</p>
-<p>
-    <strong>The Development environment shouldn't be enabled for deployed applications.</strong>
-    It can result in displaying sensitive information from exceptions to end users.
-    For local debugging, enable the <strong>Development</strong> environment by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>
-    and restarting the app.
-</p>
-
-@code{
-    [CascadingParameter]
-    public HttpContext? HttpContext { get; set; }
-
-    private string? requestId;
-    private bool ShowRequestId => !string.IsNullOrEmpty(requestId);
-
-    protected override void OnInitialized()
-    {
-        requestId = Activity.Current?.Id ?? HttpContext?.TraceIdentifier;
-    }
-}
--- a/examples-Aspire/AspireApp1.Web/Components/Pages/Home.razor
+++ b/examples-Aspire/AspireApp1.Web/Components/Pages/Home.razor
@@ -1,7 +0,0 @@
-@page "/"
-
-<PageTitle>Home</PageTitle>
-
-<h1>Hello, world!</h1>
-
-Welcome to your new app.
--- a/examples-Aspire/AspireApp1.Web/Components/Pages/Weather.razor
+++ b/examples-Aspire/AspireApp1.Web/Components/Pages/Weather.razor
@@ -1,86 +0,0 @@
-@page "/weather"
-@attribute [StreamRendering]
-@* @attribute [OutputCache(Duration = 5)] *@
-
-@inject WeatherApiClient WeatherApi
-@inject WeatherApiClient2 WeatherApi2
-
-<PageTitle>Weather</PageTitle>
-
-<h1>Weather in Den Bosch</h1>
-
-@if (forecasts1 == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <table class="table">
-        <thead>
-            <tr>
-                <th>Date</th>
-                <th>Temp. (C)</th>
-                <th>Temp. (F)</th>
-                <th>Summary</th>
-            </tr>
-        </thead>
-        <tbody>
-            @foreach (var forecast in forecasts1)
-            {
-                <tr>
-                    <td>@forecast.Date.ToShortDateString()</td>
-                    <td>@forecast.TemperatureC</td>
-                    <td>@forecast.TemperatureF</td>
-                    <td>@forecast.Summary</td>
-                </tr>
-            }
-        </tbody>
-    </table>
-}
-
-<h1>Weather in New York</h1>
-
-@if (forecasts2 == null)
-{
-    <p><em>Loading...</em></p>
-}
-else
-{
-    <table class="table">
-        <thead>
-        <tr>
-            <th>Date</th>
-            <th>Temp. (C)</th>
-            <th>Temp. (F)</th>
-            <th>Summary</th>
-        </tr>
-        </thead>
-        <tbody>
-        @foreach (var forecast in forecasts2)
-        {
-            <tr>
-                <td>@forecast.Date.ToShortDateString()</td>
-                <td>@forecast.TemperatureC</td>
-                <td>@forecast.TemperatureF</td>
-                <td>@forecast.Summary</td>
-            </tr>
-        }
-        </tbody>
-    </table>
-}
-
-@code {
-    private WeatherForecast[]? forecasts1;
-    private WeatherForecast[]? forecasts2;
-
-    protected override async Task OnInitializedAsync()
-    {
-        var forecastsTask1 = WeatherApi.GetWeatherAsync();
-        var forecastsTask2 = WeatherApi2.GetWeatherAsync();
-
-        await Task.WhenAll(forecastsTask1, forecastsTask2);
-
-        forecasts1 = await forecastsTask1;
-        forecasts2 = await forecastsTask2;
-    }
-}
--- a/examples-Aspire/AspireApp1.Web/Components/Routes.razor
+++ b/examples-Aspire/AspireApp1.Web/Components/Routes.razor
@@ -1,6 +0,0 @@
-<Router AppAssembly="@typeof(Program).Assembly">
-    <Found Context="routeData">
-        <RouteView RouteData="@routeData" DefaultLayout="@typeof(Layout.MainLayout)" />
-        <FocusOnNavigate RouteData="@routeData" Selector="h1" />
-    </Found>
-</Router>
--- a/examples-Aspire/AspireApp1.Web/Components/_Imports.razor
+++ b/examples-Aspire/AspireApp1.Web/Components/_Imports.razor
@@ -1,11 +0,0 @@
-@using System.Net.Http
-@using System.Net.Http.Json
-@using Microsoft.AspNetCore.Components.Forms
-@using Microsoft.AspNetCore.Components.Routing
-@using Microsoft.AspNetCore.Components.Web
-@using static Microsoft.AspNetCore.Components.Web.RenderMode
-@using Microsoft.AspNetCore.Components.Web.Virtualization
-@using Microsoft.AspNetCore.OutputCaching
-@using Microsoft.JSInterop
-@using AspireApp1.Web
-@using AspireApp1.Web.Components
--- a/examples-Aspire/AspireApp1.Web/Program.cs
+++ b/examples-Aspire/AspireApp1.Web/Program.cs
@@ -1,49 +0,0 @@
-using AspireApp1.Web;
-using AspireApp1.Web.Components;
-
-var builder = WebApplication.CreateBuilder(args);
-
-// Add service defaults & Aspire components.
-builder.AddServiceDefaults();
-
-// Add services to the container.
-builder.Services.AddRazorComponents()
-    .AddInteractiveServerComponents();
-
-builder.Services.AddOutputCache();
-
-builder.Services.AddHttpClient<WeatherApiClient>(client =>
-    {
-        // This URL uses "https+http://" to indicate HTTPS is preferred over HTTP.
-        // Learn more about service discovery scheme resolution at https://aka.ms/dotnet/sdschemes.
-        client.BaseAddress = new("https+http://apiservice");
-    });
-builder.Services.AddHttpClient<WeatherApiClient2>(client =>
-{
-    // This URL uses "https+http://" to indicate HTTPS is preferred over HTTP.
-    // Learn more about service discovery scheme resolution at https://aka.ms/dotnet/sdschemes.
-    client.BaseAddress = new("https+http://apiservice");
-});
-
-var app = builder.Build();
-
-if (!app.Environment.IsDevelopment())
-{
-    app.UseExceptionHandler("/Error", createScopeForErrors: true);
-    // The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-    app.UseHsts();
-}
-
-app.UseHttpsRedirection();
-
-app.UseStaticFiles();
-app.UseAntiforgery();
-
-app.UseOutputCache();
-
-app.MapRazorComponents<App>()
-    .AddInteractiveServerRenderMode();
-
-app.MapDefaultEndpoints();
-
-app.Run();
--- a/examples-Aspire/AspireApp1.Web/Properties/launchSettings.json
+++ b/examples-Aspire/AspireApp1.Web/Properties/launchSettings.json
@@ -1,23 +0,0 @@
-{
-  "$schema": "https://json.schemastore.org/launchsettings.json",
-  "profiles": {
-    "http": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "http://localhost:5124",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
-    "https": {
-      "commandName": "Project",
-      "dotnetRunMessages": true,
-      "launchBrowser": true,
-      "applicationUrl": "https://localhost:7263;http://localhost:5124",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    }
-  }
-}
--- a/examples-Aspire/AspireApp1.Web/WeatherApiClient.cs
+++ b/examples-Aspire/AspireApp1.Web/WeatherApiClient.cs
@@ -1,62 +0,0 @@
-namespace AspireApp1.Web;
-
-public class WeatherApiClient(HttpClient httpClient)
-{
-    public string GetBaseAddress()
-    {
-        return httpClient.BaseAddress?.ToString() ?? "???";
-    }
-
-    public async Task<WeatherForecast[]> GetWeatherAsync(int maxItems = 10, CancellationToken cancellationToken = default)
-    {
-        List<WeatherForecast>? forecasts = null;
-
-        await foreach (var forecast in httpClient.GetFromJsonAsAsyncEnumerable<WeatherForecast>("/weatherforecast", cancellationToken))
-        {
-            if (forecasts?.Count >= maxItems)
-            {
-                break;
-            }
-            if (forecast is not null)
-            {
-                forecasts ??= [];
-                forecasts.Add(forecast);
-            }
-        }
-
-        return forecasts?.ToArray() ?? [];
-    }
-}
-
-public class WeatherApiClient2(HttpClient httpClient)
-{
-    public string GetBaseAddress()
-    {
-        return httpClient.BaseAddress?.ToString() ?? "???";
-    }
-
-    public async Task<WeatherForecast[]> GetWeatherAsync(int maxItems = 10, CancellationToken cancellationToken = default)
-    {
-        List<WeatherForecast>? forecasts = null;
-
-        await foreach (var forecast in httpClient.GetFromJsonAsAsyncEnumerable<WeatherForecast>("/weatherforecast2", cancellationToken))
-        {
-            if (forecasts?.Count >= maxItems)
-            {
-                break;
-            }
-            if (forecast is not null)
-            {
-                forecasts ??= [];
-                forecasts.Add(forecast);
-            }
-        }
-
-        return forecasts?.ToArray() ?? [];
-    }
-}
-
-public record WeatherForecast(DateOnly Date, int TemperatureC, string? Summary)
-{
-    public int TemperatureF => 32 + (int)(TemperatureC / 0.5556);
-}
--- a/examples-Aspire/AspireApp1.Web/appsettings.Development.json
+++ b/examples-Aspire/AspireApp1.Web/appsettings.Development.json
@@ -1,8 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  }
-}
--- a/examples-Aspire/AspireApp1.Web/appsettings.json
+++ b/examples-Aspire/AspireApp1.Web/appsettings.json
@@ -1,9 +0,0 @@
-{
-  "Logging": {
-    "LogLevel": {
-      "Default": "Information",
-      "Microsoft.AspNetCore": "Warning"
-    }
-  },
-  "AllowedHosts": "*"
-}
--- a/examples-Aspire/AspireApp1.Web/wwwroot/app.css
+++ b/examples-Aspire/AspireApp1.Web/wwwroot/app.css
@@ -1,25 +0,0 @@
-h1:focus {
-    outline: none;
-}
-
-.valid.modified:not([type=checkbox]) {
-    outline: 1px solid #26b050;
-}
-
-.invalid {
-    outline: 1px solid #e51240;
-}
-
-.validation-message {
-    color: #e51240;
-}
-
-.blazor-error-boundary {
-    background: url(data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNTYiIGhlaWdodD0iNDkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIG92ZXJmbG93PSJoaWRkZW4iPjxkZWZzPjxjbGlwUGF0aCBpZD0iY2xpcDAiPjxyZWN0IHg9IjIzNSIgeT0iNTEiIHdpZHRoPSI1NiIgaGVpZ2h0PSI0OSIvPjwvY2xpcFBhdGg+PC9kZWZzPjxnIGNsaXAtcGF0aD0idXJsKCNjbGlwMCkiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0yMzUgLTUxKSI+PHBhdGggZD0iTTI2My41MDYgNTFDMjY0LjcxNyA1MSAyNjUuODEzIDUxLjQ4MzcgMjY2LjYwNiA1Mi4yNjU4TDI2Ny4wNTIgNTIuNzk4NyAyNjcuNTM5IDUzLjYyODMgMjkwLjE4NSA5Mi4xODMxIDI5MC41NDUgOTIuNzk1IDI5MC42NTYgOTIuOTk2QzI5MC44NzcgOTMuNTEzIDI5MSA5NC4wODE1IDI5MSA5NC42NzgyIDI5MSA5Ny4wNjUxIDI4OS4wMzggOTkgMjg2LjYxNyA5OUwyNDAuMzgzIDk5QzIzNy45NjMgOTkgMjM2IDk3LjA2NTEgMjM2IDk0LjY3ODIgMjM2IDk0LjM3OTkgMjM2LjAzMSA5NC4wODg2IDIzNi4wODkgOTMuODA3MkwyMzYuMzM4IDkzLjAxNjIgMjM2Ljg1OCA5Mi4xMzE0IDI1OS40NzMgNTMuNjI5NCAyNTkuOTYxIDUyLjc5ODUgMjYwLjQwNyA1Mi4yNjU4QzI2MS4yIDUxLjQ4MzcgMjYyLjI5NiA1MSAyNjMuNTA2IDUxWk0yNjMuNTg2IDY2LjAxODNDMjYwLjczNyA2Ni4wMTgzIDI1OS4zMTMgNjcuMTI0NSAyNTkuMzEzIDY5LjMzNyAyNTkuMzEzIDY5LjYxMDIgMjU5LjMzMiA2OS44NjA4IDI1OS4zNzEgNzAuMDg4N0wyNjEuNzk1IDg0LjAxNjEgMjY1LjM4IDg0LjAxNjEgMjY3LjgyMSA2OS43NDc1QzI2Ny44NiA2OS43MzA5IDI2Ny44NzkgNjkuNTg3NyAyNjcuODc5IDY5LjMxNzkgMjY3Ljg3OSA2Ny4xMTgyIDI2Ni40NDggNjYuMDE4MyAyNjMuNTg2IDY2LjAxODNaTTI2My41NzYgODYuMDU0N0MyNjEuMDQ5IDg2LjA1NDcgMjU5Ljc4NiA4Ny4zMDA1IDI1OS43ODYgODkuNzkyMSAyNTkuNzg2IDkyLjI4MzcgMjYxLjA0OSA5My41Mjk1IDI2My41NzYgOTMuNTI5NSAyNjYuMTE2IDkzLjUyOTUgMjY3LjM4NyA5Mi4yODM3IDI2Ny4zODcgODkuNzkyMSAyNjcuMzg3IDg3LjMwMDUgMjY2LjExNiA4Ni4wNTQ3IDI2My41NzYgODYuMDU0N1oiIGZpbGw9IiNGRkU1MDAiIGZpbGwtcnVsZT0iZXZlbm9kZCIvPjwvZz48L3N2Zz4=) no-repeat 1rem/1.8rem, #b32121;
-    padding: 1rem 1rem 1rem 3.7rem;
-    color: white;
-}
-
-    .blazor-error-boundary::after {
-        content: "An error has occurred."
-    }
--- a/examples-Aspire/AspireApp1.Web/wwwroot/bootstrap/bootstrap.min.css
+++ b/examples-Aspire/AspireApp1.Web/wwwroot/bootstrap/bootstrap.min.css
--- a/examples-Aspire/AspireApp1.Web/wwwroot/bootstrap/bootstrap.min.css.map
+++ b/examples-Aspire/AspireApp1.Web/wwwroot/bootstrap/bootstrap.min.css.map
--- a/examples-Aspire/AspireApp1.Web/wwwroot/favicon.png
+++ b/examples-Aspire/AspireApp1.Web/wwwroot/favicon.png
--- a/examples/WireMock.Net.Client/Program.cs
+++ b/examples/WireMock.Net.Client/Program.cs
@@ -1,151 +1,59 @@
-// Copyright © WireMock.Net
-
+using Newtonsoft.Json;
+using RestEase;
 using System;
 using System.Net.Http.Headers;
 using System.Text;
-using System.Threading.Tasks;
-using Newtonsoft.Json;
-using RestEase;
-using WireMock.Admin.Settings;
 using WireMock.Client;
-using WireMock.Client.Extensions;

-namespace WireMock.Net.Client;
-
-class Program
+namespace WireMock.Net.Client
 {
-    static async Task Main(string[] args)
+    class Program
    {
-        // Start WireMock.Net tool with Admin interface
-        // dotnet-wiremock --StartAdminInterface
-
-        // Create an implementation of the IWireMockAdminApi and pass in the base URL for the API.
-        var api = RestClient.For<IWireMockAdminApi>("http://localhost:9091");
-
-        await api.ResetMappingsAsync().ConfigureAwait(false);
-
-        var mappingBuilder = api.GetMappingBuilder();
-        mappingBuilder.Given(m => m
-            .WithTitle("This is my title 1")
-            .WithRequest(req => req
-                .UsingGet()
-                .WithPath("/bla1")
-            )
-            .WithResponse(rsp => rsp
-                .WithBody("x1")
-                .WithHeaders(h => h.Add("h1", "v1"))
-            )
-        );
-
-        mappingBuilder.Given(m => m
-            .WithTitle("This is my title 2")
-            .WithRequest(req => req
-                .UsingGet()
-                .WithPath("/bla2")
-            )
-            .WithResponse(rsp => rsp
-                .WithBody("x2")
-                .WithHeaders(h => h.Add("h2", "v2"))
-            )
-        );
-
-        mappingBuilder.Given(m => m
-            .WithTitle("This is my title 3")
-            .WithRequest(req => req
-                .UsingGet()
-                .WithPath("/bla3")
-            )
-            .WithResponse(rsp => rsp
-                .WithBodyAsJson(new
-                {
-                    x = "test"
-                }, true)
-            )
-        );
-
-        mappingBuilder.Given(m => m
-            .WithRequest(req => req
-                .WithPath("/test1")
-                .UsingPost()
-                .WithBody(b => b
-                    .WithJmesPathMatcher("things.name == 'RequiredThing'")
-                )
-            )
-            .WithResponse(rsp => rsp
-                .WithHeaders(h => h.Add("Content-Type", "application/json"))
-                .WithDelay(TimeSpan.FromMilliseconds(50))
-                .WithStatusCode(200)
-                .WithBodyAsJson(new
-                {
-                    status = "ok"
-                }, true)
-            )
-        );
-
-        var result = await mappingBuilder.BuildAndPostAsync().ConfigureAwait(false);
-        Console.WriteLine($"result = {JsonConvert.SerializeObject(result)}");
-
-        var mappings = await api.GetMappingsAsync();
-        Console.WriteLine($"mappings = {JsonConvert.SerializeObject(mappings)}");
-
-        // Set BASIC Auth
-        var value = Convert.ToBase64String(Encoding.ASCII.GetBytes("a:b"));
-        api.Authorization = new AuthenticationHeaderValue("Basic", value);
-
-        var settings1 = await api.GetSettingsAsync();
-        Console.WriteLine($"settings1 = {JsonConvert.SerializeObject(settings1)}");
-
-        var settingsViaBuilder = new SettingsModelBuilder()
-            .WithGlobalProcessingDelay(1077)
-            .Build();
-
-        settings1.GlobalProcessingDelay = 1077;
-        api.PostSettingsAsync(settings1).Wait();
-
-        var settings2 = await api.GetSettingsAsync();
-        Console.WriteLine($"settings2 = {JsonConvert.SerializeObject(settings2)}");
-
-        mappings = await api.GetMappingsAsync();
-        Console.WriteLine($"mappings = {JsonConvert.SerializeObject(mappings)}");
-
-        try
+        static void Main(string[] args)
        {
-            var guid = Guid.Parse("11111110-a633-40e8-a244-5cb80bc0ab66");
-            var mapping = await api.GetMappingAsync(guid);
-            Console.WriteLine($"mapping = {JsonConvert.SerializeObject(mapping)}");
+            // Create an implementation of the IFluentMockServerAdmin and pass in the base URL for the API.
+            var api = RestClient.For<IFluentMockServerAdmin>("http://localhost:9091");
+
+            // Set BASIC Auth
+            var value = Convert.ToBase64String(Encoding.ASCII.GetBytes("a:b"));
+            api.Authorization = new AuthenticationHeaderValue("Basic", value);
+
+            var settings1 = api.GetSettingsAsync().Result;
+            Console.WriteLine($"settings1 = {JsonConvert.SerializeObject(settings1)}");
+
+            settings1.GlobalProcessingDelay = 1077;
+            api.PostSettingsAsync(settings1).Wait();
+
+            var settings2 = api.GetSettingsAsync().Result;
+            Console.WriteLine($"settings2 = {JsonConvert.SerializeObject(settings2)}");
+
+            var mappings = api.GetMappingsAsync().Result;
+            Console.WriteLine($"mappings = {JsonConvert.SerializeObject(mappings)}");
+
+            try
+            {
+                var guid = Guid.Parse("11111110-a633-40e8-a244-5cb80bc0ab66");
+                var mapping = api.GetMappingAsync(guid).Result;
+                Console.WriteLine($"mapping = {JsonConvert.SerializeObject(mapping)}");
+            }
+            catch (Exception e)
+            {
+            }
+
+            var request = api.GetRequestsAsync().Result;
+            Console.WriteLine($"request = {JsonConvert.SerializeObject(request)}");
+
+            //var deleteRequestsAsync = api.DeleteRequestsAsync().Result;
+            //Console.WriteLine($"DeleteRequestsAsync = {deleteRequestsAsync.Status}");
+
+            //var resetRequestsAsync = api.ResetRequestsAsync().Result;
+            //Console.WriteLine($"ResetRequestsAsync = {resetRequestsAsync.Status}");
+
+            var scenarioStates = api.GetScenariosAsync().Result;
+            Console.WriteLine($"GetScenariosAsync = {JsonConvert.SerializeObject(scenarioStates)}");
+
+            Console.WriteLine("Press any key to quit");
+            Console.ReadKey();
        }
-        catch (Exception e)
-        {
-        }
-
-        var request = await api.GetRequestsAsync();
-        Console.WriteLine($"request = {JsonConvert.SerializeObject(request)}");
-
-        //var deleteRequestsAsync = api.DeleteRequestsAsync().Result;
-        //Console.WriteLine($"DeleteRequestsAsync = {deleteRequestsAsync.Status}");
-
-        //var resetRequestsAsync = api.ResetRequestsAsync().Result;
-        //Console.WriteLine($"ResetRequestsAsync = {resetRequestsAsync.Status}");
-
-        var scenarioStates = await api.GetScenariosAsync();
-        Console.WriteLine($"GetScenariosAsync = {JsonConvert.SerializeObject(scenarioStates)}");
-
-        var postFileResult = await api.PostFileAsync("1.cs", "C# Hello");
-        Console.WriteLine($"postFileResult = {JsonConvert.SerializeObject(postFileResult)}");
-
-        var getFileResult = await api.GetFileAsync("1.cs");
-        Console.WriteLine($"getFileResult = {getFileResult}");
-
-        Console.WriteLine("Press any key to reset mappings");
-        Console.ReadKey();
-
-        var resetMappingsAsync = await api.ResetMappingsAsync();
-        Console.WriteLine($"resetMappingsAsync = {resetMappingsAsync.Status}");
-
-        var resetMappingsAndReloadStaticMappingsAsync = await api.ResetMappingsAsync(true);
-        Console.WriteLine($"resetMappingsAndReloadStaticMappingsAsync = {resetMappingsAndReloadStaticMappingsAsync.Status}");
-
-        Console.WriteLine("Press any key to quit");
-        Console.ReadKey();
    }
 }
--- a/examples/WireMock.Net.Client/WireMock.Net.Client.csproj
+++ b/examples/WireMock.Net.Client/WireMock.Net.Client.csproj
@@ -1,13 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <ApplicationIcon>../../resources/WireMock.Net-Logo.ico</ApplicationIcon>
-    </PropertyGroup>
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <!-- <RuntimeFrameworkVersion>1.0.1</RuntimeFrameworkVersion> -->
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
+  </PropertyGroup>

-    <ItemGroup>
-        <ProjectReference Include="..\..\src\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="RestEase" Version="1.4.7" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>

 </Project>
--- a/examples/WireMock.Net.Console.GrpcClient/Program.cs
+++ b/examples/WireMock.Net.Console.GrpcClient/Program.cs
@@ -1,43 +0,0 @@
-// Copyright © WireMock.Net
-
-using Greet;
-using Grpc.Net.Client;
-using Policy2;
-
-await TestPolicyAsync();
-// await TestGreeterAsync();
-return;
-
-async Task TestGreeterAsync()
-{
-    var channel = GrpcChannel.ForAddress("http://localhost:9093/grpc3", new GrpcChannelOptions
-    {
-        Credentials = Grpc.Core.ChannelCredentials.Insecure
-    });
-
-    var client = new Greeter.GreeterClient(channel);
-
-    var reply = await client.SayHelloAsync(new HelloRequest { Name = "stef" });
-
-    Console.WriteLine("Greeting: " + reply.Message);
-}
-
-async Task TestPolicyAsync()
-{
-    var channel = GrpcChannel.ForAddress("http://localhost:9093/grpc-policy", new GrpcChannelOptions
-    {
-        Credentials = Grpc.Core.ChannelCredentials.Insecure
-    });
-
-    var client = new PolicyService2.PolicyService2Client(channel);
-
-    var reply = await client.GetCancellationDetailAsync(new GetCancellationDetailRequest
-    {
-        Client = new Client
-        {
-            CorrelationId = "abc"
-        }
-    });
-
-    Console.WriteLine("PolicyService2:reply.CancellationName " + reply.CancellationName);
-}
--- a/examples/WireMock.Net.Console.GrpcClient/WireMock.Net.Console.GrpcClient.csproj
+++ b/examples/WireMock.Net.Console.GrpcClient/WireMock.Net.Console.GrpcClient.csproj
@@ -1,25 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Google.Protobuf" Version="3.25.1" />
-        <PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
-        <PackageReference Include="Grpc.Tools" Version="2.60.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>
-
-    <ItemGroup>
-        <Protobuf Include="greet.proto" GrpcServices="Client" />
-        <Protobuf Include="policy.proto" GrpcServices="Client" />
-    </ItemGroup>
-
-</Project>
--- a/examples/WireMock.Net.Console.GrpcClient/greet.proto
+++ b/examples/WireMock.Net.Console.GrpcClient/greet.proto
@@ -1,33 +0,0 @@
-// Copyright 2019 The gRPC Authors
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package greet;
-
-// The greeting service definition.
-service Greeter {
-  // Sends a greeting
-  rpc SayHello (HelloRequest) returns (HelloReply);
-}
-
-// The request message containing the user's name.
-message HelloRequest {
-  string name = 1;
-}
-
-// The response message containing the greetings
-message HelloReply {
-  string message = 1;
-}
--- a/examples/WireMock.Net.Console.GrpcClient/policy.proto
+++ b/examples/WireMock.Net.Console.GrpcClient/policy.proto
@@ -1,64 +0,0 @@
-
-syntax = "proto3";
-
-import "google/protobuf/timestamp.proto";
-
-// option csharp_namespace = "NarrowIntegrationTest.Lookup";
-
-package Policy2;
-
-service PolicyService2 {	
-	rpc GetCancellationDetail (GetCancellationDetailRequest) returns (GetCancellationDetailResponse);
-}
-
-message GetCancellationDetailRequest {
-	Client Client = 1;
-	LegacyPolicyKey LegacyPolicyKey = 2;
-}
-
-message GetCancellationDetailResponse {
-	ResponseStatus Status = 1;
-	string CancellationCode = 2;
-	string CancellationName = 3;
-	string CancellationDescription = 4;
-	google.protobuf.Timestamp CancellationEffDate = 5;
-	string NonRenewalCode = 6;
-	string NonRenewalName = 7;
-	string NonRenewalDescription = 8;
-	google.protobuf.Timestamp NonRenewalEffDate = 9;
-	google.protobuf.Timestamp LastReinstatementDate = 10;
-}
-
-message LegacyPolicyKey {
-	string Group = 1;
-	int32 UnitNumber = 2;
-	int32 Year = 3;
-	string Suffix = 4;
-}
-
-message ResponseStatus {
-	bool HasErrors = 1;
-	bool HasWarnings = 2;
-	repeated string Errors = 3;
-	repeated string Warnings = 4;
-	string CorrelationId = 5;
-}
-
-message Client {
-	string CorrelationId = 1;
-	enum Clients {
-		Unknown = 0;
-        QMS = 1;
-        BillingCenter = 2;
-        PAS = 3;
-        Payroll = 4;
-        Portal = 5;
-        SFO = 6;
-        QuoteAndBind = 7;
-        LegacyConversion = 8;
-        BindNow = 9;
-		PaymentPortal = 10 ;
-		PricingEngine = 11;
-	}
-	Clients ClientName = 2;
-}
--- a/examples/WireMock.Net.Console.HeadersTest/Program.cs
+++ b/examples/WireMock.Net.Console.HeadersTest/Program.cs
@@ -0,0 +1,60 @@
+using System.IO;
+using System.Reflection;
+using log4net;
+using log4net.Config;
+using log4net.Repository;
+using Newtonsoft.Json;
+using WireMock.Logging;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+using WireMock.Settings;
+
+namespace WireMock.Net.Console.NETCoreApp
+{
+    static class Program
+    {
+        private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
+        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+
+        static void Main(params string[] args)
+        {
+            XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
+
+            string url = "http://localhost:9999/";
+
+            var server = FluentMockServer.Start(new FluentMockServerSettings
+            {
+                Urls = new[] { url },
+                StartAdminInterface = true,
+                Logger = new WireMockConsoleLogger()
+            });
+            System.Console.WriteLine("FluentMockServer listening at {0}", string.Join(",", server.Urls));
+
+            server.SetBasicAuthentication("a", "b");
+
+            server.AllowPartialMapping();
+
+            server
+                .Given(Request.Create()
+                    .UsingGet()
+                    .WithHeader("Keep-Alive-Test", "stef")
+                )
+                .RespondWith(Response.Create()
+                    .WithHeader("Keep-Alive", "timeout=1, max=1")
+                    .WithBody("Keep-Alive OK")
+                );
+
+            System.Console.WriteLine("Press any key to stop the server");
+            System.Console.ReadKey();
+            server.Stop();
+
+            System.Console.WriteLine("Displaying all requests");
+            var allRequests = server.LogEntries;
+            System.Console.WriteLine(JsonConvert.SerializeObject(allRequests, Formatting.Indented));
+
+            System.Console.WriteLine("Press any key to quit");
+            System.Console.ReadKey();
+        }
+    }
+}
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/WireMock.Net.Console.NET8.WithCertificate.csproj
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/WireMock.Net.Console.NET8.WithCertificate.csproj
@@ -1,19 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">

  <PropertyGroup>
    <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
+    <ApplicationIcon>../../WireMock.Net-Logo.ico</ApplicationIcon>
  </PropertyGroup>

  <ItemGroup>
    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+    <PackageReference Include="log4net" Version="2.0.8" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
  </ItemGroup>

  <ItemGroup>
-    <None Update="*.pem">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Update="*.pfx">
+    <None Update="log4net.config">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
    </None>
    <None Update="nlog.config">
--- a/examples/WireMock.Net.Console.HeadersTest/log4net.config
+++ b/examples/WireMock.Net.Console.HeadersTest/log4net.config
--- a/examples/WireMock.Net.Console.HeadersTest/nlog.config
+++ b/examples/WireMock.Net.Console.HeadersTest/nlog.config
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      autoReload="true"
+      internalLogLevel="info"
+      internalLogFile="c:\temp\wiremock-internal-nlog.log">
+
+  <targets>
+    <!-- write logs to file  -->
+    <target xsi:type="File" name="all" fileName="c:\temp\wiremock-${shortdate}.log"
+            layout="${longdate}|${event-properties:item=EventId.Id}|${uppercase:${level}}|${logger}|${message} ${exception}" />
+  </targets>
+
+  <!-- rules to map from logger name to target -->
+  <rules>
+    <logger name="*" minlevel="Debug" writeTo="all" />
+  </rules>
+</nlog>
--- a/examples/WireMock.Net.Console.MimePart/MainApp.cs
+++ b/examples/WireMock.Net.Console.MimePart/MainApp.cs
@@ -1,82 +0,0 @@
-// Copyright © WireMock.Net
-
-using Newtonsoft.Json;
-using WireMock.Logging;
-using WireMock.Matchers;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
-using WireMock.Server;
-using WireMock.Settings;
-
-namespace WireMock.Net.Console.MimePart;
-
-// Test this CURL:
-// curl -X POST http://localhost:9091/multipart -F "plainText=This is some plain text;type=text/plain" -F "jsonData={ `"Key`": `"Value`" };type=application/json" -F "image=@image.png;type=image/png"
-//
-// curl -X POST http://localhost:9091/multipart2 -F "plainText=This is some plain text;type=text/plain" -F "jsonData={ `"Key`": `"Value`" };type=application/json" -F "image=@image.png;type=image/png"
-
-public static class MainApp
-{
-    public static async Task RunAsync()
-    {
-        using var server = WireMockServer.Start(new WireMockServerSettings
-        {
-            Port = 9091,
-            StartAdminInterface = true,
-
-            ReadStaticMappings = true,
-            //WatchStaticMappings = true,
-            //WatchStaticMappingsInSubdirectories = true,
-
-            Logger = new WireMockConsoleLogger()
-        });
-        System.Console.WriteLine("WireMockServer listening at {0}", string.Join(",", server.Urls));
-
-        var textPlainContentTypeMatcher = new ContentTypeMatcher("text/plain");
-        var textPlainContentMatcher = new ExactMatcher("This is some plain text");
-        var textPlainMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textPlainContentTypeMatcher, null, null, textPlainContentMatcher);
-
-        var textJsonContentTypeMatcher = new ContentTypeMatcher("application/json");
-        var textJsonContentMatcher = new JsonMatcher(new { Key = "Value" }, true);
-        var textJsonMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textJsonContentTypeMatcher, null, null, textJsonContentMatcher);
-
-        var imagePngContentTypeMatcher = new ContentTypeMatcher("image/png");
-        var imagePngContentDispositionMatcher = new ExactMatcher("form-data; name=\"image\"; filename=\"image.png\"");
-        var imagePngContentTransferEncodingMatcher = new ExactMatcher("default");
-        var imagePngContentMatcher = new ExactObjectMatcher(Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC"));
-        var imagePngMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, imagePngContentTypeMatcher, imagePngContentDispositionMatcher, imagePngContentTransferEncodingMatcher, imagePngContentMatcher);
-
-        var matchers = new IMatcher[]
-        {
-            textPlainMatcher,
-            textJsonMatcher,
-            imagePngMatcher
-        };
-
-        server
-            .Given(Request.Create()
-                .WithPath("/multipart")
-                .UsingPost()
-                .WithMultiPart(matchers)
-            )
-            .WithGuid("b9c82182-e469-41da-bcaf-b6e3157fefdb")
-            .RespondWith(Response.Create()
-                .WithBody("MultiPart is ok")
-            );
-
-        // server.SaveStaticMappings();
-
-        System.Console.WriteLine(JsonConvert.SerializeObject(server.MappingModels, Formatting.Indented));
-
-        System.Console.WriteLine("Press any key to stop the server");
-        System.Console.ReadKey();
-        server.Stop();
-
-        System.Console.WriteLine("Displaying all requests");
-        var allRequests = server.LogEntries;
-        System.Console.WriteLine(JsonConvert.SerializeObject(allRequests, Formatting.Indented));
-
-        System.Console.WriteLine("Press any key to quit");
-        System.Console.ReadKey();        
-    }
-}
--- a/examples/WireMock.Net.Console.MimePart/Program.cs
+++ b/examples/WireMock.Net.Console.MimePart/Program.cs
@@ -1,23 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Reflection;
-using log4net;
-using log4net.Config;
-using log4net.Repository;
-
-namespace WireMock.Net.Console.MimePart;
-
-static class Program
-{
-    private static readonly ILoggerRepository LogRepository = LogManager.GetRepository(Assembly.GetEntryAssembly());
-    private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
-
-    static async Task Main(params string[] args)
-    {
-        Log.Info("Starting WireMock.Net.Console.MimePart...");
-
-        XmlConfigurator.Configure(LogRepository, new FileInfo("log4net.config"));
-
-        await MainApp.RunAsync();
-    }
-}
--- a/examples/WireMock.Net.Console.MimePart/WireMock.Net.Console.MimePart.csproj
+++ b/examples/WireMock.Net.Console.MimePart/WireMock.Net.Console.MimePart.csproj
@@ -1,29 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
-        <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
-        <ImplicitUsings>enable</ImplicitUsings>
-        <Nullable>enable</Nullable>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <Content Include="__admin\mappings\*.json">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </Content>
-    </ItemGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
-        <PackageReference Include="log4net" Version="2.0.15" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-    </ItemGroup>
-
-    <ItemGroup>
-        <None Update="log4net.config">
-            <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
-
-</Project>
--- a/examples/WireMock.Net.Console.MimePart/__admin/mappings/b9c82182-e469-41da-bcaf-b6e3157fefdc.json
+++ b/examples/WireMock.Net.Console.MimePart/__admin/mappings/b9c82182-e469-41da-bcaf-b6e3157fefdc.json
@@ -1,79 +0,0 @@
-{
-    "Guid": "b9c82182-e469-41da-bcaf-b6e3157fefdc",
-    "UpdatedAt": "2025-12-18T17:21:57.3879723Z",
-    "Request": {
-        "Path": {
-            "Matchers": [
-                {
-                    "Name": "WildcardMatcher",
-                    "Pattern": "/multipart2",
-                    "IgnoreCase": false
-                }
-            ]
-        },
-        "Methods": [
-            "POST"
-        ],
-        "Body": {
-            "MatcherName": "MultiPartMatcher",
-            "Matchers": [
-                {
-                    "Name": "MimePartMatcher",
-                    "ContentTypeMatcher": {
-                        "Name": "ContentTypeMatcher",
-                        "Pattern": "text/plain",
-                        "IgnoreCase": false
-                    },
-                    "ContentMatcher": {
-                        "Name": "ExactMatcher",
-                        "Pattern": "This is some plain text",
-                        "IgnoreCase": false
-                    }
-                },
-                {
-                    "Name": "MimePartMatcher",
-                    "ContentTypeMatcher": {
-                        "Name": "ContentTypeMatcher",
-                        "Pattern": "application/json",
-                        "IgnoreCase": false
-                    },
-                    "ContentMatcher": {
-                        "Name": "JsonMatcher",
-                        "Pattern": {
-                            "Key": "Value"
-                        },
-                        "IgnoreCase": true,
-                        "Regex": false
-                    }
-                },
-                {
-                    "Name": "MimePartMatcher",
-                    "ContentTypeMatcher": {
-                        "Name": "ContentTypeMatcher",
-                        "Pattern": "image/png",
-                        "IgnoreCase": false
-                    },
-                    "ContentDispositionMatcher": {
-                        "Name": "ExactMatcher",
-                        "Pattern": "form-data; name=\"image\"; filename=\"image.png\"",
-                        "IgnoreCase": false
-                    },
-                    "ContentTransferEncodingMatcher": {
-                        "Name": "ExactMatcher",
-                        "Pattern": "default",
-                        "IgnoreCase": false
-                    },
-                    "ContentMatcher": {
-                        "Name": "ExactObjectMatcher",
-                        "Pattern": "iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC"
-                    }
-                }
-            ],
-            "MatchOperator": "Or"
-        }
-    },
-    "Response": {
-        "BodyDestination": "SameAsSource",
-        "Body": "MultiPart2 is ok"
-    }
-}
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/HowTo.txt
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/HowTo.txt
@@ -1,16 +0,0 @@
-https://www.scottbrady91.com/openssl/creating-elliptical-curve-keys-using-openssl
-
-# find your curve
-openssl ecparam -list_curves
-
-# generate a private key for a curve
-openssl ecparam -name prime256v1 -genkey -noout -out private-key.pem
-
-# generate corresponding public key
-openssl ec -in private-key.pem -pubout -out public-key.pem
-
-# optional: create a self-signed certificate
-openssl req -new -x509 -key private-key.pem -out cert.pem -days 360
-
-# optional: convert pem to pfx
-openssl pkcs12 -export -inkey private-key.pem -in cert.pem -out cert.pfx
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/Program.cs
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/Program.cs
@@ -1,54 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.IO;
-using WireMock.Logging;
-using WireMock.Server;
-using WireMock.Settings;
-
-namespace WireMock.Net.Console.NET6.WithCertificate;
-
-class Program
-{
-    static void Main(string[] args)
-    {
-        var serverEC = WireMockServer.Start(new WireMockServerSettings
-        {
-            Urls = new[] { "https://localhost:8433/" },
-            StartAdminInterface = true,
-            Logger = new WireMockConsoleLogger(),
-            CertificateSettings = new WireMockCertificateSettings
-            {
-                // https://www.scottbrady91.com/c-sharp/pem-loading-in-dotnet-core-and-dotnet
-                // https://www.scottbrady91.com/openssl/creating-elliptical-curve-keys-using-openssl
-                X509CertificateFilePath = "cert.pem",
-                X509CertificatePassword = @"
-----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJZTv6ujGrEwxW+ab1+CtZouRd8PK7PsklVMvJwm1uDmoAoGCCqGSM49
-AwEHoUQDQgAE39VoI268uDuIeKmRzr9e9jgMSGeuJTvTG7+cSXmeDymrVgIGXQgm
-qKA8TDXpJNrRhWMd/fpsnWu1JwJUjBmspQ==
-----END EC PRIVATE KEY-----"
-            }
-        });
-        System.Console.WriteLine("WireMockServer listening at {0}", serverEC.Url);
-
-        var serverRSA = WireMockServer.Start(new WireMockServerSettings
-        {
-            Urls = new[] { "https://localhost:8434/" },
-            StartAdminInterface = true,
-            Logger = new WireMockConsoleLogger(),
-            CertificateSettings = new WireMockCertificateSettings
-            {
-                // https://www.scottbrady91.com/c-sharp/pem-loading-in-dotnet-core-and-dotnet
-                // https://www.scottbrady91.com/openssl/creating-rsa-keys-using-openssl
-                X509CertificateFilePath = "cert-rsa.pem",
-                X509CertificatePassword = File.ReadAllText("private-key-rsa.pem")
-            }
-        });
-        System.Console.WriteLine("WireMockServer listening at {0}", serverRSA.Url);
-
-        System.Console.WriteLine("Press any key to stop the server(s)");
-        System.Console.ReadKey();
-        serverEC.Stop();
-        serverRSA.Stop();
-    }
-}
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/cert-rsa.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/cert-rsa.pem
@@ -1,28 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIErzCCAxegAwIBAgIUeVJ5l3LJPakcwhBGXNfa7UawgPcwDQYJKoZIhvcNAQEL
-BQAwZzELMAkGA1UEBhMCTkwxEzARBgNVBAgMClNvbWUtU3RhdGUxFTATBgNVBAoM
-DFdpcmVNb2NrLk5ldDEVMBMGA1UECwwMV2lyZU1vY2suTmV0MRUwEwYDVQQDDAxX
-aXJlTW9jay5OZXQwHhcNMjIwODEyMTQzMjUxWhcNMzIwNjIwMTQzMjUxWjBnMQsw
-CQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEVMBMGA1UECgwMV2lyZU1v
-Y2suTmV0MRUwEwYDVQQLDAxXaXJlTW9jay5OZXQxFTATBgNVBAMMDFdpcmVNb2Nr
-Lk5ldDCCAaIwDQYJKoZIhvcNAQEBBQADggGPADCCAYoCggGBALyF2sKsueDaZ78r
-fQ5IyqWJLYXnYRT94xVfiPoRQNex7JMYwdIt+xEPcfhIlyODxYRxzYTSuXi/cBOM
-/svTewIdBmDDyyCDboZ+P8THlzdwCLNHUPONQqJtc0msLVfwPuvDeZIwhIn9CDwC
-1EXstWLEePxu1i2/PAfUudYeQunjrP10DE06fyW+ZH7sMSPOSyY4BO4Rt0dk3Cws
-U/CEl+bSN5Kx2WkyPxbOvZLa66JmQEaeSZ4ypkhujWE1LuIIQE94P28BzFpHtDWO
-1+42K8mqjdnO8eH1/IfAMmOE/o3rKoI4C5aUPyJpDOaz5KFCqdCSBHlb2uo3lqgd
-yYOCrVOLIsljp8H4ncfs1AUo+tExNW/5jWYegAZGXLArrWktHEbwa4f+9ZMa7+VS
-lKpx6hLI7eMSHBCsQJ7yH8QyLhr0HMjoDw38isGV+mK/N1u47s4oaTQyG+HXH+e/
-Shj5OSKnLWBV/eX7YSAJ1hqHgmAbwl/BnuGI3SBXSK4mcjcNvQIDAQABo1MwUTAd
-BgNVHQ4EFgQUYhrgWXNdcFpnyz0mifPqYM+kyK4wHwYDVR0jBBgwFoAUYhrgWXNd
-cFpnyz0mifPqYM+kyK4wDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-AYEAmfJZJ019pO7ZXDQ85nEC99+x9+MUnSZ6UuMIiy2VMcS/oea8ugQ4NBYVPpQS
-O/xiYENpw36+H4+ctv1tdAbZELGGLBahkkzZedLyiFObxDALu0PP7jQYr4nUjfQj
-B/fWuTcCrVmuH3yiutw/sALd1su63VjjZiOCwxMB8LV4T0ojBTHA2D4rqLTiSRgs
-sP3CRoWDI2JIr2afM/K8SMczRbo/5ovv0YF9kFcwG9WDEa/oQ67Yu05GFBnItYmT
-QP+Br5WiPTLOON9TKm1ZgxLwrhJNHfD2+u9uudkVF5uWyg9ZvB8sYmIw5wSvUFl5
-SDj1Pxy4olim54BL5wIwlMMQu+fKp6T89iShgN/NEot3JKW3zDpa/t93IjJXGOlh
-O4ECoUzXCtDTnc6aais2SoYjbveP2wduS9MHAQinjTiepzYbhJbySURKqCBu1mN2
-EFsU9Pzd1+MA3ZbRfhvl8Jvwdp5GqaFyCqgqmP5oPOcd9ncJowyfobfdqzYMXPGl
-bu9i
-----END CERTIFICATE-----
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/cert.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/cert.pem
@@ -1,13 +0,0 @@
-----BEGIN CERTIFICATE-----
-MIIB9TCCAZugAwIBAgIUYH7UM/DAXzosxsT+ea2jdYvhqqMwCgYIKoZIzj0EAwIw
-UDELMAkGA1UEBhMCTkwxEzARBgNVBAgMClNvbWUtU3RhdGUxFTATBgNVBAoMDFdp
-cmVNb2NrLk5ldDEVMBMGA1UEAwwMV2lyZU1vY2suTmV0MB4XDTIyMDgxMTE2MjE0
-NFoXDTMyMDYxOTE2MjE0NFowUDELMAkGA1UEBhMCTkwxEzARBgNVBAgMClNvbWUt
-U3RhdGUxFTATBgNVBAoMDFdpcmVNb2NrLk5ldDEVMBMGA1UEAwwMV2lyZU1vY2su
-TmV0MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE39VoI268uDuIeKmRzr9e9jgM
-SGeuJTvTG7+cSXmeDymrVgIGXQgmqKA8TDXpJNrRhWMd/fpsnWu1JwJUjBmspaNT
-MFEwHQYDVR0OBBYEFILL8V+fAtMnccWKGAdkx2Dh/v/TMB8GA1UdIwQYMBaAFILL
-8V+fAtMnccWKGAdkx2Dh/v/TMA8GA1UdEwEB/wQFMAMBAf8wCgYIKoZIzj0EAwID
-SAAwRQIgKDLAG8OWK6GF5HV4kmWz3kp2V3yVsNK2V9Lw3dSE+YsCIQCK1EEBvuqc
-0ncZV4ETVnOY23PWFOMk1VwN2aoTi5n++Q==
-----END CERTIFICATE-----
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/private-key-rsa.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/private-key-rsa.pem
@@ -1,39 +0,0 @@
-----BEGIN RSA PRIVATE KEY-----
-MIIG5AIBAAKCAYEAvIXawqy54Npnvyt9DkjKpYkthedhFP3jFV+I+hFA17HskxjB
-0i37EQ9x+EiXI4PFhHHNhNK5eL9wE4z+y9N7Ah0GYMPLIINuhn4/xMeXN3AIs0dQ
-841Com1zSawtV/A+68N5kjCEif0IPALURey1YsR4/G7WLb88B9S51h5C6eOs/XQM
-TTp/Jb5kfuwxI85LJjgE7hG3R2TcLCxT8ISX5tI3krHZaTI/Fs69ktrromZARp5J
-njKmSG6NYTUu4ghAT3g/bwHMWke0NY7X7jYryaqN2c7x4fX8h8AyY4T+jesqgjgL
-lpQ/ImkM5rPkoUKp0JIEeVva6jeWqB3Jg4KtU4siyWOnwfidx+zUBSj60TE1b/mN
-Zh6ABkZcsCutaS0cRvBrh/71kxrv5VKUqnHqEsjt4xIcEKxAnvIfxDIuGvQcyOgP
-DfyKwZX6Yr83W7juzihpNDIb4dcf579KGPk5IqctYFX95fthIAnWGoeCYBvCX8Ge
-4YjdIFdIriZyNw29AgMBAAECggGBAJcMsNDWUECG/iVAFP0C+ctUdDMbxr9pBS+0
-0i168XdhSeo6JeHfkZCDzY9fqil8hR+vhznrFUxYJtajW+u4UJDK7LdPaUttw3rj
-YPir6s8yZuYuOABMqJ04EO1wlQwmpGOGxbuKQEfHg3eB1M8J7/No9H9d1yHkXZbw
-rM2QhZCdKZgSCWE/g2ycdizz1hOYUMIYlGqjqzP67iY+hirqMkNxH7Hb6hTNe5ss
-ntwxqCcAwnNSlC2661yRp5nBYQUeEfgXAx/cZZ6cILjX6JanDsML/PRY1hOm5hCZ
-8/8satOGtd37rgr1cP/kvNMf7uLI8hIeC4JSCymUh6lU6ERpWRoQV8DUE60ztFbi
-bQbGU/rseznBN8O1cM6fjduno/n8d4q5wGLjAbIai+xxxTSksbnlvkthRAUfK9/Y
-rUdMxqgkDnecCAHof8UPz/Vg3n9J9wl6waFrKa+Kseda1wEB/jf51fb/t0sJP2Dq
-n2kcp239zwalUr2XnXfENfeL9IDBiQKBwQDsogaTFy7E5P+66B1ZRDP2X6WgFedH
-tjMCVXG4K4VOWp6xMfhieq2d+amMoYi/J3cxS8qDIM64q55caTaB3KTodGrzmvax
-avqG58Mpyv9VdEDzMI29D7Xtx5ykoAAWOmQaByH/4J+3IBX6efRDGmSvmoqPoa0V
-ChMO0Gw6O9GsH/kVEy2nRaj9dJpOqo05jhh9LLye2stPycCHzYybYqjs0Nt1uboY
-3mbiCJBWJ8jZk9KeFhrqCkYB1zZJIJVybJ8CgcEAy/PRm0NZDUx6IJKnwDXBriE0
-Qih1ZcvdVi907nhYAlBpAPWisGls6EghBQsfvQ4ZPwHAFBlDu/72JrqGJhkP61mP
-D/xT9d59xSU5N90doiInrTHAOoyZEdpul9QvCXxKuFFl3RZnxn0RwPgc23sZUcny
-aM4DIWk1541Z84Lxv3tFLXoG5uvqpCkSwEBd9iu0EMHlmoPFkEkY41Q3/zTs46FY
-fnWLSdRahKDFHrZTgyu4i/3clbbp9m1cpWLwzUwjAoHAVpSWCT2jPCF5vD5vdpjw
-1kV6yU8aV2+/zCvNNxCdbuTTSYw6EHZIjhOqSK1V5nMfNmc/yqi3WnRYtgE9E1jS
-8cae11Es0A+PaMrl6qW+tNqbZR+vzKwx6bVuiAGO5pMoyyku9HuQlKVlxUbX67F9
-g47tAc6rEJamEHaMEuaOOgdc0Kw6uQhQ46PFTeEzWQq3xR0YSptNZn0wN8AqoTQB
-ENz+X128TJsbU7rEbPGTmKBwoKz/3gAySzwePbVxWPOLAoHAAsqehtKAKIdwcHux
-YhcaRIjdzz4AhVkp+WEC57Sr97QkC8hQ5rs6q185XHlPgOXtgIhEmcHSxILz2Yna
-BjF3n1AFfkGE4Kuf6w/cXaBgJHT1OBCjQenkunLT6q4TyrxxxV4P19vTpcrWcF60
-/mgL66uo7rhLIKzw+O9dWNDlACruwnWWHJkECCUrxYfcAV+NwmD1BI1jKdtmRM5F
-Se/ughsWO/zd4C/Q4VnV+Nqj//qcNwZNe5saTq4mg3j8NMMjAoHBANRR+WLpgr3f
-Kh9vNA+v1gnBUFImheWrJ+Eu75q1sGKrz3gZ8glhewf37YbJVuSKFMEBAg1qobWG
-/2B26beXia/NprVuV5vqJNuts29W1/WuDKE7BsNya/quDA1WxTQAzhSA54DYtWXw
-UgVTPtEQXL9Wbk2wF98tWiUio4VjV++geVql4qKQUet1IMo1RgRgbQL5hn/rDH0g
-ZOX552VdK1xivWQRVA4486eKHlW/lbKJjX0Os6qhNIF57qVquIRQPw==
-----END RSA PRIVATE KEY-----
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/private-key.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/private-key.pem
@@ -1,5 +0,0 @@
-----BEGIN EC PRIVATE KEY-----
-MHcCAQEEIJZTv6ujGrEwxW+ab1+CtZouRd8PK7PsklVMvJwm1uDmoAoGCCqGSM49
-AwEHoUQDQgAE39VoI268uDuIeKmRzr9e9jgMSGeuJTvTG7+cSXmeDymrVgIGXQgm
-qKA8TDXpJNrRhWMd/fpsnWu1JwJUjBmspQ==
-----END EC PRIVATE KEY-----
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/public-key-rsa.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/public-key-rsa.pem
@@ -1,11 +0,0 @@
-----BEGIN PUBLIC KEY-----
-MIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAvIXawqy54Npnvyt9DkjK
-pYkthedhFP3jFV+I+hFA17HskxjB0i37EQ9x+EiXI4PFhHHNhNK5eL9wE4z+y9N7
-Ah0GYMPLIINuhn4/xMeXN3AIs0dQ841Com1zSawtV/A+68N5kjCEif0IPALURey1
-YsR4/G7WLb88B9S51h5C6eOs/XQMTTp/Jb5kfuwxI85LJjgE7hG3R2TcLCxT8ISX
-5tI3krHZaTI/Fs69ktrromZARp5JnjKmSG6NYTUu4ghAT3g/bwHMWke0NY7X7jYr
-yaqN2c7x4fX8h8AyY4T+jesqgjgLlpQ/ImkM5rPkoUKp0JIEeVva6jeWqB3Jg4Kt
-U4siyWOnwfidx+zUBSj60TE1b/mNZh6ABkZcsCutaS0cRvBrh/71kxrv5VKUqnHq
-Esjt4xIcEKxAnvIfxDIuGvQcyOgPDfyKwZX6Yr83W7juzihpNDIb4dcf579KGPk5
-IqctYFX95fthIAnWGoeCYBvCX8Ge4YjdIFdIriZyNw29AgMBAAE=
-----END PUBLIC KEY-----
--- a/examples/WireMock.Net.Console.NET8.WithCertificate/public-key.pem
+++ b/examples/WireMock.Net.Console.NET8.WithCertificate/public-key.pem
@@ -1,4 +0,0 @@
-----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE39VoI268uDuIeKmRzr9e9jgMSGeu
-JTvTG7+cSXmeDymrVgIGXQgmqKA8TDXpJNrRhWMd/fpsnWu1JwJUjBmspQ==
-----END PUBLIC KEY-----
--- a/examples/WireMock.Net.Console.NET8/CustomFileSystemFileHandler.cs
+++ b/examples/WireMock.Net.Console.NET8/CustomFileSystemFileHandler.cs
@@ -1,123 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Collections.Generic;
-using System.IO;
-using WireMock.Handlers;
-
-namespace WireMock.Net.ConsoleApplication
-{
-    internal class CustomFileSystemFileHandler : IFileSystemHandler
-    {
-        private static readonly string AdminMappingsFolder = Path.Combine("__admin", "mappings");
-        private static readonly string UnmatchedRequestsFolder = Path.Combine("requests", "unmatched");
-
-        /// <inheritdoc cref="IFileSystemHandler.FolderExists"/>
-        public bool FolderExists(string path)
-        {
-            return Directory.Exists(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.CreateFolder"/>
-        public void CreateFolder(string path)
-        {
-            Directory.CreateDirectory(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.EnumerateFiles"/>
-        public IEnumerable<string> EnumerateFiles(string path, bool includeSubdirectories)
-        {
-            return includeSubdirectories ? Directory.EnumerateFiles(path, "*", SearchOption.AllDirectories) : Directory.EnumerateFiles(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.GetMappingFolder"/>
-        public string GetMappingFolder()
-        {
-            return Path.Combine(@"c:\temp-wiremock", AdminMappingsFolder);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadMappingFile"/>
-        public string ReadMappingFile(string path)
-        {
-            return File.ReadAllText(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.WriteMappingFile"/>
-        public void WriteMappingFile(string path, string text)
-        {
-            File.WriteAllText(path, text);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
-        public byte[] ReadResponseBodyAsFile(string path)
-        {
-            return File.ReadAllBytes(Path.GetFileName(path) == path ? Path.Combine(GetMappingFolder(), path) : path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadResponseBodyAsFile"/>
-        public string ReadResponseBodyAsString(string path)
-        {
-            return File.ReadAllText(Path.GetFileName(path) == path ? Path.Combine(GetMappingFolder(), path) : path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.FileExists"/>
-        public bool FileExists(string path)
-        {
-            return File.Exists(AdjustPath(path));
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.WriteFile(string, byte[])"/>
-        public void WriteFile(string path, byte[] bytes)
-        {
-            File.WriteAllBytes(AdjustPath(path), bytes);
-        }
-
-        public void WriteFile(string folder, string filename, byte[] bytes)
-        {
-            File.WriteAllBytes(Path.Combine(folder, filename), bytes);
-
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.DeleteFile"/>
-        public void DeleteFile(string path)
-        {
-            File.Delete(AdjustPath(path));
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadFile"/>
-        public byte[] ReadFile(string path)
-        {
-            return File.ReadAllBytes(AdjustPath(path));
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.ReadFileAsString"/>
-        public string ReadFileAsString(string path)
-        {
-            return File.ReadAllText(path);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.GetUnmatchedRequestsFolder"/>
-        public string GetUnmatchedRequestsFolder()
-        {
-            return Path.Combine(@"c:\temp-wiremock", UnmatchedRequestsFolder);
-        }
-
-        /// <inheritdoc cref="IFileSystemHandler.WriteUnmatchedRequest"/>
-        public void WriteUnmatchedRequest(string filename, string text)
-        {
-            var folder = GetUnmatchedRequestsFolder();
-            Directory.CreateDirectory(folder);
-
-            File.WriteAllText(Path.Combine(folder, filename), text);
-        }
-
-        /// <summary>
-        /// Adjusts the path to the MappingFolder.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>Adjusted path</returns>
-        private string AdjustPath(string path)
-        {
-            return Path.Combine(GetMappingFolder(), path);
-        }
-    }
-}
--- a/examples/WireMock.Net.Console.NET8/MainApp.cs
+++ b/examples/WireMock.Net.Console.NET8/MainApp.cs
--- a/Show More
+++ b/Show More