1.8.13

Add Scenario set State method (#1322 )
* Add SetScenarioState * add tests * summary * . * 1.8.13-preview-01 * fix * fix name
2026-01-14 07:33:33 +01:00 · 2025-06-23 08:07:30 +02:00 · 2025-06-23 08:03:11 +02:00 · 2025-06-15 11:50:31 +02:00 · 2025-06-15 11:44:09 +02:00 · 2025-06-14 11:13:04 +02:00
60 changed files with 2106 additions and 2021 deletions
--- a/.github/workflows/CreateRelease.yml
+++ b/.github/workflows/CreateRelease.yml
@@ -1,5 +1,8 @@
 name: CreateRelease

+permissions:
+  contents: write
+
 on:
  push:
    tags:
@@ -10,6 +13,9 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
+
      - name: Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
+        with:
+          generate_release_notes: true
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,6 +22,9 @@ jobs:
    - 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

@@ -46,6 +49,9 @@ jobs:
    - 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

--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# 1.8.13 (23 June 2025)
+- [#1322](https://github.com/wiremock/WireMock.Net/pull/1322) - Add Scenario set State method [feature] contributed by [StefH](https://github.com/StefH)
+- [#1321](https://github.com/wiremock/WireMock.Net/issues/1321) - Feature: Setting individual scenario state via Admin API [feature]
+
+# 1.8.12 (15 June 2025)
+- [#1317](https://github.com/wiremock/WireMock.Net/pull/1317) - Set description when converting MappingModel to IRespondWithAProvider [feature] contributed by [BodrickLight](https://github.com/BodrickLight)
+- [#1320](https://github.com/wiremock/WireMock.Net/pull/1320) - Fix TypeLoader [bug] contributed by [StefH](https://github.com/StefH)
+- [#1319](https://github.com/wiremock/WireMock.Net/issues/1319) - Why is IRequestMessage.BodyAsMimeMessage null in new versions (&gt; 1.8.7) [bug]
+
+# 1.8.11 (11 June 2025)
+- [#1311](https://github.com/wiremock/WireMock.Net/pull/1311) - Bump Testcontainers version to 4.5.0 [feature] contributed by [scrocquesel](https://github.com/scrocquesel)
+- [#1313](https://github.com/wiremock/WireMock.Net/pull/1313) - Update RandomDataGenerator.Net to 1.0.19 [feature] contributed by [StefH](https://github.com/StefH)
+- [#1315](https://github.com/wiremock/WireMock.Net/pull/1315) - Fix for WithTransformer and JsonBody as list [bug] contributed by [StefH](https://github.com/StefH)
+- [#1310](https://github.com/wiremock/WireMock.Net/issues/1310) - Binary compat issue with testcontainers 4.5.0 [bug]
+- [#1312](https://github.com/wiremock/WireMock.Net/issues/1312) - WithTransformer breaks when the response BodyAsJson is a List [bug]
+
 # 1.8.10 (10 June 2025)
 - [#1306](https://github.com/wiremock/WireMock.Net/pull/1306) - Update RequestModelBuilder (add WithHeader) [feature] contributed by [StefH](https://github.com/StefH)
 - [#1308](https://github.com/wiremock/WireMock.Net/pull/1308) - For some projects, change dependency to WireMock.Net.Minimal [feature] contributed by [StefH](https://github.com/StefH)
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <VersionPrefix>1.8.10</VersionPrefix>
+        <VersionPrefix>1.8.13</VersionPrefix>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/wiremock/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes

-SET version=1.8.10
+SET version=1.8.13

 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels wontfix test question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%

--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,8 +1,5 @@
-# 1.8.10 (10 June 2025)
- #1306 Update RequestModelBuilder (add WithHeader) [feature]
- #1308 For some projects, change dependency to WireMock.Net.Minimal [feature]
- #1309 Update AwesomeAssertions to version 9 [feature]
- #1305 AdminApiMappingBuilder do not expose WithHeader for Request [feature]
- #1307 Update WireMock.Net.AwesomeAssertions to use latest version from AwesomeAssertions [feature]
+# 1.8.13 (23 June 2025)
+- #1322 Add Scenario set State method [feature]
+- #1321 Feature: Setting individual scenario state via Admin API [feature]

 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,4 +1,4 @@
-# WireMock.Net
+# ![Project Icon](./resources/logo_32x32.png) WireMock.Net
 A C# .NET version based on [mock4net](https://github.com/alexvictoor/mock4net) which mimics the functionality from the JAVA based [WireMock](http://wiremock.org).

 For more info, see also this WIKI page: [What is WireMock.Net](https://github.com/wiremock/WireMock.Net/wiki/What-Is-WireMock.Net).
--- a/Solution.sln
+++ b/Solution.sln
@@ -38,12 +38,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Client", "examples\WireMock.Net.Client\WireMock.Net.Client.csproj", "{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Proxy.Net452", "examples\WireMock.Net.Console.Proxy.Net452\WireMock.Net.Console.Proxy.Net452.csproj", "{26433A8F-BF01-4962-97EB-81BFFBB61096}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Service", "examples\Wiremock.Net.Service\WireMock.Net.Service.csproj", "{7F0B2446-0363-4720-AF46-F47F83B557DC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Console.Net452.Classic", "examples\WireMock.Net.Console.Net452.Classic\WireMock.Net.Console.Net452.Classic.csproj", "{668F689E-57B4-422E-8846-C0FF643CA268}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.RequestLogTest", "examples\WireMock.Net.Console.RequestLogTest\WireMock.Net.Console.RequestLogTest.csproj", "{A9D039B9-7509-4CF1-9EFD-87EB82998575}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.OpenApiParser.ConsoleApp", "examples\WireMock.Net.OpenApiParser.ConsoleApp\WireMock.Net.OpenApiParser.ConsoleApp.csproj", "{5C09FB93-1535-4F92-AF26-21E8A061EE4A}"
@@ -136,6 +132,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Shared", "src\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Minimal", "src\WireMock.Net.Minimal\WireMock.Net.Minimal.csproj", "{BFEF8990-65B3-4274-310F-7355F0B84035}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ConsoleApp.UsingNuGet", "examples\WireMock.Net.ConsoleApp.UsingNuGet\WireMock.Net.ConsoleApp.UsingNuGet.csproj", "{1F80A6E6-D146-4E40-9EA8-49DB8494239F}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Tests.UsingNuGet", "test\WireMock.Net.Tests.UsingNuGet\WireMock.Net.Tests.UsingNuGet.csproj", "{BBA332C6-28A9-42E7-9C4D-A0816E52A198}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -166,18 +166,10 @@ Global
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{26433A8F-BF01-4962-97EB-81BFFBB61096}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7F0B2446-0363-4720-AF46-F47F83B557DC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{668F689E-57B4-422E-8846-C0FF643CA268}.Release|Any CPU.Build.0 = Release|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -326,6 +318,14 @@ Global
 		{BFEF8990-65B3-4274-310F-7355F0B84035}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BFEF8990-65B3-4274-310F-7355F0B84035}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BFEF8990-65B3-4274-310F-7355F0B84035}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -337,9 +337,7 @@ Global
 		{B6269AAC-170A-43D5-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{31DC2EF8-C3FE-467D-84BE-FB5D956E612E} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{74D91AD0-D96D-4FD2-AEC5-CC49D38346C0} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{26433A8F-BF01-4962-97EB-81BFFBB61096} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{7F0B2446-0363-4720-AF46-F47F83B557DC} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
-		{668F689E-57B4-422E-8846-C0FF643CA268} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{A9D039B9-7509-4CF1-9EFD-87EB82998575} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{5C09FB93-1535-4F92-AF26-21E8A061EE4A} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{B6269AAC-170A-4346-8B9A-579DED3D9A95} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
@@ -379,6 +377,8 @@ Global
 		{F8B4A93E-46EF-4237-88FE-15FDAB7635D4} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{D3804228-91F4-4502-9595-39584E5A0177} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{BFEF8990-65B3-4274-310F-7355F0B84035} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{1F80A6E6-D146-4E40-9EA8-49DB8494239F} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{BBA332C6-28A9-42E7-9C4D-A0816E52A198} = {0BB8B634-407A-4610-A91F-11586990767A}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -109,6 +109,13 @@ jobs:
      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:
--- a/examples/WireMock.Net.Console.Net452.Classic/CustomFileSystemFileHandler.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/CustomFileSystemFileHandler.cs
--- a/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/MainApp.cs
--- a/examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj
+++ b/examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj
@@ -6,11 +6,6 @@
      <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
  </PropertyGroup>

-  <ItemGroup>
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\MainApp.cs" Link="MainApp.cs" />
-    <Compile Include="..\WireMock.Net.Console.Net452.Classic\CustomFileSystemFileHandler.cs" Link="CustomFileSystemFileHandler.cs" />
-  </ItemGroup>
-
  <ItemGroup>
    <Content Include="__admin\mappings\*.json">
      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
--- a/examples/WireMock.Net.Console.Net452.Classic/App.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/App.config
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-    </startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="HandlebarsDotNet.Helpers.Core" publicKeyToken="00d131fae0c250bc" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.3.3.0" newVersion="2.3.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Handlebars" publicKeyToken="22225d0bf33cd661" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.1.2.0" newVersion="2.1.2.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
--- a/examples/WireMock.Net.Console.Net452.Classic/Program.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/Program.cs
@@ -1,16 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.IO;
-using log4net.Config;
-
-namespace WireMock.Net.ConsoleApplication;
-
-static class Program
-{
-    static void Main(params string[] args)
-    {
-        XmlConfigurator.Configure(new FileInfo("log4net.config"));
-
-        MainApp.Run();
-    }
-}
--- a/examples/WireMock.Net.Console.Net452.Classic/Properties/AssemblyInfo.cs
+++ b/examples/WireMock.Net.Console.Net452.Classic/Properties/AssemblyInfo.cs
@@ -1,37 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("WireMock.Net.Console.Net452.Classic")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WireMock.Net.Console.Net452.Classic")]
-[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("668f689e-57b4-422e-8846-c0ff643ca268")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
+++ b/examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{668F689E-57B4-422E-8846-C0FF643CA268}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>WireMock.Net.ConsoleApplication</RootNamespace>
-    <AssemblyName>WireMock.Net.ConsoleApplication</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationIcon>..\..\resources\WireMock.Net-Logo.ico</ApplicationIcon>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
-    </Reference>
-    <Reference Include="Handlebars, Version=2.1.6.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.6\lib\net451\Handlebars.dll</HintPath>
-    </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.3\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
-    </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.3\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="log4net, Version=2.0.17.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.17\lib\net45\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="SimMetrics.Net, Version=1.0.5.0, Culture=neutral, PublicKeyToken=c58dc06d59f3391b, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SimMetrics.Net.1.0.5\lib\net45\SimMetrics.Net.dll</HintPath>
-    </Reference>
-    <Reference Include="Stef.Validation, Version=0.1.1.0, Culture=neutral, PublicKeyToken=8f3400880c321038, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Stef.Validation.0.1.1\lib\net40\Stef.Validation.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Web" />
-    <Reference Include="System.XML" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="CustomFileSystemFileHandler.cs" />
-    <Compile Include="MainApp.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="log4net.config">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
-    <Content Include="__admin\mappings\11111110-a633-40e8-a244-5cb80bc0ab66.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <None Include="__admin\mappings\873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
-      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
-      <Name>WireMock.Net.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="log4net">
-      <Version>2.0.17</Version>
-    </PackageReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
--- a/examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json
+++ b/examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/11111110-a633-40e8-a244-5cb80bc0ab66.json
@@ -1,21 +0,0 @@
-{
-    "Request": {
-        "Path": {
-            "Matchers": [
-                {
-                    "Name": "WildcardMatcher",
-                    "Pattern": "/static/mapping"
-                }
-            ]
-        },
-        "Methods": [
-            "get"
-        ]
-    },
-    "Response": {
-        "BodyAsJson": { "body": "static mapping" },
-        "Headers": {
-            "Content-Type": "application/json"
-        }
-    }
-}
--- a/examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json
+++ b/examples/WireMock.Net.Console.Net452.Classic/__admin/mappings/873d495f-940e-4b86-a1f4-4f0fc7be8b8b.json
@@ -1,19 +0,0 @@
-{
-  "Guid": "873d495f-940e-4b86-a1f4-4f0fc7be8b8b",
-  "Priority": 4,
-  "Request": {
-    "Path": {},
-    "Methods": [
-      "get"
-    ]
-  },
-  "Response": {
-    "StatusCode": 200,
-    "BodyDestination": "SameAsSource",
-    "Body": "NO PATH OR URL",
-    "UseTransformer": false,
-    "Headers": {
-      "Content-Type": "application/json"
-    }
-  }
-}
--- a/examples/WireMock.Net.Console.Net452.Classic/log4net.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/log4net.config
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-  <configSections>
-    <section name="log4net" type="System.Configuration.IgnoreSectionHandler" />
-  </configSections>
-  <appSettings>
-    <add key="log4net.Internal.Debug" value="true"/>
-  </appSettings>
-  <log4net>
-    <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender">
-      <layout type="log4net.Layout.PatternLayout">
-        <conversionPattern value="%date [%thread] %-5level %logger{1} - %message%newline" />
-      </layout>
-    </appender>
-    <root>
-      <level value="DEBUG" />
-      <appender-ref ref="ConsoleAppender" />
-    </root>
-  </log4net>
-</configuration>
--- a/examples/WireMock.Net.Console.Net452.Classic/packages.config
+++ b/examples/WireMock.Net.Console.Net452.Classic/packages.config
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="AnyOf" version="0.3.0" targetFramework="net452" />
-  <package id="Handlebars.Net" version="2.1.6" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers" version="2.4.3" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.4.3" targetFramework="net452" />
-  <package id="log4net" version="2.0.17" targetFramework="net452" />
-  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
-  <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />
-  <package id="Stef.Validation" version="0.1.1" targetFramework="net452" />
-  <package id="System.ValueTuple" version="4.5.0" targetFramework="net452" />
-</packages>
--- a/examples/WireMock.Net.Console.Proxy.Net452/App.config
+++ b/examples/WireMock.Net.Console.Proxy.Net452/App.config
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/>
-    </startup>
-</configuration>
--- a/examples/WireMock.Net.Console.Proxy.Net452/Program.cs
+++ b/examples/WireMock.Net.Console.Proxy.Net452/Program.cs
@@ -1,60 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Collections.Specialized;
-using System.Net.Http;
-using WireMock.Server;
-using WireMock.Settings;
-
-namespace WireMock.Net.Console.Proxy.Net452
-{
-    class Program
-    {
-        static void Main(string[] args)
-        {
-            string[] urls = { "http://localhost:9091/", "https://localhost:9443/" };
-            var server = WireMockServer.Start(new WireMockServerSettings
-            {
-                Urls = urls,
-                StartAdminInterface = true,
-                ReadStaticMappings = false,
-                ProxyAndRecordSettings = new ProxyAndRecordSettings
-                {
-                    Url = "http://postman-echo.com/post",
-                    //ClientX509Certificate2ThumbprintOrSubjectName = "www.yourclientcertname.com OR yourcertificatethumbprint (only if the service you're proxying to requires it)",
-                    SaveMapping = true,
-                    SaveMappingToFile = false,
-                    ExcludedHeaders = new[] { "dnt", "Content-Length" }
-                }
-            });
-
-            System.Console.WriteLine("Subscribing to LogEntriesChanged");
-            server.LogEntriesChanged += Server_LogEntriesChanged;
-
-            var uri = new Uri(urls[0]);
-            var form = new MultipartFormDataContent
-            {
-                { new StringContent("data"), "test", "test.txt" }
-            };
-            new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
-
-            System.Console.WriteLine("Unsubscribing to LogEntriesChanged");
-            server.LogEntriesChanged -= Server_LogEntriesChanged;
-
-            form = new MultipartFormDataContent
-            {
-                { new StringContent("data2"), "test2", "test2.txt" }
-            };
-            new HttpClient().PostAsync(uri, form).GetAwaiter().GetResult();
-
-            System.Console.WriteLine("Press any key to stop the server");
-            System.Console.ReadKey();
-            server.Stop();
-        }
-
-        private static void Server_LogEntriesChanged(object sender, NotifyCollectionChangedEventArgs eventRecordArgs)
-        {
-            System.Console.WriteLine("Server_LogEntriesChanged : {0}", eventRecordArgs.NewItems.Count);
-        }
-    }
-}
--- a/examples/WireMock.Net.Console.Proxy.Net452/Properties/AssemblyInfo.cs
+++ b/examples/WireMock.Net.Console.Proxy.Net452/Properties/AssemblyInfo.cs
@@ -1,37 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Reflection;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("WireMock.Net.Console.Proxy.Net452")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("WireMock.Net.Console.Proxy.Net452")]
-[assembly: AssemblyCopyright("Copyright © Stef Heyenrath 2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("26433a8f-bf01-4962-97eb-81bffbb61096")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj
+++ b/examples/WireMock.Net.Console.Proxy.Net452/WireMock.Net.Console.Proxy.Net452.csproj
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{26433A8F-BF01-4962-97EB-81BFFBB61096}</ProjectGuid>
-    <OutputType>Exe</OutputType>
-    <RootNamespace>WireMock.Net.Console.Proxy.Net452</RootNamespace>
-    <AssemblyName>WireMock.Net.Console.Proxy.Net452</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject>WireMock.Net.Console.Proxy.Net452.Program</StartupObject>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <Prefer32Bit>true</Prefer32Bit>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Condition="'$(Platform)' == 'x64'" Include="..\packages\Libuv.1.10.0\runtimes\win7-x64\native\libuv.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-      <Link>libuv.dll</Link>
-    </None>
-    <None Condition="'$(Platform)' == 'x86'" Include="..\packages\Libuv.1.10.0\runtimes\win7-x86\native\libuv.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <Visible>False</Visible>
-      <Link>libuv.dll</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Owin.Host.HttpListener.3.1.0\lib\net45\Microsoft.Owin.Host.HttpListener.dll</HintPath>
-    </Reference>
-    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
--- a/examples/WireMock.Net.Console.Proxy.Net452/packages.config
+++ b/examples/WireMock.Net.Console.Proxy.Net452/packages.config
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
-  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
-</packages>
--- a/examples/WireMock.Net.ConsoleApp.UsingNuGet/Program.cs
+++ b/examples/WireMock.Net.ConsoleApp.UsingNuGet/Program.cs
@@ -0,0 +1,88 @@
+// Copyright © WireMock.Net
+
+using System.Net.Http.Headers;
+using System.Text;
+using WireMock.Matchers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+
+Directory.SetCurrentDirectory(Path.GetTempPath());
+
+using var server = WireMockServer.Start();
+
+var textPlainContent = "This is some plain text";
+var textPlainContentType = "text/plain";
+var textPlainContentTypeMatcher = new ContentTypeMatcher(textPlainContentType);
+var textPlainContentMatcher = new ExactMatcher(textPlainContent);
+var textPlainMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textPlainContentTypeMatcher, null, null, textPlainContentMatcher);
+
+var textJson = "{ \"Key\" : \"Value\" }";
+var textJsonContentType = "text/json";
+var textJsonContentTypeMatcher = new ContentTypeMatcher(textJsonContentType);
+var textJsonContentMatcher = new JsonMatcher(new { Key = "Value" }, true);
+var jsonMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textJsonContentTypeMatcher, null, null, textJsonContentMatcher);
+
+var imagePngBytes = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC");
+var imagePngContentMatcher = new ExactObjectMatcher(imagePngBytes);
+var imagePngMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, null, null, null, imagePngContentMatcher);
+
+var matchers = new IMatcher[]
+{
+    textPlainMatcher,
+    jsonMatcher,
+    imagePngMatcher
+};
+
+server
+    .Given(Request.Create()
+        .UsingPost()
+        .WithPath("/multipart")
+        .WithMultiPart(matchers)
+    )
+    .RespondWith(Response.Create()
+        .WithBodyAsJson(new
+        {
+            Method = "{{request.Method}}",
+            BodyAsMimeMessage = "{{request.BodyAsMimeMessage.TextBody}}"
+        })
+        .WithTransformer()
+    );
+
+server
+    .Given(Request.Create()
+        .UsingPost()
+        .WithPath("/multipart2")
+        .WithMultiPart(matchers)
+    )
+    .RespondWith(Response.Create()
+        .WithBody(request =>
+        {
+            if (request.BodyAsMimeMessage == null)
+            {
+                throw new InvalidProgramException("Not expected");
+            }
+            return "OK";
+        })
+        .WithTransformer()
+    );
+
+var formDataContent = new MultipartFormDataContent
+{
+    { new StringContent(textPlainContent, Encoding.UTF8, textPlainContentType), "text" },
+    { new StringContent(textJson, Encoding.UTF8, textJsonContentType), "json" }
+};
+
+var fileContent = new ByteArrayContent(imagePngBytes);
+fileContent.Headers.ContentType = new MediaTypeHeaderValue("image/png");
+formDataContent.Add(fileContent, "somefile", "image.png");
+
+var client = server.CreateClient();
+
+var response = await client.PostAsync("/multipart", formDataContent);
+var content = await response.Content.ReadAsStringAsync();
+Console.WriteLine(content);
+
+var response2 = await client.PostAsync("/multipart2", formDataContent);
+var content2 = await response2.Content.ReadAsStringAsync();
+Console.WriteLine(content2);
--- a/examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj
+++ b/examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Update="SonarAnalyzer.CSharp" Version="10.12.0.118525" />
+  </ItemGroup>
+
+  <!--<ItemGroup>
+    <PackageReference Include="WireMock.Net" Version="1.8.11" />
+  </ItemGroup>-->
+
+</Project>
--- a/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
+++ b/examples/WireMock.Net.Service/WireMock.Net.Service.csproj
@@ -113,20 +113,13 @@
    </None>
    <None Include="packages.config" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\WireMock.Net.Abstractions\WireMock.Net.Abstractions.csproj">
-      <Project>{b6269aac-170a-4346-8b9a-579ded3d9a94}</Project>
-      <Name>WireMock.Net.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\WireMock.Net\WireMock.Net.csproj">
-      <Project>{d3804228-91f4-4502-9595-39584e5a01ad}</Project>
-      <Name>WireMock.Net</Name>
-    </ProjectReference>
-  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="log4net">
      <Version>3.0.3</Version>
    </PackageReference>
+    <PackageReference Include="WireMock.Net">
+      <Version>1.8.11</Version>
+    </PackageReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/examples/WireMock.Net.TestcontainersExample/Program.cs
+++ b/examples/WireMock.Net.TestcontainersExample/Program.cs
@@ -159,9 +159,7 @@ internal class Program
    private static async Task TestWindowsCopyAsync()
    {
        var builder = new WireMockContainerBuilder()
-            .WithWatchStaticMappings(true)
-            .WithAutoRemove(true)
-            .WithCleanUp(true);
+            .WithWatchStaticMappings(true);

        var container = builder.Build();

@@ -186,8 +184,6 @@ internal class Program
        var mappings = await adminClient.GetMappingsAsync();
        Console.WriteLine("mappings = " + JsonConvert.SerializeObject(mappings, Formatting.Indented));

-        await Task.Delay(1_000);
-
        await container.StopAsync();
    }

@@ -205,9 +201,7 @@ internal class Program
            .WithNetwork(dummyNetwork)
            .WithAdminUserNameAndPassword("x", "y")
            .WithMappings(mappingsPath)
-            .WithWatchStaticMappings(true)
-            // .WithAutoRemove(true)
-            .WithCleanUp(true);
+            .WithWatchStaticMappings(true);

        if (image != null)
        {
--- a/resources/MyGet-Config.png
+++ b/resources/MyGet-Config.png
--- a/resources/MyGet-Use.png
+++ b/resources/MyGet-Use.png
--- a/resources/WireMock.Net-Logo.png
+++ b/resources/WireMock.Net-Logo.png
--- a/resources/WireMock.Net-LogoAspire.png
+++ b/resources/WireMock.Net-LogoAspire.png
--- a/resources/logo_32x32.png
+++ b/resources/logo_32x32.png
--- a/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateUpdateModel.cs
+++ b/src/WireMock.Net.Abstractions/Admin/Scenarios/ScenarioStateUpdateModel.cs
@@ -0,0 +1,15 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.Admin.Scenarios;
+
+/// <summary>
+/// ScenarioStateModel
+/// </summary>
+[FluentBuilder.AutoGenerateBuilder]
+public class ScenarioStateUpdateModel
+{
+    /// <summary>
+    /// Gets or sets the NextState.
+    /// </summary>
+    public string? State { get; set; }
+}
--- a/src/WireMock.Net.Abstractions/Server/IWireMockServer.cs
+++ b/src/WireMock.Net.Abstractions/Server/IWireMockServer.cs
@@ -161,6 +161,11 @@ public interface IWireMockServer : IDisposable
    /// </summary>
    bool ResetScenario(string name);

+    /// <summary>
+    /// Sets a scenario to a state.
+    /// </summary>
+    bool SetScenarioState(string name, string? state);
+
    /// <summary>
    /// Resets the LogEntries.
    /// </summary>
--- a/src/WireMock.Net.MimePart/Util/MimeKitUtils.cs
+++ b/src/WireMock.Net.MimePart/Util/MimeKitUtils.cs
@@ -28,7 +28,7 @@ internal class MimeKitUtils : IMimeKitUtils

        if (requestMessage.BodyData != null &&
            requestMessage.Headers?.TryGetValue(HttpKnownHeaderNames.ContentType, out var contentTypeHeader) == true &&
-            StartsWithMultiPart(contentTypeHeader) // Only parse when "multipart/mixed"
+            StartsWithMultiPart(contentTypeHeader)
        )
        {
            var bytes = requestMessage.BodyData?.DetectedBodyType switch
--- a/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj
+++ b/src/WireMock.Net.MimePart/WireMock.Net.MimePart.csproj
@@ -36,9 +36,9 @@
    </PropertyGroup>

    <ItemGroup>
-        <PackageReference Include="PolySharp" Version="1.15.0">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        <PackageReference Include="Nullable" Version="1.3.1">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
        <PackageReference Include="Stef.Validation" Version="0.1.1" />
    </ItemGroup>
--- a/src/WireMock.Net.Minimal/IMapping.cs
+++ b/src/WireMock.Net.Minimal/IMapping.cs
@@ -86,7 +86,7 @@ public interface IMapping
    WireMockServerSettings Settings { get; }

    /// <summary>
-    /// Is State started ?
+    /// Indicates if the state is started or manually set to a value.
    /// </summary>
    bool IsStartState { get; }

--- a/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs
+++ b/src/WireMock.Net.Minimal/Server/WireMockServer.Admin.cs
@@ -66,6 +66,7 @@ public partial class WireMockServer
        public RegexMatcher MappingsCodeGuidPathMatcher => new($"^{_prefixEscaped}\\/mappings\\/code\\/([0-9A-Fa-f]{{8}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{12}})$");
        public RegexMatcher RequestsGuidPathMatcher => new($"^{_prefixEscaped}\\/requests\\/([0-9A-Fa-f]{{8}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{4}}[-][0-9A-Fa-f]{{12}})$");
        public RegexMatcher ScenariosNameMatcher => new($"^{_prefixEscaped}\\/scenarios\\/.+$");
+        public RegexMatcher ScenariosNameWithStateMatcher => new($"^{_prefixEscaped}\\/scenarios\\/.+\\/state$");
        public RegexMatcher ScenariosNameWithResetMatcher => new($"^{_prefixEscaped}\\/scenarios\\/.+\\/reset$");
        public RegexMatcher FilesFilenamePathMatcher => new($"^{_prefixEscaped}\\/files\\/.+$");
        public RegexMatcher ProtoDefinitionsIdPathMatcher => new($"^{_prefixEscaped}\\/protodefinitions\\/.+$");
@@ -138,6 +139,9 @@ public partial class WireMockServer
        Given(Request.Create().WithPath(_adminPaths.Scenarios + "/reset").UsingPost()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(ScenariosReset));
        Given(Request.Create().WithPath(_adminPaths.ScenariosNameWithResetMatcher).UsingPost()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(ScenarioReset));

+        // __admin/scenarios/{scenario}/state
+        Given(Request.Create().WithPath(_adminPaths.ScenariosNameWithStateMatcher).UsingPut()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(ScenariosSetState));
+
        // __admin/files/{filename}
        Given(Request.Create().WithPath(_adminPaths.FilesFilenamePathMatcher).UsingPost()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(FilePost));
        Given(Request.Create().WithPath(_adminPaths.FilesFilenamePathMatcher).UsingPut()).AtPriority(WireMockConstants.AdminPriority).RespondWith(new DynamicResponseProvider(FilePut));
@@ -705,6 +709,21 @@ public partial class WireMockServer
            ResponseMessageBuilder.Create(200, "Scenario reset") :
            ResponseMessageBuilder.Create(HttpStatusCode.NotFound, $"No scenario found by name '{name}'.");
    }
+
+    private IResponseMessage ScenariosSetState(IRequestMessage requestMessage)
+    {
+        var name = requestMessage.Path.Split('/').Reverse().Skip(1).First();
+        if (!_options.Scenarios.ContainsKey(name))
+        {
+            ResponseMessageBuilder.Create(HttpStatusCode.NotFound, $"No scenario found by name '{name}'.");
+        }
+
+        var update = DeserializeObject<ScenarioStateUpdateModel>(requestMessage);
+
+        return SetScenarioState(name, update.State) ?
+            ResponseMessageBuilder.Create(200, $"Scenario state set to '{update.State}'") :
+            ResponseMessageBuilder.Create(HttpStatusCode.NotFound, $"No scenario found by name '{name}'.");
+    }
    #endregion

    #region Pact
--- a/src/WireMock.Net.Minimal/Server/WireMockServer.ConvertMapping.cs
+++ b/src/WireMock.Net.Minimal/Server/WireMockServer.ConvertMapping.cs
@@ -76,6 +76,11 @@ public partial class WireMockServer
            respondProvider = respondProvider.WithTitle(mappingModel.Title!);
        }

+        if (!string.IsNullOrEmpty(mappingModel.Description))
+        {
+            respondProvider = respondProvider.WithDescription(mappingModel.Description!);
+        }
+
        if (mappingModel.Priority != null)
        {
            respondProvider = respondProvider.AtPriority(mappingModel.Priority.Value);
--- a/src/WireMock.Net.Minimal/Server/WireMockServer.cs
+++ b/src/WireMock.Net.Minimal/Server/WireMockServer.cs
@@ -567,6 +567,32 @@ public partial class WireMockServer : IWireMockServer
        return _options.Scenarios.ContainsKey(name) && _options.Scenarios.TryRemove(name, out _);
    }

+    /// <inheritdoc />
+    [PublicAPI]
+    public bool SetScenarioState(string name, string? state)
+    {
+        if (state == null)
+        {
+            return ResetScenario(name);
+        }
+
+        _options.Scenarios.AddOrUpdate(
+            name,
+            _ => new ScenarioState
+            {
+                Name = name,
+                NextState = state
+            },
+            (_, current) =>
+            {
+                current.NextState = state;
+                return current;
+            }
+        );
+
+        return true;
+    }
+
    /// <inheritdoc cref="IWireMockServer.WithMapping(MappingModel[])" />
    [PublicAPI]
    public IWireMockServer WithMapping(params MappingModel[] mappings)
--- a/src/WireMock.Net.Minimal/Transformers/Transformer.cs
+++ b/src/WireMock.Net.Minimal/Transformers/Transformer.cs
@@ -1,6 +1,7 @@
 // Copyright © WireMock.Net

 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using HandlebarsDotNet.Helpers.Models;
@@ -170,8 +171,8 @@ internal class Transformer : ITransformer
                WalkNode(transformerContext, options, jToken, model);
                break;

-            case Array bodyAsArray:
-                jToken = JArray.FromObject(bodyAsArray, _jsonSerializer);
+            case var bodyAsEnumerable when bodyAsEnumerable is IEnumerable and not string:
+                jToken = JArray.FromObject(bodyAsEnumerable, _jsonSerializer);
                WalkNode(transformerContext, options, jToken, model);
                break;

--- a/src/WireMock.Net.Minimal/Util/TypeLoader.cs
+++ b/src/WireMock.Net.Minimal/Util/TypeLoader.cs
@@ -51,7 +51,7 @@ internal static class TypeLoader
    {
        var key = typeof(TInterface).FullName!;

-        var pluginType = Assemblies.GetOrAdd(key, _ =>
+        return Assemblies.GetOrAdd(key, _ =>
        {
            if (TryFindTypeInDlls<TInterface>(null, out var foundType))
            {
@@ -60,7 +60,6 @@ internal static class TypeLoader

            throw new DllNotFoundException($"No dll found which implements interface '{key}'.");
        });
-        return pluginType;
    }

    private static Type GetPluginTypeByFullName<TInterface>(string implementationTypeFullName) where TInterface : class
@@ -68,7 +67,7 @@ internal static class TypeLoader
        var @interface = typeof(TInterface).FullName;
        var key = $"{@interface}_{implementationTypeFullName}";

-        var pluginType = Assemblies.GetOrAdd(key, _ =>
+        return Assemblies.GetOrAdd(key, _ =>
        {
            if (TryFindTypeInDlls<TInterface>(implementationTypeFullName, out var foundType))
            {
@@ -77,28 +76,40 @@ internal static class TypeLoader

            throw new DllNotFoundException($"No dll found which implements Interface '{@interface}' and has FullName '{implementationTypeFullName}'.");
        });
-        return pluginType;
    }

    private static bool TryFindTypeInDlls<TInterface>(string? implementationTypeFullName, [NotNullWhen(true)] out Type? pluginType) where TInterface : class
    {
-        foreach (var file in Directory.GetFiles(Directory.GetCurrentDirectory(), "*.dll"))
+#if NETSTANDARD1_3
+        var directoriesToSearch = new[] { AppContext.BaseDirectory };
+#else
+        var processDirectory = Path.GetDirectoryName(System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName);
+        var assemblyDirectory = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+        var directoriesToSearch = new[] { processDirectory, assemblyDirectory }
+            .Where(d => !string.IsNullOrEmpty(d))
+            .Distinct()
+            .ToArray();
+#endif
+        foreach (var directory in directoriesToSearch)
        {
-            try
+            foreach (var file in Directory.GetFiles(directory!, "*.dll"))
            {
-                var assembly = Assembly.Load(new AssemblyName
+                try
                {
-                    Name = Path.GetFileNameWithoutExtension(file)
-                });
+                    var assembly = Assembly.Load(new AssemblyName
+                    {
+                        Name = Path.GetFileNameWithoutExtension(file)
+                    });

-                if (TryGetImplementationTypeByInterfaceAndOptionalFullName<TInterface>(assembly, implementationTypeFullName, out pluginType))
-                {
-                    return true;
+                    if (TryGetImplementationTypeByInterfaceAndOptionalFullName<TInterface>(assembly, implementationTypeFullName, out pluginType))
+                    {
+                        return true;
+                    }
+                }
+                catch
+                {
+                    // no-op: just try next .dll
                }
-            }
-            catch
-            {
-                // no-op: just try next .dll
            }
        }

--- a/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
+++ b/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
@@ -65,7 +65,7 @@
        <PackageReference Include="JmesPath.Net" Version="1.0.330" />
        <PackageReference Include="AnyOf" Version="0.4.0" />
        <PackageReference Include="TinyMapper.Signed" Version="4.0.0" />
-        <PackageReference Include="PolySharp" Version="1.15.0">
+        <PackageReference Include="Nullable" Version="1.3.1">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
@@ -157,13 +157,13 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Handlebars.Net.Helpers" Version="2.5.0" />
-        <!--<PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.5.0" />-->
-        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.5.0" />
-        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.5.0" />
-        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.5.0" />
-        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.5.0" />
-        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.5.0" />
+        <PackageReference Include="Handlebars.Net.Helpers" Version="2.5.2" />
+        <!--<PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.5.2" />-->
+        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.5.2" />
+        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.5.2" />
+        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.5.2" />
+        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.5.2" />
+        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.5.2" />
    </ItemGroup>

    <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' ">
--- a/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
+++ b/src/WireMock.Net.OpenApiParser/WireMock.Net.OpenApiParser.csproj
@@ -29,7 +29,7 @@
        </PackageReference>
        <PackageReference Include="RamlToOpenApiConverter.SourceOnly" Version="0.8.0" />
        <PackageReference Include="YamlDotNet" Version="8.1.0" />
-        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.18" />
+        <PackageReference Include="RandomDataGenerator.Net" Version="1.0.19" />
        <PackageReference Include="Stef.Validation" Version="0.1.1" />
    </ItemGroup>

--- a/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
+++ b/src/WireMock.Net.RestClient/IWireMockAdminApi.cs
@@ -256,7 +256,7 @@ public interface IWireMockAdminApi
    /// Delete (reset) all scenarios
    /// </summary>
    /// <param name="cancellationToken">The optional cancellationToken.</param>
-    [Post("scenarios")]
+    [Post("scenarios/reset")]
    Task<StatusModel> ResetScenariosAsync(CancellationToken cancellationToken = default);

    /// <summary>
@@ -269,7 +269,7 @@ public interface IWireMockAdminApi
    Task<StatusModel> DeleteScenarioAsync([Path] string name, CancellationToken cancellationToken = default);

    /// <summary>
-    /// Delete (reset) all scenarios
+    /// Delete (reset) a specific scenario
    /// </summary>
    /// <param name="name">Scenario name.</param>
    /// <param name="cancellationToken">The optional cancellationToken.</param>
@@ -277,6 +277,16 @@ public interface IWireMockAdminApi
    [AllowAnyStatusCode]
    Task<StatusModel> ResetScenarioAsync([Path] string name, CancellationToken cancellationToken = default);

+    /// <summary>
+    /// Update the state for a scenario.
+    /// </summary>
+    /// <param name="name">Scenario name.</param>
+    /// <param name="updateModel">Scenario state update model.</param>
+    /// <param name="cancellationToken">The optional cancellationToken.</param>
+    [Put("scenarios/{name}/state")]
+    [AllowAnyStatusCode]
+    Task<StatusModel> PutScenarioStateAsync([Path] string name, [Body] ScenarioStateUpdateModel updateModel, CancellationToken cancellationToken = default);
+
    /// <summary>
    /// Create a new File
    /// </summary>
--- a/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
+++ b/src/WireMock.Net.Testcontainers/WireMock.Net.Testcontainers.csproj
@@ -39,11 +39,11 @@
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
        <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="Testcontainers" Version="4.0.0" />
+        <PackageReference Include="Testcontainers" Version="4.5.0" />
    </ItemGroup>

    <ItemGroup>
      <ProjectReference Include="..\WireMock.Net.RestClient\WireMock.Net.RestClient.csproj" />
    </ItemGroup>
-    
+
 </Project>
--- a/test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj
+++ b/test/WireMock.Net.Tests.UsingNuGet/WireMock.Net.Tests.UsingNuGet.csproj
@@ -0,0 +1,39 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+
+        <IsPackable>false</IsPackable>
+        <IsTestProject>true</IsTestProject>
+    </PropertyGroup>
+
+    <PropertyGroup>
+        <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="AwesomeAssertions" Version="9.0.0" />
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+        <PackageReference Include="WireMock.Net" Version="1.8.11" />
+        <PackageReference Include="xunit" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.1">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Using Include="Xunit" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Update="SonarAnalyzer.CSharp" Version="10.11.0.117924" />
+    </ItemGroup>
+
+</Project>
--- a/test/WireMock.Net.Tests.UsingNuGet/WireMockServerTests.WithMultiPart.cs
+++ b/test/WireMock.Net.Tests.UsingNuGet/WireMockServerTests.WithMultiPart.cs
@@ -0,0 +1,103 @@
+// Copyright © WireMock.Net
+
+using System.Net;
+using System.Net.Http.Headers;
+using System.Text;
+using AwesomeAssertions;
+using WireMock.Matchers;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
+using WireMock.Server;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.Net.Tests;
+
+public partial class WireMockServerTests
+{
+    [Fact]
+    public async Task WireMockServer_WithMultiPartBody_Using_MimePartMatchers()
+    {
+        // Arrange
+        using var server = WireMockServer.Start();
+
+        var textPlainContent = "This is some plain text";
+        var textPlainContentType = "text/plain";
+        var textPlainContentTypeMatcher = new ContentTypeMatcher(textPlainContentType);
+        var textPlainContentMatcher = new ExactMatcher(textPlainContent);
+        var textPlainMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textPlainContentTypeMatcher, null, null, textPlainContentMatcher);
+
+        var textJson = "{ \"Key\" : \"Value\" }";
+        var textJsonContentType = "text/json";
+        var textJsonContentTypeMatcher = new ContentTypeMatcher(textJsonContentType);
+        var textJsonContentMatcher = new JsonMatcher(new { Key = "Value" }, true);
+        var jsonMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, textJsonContentTypeMatcher, null, null, textJsonContentMatcher);
+
+        var imagePngBytes = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC");
+        var imagePngContentMatcher = new ExactObjectMatcher(imagePngBytes);
+        var imagePngMatcher = new MimePartMatcher(MatchBehaviour.AcceptOnMatch, null, null, null, imagePngContentMatcher);
+
+        var matchers = new IMatcher[]
+        {
+            textPlainMatcher,
+            jsonMatcher,
+            imagePngMatcher
+        };
+
+        server
+            .Given(Request.Create()
+                .UsingPost()
+                .WithPath("/multipart")
+                .WithMultiPart(matchers)
+            )
+            .RespondWith(Response.Create()
+                .WithBody("{{request.Method}};{{request.BodyAsMimeMessage.TextBody}}")
+                .WithTransformer()
+            );
+
+        server
+            .Given(Request.Create()
+                .UsingPost()
+                .WithPath("/multipart2")
+                .WithMultiPart(matchers)
+            )
+            .RespondWith(Response.Create()
+                .WithBody(request =>
+                {
+                    if (request.BodyAsMimeMessage == null)
+                    {
+                        throw new InvalidProgramException("Not expected");
+                    }
+                    return "OK";
+                })
+                .WithTransformer()
+            );
+
+        var formDataContent = new MultipartFormDataContent
+        {
+            { new StringContent(textPlainContent, Encoding.UTF8, textPlainContentType), "text" },
+            { new StringContent(textJson, Encoding.UTF8, textJsonContentType), "json" }
+        };
+
+        var fileContent = new ByteArrayContent(imagePngBytes);
+        fileContent.Headers.ContentType = new MediaTypeHeaderValue("image/png");
+        formDataContent.Add(fileContent, "somefile", "image.png");
+
+        var client = server.CreateClient();
+
+        // Act 1
+        var response1 = await client.PostAsync("/multipart", formDataContent);
+
+        // Assert 1
+        response1.StatusCode.Should().Be(HttpStatusCode.OK);
+        var content1 = await response1.Content.ReadAsStringAsync();
+        content1.Should().Be("POST;This is some plain text");
+
+        // Act 2
+        var response2 = await client.PostAsync("/multipart2", formDataContent);
+
+        // Assert 1
+        response2.StatusCode.Should().Be(HttpStatusCode.OK);
+        var content2 = await response2.Content.ReadAsStringAsync();
+        content2.Should().Be("OK");
+    }
+}
--- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs
+++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.PostMappings.cs
@@ -62,13 +62,15 @@ public partial class WireMockAdminApiTests
        {
            Request = new RequestModel { Path = "/1" },
            Response = new ResponseModel { Body = "txt 1" },
-            Title = "test 1"
+            Title = "test 1",
+            Description = "description 1"
        };
        var model2 = new MappingModel
        {
            Request = new RequestModel { Path = "/2" },
            Response = new ResponseModel { Body = "txt 2" },
-            Title = "test 2"
+            Title = "test 2",
+            Description = "description 2"
        };
        var result = await api.PostMappingsAsync(new[] { model1, model2 }).ConfigureAwait(false);

@@ -77,6 +79,8 @@ public partial class WireMockAdminApiTests
        Check.That(result.Status).IsNotNull();
        Check.That(result.Guid).IsNull();
        Check.That(server.Mappings.Where(m => !m.IsAdminInterface)).HasSize(2);
+        Check.That(server.Mappings.Single(x => x.Title == "test 1").Description).IsEqualTo("description 1");
+        Check.That(server.Mappings.Single(x => x.Title == "test 2").Description).IsEqualTo("description 2");

        server.Stop();
    }
--- a/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs
+++ b/test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs
@@ -17,6 +17,7 @@ using RestEase;
 using VerifyTests;
 using VerifyXunit;
 using WireMock.Admin.Mappings;
+using WireMock.Admin.Scenarios;
 using WireMock.Admin.Settings;
 using WireMock.Client;
 using WireMock.Client.Extensions;
@@ -743,6 +744,57 @@ public partial class WireMockAdminApiTests
        status.Status.Should().Be("No scenario found by name 'x'.");
    }

+    [Fact]
+    public async Task IWireMockAdminApi_UpdateNonExistingScenarioState()
+    {
+        // Arrange
+        using var server = WireMockServer.StartWithAdminInterface();
+
+        var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
+
+        // Act
+        var update = new ScenarioStateUpdateModel
+        {
+            State = null
+        };
+        var status = await api.PutScenarioStateAsync("x", update).ConfigureAwait(false);
+        status.Status.Should().Be("No scenario found by name 'x'.");
+    }
+
+    [Fact]
+    public async Task IWireMockAdminApi_UpdateScenarioState()
+    {
+        // Arrange
+        using var server = WireMockServer.StartWithAdminInterface();
+        server
+            .Given(Request.Create()
+                .WithPath("/state1")
+                .UsingGet())
+            .InScenario("s1")
+            .WillSetStateTo("Test state 1")
+            .RespondWith(Response.Create()
+                .WithBody("No state msg 1"));
+
+        server
+            .Given(Request.Create()
+                .WithPath("/foostate1")
+                .UsingGet())
+            .InScenario("s1")
+            .WhenStateIs("Test state 1")
+            .RespondWith(Response.Create()
+                .WithBody("Test state msg 1"));
+
+        var api = RestClient.For<IWireMockAdminApi>(server.Urls[0]);
+
+        // Act
+        var update = new ScenarioStateUpdateModel
+        {
+            State = null
+        };
+        var status = await api.PutScenarioStateAsync("s1", update).ConfigureAwait(false);
+        status.Status.Should().Be("Scenario state set to ''");
+    }
+
    [Fact]
    public async Task IWireMockAdminApi_GetMappingByGuidAsync()
    {
--- a/test/WireMock.Net.Tests/Constants.cs
+++ b/test/WireMock.Net.Tests/Constants.cs
@@ -6,5 +6,5 @@ internal static class Constants
 {
    internal const int NumStaticMappings = 10;

-    internal const int NumAdminMappings = 36;
+    internal const int NumAdminMappings = 37;
 }
--- a/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
+++ b/test/WireMock.Net.Tests/StatefulBehaviorTests.cs
@@ -12,340 +12,447 @@ using WireMock.ResponseBuilders;
 using WireMock.Server;
 using Xunit;

-namespace WireMock.Net.Tests
+namespace WireMock.Net.Tests;
+
+public class StatefulBehaviorTests
 {
-    public class StatefulBehaviorTests
+    [Fact]
+    public async Task Scenarios_Should_skip_non_relevant_states()
    {
-        [Fact]
-        public async Task Scenarios_Should_skip_non_relevant_states()
-        {
-            // given
-            string path = $"/foo_{Guid.NewGuid()}";
-            var server = WireMockServer.Start();
+        // given
+        string path = $"/foo_{Guid.NewGuid()}";
+        var server = WireMockServer.Start();

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario("s")
-                .WhenStateIs("Test state")
-                .RespondWith(Response.Create());
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario("s")
+            .WhenStateIs("Test state")
+            .RespondWith(Response.Create());

-            // when
-            var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        // when
+        var response = await new HttpClient().GetAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);

-            // then
-            Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound);
+        // then
+        Check.That(response.StatusCode).IsEqualTo(HttpStatusCode.NotFound);

-            server.Stop();
-        }
+        server.Stop();
+    }

-        [Fact]
-        public async Task Scenarios_Should_process_request_if_equals_state_and_single_state_defined()
-        {
-            // given
-            string path = $"/foo_{Guid.NewGuid()}";
-            var server = WireMockServer.Start();
+    [Fact]
+    public async Task Scenarios_Should_process_request_if_equals_state_and_single_state_defined()
+    {
+        // Arrange
+        var path = $"/foo_{Guid.NewGuid()}";
+        using var server = WireMockServer.Start();

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario("s")
-                .WillSetStateTo("Test state")
-                .RespondWith(Response.Create().WithBody("No state msg"));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario("s")
+            .WillSetStateTo("Test state")
+            .RespondWith(Response.Create().WithBody("No state msg"));

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario("s")
-                .WhenStateIs("Test state")
-                .RespondWith(Response.Create().WithBody("Test state msg"));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario("s")
+            .WhenStateIs("Test state")
+            .RespondWith(Response.Create().WithBody("Test state msg"));

-            // when
-            var responseNoState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
-            var responseWithState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        // Act
+        var responseNoState = await new HttpClient().GetStringAsync(server.Url + path).ConfigureAwait(false);
+        var responseWithState = await new HttpClient().GetStringAsync(server.Url + path).ConfigureAwait(false);

-            // then
-            Check.That(responseNoState).Equals("No state msg");
-            Check.That(responseWithState).Equals("Test state msg");
+        // Assert
+        Check.That(responseNoState).Equals("No state msg");
+        Check.That(responseWithState).Equals("Test state msg");
+    }

-            server.Stop();
-        }
+    [Theory]
+    [InlineData(null, "step 1", "step 2")]
+    [InlineData("step 2", "step 2", "step 3")]
+    public async Task Scenarios_Should_ContinueOnCorrectState_WhenStateIsUpdated(string? state, string expected1, string expected2)
+    {
+        // Arrange
+        var path = $"/foo_{Guid.NewGuid()}";
+        var scenario = "s";
+        using var server = WireMockServer.Start();

-        [Fact]
-        public async Task Scenarios_With_Same_Path_Should_Use_Times_When_Moving_To_Next_State()
-        {
-            // given
-            const int times = 2;
-            string path = $"/foo_{Guid.NewGuid()}";
-            string body1 = "Scenario S1, No State, Setting State T2";
-            string body2 = "Scenario S1, State T2, End";
-            var server = WireMockServer.Start();
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario(scenario)
+            .WillSetStateTo("step 2")
+            .RespondWith(Response.Create().WithBody("step 1"));

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario(1)
-                .WillSetStateTo(2, times)
-                .RespondWith(Response.Create().WithBody(body1));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario(scenario)
+            .WhenStateIs("step 2")
+            .WillSetStateTo("step 3")
+            .RespondWith(Response.Create().WithBody("step 2"));

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario(1)
-                .WhenStateIs(2)
-                .RespondWith(Response.Create().WithBody(body2));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario(scenario)
+            .WhenStateIs("step 3")
+            .RespondWith(Response.Create().WithBody("step 3"));

-            // when
-            var client = new HttpClient();
-            var responseScenario1 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
-            var responseScenario2 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
-            var responseWithState = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        // Act
+        var client = server.CreateClient();
+        var response1 = await client.GetStringAsync(server.Url + path);
+        var response2 = await client.GetStringAsync(server.Url + path);
+        var response3 = await client.GetStringAsync(server.Url + path);

-            // then
-            responseScenario1.Should().Be(body1);
-            responseScenario2.Should().Be(body1);
-            responseWithState.Should().Be(body2);
+        server.SetScenarioState(scenario, state);
+        var responseA = await client.GetStringAsync(server.Url + path);
+        var responseB = await client.GetStringAsync(server.Url + path);

-            server.Stop();
-        }
+        // Assert
+        Check.That(response1).Equals("step 1");
+        Check.That(response2).Equals("step 2");
+        Check.That(response3).Equals("step 3");
+        Check.That(responseA).Equals(expected1);
+        Check.That(responseB).Equals(expected2);
+    }

-        [Fact]
-        public async Task Scenarios_With_Different_Paths_Should_Use_Times_When_Moving_To_Next_State()
-        {
-            // given
-            const int times = 2;
-            string path1 = $"/a_{Guid.NewGuid()}";
-            string path2 = $"/b_{Guid.NewGuid()}";
-            string path3 = $"/c_{Guid.NewGuid()}";
-            string body1 = "Scenario S1, No State, Setting State T2";
-            string body2 = "Scenario S1, State T2, Setting State T3";
-            string body3 = "Scenario S1, State T3, End";
+    [Fact]
+    public async Task Scenarios_With_Same_Path_Should_Use_Times_When_Moving_To_Next_State()
+    {
+        // given
+        const int times = 2;
+        string path = $"/foo_{Guid.NewGuid()}";
+        string body1 = "Scenario S1, No State, Setting State T2";
+        string body2 = "Scenario S1, State T2, End";
+        var server = WireMockServer.Start();

-            var server = WireMockServer.Start();
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario(1)
+            .WillSetStateTo(2, times)
+            .RespondWith(Response.Create().WithBody(body1));

-            server
-                .Given(Request.Create().WithPath(path1).UsingGet())
-                .InScenario("S1")
-                .WillSetStateTo("T2", times)
-                .RespondWith(Response.Create().WithBody(body1));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario(1)
+            .WhenStateIs(2)
+            .RespondWith(Response.Create().WithBody(body2));

-            server
-                .Given(Request.Create().WithPath(path2).UsingGet())
-                .InScenario("S1")
-                .WhenStateIs("T2")
-                .WillSetStateTo("T3", times)
-                .RespondWith(Response.Create().WithBody(body2));
+        // when
+        var client = new HttpClient();
+        var responseScenario1 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        var responseScenario2 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        var responseWithState = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);

-            server
-                .Given(Request.Create().WithPath(path3).UsingGet())
-                .InScenario("S1")
-                .WhenStateIs("T3")
-                .RespondWith(Response.Create().WithBody(body3));
+        // then
+        responseScenario1.Should().Be(body1);
+        responseScenario2.Should().Be(body1);
+        responseWithState.Should().Be(body2);

-            // when
-            var client = new HttpClient();
-            var t1a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1).ConfigureAwait(false);
-            var t1b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1).ConfigureAwait(false);
-            var t2a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2).ConfigureAwait(false);
-            var t2b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2).ConfigureAwait(false);
-            var t3 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path3).ConfigureAwait(false);
+        server.Stop();
+    }

-            // then
-            t1a.Should().Be(body1);
-            t1b.Should().Be(body1);
-            t2a.Should().Be(body2);
-            t2b.Should().Be(body2);
-            t3.Should().Be(body3);
+    [Fact]
+    public async Task Scenarios_With_Different_Paths_Should_Use_Times_When_Moving_To_Next_State()
+    {
+        // given
+        const int times = 2;
+        string path1 = $"/a_{Guid.NewGuid()}";
+        string path2 = $"/b_{Guid.NewGuid()}";
+        string path3 = $"/c_{Guid.NewGuid()}";
+        string body1 = "Scenario S1, No State, Setting State T2";
+        string body2 = "Scenario S1, State T2, Setting State T3";
+        string body3 = "Scenario S1, State T3, End";

-            server.Stop();
-        }
+        var server = WireMockServer.Start();

-        [Fact]
-        public async Task Scenarios_Should_Respect_Int_Valued_Scenarios_and_States()
-        {
-            // given
-            string path = $"/foo_{Guid.NewGuid()}";
-            var server = WireMockServer.Start();
+        server
+            .Given(Request.Create().WithPath(path1).UsingGet())
+            .InScenario("S1")
+            .WillSetStateTo("T2", times)
+            .RespondWith(Response.Create().WithBody(body1));

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario(1)
-                .WillSetStateTo(2)
-                .RespondWith(Response.Create().WithBody("Scenario 1, Setting State 2"));
+        server
+            .Given(Request.Create().WithPath(path2).UsingGet())
+            .InScenario("S1")
+            .WhenStateIs("T2")
+            .WillSetStateTo("T3", times)
+            .RespondWith(Response.Create().WithBody(body2));

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario(1)
-                .WhenStateIs(2)
-                .RespondWith(Response.Create().WithBody("Scenario 1, State 2"));
+        server
+            .Given(Request.Create().WithPath(path3).UsingGet())
+            .InScenario("S1")
+            .WhenStateIs("T3")
+            .RespondWith(Response.Create().WithBody(body3));

-            // when
-            var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
-            var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        // when
+        var client = new HttpClient();
+        var t1a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1).ConfigureAwait(false);
+        var t1b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path1).ConfigureAwait(false);
+        var t2a = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2).ConfigureAwait(false);
+        var t2b = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path2).ConfigureAwait(false);
+        var t3 = await client.GetStringAsync("http://localhost:" + server.Ports[0] + path3).ConfigureAwait(false);

-            // then
-            Check.That(responseIntScenario).Equals("Scenario 1, Setting State 2");
-            Check.That(responseWithIntState).Equals("Scenario 1, State 2");
+        // then
+        t1a.Should().Be(body1);
+        t1b.Should().Be(body1);
+        t2a.Should().Be(body2);
+        t2b.Should().Be(body2);
+        t3.Should().Be(body3);

-            server.Stop();
-        }
+        server.Stop();
+    }

-        [Fact]
-        public async Task Scenarios_Should_Respect_Mixed_String_Scenario_and_Int_State()
-        {
-            // given
-            string path = $"/foo_{Guid.NewGuid()}";
-            var server = WireMockServer.Start();
+    [Fact]
+    public async Task Scenarios_Should_Respect_Int_Valued_Scenarios_and_States()
+    {
+        // given
+        string path = $"/foo_{Guid.NewGuid()}";
+        var server = WireMockServer.Start();

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario("state string")
-                .WillSetStateTo(1)
-                .RespondWith(Response.Create().WithBody("string state, Setting State 2"));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario(1)
+            .WillSetStateTo(2)
+            .RespondWith(Response.Create().WithBody("Scenario 1, Setting State 2"));

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario("state string")
-                .WhenStateIs(1)
-                .RespondWith(Response.Create().WithBody("string state, State 2"));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario(1)
+            .WhenStateIs(2)
+            .RespondWith(Response.Create().WithBody("Scenario 1, State 2"));

-            // when
-            var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
-            var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        // when
+        var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);

-            // then
-            Check.That(responseIntScenario).Equals("string state, Setting State 2");
-            Check.That(responseWithIntState).Equals("string state, State 2");
+        // then
+        Check.That(responseIntScenario).Equals("Scenario 1, Setting State 2");
+        Check.That(responseWithIntState).Equals("Scenario 1, State 2");

-            server.Stop();
-        }
+        server.Stop();
+    }

-        [Fact]
-        public async Task Scenarios_Should_Respect_Mixed_Int_Scenario_and_String_Scenario_and_String_State()
-        {
-            // given
-            string path = $"/foo_{Guid.NewGuid()}";
-            var server = WireMockServer.Start();
+    [Fact]
+    public async Task Scenarios_Should_Respect_Mixed_String_Scenario_and_Int_State()
+    {
+        // given
+        string path = $"/foo_{Guid.NewGuid()}";
+        var server = WireMockServer.Start();

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario(1)
-                .WillSetStateTo("Next State")
-                .RespondWith(Response.Create().WithBody("int state, Setting State 2"));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario("state string")
+            .WillSetStateTo(1)
+            .RespondWith(Response.Create().WithBody("string state, Setting State 2"));

-            server
-                .Given(Request.Create().WithPath(path).UsingGet())
-                .InScenario("1")
-                .WhenStateIs("Next State")
-                .RespondWith(Response.Create().WithBody("string state, State 2"));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario("state string")
+            .WhenStateIs(1)
+            .RespondWith(Response.Create().WithBody("string state, State 2"));

-            // when
-            var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
-            var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        // when
+        var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);

-            // then
-            Check.That(responseIntScenario).Equals("int state, Setting State 2");
-            Check.That(responseWithIntState).Equals("string state, State 2");
+        // then
+        Check.That(responseIntScenario).Equals("string state, Setting State 2");
+        Check.That(responseWithIntState).Equals("string state, State 2");

-            server.Stop();
-        }
+        server.Stop();
+    }

-        [Fact]
-        public async Task Scenarios_TodoList_Example()
-        {
-            // Assign
-            var server = WireMockServer.Start();
+    [Fact]
+    public async Task Scenarios_Should_Respect_Mixed_Int_Scenario_and_String_Scenario_and_String_State()
+    {
+        // given
+        string path = $"/foo_{Guid.NewGuid()}";
+        var server = WireMockServer.Start();

-            server
-                .Given(Request.Create().WithPath("/todo/items").UsingGet())
-                .InScenario("To do list")
-                .WillSetStateTo("TodoList State Started")
-                .RespondWith(Response.Create().WithBody("Buy milk"));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario(1)
+            .WillSetStateTo("Next State")
+            .RespondWith(Response.Create().WithBody("int state, Setting State 2"));

-            server
-                .Given(Request.Create().WithPath("/todo/items").UsingPost())
-                .InScenario("To do list")
-                .WhenStateIs("TodoList State Started")
-                .WillSetStateTo("Cancel newspaper item added")
-                .RespondWith(Response.Create().WithStatusCode(201));
+        server
+            .Given(Request.Create().WithPath(path).UsingGet())
+            .InScenario("1")
+            .WhenStateIs("Next State")
+            .RespondWith(Response.Create().WithBody("string state, State 2"));

-            server
-                .Given(Request.Create().WithPath("/todo/items").UsingGet())
-                .InScenario("To do list")
-                .WhenStateIs("Cancel newspaper item added")
-                .RespondWith(Response.Create().WithBody("Buy milk;Cancel newspaper subscription"));
+        // when
+        var responseIntScenario = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);
+        var responseWithIntState = await new HttpClient().GetStringAsync("http://localhost:" + server.Ports[0] + path).ConfigureAwait(false);

-            Check.That(server.Scenarios.Any()).IsFalse();
+        // then
+        Check.That(responseIntScenario).Equals("int state, Setting State 2");
+        Check.That(responseWithIntState).Equals("string state, State 2");

-            // Act and Assert
-            string url = "http://localhost:" + server.Ports[0];
-            string getResponse1 = new HttpClient().GetStringAsync(url + "/todo/items").Result;
-            Check.That(getResponse1).Equals("Buy milk");
+        server.Stop();
+    }

-            Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list");
-            Check.That(server.Scenarios["To do list"].NextState).IsEqualTo("TodoList State Started");
-            Check.That(server.Scenarios["To do list"].Started).IsTrue();
-            Check.That(server.Scenarios["To do list"].Finished).IsFalse();
+    [Fact]
+    public async Task Scenarios_TodoList_Example()
+    {
+        // Arrange
+        var server = WireMockServer.Start();
+        var client = server.CreateClient();

-            var postResponse = await new HttpClient().PostAsync(url + "/todo/items", new StringContent("Cancel newspaper subscription")).ConfigureAwait(false);
-            Check.That(postResponse.StatusCode).Equals(HttpStatusCode.Created);
+        server
+            .Given(Request.Create().WithPath("/todo/items").UsingGet())
+            .InScenario("To do list")
+            .WillSetStateTo("TodoList State Started")
+            .RespondWith(Response.Create().WithBody("Buy milk"));

-            Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list");
-            Check.That(server.Scenarios["To do list"].NextState).IsEqualTo("Cancel newspaper item added");
-            Check.That(server.Scenarios["To do list"].Started).IsTrue();
-            Check.That(server.Scenarios["To do list"].Finished).IsFalse();
+        server
+            .Given(Request.Create().WithPath("/todo/items").UsingPost())
+            .InScenario("To do list")
+            .WhenStateIs("TodoList State Started")
+            .WillSetStateTo("Cancel newspaper item added")
+            .RespondWith(Response.Create().WithStatusCode(201));

-            string getResponse2 = await new HttpClient().GetStringAsync(url + "/todo/items").ConfigureAwait(false);
-            Check.That(getResponse2).Equals("Buy milk;Cancel newspaper subscription");
+        server
+            .Given(Request.Create().WithPath("/todo/items").UsingGet())
+            .InScenario("To do list")
+            .WhenStateIs("Cancel newspaper item added")
+            .RespondWith(Response.Create().WithBody("Buy milk;Cancel newspaper subscription"));

-            Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list");
-            Check.That(server.Scenarios["To do list"].NextState).IsNull();
-            Check.That(server.Scenarios["To do list"].Started).IsTrue();
-            Check.That(server.Scenarios["To do list"].Finished).IsTrue();
+        Check.That(server.Scenarios.Any()).IsFalse();

-            server.Stop();
-        }
+        // Act and Assert
+        var getResponse1 = await client.GetStringAsync("/todo/items").ConfigureAwait(false);
+        Check.That(getResponse1).Equals("Buy milk");

-        [Fact]
-        public async Task Scenarios_Should_process_request_if_equals_state_and_multiple_state_defined()
-        {
-            // Assign
-            var server = WireMockServer.Start();
+        Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list");
+        Check.That(server.Scenarios["To do list"].NextState).IsEqualTo("TodoList State Started");
+        Check.That(server.Scenarios["To do list"].Started).IsTrue();
+        Check.That(server.Scenarios["To do list"].Finished).IsFalse();

-            server
-                .Given(Request.Create().WithPath("/state1").UsingGet())
-                .InScenario("s1")
-                .WillSetStateTo("Test state 1")
-                .RespondWith(Response.Create().WithBody("No state msg 1"));
+        var postResponse = await client.PostAsync("/todo/items", new StringContent("Cancel newspaper subscription")).ConfigureAwait(false);
+        Check.That(postResponse.StatusCode).Equals(HttpStatusCode.Created);

-            server
-                .Given(Request.Create().WithPath("/foo1X").UsingGet())
-                .InScenario("s1")
-                .WhenStateIs("Test state 1")
-                .RespondWith(Response.Create().WithBody("Test state msg 1"));
+        Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list");
+        Check.That(server.Scenarios["To do list"].NextState).IsEqualTo("Cancel newspaper item added");
+        Check.That(server.Scenarios["To do list"].Started).IsTrue();
+        Check.That(server.Scenarios["To do list"].Finished).IsFalse();

-            server
-                .Given(Request.Create().WithPath("/state2").UsingGet())
-                .InScenario("s2")
-                .WillSetStateTo("Test state 2")
-                .RespondWith(Response.Create().WithBody("No state msg 2"));
+        string getResponse2 = await client.GetStringAsync("/todo/items").ConfigureAwait(false);
+        Check.That(getResponse2).Equals("Buy milk;Cancel newspaper subscription");

-            server
-                .Given(Request.Create().WithPath("/foo2X").UsingGet())
-                .InScenario("s2")
-                .WhenStateIs("Test state 2")
-                .RespondWith(Response.Create().WithBody("Test state msg 2"));
+        Check.That(server.Scenarios["To do list"].Name).IsEqualTo("To do list");
+        Check.That(server.Scenarios["To do list"].NextState).IsNull();
+        Check.That(server.Scenarios["To do list"].Started).IsTrue();
+        Check.That(server.Scenarios["To do list"].Finished).IsTrue();

-            // Act and Assert
-            string url = "http://localhost:" + server.Ports[0];
-            var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1").ConfigureAwait(false);
-            Check.That(responseNoState1).Equals("No state msg 1");
+        server.Stop();
+    }

-            var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2").ConfigureAwait(false);
-            Check.That(responseNoState2).Equals("No state msg 2");
+    [Fact]
+    public async Task Scenarios_TodoList_WithSetState()
+    {
+        // Arrange
+        var scenario = "To do list";
+        using var server = WireMockServer.Start();
+        var client = server.CreateClient();

-            var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X").ConfigureAwait(false);
-            Check.That(responseWithState1).Equals("Test state msg 1");
+        server
+            .Given(Request.Create().WithPath("/todo/items").UsingGet())
+            .InScenario(scenario)
+            .WhenStateIs("Buy milk")
+            .RespondWith(Response.Create().WithBody("Buy milk"));

-            var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X").ConfigureAwait(false);
-            Check.That(responseWithState2).Equals("Test state msg 2");
+        server
+            .Given(Request.Create().WithPath("/todo/items").UsingGet())
+            .InScenario(scenario)
+            .WhenStateIs("Cancel newspaper")
+            .RespondWith(Response.Create().WithBody("Buy milk;Cancel newspaper subscription"));

-            server.Stop();
-        }
+        // Act and Assert
+        server.SetScenarioState(scenario, "Buy milk");
+        server.Scenarios[scenario].Should().BeEquivalentTo(new { Name = scenario, NextState = "Buy milk" });
+        
+        var getResponse1 = await client.GetStringAsync("/todo/items").ConfigureAwait(false);
+        getResponse1.Should().Be("Buy milk");
+
+        server.SetScenarioState(scenario, "Cancel newspaper");
+        server.Scenarios[scenario].Name.Should().Be(scenario);
+        server.Scenarios[scenario].Should().BeEquivalentTo(new { Name = scenario, NextState = "Cancel newspaper" });
+
+        var getResponse2 = await client.GetStringAsync("/todo/items").ConfigureAwait(false);
+        getResponse2.Should().Be("Buy milk;Cancel newspaper subscription");
+    }
+
+    [Fact]
+    public void Scenarios_TodoList_WithSetStateToNull_ShouldThrowException()
+    {
+        // Arrange
+        var scenario = "To do list";
+        using var server = WireMockServer.Start();
+        var client = server.CreateClient();
+
+        server
+            .Given(Request.Create().WithPath("/todo/items").UsingGet())
+            .InScenario(scenario)
+            .WhenStateIs("Buy milk")
+            .RespondWith(Response.Create().WithBody("Buy milk"));
+
+        server
+            .Given(Request.Create().WithPath("/todo/items").UsingGet())
+            .InScenario(scenario)
+            .WhenStateIs("Cancel newspaper")
+            .RespondWith(Response.Create().WithBody("Buy milk;Cancel newspaper subscription"));
+
+        // Act
+        server.SetScenarioState(scenario, null);
+        var action = async () => await client.GetStringAsync("/todo/items");
+
+        // Assert
+        action.Should().ThrowAsync<HttpRequestException>();
+    }
+
+    [Fact]
+    public async Task Scenarios_Should_process_request_if_equals_state_and_multiple_state_defined()
+    {
+        // Assign
+        var server = WireMockServer.Start();
+
+        server
+            .Given(Request.Create().WithPath("/state1").UsingGet())
+            .InScenario("s1")
+            .WillSetStateTo("Test state 1")
+            .RespondWith(Response.Create().WithBody("No state msg 1"));
+
+        server
+            .Given(Request.Create().WithPath("/foo1X").UsingGet())
+            .InScenario("s1")
+            .WhenStateIs("Test state 1")
+            .RespondWith(Response.Create().WithBody("Test state msg 1"));
+
+        server
+            .Given(Request.Create().WithPath("/state2").UsingGet())
+            .InScenario("s2")
+            .WillSetStateTo("Test state 2")
+            .RespondWith(Response.Create().WithBody("No state msg 2"));
+
+        server
+            .Given(Request.Create().WithPath("/foo2X").UsingGet())
+            .InScenario("s2")
+            .WhenStateIs("Test state 2")
+            .RespondWith(Response.Create().WithBody("Test state msg 2"));
+
+        // Act and Assert
+        string url = "http://localhost:" + server.Ports[0];
+        var responseNoState1 = await new HttpClient().GetStringAsync(url + "/state1").ConfigureAwait(false);
+        Check.That(responseNoState1).Equals("No state msg 1");
+
+        var responseNoState2 = await new HttpClient().GetStringAsync(url + "/state2").ConfigureAwait(false);
+        Check.That(responseNoState2).Equals("No state msg 2");
+
+        var responseWithState1 = await new HttpClient().GetStringAsync(url + "/foo1X").ConfigureAwait(false);
+        Check.That(responseWithState1).Equals("Test state msg 1");
+
+        var responseWithState2 = await new HttpClient().GetStringAsync(url + "/foo2X").ConfigureAwait(false);
+        Check.That(responseWithState2).Equals("Test state msg 2");
+
+        server.Stop();
    }
 }
