1.8.15

* Correctly map the Pact Interaction Description property

* Update src/WireMock.Net.Minimal/Serialization/PactMapper.cs

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* post

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

CHANGELOG.md

@@ -1,3 +1,17 @@
+# 1.8.15 (18 July 2025)
+- [#1331](https://github.com/wiremock/WireMock.Net/pull/1331) - Correctly map the Pact Interaction Description property [bug] contributed by [StefH](https://github.com/StefH)
+- [#1330](https://github.com/wiremock/WireMock.Net/issues/1330) - Generated Pact-compatible consumer contract does not contain description [bug]
+
+# 1.8.14 (13 July 2025)
+- [#1325](https://github.com/wiremock/WireMock.Net/pull/1325) - Add method CreateHttpClientFactory [feature] contributed by [StefH](https://github.com/StefH)
+- [#1326](https://github.com/wiremock/WireMock.Net/pull/1326) - Implement IMimeMessageData [feature] contributed by [StefH](https://github.com/StefH)
+- [#1329](https://github.com/wiremock/WireMock.Net/pull/1329) - Fix HandlebarsContext.ParseAndEvaluate [bug] contributed by [StefH](https://github.com/StefH)
+- [#1327](https://github.com/wiremock/WireMock.Net/issues/1327) - Response Body Does Not Evaluate Multiple Handlebars Templates [bug]
+
+# 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)

Directory.Build.props

@@ -4,7 +4,7 @@
     </PropertyGroup>
 
     <PropertyGroup>
-        <VersionPrefix>1.8.12</VersionPrefix>
+        <VersionPrefix>1.8.15</VersionPrefix>
         <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
         <PackageProjectUrl>https://github.com/wiremock/WireMock.Net</PackageProjectUrl>
         <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>

Generate-ReleaseNotes.cmd

@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes
 
-SET version=1.8.12
+SET version=1.8.15
 
 GitHubReleaseNotes --output CHANGELOG.md --skip-empty-releases --exclude-labels wontfix test question invalid doc duplicate example environment --version %version% --token %GH_TOKEN%
 

PackageReleaseNotes.txt

@@ -1,6 +1,5 @@
-# 1.8.12 (15 June 2025)
-- #1317 Set description when converting MappingModel to IRespondWithAProvider [feature]
-- #1320 Fix TypeLoader [bug]
-- #1319 Why is IRequestMessage.BodyAsMimeMessage null in new versions (> 1.8.7) [bug]
+# 1.8.15 (18 July 2025)
+- #1331 Correctly map the Pact Interaction Description property [bug]
+- #1330 Generated Pact-compatible consumer contract does not contain description [bug]
 
 The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md

README.md

@@ -132,3 +132,8 @@ For more details see also [Docker](https://github.com/wiremock/WireMock.Net-dock
 
 #### HTTPS / SSL
 More details on using HTTPS (SSL) can be found here [Wiki : HTTPS](https://github.com/wiremock/WireMock.Net/wiki/Using-HTTPS-(SSL))
+
+---
+
+## Powered by
+[![JetBrains logo.](https://resources.jetbrains.com/storage/products/company/brand/logos/jetbrains.svg)](https://jb.gg/OpenSource)

examples/WireMock.Net.ConsoleApp.UsingNuGet/WireMock.Net.ConsoleApp.UsingNuGet.csproj

@@ -11,6 +11,10 @@
     <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>-->

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; }
+}

src/WireMock.Net.Abstractions/IRequestMessage.cs

@@ -123,7 +123,7 @@ public interface IRequestMessage
     /// The original body as MimeMessage.
     /// Convenience getter for Handlebars and WireMockAssertions.
     /// </summary>
-    object? BodyAsMimeMessage { get; }
+    Models.Mime.IMimeMessageData? BodyAsMimeMessage { get; }
 #endif
 
     /// <summary>

src/WireMock.Net.Abstractions/Models/Mime/IContentDispositionData.cs

@@ -0,0 +1,60 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// An interface exposing the public, readable properties of a ContentDisposition.
+/// </summary>
+public interface IContentDispositionData
+{
+    /// <summary>
+    /// Get the disposition.
+    /// </summary>
+    /// <value>The disposition.</value>
+    string Disposition { get; }
+
+    /// <summary>
+    /// Get a value indicating whether the <see cref="IMimeEntityData"/> is an attachment.
+    /// </summary>
+    /// <value><see langword="true" /> if the <see cref="IMimeEntityData"/> is an attachment; otherwise, <see langword="false" />.</value>
+    bool IsAttachment { get; }
+
+    /// <summary>
+    /// Get the list of parameters on the ContentDisposition.
+    /// </summary>
+    /// <value>The parameters.</value>
+    public IList<string> Parameters { get; }
+
+    /// <summary>
+    /// Get the name of the file.
+    /// </summary>
+    /// <value>The name of the file.</value>
+    string FileName { get; }
+
+    /// <summary>
+    /// Get the creation-date parameter.
+    /// </summary>
+    /// <value>The creation date.</value>
+    DateTimeOffset? CreationDate { get; }
+
+    /// <summary>
+    /// Get the modification-date parameter.
+    /// </summary>
+    /// <value>The modification date.</value>
+    DateTimeOffset? ModificationDate { get; }
+
+    /// <summary>
+    /// Get the read-date parameter.
+    /// </summary>
+    /// <value>The read date.</value>
+    DateTimeOffset? ReadDate { get; }
+
+    /// <summary>
+    /// Get the size parameter.
+    /// </summary>
+    /// <value>The size.</value>
+    long? Size { get; }
+}

src/WireMock.Net.Abstractions/Models/Mime/IContentTypeData.cs

@@ -0,0 +1,67 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Text;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// An interface exposing the public, readable properties of a ContentType
+/// with complex types simplified to a generic object.
+/// </summary>
+public interface IContentTypeData
+{
+    /// <summary>
+    /// Get the type of the media.
+    /// </summary>
+    /// <value>The type of the media.</value>
+    string MediaType { get; }
+
+    /// <summary>
+    /// Get the media subtype.
+    /// </summary>
+    /// <value>The media subtype.</value>
+    string MediaSubtype { get; }
+
+    /// <summary>
+    /// Get the list of parameters on the ContentType.
+    /// </summary>
+    /// <value>The parameters.</value>
+    IList<string> Parameters { get; }
+
+    /// <summary>
+    /// Get the boundary parameter.
+    /// </summary>
+    /// <value>The boundary.</value>
+    string Boundary { get; }
+
+    /// <summary>
+    /// Get the charset parameter.
+    /// </summary>
+    /// <value>The charset.</value>
+    string Charset { get; }
+
+    /// <summary>
+    /// Get the charset parameter as an Encoding.
+    /// </summary>
+    /// <value>The charset encoding.</value>
+    Encoding CharsetEncoding { get; }
+
+    /// <summary>
+    /// Get the format parameter.
+    /// </summary>
+    /// <value>The format.</value>
+    string Format { get; }
+
+    /// <summary>
+    /// Get the simple mime-type.
+    /// </summary>
+    /// <value>The mime-type.</value>
+    string MimeType { get; }
+
+    /// <summary>
+    /// Get the name parameter.
+    /// </summary>
+    /// <value>The name.</value>
+    string Name { get; }
+}

src/WireMock.Net.Abstractions/Models/Mime/IMimeEntityData.cs

@@ -0,0 +1,54 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// A simplified interface exposing the public, readable properties of MimeEntity.
+/// </summary>
+public interface IMimeEntityData
+{
+    /// <summary>
+    /// Get the list of headers.
+    /// </summary>
+    /// <value>The list of headers.</value>
+    IList<string> Headers { get; }
+
+    /// <summary>
+    /// Get the content disposition.
+    /// </summary>
+    /// <value>The content disposition.</value>
+    IContentDispositionData? ContentDisposition { get; }
+
+    /// <summary>
+    /// Get the type of the content.
+    /// </summary>
+    /// <value>The type of the content.</value>
+    IContentTypeData? ContentType { get; }
+
+    /// <summary>
+    /// Get the base content URI.
+    /// </summary>
+    /// <value>The base content URI or <see langword="null"/>.</value>
+    Uri ContentBase { get; }
+
+    /// <summary>
+    /// Get the content location.
+    /// </summary>
+    /// <value>The content location or <see langword="null"/>.</value>
+    Uri ContentLocation { get; }
+
+    /// <summary>
+    /// Get the Content-Id.
+    /// </summary>
+    /// <value>The content identifier.</value>
+    string ContentId { get; }
+
+    /// <summary>
+    /// Get a value indicating whether this <see cref="IMimeEntityData"/> is an attachment.
+    /// </summary>
+    /// <value><see langword="true" /> if this <see cref="IMimeEntityData"/> is an attachment; otherwise, <see langword="false" />.</value>
+    bool IsAttachment { get; }
+}

src/WireMock.Net.Abstractions/Models/Mime/IMimeMessageData.cs

@@ -0,0 +1,186 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// A simplified interface exposing the public, readable properties of a MIME message.
+/// </summary>
+public interface IMimeMessageData
+{
+    /// <summary>
+    /// Get the list of headers.
+    /// </summary>
+    /// <value>The list of headers.</value>
+    IList<string> Headers { get; }
+
+    /// <summary>
+    /// Get the value of the Importance header.
+    /// </summary>
+    /// <value>The importance, as an integer.</value>
+    int Importance { get; }
+
+    /// <summary>
+    /// Get the value of the Priority header.
+    /// </summary>
+    /// <value>The priority, as an integer.</value>
+    int Priority { get; }
+
+    /// <summary>
+    /// Get the value of the X-Priority header.
+    /// </summary>
+    /// <value>The X-priority, as an integer.</value>
+    int XPriority { get; }
+
+    /// <summary>
+    /// Get the address in the Sender header.
+    /// </summary>
+    /// <value>The address in the Sender header.</value>
+    string Sender { get; }
+
+    /// <summary>
+    /// Get the address in the Resent-Sender header.
+    /// </summary>
+    /// <value>The address in the Resent-Sender header.</value>
+    string ResentSender { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the From header.
+    /// </summary>
+    /// <value>The list of addresses in the From header.</value>
+    IList<string> From { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-From header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-From header.</value>
+    IList<string> ResentFrom { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Reply-To header.
+    /// </summary>
+    /// <value>The list of addresses in the Reply-To header.</value>
+    IList<string> ReplyTo { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-Reply-To header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-Reply-To header.</value>
+    IList<string> ResentReplyTo { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the To header.
+    /// </summary>
+    /// <value>The list of addresses in the To header.</value>
+    IList<string> To { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-To header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-To header.</value>
+    IList<string> ResentTo { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Cc header.
+    /// </summary>
+    /// <value>The list of addresses in the Cc header.</value>
+    IList<string> Cc { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-Cc header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-Cc header.</value>
+    IList<string> ResentCc { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Bcc header.
+    /// </summary>
+    /// <value>The list of addresses in the Bcc header.</value>
+    IList<string> Bcc { get; }
+
+    /// <summary>
+    /// Get the list of addresses in the Resent-Bcc header.
+    /// </summary>
+    /// <value>The list of addresses in the Resent-Bcc header.</value>
+    IList<string> ResentBcc { get; }
+        
+    /// <summary>
+    /// Get the subject of the message.
+    /// </summary>
+    /// <value>The subject of the message.</value>
+    string Subject { get; }
+
+    /// <summary>
+    /// Get the date of the message.
+    /// </summary>
+    /// <value>The date of the message.</value>
+    DateTimeOffset Date { get; }
+
+    /// <summary>
+    /// Get the Resent-Date of the message.
+    /// </summary>
+    /// <value>The Resent-Date of the message.</value>
+    DateTimeOffset ResentDate { get; }
+
+    /// <summary>
+    /// Get the list of references to other messages.
+    /// </summary>
+    /// <value>The references.</value>
+    IList<string> References { get; }
+
+    /// <summary>
+    /// Get the Message-Id that this message is replying to.
+    /// </summary>
+    /// <value>The message id that this message is in reply to.</value>
+    string InReplyTo { get; }
+
+    /// <summary>
+    /// Get the message identifier.
+    /// </summary>
+    /// <value>The message identifier.</value>
+    string MessageId { get; }
+
+    /// <summary>
+    /// Get the Resent-Message-Id header.
+    /// </summary>
+    /// <value>The Resent-Message-Id.</value>
+    string ResentMessageId { get; }
+
+    /// <summary>
+    /// Get the MIME-Version.
+    /// </summary>
+    /// <value>The MIME version.</value>
+    Version MimeVersion { get; }
+
+    /// <summary>
+    /// Get the body of the message.
+    /// </summary>
+    /// <value>The body of the message.</value>
+    IMimeEntityData Body { get; }
+
+    /// <summary>
+    /// Get the text body of the message if it exists.
+    /// </summary>
+    /// <value>The text body if it exists; otherwise, <see langword="null"/>.</value>
+    string TextBody { get; }
+
+    /// <summary>
+    /// Get the html body of the message if it exists.
+    /// </summary>
+    /// <value>The html body if it exists; otherwise, <see langword="null"/>.</value>
+    string HtmlBody { get; }
+
+    /// <summary>
+    /// Get the body parts of the message.
+    /// </summary>
+    /// <value>The body parts.</value>
+    IList<IMimePartData> BodyParts { get; }
+
+    /// <summary>
+    /// Get the attachments.
+    /// </summary>
+    /// <value>The attachments.</value>
+    IList<IMimeEntityData> Attachments { get; }
+}

src/WireMock.Net.Abstractions/Models/Mime/IMimePartData.cs

@@ -0,0 +1,57 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.IO;
+
+namespace WireMock.Models.Mime;
+
+/// <summary>
+/// A simplified interface exposing the public, readable properties of MimePart.
+/// </summary>
+public interface IMimePartData : IMimeEntityData
+{
+    /// <summary>
+    /// Get the description of the content if available.
+    /// </summary>
+    /// <value>The description of the content.</value>
+    string ContentDescription { get; }
+
+    /// <summary>
+    /// Get the duration of the content if available.
+    /// </summary>
+    /// <value>The duration of the content.</value>
+    int? ContentDuration { get; }
+
+    /// <summary>
+    /// Get the md5sum of the content.
+    /// </summary>
+    /// <value>The md5sum of the content.</value>
+    string ContentMd5 { get; }
+
+    /// <summary>
+    /// Get the content transfer encoding.
+    /// </summary>
+    /// <value>The content transfer encoding as a string.</value>
+    string ContentTransferEncoding { get; }
+
+    /// <summary>
+    /// Get the name of the file.
+    /// </summary>
+    /// <value>The name of the file.</value>
+    string FileName { get; }
+
+    /// <summary>
+    /// Get the MIME content.
+    /// </summary>
+    /// <value>The MIME content.</value>
+    IDictionary<string, object?> Content { get; }
+
+    /// <summary>
+    /// Open the decoded content stream.
+    /// </summary>
+    /// <remarks>
+    /// Provides a means of reading the decoded content without having to first write it to another stream.
+    /// </remarks>
+    /// <returns>The decoded content stream.</returns>
+    Stream Open();
+}

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>

src/WireMock.Net.MimePart/Matchers/MimePartMatcher.cs

@@ -1,8 +1,8 @@
 // Copyright © WireMock.Net
 
 using System;
-using MimeKit;
 using WireMock.Matchers.Helpers;
+using WireMock.Models.Mime;
 using WireMock.Util;
 
 namespace WireMock.Matchers;
@@ -12,7 +12,7 @@ namespace WireMock.Matchers;
 /// </summary>
 public class MimePartMatcher : IMimePartMatcher
 {
-    private readonly Func<MimePart, MatchResult>[] _funcs;
+    private readonly Func<IMimePartData, MatchResult>[] _funcs;
 
     /// <inheritdoc />
     public string Name => nameof(MimePartMatcher);
@@ -52,21 +52,21 @@ public class MimePartMatcher : IMimePartMatcher
         _funcs =
         [
             mp => ContentTypeMatcher?.IsMatch(GetContentTypeAsString(mp.ContentType)) ?? MatchScores.Perfect,
-            mp => ContentDispositionMatcher?.IsMatch(mp.ContentDisposition.ToString().Replace("Content-Disposition: ", string.Empty)) ?? MatchScores.Perfect,
-            mp => ContentTransferEncodingMatcher?.IsMatch(mp.ContentTransferEncoding.ToString().ToLowerInvariant()) ?? MatchScores.Perfect,
+            mp => ContentDispositionMatcher?.IsMatch(mp.ContentDisposition?.ToString()?.Replace("Content-Disposition: ", string.Empty)) ?? MatchScores.Perfect,
+            mp => ContentTransferEncodingMatcher?.IsMatch(mp.ContentTransferEncoding.ToLowerInvariant()) ?? MatchScores.Perfect,
             MatchOnContent
         ];
     }
 
     /// <inheritdoc />
-    public MatchResult IsMatch(object value)
+    public MatchResult IsMatch(IMimePartData value)
     {
         var score = MatchScores.Mismatch;
         Exception? exception = null;
 
         try
         {
-            if (value is MimePart mimePart && Array.TrueForAll(_funcs, func => func(mimePart).IsPerfect()))
+            if (Array.TrueForAll(_funcs, func => func(value).IsPerfect()))
             {
                 score = MatchScores.Perfect;
             }
@@ -85,7 +85,7 @@ public class MimePartMatcher : IMimePartMatcher
         return "NotImplemented";
     }
 
-    private MatchResult MatchOnContent(MimePart mimePart)
+    private MatchResult MatchOnContent(IMimePartData mimePart)
     {
         if (ContentMatcher == null)
         {
@@ -94,10 +94,10 @@ public class MimePartMatcher : IMimePartMatcher
 
         var bodyParserSettings = new BodyParserSettings
         {
-            Stream = mimePart.Content.Open(),
+            Stream = mimePart.Open(),
             ContentType = GetContentTypeAsString(mimePart.ContentType),
             DeserializeJson = true,
-            ContentEncoding = null, // mimePart.ContentType.CharsetEncoding.ToString(),
+            ContentEncoding = null, // mimePart.ContentType?.CharsetEncoding.ToString(),
             DecompressGZipAndDeflate = true
         };
 
@@ -105,8 +105,8 @@ public class MimePartMatcher : IMimePartMatcher
         return BodyDataMatchScoreCalculator.CalculateMatchScore(bodyData, ContentMatcher);
     }
 
-    private static string? GetContentTypeAsString(ContentType? contentType)
+    private static string? GetContentTypeAsString(IContentTypeData? contentType)
     {
-        return contentType?.ToString().Replace("Content-Type: ", string.Empty);
+        return contentType?.ToString()?.Replace("Content-Type: ", string.Empty);
     }
 }

src/WireMock.Net.MimePart/Models/ContentDispositionDataWrapper.cs

@@ -0,0 +1,63 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the IContentDispositionData interface
+/// by wrapping a ContentDisposition object.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of a ContentDisposition.
+/// </remarks>
+public class ContentDispositionDataWrapper : IContentDispositionData
+{
+    private readonly ContentDisposition _contentDisposition;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentDispositionDataWrapper"/> class.
+    /// </summary>
+    /// <param name="contentDisposition">The ContentDisposition to wrap.</param>
+    public ContentDispositionDataWrapper(ContentDisposition contentDisposition)
+    {
+        _contentDisposition = Guard.NotNull(contentDisposition);
+
+        Parameters = _contentDisposition.Parameters.Select(p => p.ToString()).ToList();
+    }
+
+    /// <inheritdoc/>
+    public string Disposition => _contentDisposition.Disposition;
+
+    /// <inheritdoc/>
+    public bool IsAttachment => _contentDisposition.IsAttachment;
+
+    /// <inheritdoc/>
+    public IList<string> Parameters { get; private set; }
+
+    /// <inheritdoc/>
+    public string FileName => _contentDisposition.FileName;
+
+    /// <inheritdoc/>
+    public DateTimeOffset? CreationDate => _contentDisposition.CreationDate;
+
+    /// <inheritdoc/>
+    public DateTimeOffset? ModificationDate => _contentDisposition.ModificationDate;
+
+    /// <inheritdoc/>
+    public DateTimeOffset? ReadDate => _contentDisposition.ReadDate;
+
+    /// <inheritdoc/>
+    public long? Size => _contentDisposition.Size;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _contentDisposition.ToString();
+    }
+}

src/WireMock.Net.MimePart/Models/ContentTypeDataWrapper.cs

@@ -0,0 +1,65 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IContentTypeData"/> interface by wrapping a <see cref="ContentType"/> object.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of a <see cref="ContentType"/>.
+/// </remarks>
+public class ContentTypeDataWrapper : IContentTypeData
+{
+    private readonly ContentType _contentType;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ContentTypeDataWrapper"/> class.
+    /// </summary>
+    /// <param name="contentType">The ContentType to wrap.</param>
+    public ContentTypeDataWrapper(ContentType contentType)
+    {
+        _contentType = Guard.NotNull(contentType);
+
+        Parameters = _contentType.Parameters.Select(p => p.ToString()).ToList();
+    }
+
+    /// <inheritdoc/>
+    public string MediaType => _contentType.MediaType;
+
+    /// <inheritdoc/>
+    public string MediaSubtype => _contentType.MediaSubtype;
+
+    /// <inheritdoc/>
+    public IList<string> Parameters { get; private set; }
+
+    /// <inheritdoc/>
+    public string Boundary => _contentType.Boundary;
+
+    /// <inheritdoc/>
+    public string Charset => _contentType.Charset;
+
+    /// <inheritdoc/>
+    public Encoding CharsetEncoding => _contentType.CharsetEncoding;
+
+    /// <inheritdoc/>
+    public string Format => _contentType.Format;
+
+    /// <inheritdoc/>
+    public string MimeType => _contentType.MimeType;
+
+    /// <inheritdoc/>
+    public string Name => _contentType.Name;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _contentType.ToString();
+    }
+}

src/WireMock.Net.MimePart/Models/MimeEntityDataWrapper.cs

@@ -0,0 +1,61 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IMimeEntityData" /> interface by wrapping an <see cref="IMimeEntity" /> interface.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of an <see cref="IMimeEntity"/>.
+/// </remarks>
+public class MimeEntityDataWrapper : IMimeEntityData
+{
+    private readonly IMimeEntity _entity;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MimeEntityDataWrapper"/> class.
+    /// </summary>
+    /// <param name="entity">The MIME entity to wrap.</param>
+    public MimeEntityDataWrapper(IMimeEntity entity)
+    {
+        _entity = Guard.NotNull(entity);
+
+        ContentDisposition = _entity.ContentDisposition != null ? new ContentDispositionDataWrapper(_entity.ContentDisposition) : null;
+        ContentType = _entity.ContentType != null ? new ContentTypeDataWrapper(_entity.ContentType) : null;
+        Headers = _entity.Headers.Select(h => h.ToString()).ToList();
+    }
+
+    /// <inheritdoc/>
+    public IList<string> Headers { get; private set; }
+
+    /// <inheritdoc/>
+    public IContentDispositionData? ContentDisposition { get; private set; }
+
+    /// <inheritdoc/>
+    public IContentTypeData? ContentType { get; private set; }
+
+    /// <inheritdoc/>
+    public Uri ContentBase => _entity.ContentBase;
+
+    /// <inheritdoc/>
+    public Uri ContentLocation => _entity.ContentLocation;
+
+    /// <inheritdoc/>
+    public string ContentId => _entity.ContentId;
+
+    /// <inheritdoc/>
+    public bool IsAttachment => _entity.IsAttachment;
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _entity.ToString()!;
+    }
+}

src/WireMock.Net.MimePart/Models/MimeMessageDataWrapper.cs

@@ -0,0 +1,140 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IMimeMessageData" /> interface by wrapping an <see cref="IMimeMessage" /> interface.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of an <see cref="IMimeMessage"/>.
+/// </remarks>
+internal class MimeMessageDataWrapper : IMimeMessageData
+{
+    private readonly IMimeMessage _message;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MimeMessageDataWrapper"/> class.
+    /// </summary>
+    /// <param name="message">The MIME message to wrap.</param>
+    public MimeMessageDataWrapper(IMimeMessage message)
+    {
+        _message = Guard.NotNull(message);
+
+        Bcc = _message.Bcc.Select(h => h.ToString()).ToList();
+        Cc = _message.Cc.Select(h => h.ToString()).ToList();
+        From = _message.From.Select(h => h.ToString()).ToList();
+        Headers = _message.Headers.Select(h => h.ToString()).ToList();
+        References = _message.References.ToList();
+        ReplyTo = _message.ReplyTo.Select(h => h.ToString()).ToList();
+        ResentBcc = _message.ResentBcc.Select(h => h.ToString()).ToList();
+        ResentCc = _message.ResentCc.Select(h => h.ToString()).ToList();
+        ResentFrom = _message.ResentFrom.Select(h => h.ToString()).ToList();
+        ResentReplyTo = _message.ResentReplyTo.Select(h => h.ToString()).ToList();
+        ResentTo = _message.ResentTo.Select(h => h.ToString()).ToList();
+        To = _message.To.Select(h => h.ToString()).ToList();
+
+        Body = new MimeEntityDataWrapper(_message.Body);
+        BodyParts = _message.BodyParts.OfType<MimePart>().Select(mp => new MimePartDataWrapper(mp)).ToList<IMimePartData>();
+        Attachments = _message.Attachments.Select(me => new MimeEntityDataWrapper(me)).ToList<IMimeEntityData>();
+    }
+
+    /// <inheritdoc/>
+    public IList<string> Headers { get; private set; }
+
+    /// <inheritdoc/>
+    public int Importance => (int)_message.Importance;
+
+    /// <inheritdoc/>
+    public int Priority => (int)_message.Priority;
+
+    /// <inheritdoc/>
+    public int XPriority => (int)_message.XPriority;
+
+    /// <inheritdoc/>
+    public string Sender => _message.Sender.Address;
+
+    /// <inheritdoc/>
+    public string ResentSender => _message.ResentSender.ToString();
+
+    /// <inheritdoc/>
+    public IList<string> From { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentFrom { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ReplyTo { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentReplyTo { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> To { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentTo { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> Cc { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentCc { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> Bcc { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<string> ResentBcc { get; private set; }
+
+    /// <inheritdoc/>
+    public string Subject => _message.Subject;
+
+    /// <inheritdoc/>
+    public DateTimeOffset Date => _message.Date;
+
+    /// <inheritdoc/>
+    public DateTimeOffset ResentDate => _message.ResentDate;
+
+    /// <inheritdoc/>
+    public IList<string> References { get; private set; }
+
+    /// <inheritdoc/>
+    public string InReplyTo => _message.InReplyTo;
+
+    /// <inheritdoc/>
+    public string MessageId => _message.MessageId;
+
+    /// <inheritdoc/>
+    public string ResentMessageId => _message.ResentMessageId;
+
+    /// <inheritdoc/>
+    public Version MimeVersion => _message.MimeVersion;
+
+    /// <inheritdoc/>
+    public IMimeEntityData Body { get; private set; }
+
+    /// <inheritdoc/>
+    public string TextBody => _message.TextBody;
+
+    /// <inheritdoc/>
+    public string HtmlBody => _message.HtmlBody;
+
+    /// <inheritdoc/>
+    public IList<IMimePartData> BodyParts { get; private set; }
+
+    /// <inheritdoc/>
+    public IList<IMimeEntityData> Attachments { get; private set; }
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _message.ToString();
+    }
+}

src/WireMock.Net.MimePart/Models/MimePartDataWrapper.cs

@@ -0,0 +1,64 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.IO;
+using MimeKit;
+using Stef.Validation;
+using WireMock.Models.Mime;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// A wrapper class that implements the <see cref="IMimePartData" /> interface by wrapping an <see cref="IMimePart"/> interface.
+/// </summary>
+/// <remarks>
+/// This class provides a simplified, read-only view of an <see cref="IMimePart"/>.
+/// </remarks>
+public class MimePartDataWrapper : MimeEntityDataWrapper, IMimePartData
+{
+    private readonly IMimePart _part;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MimePartDataWrapper"/> class.
+    /// </summary>
+    /// <param name="part">The MIME part to wrap.</param>
+    /// <exception cref="System.ArgumentNullException">
+    /// <paramref name="part"/> is <see langword="null"/>.
+    /// </exception>
+    public MimePartDataWrapper(IMimePart part) : base(part)
+    {
+        _part = Guard.NotNull(part);
+    }
+
+    /// <inheritdoc/>
+    public string ContentDescription => _part.ContentDescription;
+
+    /// <inheritdoc/>
+    public int? ContentDuration => _part.ContentDuration;
+
+    /// <inheritdoc/>
+    public string ContentMd5 => _part.ContentMd5;
+
+    /// <inheritdoc/>
+    public string ContentTransferEncoding => _part.ContentTransferEncoding.ToString();
+
+    /// <inheritdoc/>
+    public string FileName => _part.FileName;
+
+    /// <inheritdoc/>
+    public IDictionary<string, object?> Content => new Dictionary<string, object?>()
+    {
+        { nameof(MimePart.Content.Encoding),  _part.Content.Encoding },
+        { nameof(MimePart.Content.NewLineFormat),  _part.Content.NewLineFormat },
+        { nameof(MimePart.Content.Stream),  _part.Content.Stream }
+    };
+
+    /// <inheritdoc/>
+    public Stream Open() => _part.Content.Open();
+
+    /// <inheritdoc/>
+    public override string ToString()
+    {
+        return _part.ToString()!;
+    }
+}

src/WireMock.Net.MimePart/Util/MimeKitUtils.cs

@@ -9,6 +9,8 @@ using System.Text;
 using MimeKit;
 using Stef.Validation;
 using WireMock.Http;
+using WireMock.Models;
+using WireMock.Models.Mime;
 using WireMock.Types;
 
 namespace WireMock.Util;
@@ -16,13 +18,13 @@ namespace WireMock.Util;
 internal class MimeKitUtils : IMimeKitUtils
 {
     /// <inheritdoc />
-    public object LoadFromStream(Stream stream)
+    public IMimeMessageData LoadFromStream(Stream stream)
     {
-        return MimeMessage.Load(Guard.NotNull(stream));
+        return new MimeMessageDataWrapper(MimeMessage.Load(Guard.NotNull(stream)));
     }
 
     /// <inheritdoc />
-    public bool TryGetMimeMessage(IRequestMessage requestMessage, [NotNullWhen(true)] out object? mimeMessage)
+    public bool TryGetMimeMessage(IRequestMessage requestMessage, [NotNullWhen(true)] out IMimeMessageData? mimeMessageData)
     {
         Guard.NotNull(requestMessage);
 
@@ -44,26 +46,14 @@ internal class MimeKitUtils : IMimeKitUtils
 
             var fixedBytes = FixBytes(bytes, contentTypeHeader[0]);
 
-            mimeMessage = LoadFromStream(new MemoryStream(fixedBytes));
+            mimeMessageData = LoadFromStream(new MemoryStream(fixedBytes));
             return true;
         }
 
-        mimeMessage = null;
+        mimeMessageData = null;
         return false;
     }
 
-    /// <inheritdoc />
-    public IReadOnlyList<object> GetBodyParts(object mimeMessage)
-    {
-        if (mimeMessage is not MimeMessage mm)
-        {
-            throw new ArgumentException($"The mimeMessage must be of type {nameof(MimeMessage)}", nameof(mimeMessage));
-        }
-
-        return mm.BodyParts
-            .OfType<MimePart>()
-            .ToArray();
-    }
 
     private static bool StartsWithMultiPart(WireMockList<string> contentTypeHeader)
     {

src/WireMock.Net.Minimal/Http/WireMockHttpClientFactory.cs

@@ -0,0 +1,18 @@
+// Copyright © WireMock.Net
+#if NET5_0_OR_GREATER
+using System;
+using System.Net.Http;
+using WireMock.Server;
+
+namespace WireMock.Http;
+
+internal class WireMockHttpClientFactory(WireMockServer server, params DelegatingHandler[] handlers) : IHttpClientFactory
+{
+    private readonly Lazy<HttpClient> _lazyHttpClient = new(() => server.CreateClient());
+
+    public HttpClient CreateClient(string name)
+    {
+        return handlers.Length > 0 ? server.CreateClient(handlers) : _lazyHttpClient.Value;
+    }
+}
+#endif

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; }
 

src/WireMock.Net.Minimal/Matchers/Request/RequestMessageMultiPartMatcher.cs

@@ -72,7 +72,8 @@ public class RequestMessageMultiPartMatcher : IRequestMatcher
             foreach (var mimePartMatcher in Matchers.OfType<IMimePartMatcher>().ToArray())
             {
                 score = MatchScores.Mismatch;
-                foreach (var mimeBodyPart in MimeKitUtils.GetBodyParts(message))
+
+                foreach (var mimeBodyPart in message.BodyParts)
                 {
                     var matchResult = mimePartMatcher.IsMatch(mimeBodyPart);
                     if (matchResult.IsPerfect())

src/WireMock.Net.Minimal/RequestMessage.cs

@@ -85,7 +85,7 @@ public class RequestMessage : IRequestMessage
 #if MIMEKIT
     /// <inheritdoc />
     [Newtonsoft.Json.JsonIgnore] // Issue 1001
-    public object? BodyAsMimeMessage { get; }
+    public Models.Mime.IMimeMessageData? BodyAsMimeMessage { get; }
 #endif
 
     /// <inheritdoc />

src/WireMock.Net.Minimal/Serialization/PactMapper.cs

@@ -42,8 +42,7 @@ internal static class PactMapper
 
             var interaction = new Interaction
             {
-                Description = mapping.Description,
-                ProviderState = mapping.Title,
+                Description = !string.IsNullOrWhiteSpace(mapping.Description) ? mapping.Description : mapping.Title ?? string.Empty,
                 Request = MapRequest(mapping.Request, path),
                 Response = MapResponse(mapping.Response)
             };

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

src/WireMock.Net.Minimal/Server/WireMockServer.cs

@@ -120,6 +120,32 @@ public partial class WireMockServer : IWireMockServer
     #endregion
 
     #region HttpClient
+#if NET5_0_OR_GREATER
+    private readonly Lazy<IHttpClientFactory> _lazyHttpClientFactory;
+
+    /// <summary>
+    /// Create a <see cref="IHttpClientFactory"/> which can be used to generate a HttpClient to call this instance.
+    /// <param name="handlers">
+    /// An ordered list of System.Net.Http.DelegatingHandler instances to be invoked
+    /// as an System.Net.Http.HttpRequestMessage travels from the System.Net.Http.HttpClient
+    /// to the network and an System.Net.Http.HttpResponseMessage travels from the network
+    /// back to System.Net.Http.HttpClient. The handlers are invoked in a top-down fashion.
+    /// That is, the first entry is invoked first for an outbound request message but
+    /// last for an inbound response message.
+    /// </param>
+    /// </summary>
+    [PublicAPI]
+    public IHttpClientFactory CreateHttpClientFactory(params DelegatingHandler[] handlers)
+    {
+        if (!IsStarted)
+        {
+            throw new InvalidOperationException("Unable to create IHttpClientFactory because the service is not started.");
+        }
+
+        return handlers.Length > 0 ? new WireMockHttpClientFactory(this, handlers) : _lazyHttpClientFactory.Value;
+    }
+#endif
+
     /// <summary>
     /// Create a <see cref="HttpClient"/> which can be used to call this instance.
     /// <param name="handlers">
@@ -427,6 +453,10 @@ public partial class WireMockServer : IWireMockServer
         }
 
         InitSettings(settings);
+
+#if NET5_0_OR_GREATER
+        _lazyHttpClientFactory = new Lazy<IHttpClientFactory>(() => new WireMockHttpClientFactory(this));
+#endif
     }
 
     /// <inheritdoc cref="IWireMockServer.Stop" />
@@ -567,6 +597,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)

src/WireMock.Net.Minimal/Transformers/Handlebars/HandlebarsContext.cs

@@ -1,5 +1,6 @@
 // Copyright © WireMock.Net
 
+using System.Text.RegularExpressions;
 using HandlebarsDotNet;
 using HandlebarsDotNet.Helpers.Extensions;
 using Stef.Validation;
@@ -9,6 +10,8 @@ namespace WireMock.Transformers.Handlebars;
 
 internal class HandlebarsContext : IHandlebarsContext
 {
+    private static readonly Regex _tryEvaluateRegex = new(@"\{\{.*?\}\}", RegexOptions.Compiled);
+
     public IHandlebars Handlebars { get; }
 
     public IFileSystemHandler FileSystemHandler { get; }
@@ -27,9 +30,8 @@ internal class HandlebarsContext : IHandlebarsContext
 
     public object? ParseAndEvaluate(string text, object model)
     {
-        if (text.StartsWith("{{") && text.EndsWith("}}") &&
-            Handlebars.TryEvaluate(text, model, out var result) &&
-            result is not UndefinedBindingResult)
+        // Only try to evaluate if the text matches the pattern `{{ xxx }}` exactly once.
+        if (_tryEvaluateRegex.Matches(text).Count == 1 && Handlebars.TryEvaluate(text, model, out var result) && result is not UndefinedBindingResult)
         {
             return result;
         }

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>

src/WireMock.Net.Shared/Matchers/IMimePartMatcher.cs

@@ -1,5 +1,7 @@
 // Copyright © WireMock.Net
 
+using WireMock.Models.Mime;
+
 namespace WireMock.Matchers;
 
 /// <summary>
@@ -33,5 +35,5 @@ public interface IMimePartMatcher : IMatcher
     /// </summary>
     /// <param name="value">The MimePart.</param>
     /// <returns>A value between 0.0 - 1.0 of the similarity.</returns>
-    public MatchResult IsMatch(object value);
+    public MatchResult IsMatch(IMimePartData value);
 }

src/WireMock.Net.Shared/Util/IMimeKitUtils.cs

@@ -1,8 +1,8 @@
 // Copyright © WireMock.Net
 
-using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using WireMock.Models.Mime;
 
 namespace WireMock.Util;
 
@@ -12,24 +12,16 @@ namespace WireMock.Util;
 public interface IMimeKitUtils
 {
     /// <summary>
-    /// Loads the MimeKit.MimeMessage from the stream.
+    /// Loads the <see cref="IMimeMessageData"/> from the stream.
     /// </summary>
     /// <param name="stream">The stream</param>
-    /// <returns>MimeKit.MimeMessage</returns>
-    object LoadFromStream(Stream stream);
+    IMimeMessageData LoadFromStream(Stream stream);
 
     /// <summary>
-    /// Tries to get the MimeKit.MimeMessage from the request message.
+    /// Tries to get the <see cref="IMimeMessageData"/> from the request message.
     /// </summary>
     /// <param name="requestMessage">The request message.</param>
-    /// <param name="mimeMessage">The MimeKit.MimeMessage</param>
+    /// <param name="mimeMessageData">A class MimeMessageDataWrapper which wraps a MimeKit.MimeMessage.</param>
     /// <returns><c>true</c> when parsed correctly, else <c>false</c></returns>
-    bool TryGetMimeMessage(IRequestMessage requestMessage, [NotNullWhen(true)] out object? mimeMessage);
-
-    /// <summary>
-    /// Gets the body parts from the MimeKit.MimeMessage.
-    /// </summary>
-    /// <param name="mimeMessage">The MimeKit.MimeMessage.</param>
-    /// <returns>A list of MimeParts.</returns>
-    IReadOnlyList<object> GetBodyParts(object mimeMessage);
+    bool TryGetMimeMessage(IRequestMessage requestMessage, [NotNullWhen(true)] out IMimeMessageData? mimeMessageData);
 }

test/WireMock.Net.Tests/AdminApi/WireMockAdminApiTests.cs

@@ -17,13 +17,13 @@ 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;
 using WireMock.Handlers;
 using WireMock.Logging;
 using WireMock.Matchers;
-using WireMock.Models;
 using WireMock.Net.Tests.VerifyExtensions;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
@@ -184,7 +184,7 @@ public partial class WireMockAdminApiTests
         server.Stop();
     }
 
-    
+
 
     [Fact]
     public async Task IWireMockAdminApi_FindRequestsAsync()
@@ -743,6 +743,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()
     {

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;
 }

test/WireMock.Net.Tests/Matchers/MimePartMatcherTests.cs

@@ -48,7 +48,7 @@ public class MimePartMatcherTests
     {
         // Arrange
         var message = MimeKitUtils.LoadFromStream(StreamUtils.CreateStream(TestMultiPart));
-        var part = MimeKitUtils.GetBodyParts(message)[0];
+        var part = message.BodyParts[0];
 
         // Act
         var contentTypeMatcher = new ContentTypeMatcher("text/plain");
@@ -67,7 +67,7 @@ public class MimePartMatcherTests
     {
         // Arrange
         var message = MimeKitUtils.LoadFromStream(StreamUtils.CreateStream(TestMultiPart));
-        var part = MimeKitUtils.GetBodyParts(message)[1];
+        var part = message.BodyParts[1];
 
         // Act
         var contentTypeMatcher = new ContentTypeMatcher("text/json");
@@ -85,7 +85,7 @@ public class MimePartMatcherTests
     {
         // Arrange
         var message = MimeKitUtils.LoadFromStream(StreamUtils.CreateStream(TestMultiPart));
-        var part = MimeKitUtils.GetBodyParts(message)[2];
+        var part = message.BodyParts[2];
 
         // Act
         var contentTypeMatcher = new ContentTypeMatcher("image/png");

test/WireMock.Net.Tests/Pact/PactTests.SavePact_Get_Request_And_Response_WithBodyAsJson.verified.json

@@ -0,0 +1,32 @@
+{
+  "consumer": {
+    "name": "Something API Consumer Get"
+  },
+  "interactions": [
+    {
+      "description": "A GET request to retrieve the something",
+      "request": {
+        "headers": {
+          "Accept": "application/json"
+        },
+        "method": "GET",
+        "path": "/tester",
+        "query": "q1=test&q2=ok"
+      },
+      "response": {
+        "body": {
+          "id": "tester",
+          "firstName": "Totally",
+          "lastName": "Awesome"
+        },
+        "headers": {
+          "Content-Type": "application/json; charset=utf-8"
+        },
+        "status": 200
+      }
+    }
+  ],
+  "provider": {
+    "name": "Something API"
+  }
+}

test/WireMock.Net.Tests/Pact/PactTests.SavePact_Post_Request_WithDescription.verified.json

@@ -0,0 +1,20 @@
+{
+  "consumer": {
+    "name": "Default Consumer"
+  },
+  "interactions": [
+    {
+      "description": "A POST request to change something",
+      "request": {
+        "method": "POST",
+        "path": "/tester"
+      },
+      "response": {
+        "status": 200
+      }
+    }
+  ],
+  "provider": {
+    "name": "Default Provider"
+  }
+}

test/WireMock.Net.Tests/Pact/PactTests.cs

@@ -1,11 +1,14 @@
+#if !(NET452 || NET461 || NETCOREAPP3_1)
 // Copyright © WireMock.Net
 
 using System.IO;
 using System.Net;
 using System.Text;
+using System.Threading.Tasks;
 using FluentAssertions;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using VerifyXunit;
 using WireMock.Matchers;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
@@ -14,10 +17,11 @@ using Xunit;
 
 namespace WireMock.Net.Tests.Pact;
 
+[UsesVerify]
 public class PactTests
 {
     [Fact]
-    public void SavePact_Get_Request_And_Response_WithBodyAsJson()
+    public async Task SavePact_Get_Request_And_Response_WithBodyAsJson()
     {
         var server = WireMockServer.Start();
         server
@@ -46,12 +50,34 @@ public class PactTests
 
         var folder = Path.Combine("../../../", "Pact", "files");
         var file = "pact-get.json";
+        var path = Path.Combine(folder, file);
 
         // Act
         server.SavePact(folder, file);
 
         // Assert
-        File.ReadAllBytes(Path.Combine(folder, file)).Length.Should().BeGreaterThan(1);
+        await Verifier.VerifyFile(path);
+    }
+
+    [Fact]
+    public async Task SavePact_Post_Request_WithDescription()
+    {
+        var server = WireMockServer.Start();
+        server
+            .Given(Request.Create().UsingPost().WithPath("/tester"))
+            .WithTitle("POST something")
+            .WithDescription("A POST request to change something")
+            .RespondWith(Response.Create().WithStatusCode(HttpStatusCode.OK));
+
+        var folder = Path.Combine("../../../", "Pact", "files");
+        var file = "pact-post.json";
+        var path = Path.Combine(folder, file);
+
+        // Act
+        server.SavePact(folder, file);
+
+        // Assert
+        await Verifier.VerifyFile(path);
     }
 
     [Fact]
@@ -219,4 +245,5 @@ public class PactTests
         // Assert
         File.ReadAllBytes(Path.Combine(folder, file)).Length.Should().BeGreaterThan(1);
     }
-}
+}
+#endif

test/WireMock.Net.Tests/Pact/files/pact-get.json

@@ -4,7 +4,7 @@
   },
   "interactions": [
     {
-      "providerState": "A GET request to retrieve the something",
+      "description": "A GET request to retrieve the something",
       "request": {
         "headers": {
           "Accept": "application/json"

test/WireMock.Net.Tests/Pact/files/pact-multiple.json

@@ -4,7 +4,7 @@
   },
   "interactions": [
     {
-      "providerState": "A GET request to retrieve the something",
+      "description": "A GET request to retrieve the something",
       "request": {
         "headers": {
           "Accept": "application/json"
@@ -26,7 +26,7 @@
       }
     },
     {
-      "providerState": "A Post request to add the something",
+      "description": "A Post request to add the something",
       "request": {
         "headers": {
           "Accept": "application/json"

test/WireMock.Net.Tests/Pact/files/pact-post.json

@@ -0,0 +1,20 @@
+{
+  "consumer": {
+    "name": "Default Consumer"
+  },
+  "interactions": [
+    {
+      "description": "A POST request to change something",
+      "request": {
+        "method": "POST",
+        "path": "/tester"
+      },
+      "response": {
+        "status": 200
+      }
+    }
+  ],
+  "provider": {
+    "name": "Default Provider"
+  }
+}

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

@@ -120,21 +120,21 @@ public class ResponseWithTransformerTests
         var request = new RequestMessage(urlDetails, "POST", ClientIp);
 
         var responseBuilder = Response.Create()
-            .WithBody("{{request.PathSegments.[0]}} {{request.AbsolutePathSegments.[0]}}")
+            .WithBody("{{request.PathSegments.[0]}} {{request.PathSegments.[1]}} {{request.AbsolutePathSegments.[0]}}")
             .WithTransformer();
 
         // Act
         var response = await responseBuilder.ProvideResponseAsync(_mappingMock.Object, request, _settings).ConfigureAwait(false);
 
         // Assert
-        Check.That(response.Message.BodyData!.BodyAsString).Equals("a wiremock");
+        Check.That(response.Message.BodyData!.BodyAsString).Equals("a b wiremock");
     }
 
     [Theory]
-    [InlineData("{{request.PathSegments.[0]}}", "a")]
-    [InlineData("prefix_{{request.PathSegments.[0]}}", "prefix_a")]
-    [InlineData("{{request.PathSegments.[0]}}_postfix", "a_postfix")]
-    [InlineData("prefix_{{request.PathSegments.[0]}}_postfix", "prefix_a_postfix")]
+    [InlineData("{{request.PathSegments.[0]}} {{request.PathSegments.[1]}}", "a b")]
+    [InlineData("prefix_{{request.PathSegments.[0]}} {{request.PathSegments.[1]}}", "prefix_a b")]
+    [InlineData("{{request.PathSegments.[0]}} {{request.PathSegments.[1]}}_postfix", "a b_postfix")]
+    [InlineData("prefix_{{request.PathSegments.[0]}} {{request.PathSegments.[1]}}_postfix", "prefix_a b_postfix")]
     public async Task Response_ProvideResponse_Handlebars_BodyAsJson_PathSegments(string field, string expected)
     {
         // Assign

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();
     }
 }

test/WireMock.Net.Tests/WireMockServer.Admin.cs

@@ -560,6 +560,30 @@ public class WireMockServerAdminTests
         Check.That(await response.Content.ReadAsStringAsync().ConfigureAwait(false)).Equals($"{{\"Status\":\"Mappings deleted. Affected GUIDs: [{guid1}, {guid2}]\"}}");
     }
 
+#if NET5_0_OR_GREATER
+    [Fact]
+    public async Task WireMockServer_CreateHttpClientFactory_And_CallEndpoint()
+    {
+        // Arrange
+        var server = WireMockServer.Start();
+        var factory = server.CreateHttpClientFactory();
+        var client = factory.CreateClient("any name");
+
+        // Act
+        await client.GetAsync($"{server.Url}/foo").ConfigureAwait(false);
+
+        // Assert
+        Check.That(server.LogEntries).HasSize(1);
+        var requestLogged = server.LogEntries.First();
+        Check.That(requestLogged.RequestMessage.Method).IsEqualTo("GET");
+        Check.That(requestLogged.RequestMessage.BodyData).IsNull();
+
+        // Cleanup
+        server.Stop();
+        server.Dispose();
+    }
+#endif
+
     [Fact]
     public async Task WireMockServer_CreateClient_And_CallEndpoint()
     {