--- a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.Grpc.cs
+++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.Grpc.cs
@@ -25,8 +25,6 @@ public partial class TestcontainersTests
        var adminUsername = $"username_{Guid.NewGuid()}";
        var adminPassword = $"password_{Guid.NewGuid()}";
        var wireMockContainer = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
            .WithAdminUserNameAndPassword(adminUsername, adminPassword)
            .WithCommand("--UseHttp2")
            .WithCommand("--Urls", "http://*:80 grpc://*:9090")
@@ -69,7 +67,7 @@ public partial class TestcontainersTests
        }
        finally
        {
-            await wireMockContainer.StopAsync();
+            await StopAsync(wireMockContainer);
        }
    }

@@ -80,8 +78,6 @@ public partial class TestcontainersTests
        var adminUsername = $"username_{Guid.NewGuid()}";
        var adminPassword = $"password_{Guid.NewGuid()}";
        var wireMockContainer = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
            .WithAdminUserNameAndPassword(adminUsername, adminPassword)
            .AddUrl("http://*:8080")
            .AddUrl("grpc://*:9090")
@@ -121,7 +117,7 @@ public partial class TestcontainersTests
        }
        finally
        {
-            await wireMockContainer.StopAsync();
+            await StopAsync(wireMockContainer);
        }
    }

@@ -136,7 +132,7 @@ public partial class TestcontainersTests

        Then_ReplyMessage_Should_BeCorrect(reply);

-        await wireMockContainer.StopAsync();
+        await StopAsync(wireMockContainer);
    }

    [Fact]
@@ -150,14 +146,12 @@ public partial class TestcontainersTests

        Then_ReplyMessage_Should_BeCorrect(reply);

-        await wireMockContainer.StopAsync();
+        await StopAsync(wireMockContainer);
    }

    private static async Task<WireMockContainer> Given_WireMockContainerIsStartedForHttpAndGrpcAsync()
    {
        var wireMockContainer = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
            .AddUrl("grpc://*:9090")
            .Build();

@@ -169,8 +163,6 @@ public partial class TestcontainersTests
    private static async Task<WireMockContainer> Given_WireMockContainerWithProtoDefinitionAtServerLevelIsStartedForHttpAndGrpcAsync()
    {
        var wireMockContainer = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
            .AddUrl("grpc://*:9090")
            .AddProtoDefinition("my-greeter", ReadFile("greet.proto"))
            .Build();
--- a/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
+++ b/test/WireMock.Net.Tests/Testcontainers/TestcontainersTests.cs
@@ -11,10 +11,11 @@ using WireMock.Net.Testcontainers;
 using WireMock.Net.Testcontainers.Utils;
 using WireMock.Net.Tests.Facts;
 using Xunit;
+using Xunit.Abstractions;

 namespace WireMock.Net.Tests.Testcontainers;

-public partial class TestcontainersTests
+public partial class TestcontainersTests(ITestOutputHelper testOutputHelper)
 {
    [Fact]
    public async Task WireMockContainer_Build_And_StartAsync_and_StopAsync()
@@ -23,12 +24,11 @@ public partial class TestcontainersTests
        var adminUsername = $"username_{Guid.NewGuid()}";
        var adminPassword = $"password_{Guid.NewGuid()}";
        var wireMockContainer = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
            .WithAdminUserNameAndPassword(adminUsername, adminPassword)
            .Build();

-        await StartTestAndStopAsync(wireMockContainer);
+        await StartTestAsync(wireMockContainer);
+        await StopAsync(wireMockContainer);
    }

    // https://github.com/testcontainers/testcontainers-dotnet/issues/1322
@@ -38,17 +38,15 @@ public partial class TestcontainersTests
        // Act
        var dummyNetwork = new NetworkBuilder()
            .WithName("Dummy Network for TestcontainersTests")
-            .WithCleanUp(true)
            .Build();

        var wireMockContainer = new WireMockContainerBuilder()
            .WithNetwork(dummyNetwork)
            .WithWatchStaticMappings(true)
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
            .Build();

-        await StartTestAndStopAsync(wireMockContainer);
+        await StartTestAsync(wireMockContainer);
+        await StopAsync(wireMockContainer);
    }

    [Fact]
@@ -58,8 +56,6 @@ public partial class TestcontainersTests
        var adminUsername = $"username_{Guid.NewGuid()}";
        var adminPassword = $"password_{Guid.NewGuid()}";
        var wireMockContainerBuilder = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
            .WithAdminUserNameAndPassword(adminUsername, adminPassword);

        var imageOS = await TestcontainersUtils.GetImageOSAsync.Value;
@@ -74,7 +70,8 @@ public partial class TestcontainersTests

        var wireMockContainer = wireMockContainerBuilder.Build();

-        await StartTestAndStopAsync(wireMockContainer);
+        await StartTestAsync(wireMockContainer);
+        await StopAsync(wireMockContainer);
    }

    [Fact]
@@ -84,8 +81,6 @@ public partial class TestcontainersTests
        var adminUsername = $"username_{Guid.NewGuid()}";
        var adminPassword = $"password_{Guid.NewGuid()}";
        var wireMockContainerBuilder = new WireMockContainerBuilder()
-            .WithAutoRemove(true)
-            .WithCleanUp(true)
            .WithAdminUserNameAndPassword(adminUsername, adminPassword);

        var imageOS = await TestcontainersUtils.GetImageOSAsync.Value;
@@ -100,31 +95,48 @@ public partial class TestcontainersTests

        var wireMockContainer = wireMockContainerBuilder.Build();

-        await StartTestAndStopAsync(wireMockContainer);
+        await StartTestAsync(wireMockContainer);
+        await StopAsync(wireMockContainer);
    }

-    private static async Task StartTestAndStopAsync(WireMockContainer wireMockContainer)
+    private static async Task StartTestAsync(WireMockContainer wireMockContainer)
+    {
+        // Start
+        await wireMockContainer.StartAsync().ConfigureAwait(false);
+
+        // Assert
+        using (new AssertionScope())
+        {
+            var url = wireMockContainer.GetPublicUrl();
+            url.Should().NotBeNullOrWhiteSpace();
+
+            var adminClient = wireMockContainer.CreateWireMockAdminClient();
+
+            var settings = await adminClient.GetSettingsAsync();
+            settings.Should().NotBeNull();
+        }
+    }
+
+    private async Task StopAsync(WireMockContainer wireMockContainer)
    {
        try
-        {
-            await wireMockContainer.StartAsync().ConfigureAwait(false);
-
-            // Assert
-            using (new AssertionScope())
-            {
-                var url = wireMockContainer.GetPublicUrl();
-                url.Should().NotBeNullOrWhiteSpace();
-
-                var adminClient = wireMockContainer.CreateWireMockAdminClient();
-
-                var settings = await adminClient.GetSettingsAsync();
-                settings.Should().NotBeNull();
-            }
-        }
-        finally
        {
            await wireMockContainer.StopAsync();
        }
+        catch (Exception ex)
+        {
+            // Sometimes we get this exception, so for now ignore it.
+            /*
+            Failed WireMock.Net.Tests.Testcontainers.TestcontainersTests.WireMockContainer_Build_WithImageAsText_And_StartAsync_and_StopAsync [9 s]
+               Error Message:
+                System.NullReferenceException : Object reference not set to an instance of an object.
+               Stack Trace:
+                  at DotNet.Testcontainers.Containers.DockerContainer.UnsafeStopAsync(CancellationToken ct) in /_/src/Testcontainers/Containers/DockerContainer.cs:line 567
+                at DotNet.Testcontainers.Containers.DockerContainer.StopAsync(CancellationToken ct) in /_/src/Testcontainers/Containers/DockerContainer.cs:line 319
+            */
+
+            testOutputHelper.WriteLine($"Exception during StopAsync: {ex}");
+        }
    }
 }
 #endif
--- a/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs
+++ b/test/WireMock.Net.Tests/Util/TypeLoaderTests.cs
@@ -1,6 +1,7 @@
 // Copyright © WireMock.Net

 using System;
+using System.IO;
 using AnyOfTypes;
 using FluentAssertions;
 using WireMock.Matchers;
@@ -57,12 +58,22 @@ public class TypeLoaderTests
    [Fact]
    public void LoadNewInstance()
    {
-        // Act
-        AnyOf<string, StringPattern> pattern = "x";
-        var result = TypeLoader.LoadNewInstance<ICSharpCodeMatcher>(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, pattern);
+        var current = Directory.GetCurrentDirectory();
+        try
+        {
+            Directory.SetCurrentDirectory(Path.GetTempPath());

-        // Assert
-        result.Should().NotBeNull();
+            // Act
+            AnyOf<string, StringPattern> pattern = "x";
+            var result = TypeLoader.LoadNewInstance<ICSharpCodeMatcher>(MatchBehaviour.AcceptOnMatch, MatchOperator.Or, pattern);
+
+            // Assert
+            result.Should().NotBeNull();
+        }
+        finally
+        {
+            Directory.SetCurrentDirectory(current);
+        }
    }

    [Fact]
--- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
+++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
@@ -102,7 +102,7 @@
    </ItemGroup>

    <ItemGroup Condition="'$(TargetFramework)' != 'net452'">
-        <PackageReference Include="System.Net.Http.Json" Version="3.2.1" />
+        <PackageReference Include="System.Net.Http.Json" Version="8.0.1" />
        <PackageReference Include="JsonConverter.System.Text.Json" Version="0.7.0" />
        <PackageReference Include="Google.Protobuf" Version="3.25.1" />
        <PackageReference Include="Grpc.Net.Client" Version="2.60.0" />
--- a/test/WireMock.Net.Tests/WireMockServer.Proxy.cs
+++ b/test/WireMock.Net.Tests/WireMockServer.Proxy.cs
@@ -924,49 +924,4 @@ public class WireMockServerProxyTests
        server.LogEntries.Should().HaveCount(1);
        server.Stop();
    }
-
-    [Fact]
-    public async Task WireMockServer_ProxyAndRecordSettings_SameRequest_ShouldProxyAll()
-    {
-        //Arrange
-        var wireMockServerSettings = new WireMockServerSettings
-        {
-            Urls = new[] { "http://localhost:19091" },
-            ProxyAndRecordSettings = new ProxyAndRecordSettings
-            {
-                Url = "http://postman-echo.com",
-                SaveMapping = true,
-                ProxyAll = true,
-                SaveMappingToFile = false,
-                ExcludedHeaders = new[] { "Postman-Token" },
-                ExcludedCookies = new[] { "sails.sid" }
-            }
-        };
-
-        var server = WireMockServer.Start(wireMockServerSettings);
-
-        var requestBody = "{\"key1\": \"value1\", \"key2\": \"value2\"}";
-        var request = new HttpRequestMessage
-        {
-            Method = HttpMethod.Post,
-            RequestUri = new Uri("http://localhost:19091/post"),
-            Content = new StringContent(requestBody)
-        };
-        var request2 = new HttpRequestMessage
-        {
-            Method = HttpMethod.Post,
-            RequestUri = new Uri("http://localhost:19091/post"),
-            Content = new StringContent(requestBody)
-        };
-        server.ResetMappings();
-
-        //Act
-        await new HttpClient().SendAsync(request);
-        await new HttpClient().SendAsync(request2);
-
-        //Assert
-        Check.That(server.Mappings.Count()).IsEqualTo(3);
-
-        server.Dispose();
-    }
 }
--- a/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs
+++ b/test/WireMock.Net.Tests/WireMockServerTests.WithTransformer.cs
@@ -1,12 +1,11 @@
 // Copyright © WireMock.Net

 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net.Http;
 using System.Threading.Tasks;
 using FluentAssertions;
-using WireMock.RequestBuilders;
-using WireMock.ResponseBuilders;
 using WireMock.Server;
 using Xunit;

@@ -44,6 +43,78 @@ public partial class WireMockServerTests
        response.Should().Contain("Hello, Stef!");
    }

+    [Fact]
+    public async Task WireMockServer_WithTransformer_WithJsonBodyAsArray_ShouldWork()
+    {
+        // Arrange
+        using var server = WireMockServer.Start();
+        server
+            .WhenRequest(req => req
+                .WithPath("/withbody")
+                .UsingPost()
+            )
+            .ThenRespondWith(rsp => rsp
+                .WithSuccess()
+                .WithBodyAsJson(new[]
+                    {
+                        new
+                        {
+                            test = "test",
+                            secret = true
+                        },
+                        new
+                        {
+                            test = "123",
+                            secret = false
+                        }
+                    }
+                )
+                .WithTransformer()
+            );
+
+        // Act
+        var response = await GetResponseAsync(server, "/withbody");
+
+        // Assert
+        response.Should().Be("""[{"test":"test","secret":true},{"test":"123","secret":false}]""");
+    }
+
+    [Fact]
+    public async Task WireMockServer_WithTransformer_WithJsonBodyAsList_ShouldWork()
+    {
+        // Arrange
+        using var server = WireMockServer.Start();
+        server
+            .WhenRequest(req => req
+                .WithPath("/withbody")
+                .UsingPost()
+            )
+            .ThenRespondWith(rsp => rsp
+                .WithSuccess()
+                .WithBodyAsJson(
+                    new List<object>
+                    {
+                        new
+                        {
+                            test = "test",
+                            secret = true
+                        },
+                        new
+                        {
+                            test = "123",
+                            secret = false
+                        }
+                    })
+                .WithTransformer()
+            );
+
+        // Act
+        var response = await GetResponseAsync(server, "/withbody");
+
+        // Assert
+        response.Should().Be("""[{"test":"test","secret":true},{"test":"123","secret":false}]""");
+    }
+
    [Fact]
    public async Task WireMockServer_WithTransformerBefore_WithBodyFromFile_ShouldWork()
    {
@@ -88,8 +159,7 @@ public partial class WireMockServerTests

    private static async Task<string> GetResponseAsync(WireMockServer server, string relativePath)
    {
-        using HttpClient httpClient = new HttpClient();
-        httpClient.BaseAddress = new Uri(server.Urls[0]);
+        using var httpClient = server.CreateClient();

        using var requestContent = new StringContent(RequestXml);
        using var responseMsg = await httpClient.PostAsync(relativePath, requestContent);
Author	SHA1	Message	Date
Stef Heyenrath	b925c537c7	1.8.13	2025-06-23 08:07:30 +02:00
Stef Heyenrath	f80925c1fb	Add Scenario set State method (#1322 ) * Add SetScenarioState * add tests * summary * . * 1.8.13-preview-01 * fix * fix name	2025-06-23 08:03:11 +02:00
Stef Heyenrath	43cff52b69	1.8.12	2025-06-15 11:50:31 +02:00
Stef Heyenrath	7b93b2668d	Fix TypeLoader (#1320 ) * no ilmerge * . * . * nullable * .UsingNuGet * fix * . * directoriesToSearch * .	2025-06-15 11:44:09 +02:00
Dom Light	70a9180af4	Set description when converting MappingModel to IRespondWithAProvider (#1317 ) Adding a mapping with a description to `WireMockServer.WithMapping` did not include the description to the resulting `IRespondWithAProvider`, which means that calling `WireMockServer.SavePact` does not populate the description in the contract file. This PR includes the description when mapping from `MappingModel` to `IRespondWithAProvider`.	2025-06-14 11:13:04 +02:00
Stef Heyenrath	acd6592562	remove some old console projects	2025-06-13 13:07:48 +02:00
Sébastien Crocquesel	2a010dcd42	Use default resource cleaning behavior in test (#1316 )	2025-06-12 22:06:58 +02:00
Stef Heyenrath	8151119cca	1.8.11	2025-06-11 12:04:21 +02:00
Stef Heyenrath	77000372c6	Fix for WithTransformer and JsonBody as list (#1315 ) * Fix for WithTransformer and JsonBody as list * Fix WithTransformer when the response BodyAsJson is a List	2025-06-11 11:51:29 +02:00
Stef Heyenrath	ec248a9a78	Fix TestcontainersTests to ignore exception when stopping (#1314 )	2025-06-11 11:12:58 +02:00
Stef Heyenrath	2f7e3a3178	Update TestcontainersTests to ignore exception when stopping	2025-06-11 10:21:42 +02:00
Stef Heyenrath	ac9c51e34e	Update RandomDataGenerator.Net to 1.0.19 (#1313 ) * Update RandomDataGenerator.Net to 1.0.19 * Handlebars.Net.Helpers	2025-06-11 09:00:23 +02:00
Sébastien Crocquesel	8ba243ddcd	Bump Testcontainers version to 4.5.0 (#1311 ) * Bump Testcontainers version to 4.5.0 The Testcontainers dependency Docker.DotNet was bumped to 3.128.1 and is not binary compatible with previous version. When a user has a direct dependency on Testcontainers 4.5.0, WireMock.Net.Testcontainers fails with : System.MissingMethodException : Method not found: 'Docker.DotNet.DockerClient Docker.DotNet.DockerClientConfiguration.CreateClient(System.Version)' * Bump System.Net.Http.Json version to 8.0.1 Minimum required version for Testcontainers 4.5.0 * Do not dispose null container	2025-06-10 22:23:56 +02:00
Stef Heyenrath	d4b95e73ea	Remove unit test which uses postman-echo	2025-06-10 13:16:24 +02:00
Stef Heyenrath	f9ae045847	Images/Icons	2025-06-10 12:23:07 +02:00