1.11.2

Revert JetBrains.Annotations and add System.Text.RegularExpressions to solve CVE (#1355 )
1.11.1
2026-02-06 18:39:33 +01:00 · 2025-08-27 10:25:31 +02:00 · 2025-08-27 10:04:36 +02:00 · 2025-08-27 08:47:58 +02:00 · 2025-08-27 08:45:24 +02:00 · 2025-08-27 08:33:01 +02:00
84 changed files with 797 additions and 441 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,18 @@
+# 1.11.2 (27 August 2025)
+- [#1352](https://github.com/wiremock/WireMock.Net/pull/1352) - Add additional try-catch to TypeLoader logic [feature] contributed by [StefH](https://github.com/StefH)
+- [#1354](https://github.com/wiremock/WireMock.Net/pull/1354) - Add System.Net.Http again to solve CVE warning [bug] contributed by [StefH](https://github.com/StefH)
+- [#1355](https://github.com/wiremock/WireMock.Net/pull/1355) - Revert JetBrains.Annotations and add System.Text.RegularExpressions t&#8230; [bug] contributed by [StefH](https://github.com/StefH)
+- [#1071](https://github.com/wiremock/WireMock.Net/issues/1071) - Split WireMock into multiple nuget packages depending on features [feature]
+- [#1351](https://github.com/wiremock/WireMock.Net/issues/1351) - Version 1.11.0 seems to have a dependency to non-existing version of JetBrans.Annotations [bug]
+- [#1353](https://github.com/wiremock/WireMock.Net/issues/1353) - 1.11.0: NU1903: Warning As Error: Package 'System.Net.Http' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-7jgj-8wvc-jh57 [bug]
+
+# 1.11.0 (26 August 2025)
+- [#1350](https://github.com/wiremock/WireMock.Net/pull/1350) - Create WireMock.Net.ProtoBuf project [feature] contributed by [StefH](https://github.com/StefH)
+
+# 1.10.1 (22 August 2025)
+- [#1349](https://github.com/wiremock/WireMock.Net/pull/1349) - Add AtPath and AtAbsolutePath to Assertions projects [feature] contributed by [StefH](https://github.com/StefH)
+- [#1348](https://github.com/wiremock/WireMock.Net/issues/1348) - Support AtPath and AtAbsolutePath in WireMockAssertions [feature]
+
 # 1.10.0 (18 August 2025)
 - [#1344](https://github.com/wiremock/WireMock.Net/pull/1344) - Add new package WireMock.Net.Extensions.Routing which provides minimal-API-style routing for WireMock.Net [feature] contributed by [GennadyGS](https://github.com/GennadyGS)
 - [#1340](https://github.com/wiremock/WireMock.Net/issues/1340) - Feature Request: Add minimal-API-style routing as Extension Package [feature]
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
    </PropertyGroup>

    <PropertyGroup>
-        <VersionPrefix>1.10.0</VersionPrefix>
+        <Version>1.11.2</Version>
        <PackageIcon>WireMock.Net-Logo.png</PackageIcon>
        <PackageProjectUrl>https://github.com/wiremock/WireMock.Net</PackageProjectUrl>
        <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
@@ -58,7 +58,7 @@
    </ItemGroup>

    <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
-        <PackageReference Include="SonarAnalyzer.CSharp" Version="9.32.0.97167">
+        <PackageReference Include="SonarAnalyzer.CSharp" Version="10.15.0.120848">
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
--- a/Generate-ReleaseNotes.cmd
+++ b/Generate-ReleaseNotes.cmd
@@ -1,6 +1,6 @@
 rem https://github.com/StefH/GitHubReleaseNotes

-SET version=1.10.0
+SET version=1.11.2

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

--- a/PackageReleaseNotes.txt
+++ b/PackageReleaseNotes.txt
@@ -1,5 +1,9 @@
-# 1.10.0 (18 August 2025)
- #1344 Add new package WireMock.Net.Extensions.Routing which provides minimal-API-style routing for WireMock.Net [feature]
- #1340 Feature Request: Add minimal-API-style routing as Extension Package [feature]
+# 1.11.2 (27 August 2025)
+- #1352 Add additional try-catch to TypeLoader logic [feature]
+- #1354 Add System.Net.Http again to solve CVE warning [bug]
+- #1355 Revert JetBrains.Annotations and add System.Text.RegularExpressions t&#8230; [bug]
+- #1071 Split WireMock into multiple nuget packages depending on features [feature]
+- #1351 Version 1.11.0 seems to have a dependency to non-existing version of JetBrans.Annotations [bug]
+- #1353 1.11.0: NU1903: Warning As Error: Package 'System.Net.Http' 4.3.0 has a known high severity vulnerability, https://github.com/advisories/GHSA-7jgj-8wvc-jh57 [bug]

 The full release notes can be found here: https://github.com/wiremock/WireMock.Net/blob/master/CHANGELOG.md
--- a/README.md
+++ b/README.md
@@ -56,13 +56,14 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 | &nbsp;&nbsp;**WireMock.Net.OpenApiParser** | [![NuGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/nuget/v/WireMock.Net.OpenApiParser)](https://www.nuget.org/packages/WireMock.Net.OpenApiParser) | [![MyGet Badge WireMock.Net.OpenApiParser](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.OpenApiParser?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.OpenApiParser)
 | &nbsp;&nbsp;**WireMock.Net.MimePart** | [![NuGet Badge WireMock.Net.MimePart](https://img.shields.io/nuget/v/WireMock.Net.MimePart)](https://www.nuget.org/packages/WireMock.Net.MimePart) | [![MyGet Badge WireMock.Net.MimePart](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.MimePart?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.MimePart)
 | &nbsp;&nbsp;**WireMock.Net.GraphQL** | [![NuGet Badge WireMock.Net.GraphQL](https://img.shields.io/nuget/v/WireMock.Net.GraphQL)](https://www.nuget.org/packages/WireMock.Net.GraphQL) | [![MyGet Badge WireMock.Net.GraphQL](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.GraphQL?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.GraphQL)
+| &nbsp;&nbsp;**WireMock.Net.ProtoBuf** | [![NuGet Badge WireMock.Net.ProtoBuf](https://img.shields.io/nuget/v/WireMock.Net.ProtoBuf)](https://www.nuget.org/packages/WireMock.Net.ProtoBuf) | [![MyGet Badge WireMock.Net.ProtoBuf](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.ProtoBuf?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.ProtoBuf)
 | | | |
 | &nbsp;&nbsp;**WireMock.Net.RestClient** | [![NuGet Badge WireMock.Net.RestClient](https://img.shields.io/nuget/v/WireMock.Net.RestClient)](https://www.nuget.org/packages/WireMock.Net.RestClient) | [![MyGet Badge WireMock.Net.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Net.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Net.RestClient)
 | &nbsp;&nbsp;**WireMock.Org.RestClient** | [![NuGet Badge WireMock.Org.RestClient](https://img.shields.io/nuget/v/WireMock.Org.RestClient)](https://www.nuget.org/packages/WireMock.Org.RestClient) | [![MyGet Badge WireMock.Org.RestClient](https://img.shields.io/myget/wiremock-net/vpre/WireMock.Org.RestClient?includePreReleases=true&label=MyGet)](https://www.myget.org/feed/wiremock-net/package/nuget/WireMock.Org.RestClient)

 <br />

-🔺 **WireMock.Net.Minimal** does not include *WireMock.Net.MimePart* and *WireMock.Net.GraphQL*.
+🔺 **WireMock.Net.Minimal** does not include *WireMock.Net.MimePart*, *WireMock.Net.GraphQL* and *WireMock.Net.ProtoBuf*.

 ---

--- a/Solution.sln
+++ b/Solution.sln
@@ -142,6 +142,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Extensions.Rou
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.Extensions.Routing", "src\WireMock.Net.Extensions.Routing\WireMock.Net.Extensions.Routing.csproj", "{1E874C8F-08A2-493B-8421-619F9A6E9E77}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WireMock.Net.ProtoBuf", "src\WireMock.Net.ProtoBuf\WireMock.Net.ProtoBuf.csproj", "{B47413AA-55D3-49A7-896A-17ADBFF72407}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -344,6 +346,10 @@ Global
 		{1E874C8F-08A2-493B-8421-619F9A6E9E77}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E874C8F-08A2-493B-8421-619F9A6E9E77}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1E874C8F-08A2-493B-8421-619F9A6E9E77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B47413AA-55D3-49A7-896A-17ADBFF72407}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -400,6 +406,7 @@ Global
 		{B6269AAC-170A-4346-8B9A-444DED3D9A45} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 		{3FCBCA9C-9DB0-4A96-B47E-30470764CC9C} = {0BB8B634-407A-4610-A91F-11586990767A}
 		{1E874C8F-08A2-493B-8421-619F9A6E9E77} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
+		{B47413AA-55D3-49A7-896A-17ADBFF72407} = {8F890C6F-9ACC-438D-928A-AD61CDA862F2}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}
--- a/src/WireMock.Net.Abstractions/IResponseMessage.cs
+++ b/src/WireMock.Net.Abstractions/IResponseMessage.cs
@@ -15,12 +15,12 @@ public interface IResponseMessage
    /// <summary>
    /// The Body.
    /// </summary>
-    IBodyData? BodyData { get; }
+    IBodyData? BodyData { get; set; }

    /// <summary>
    /// Gets the body destination (Null, SameAsSource, String or Bytes).
    /// </summary>
-    string? BodyDestination { get; }
+    string? BodyDestination { get; set; }

    /// <summary>
    /// Gets or sets the body.
@@ -30,27 +30,27 @@ public interface IResponseMessage
    /// <summary>
    /// Gets the Fault percentage.
    /// </summary>
-    double? FaultPercentage { get; }
+    double? FaultPercentage { get; set; }

    /// <summary>
    /// The FaultType.
    /// </summary>
-    FaultType FaultType { get; }
+    FaultType FaultType { get; set; }

    /// <summary>
    /// Gets the headers.
    /// </summary>
-    IDictionary<string, WireMockList<string>>? Headers { get; }
+    IDictionary<string, WireMockList<string>>? Headers { get; set; }

    /// <summary>
    /// Gets the trailing headers.
    /// </summary>
-    IDictionary<string, WireMockList<string>>? TrailingHeaders { get; }
+    IDictionary<string, WireMockList<string>>? TrailingHeaders { get; set; }

    /// <summary>
    /// Gets or sets the status code.
    /// </summary>
-    object? StatusCode { get; }
+    object? StatusCode { get; set; }

    /// <summary>
    /// Adds the header.
--- a/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
+++ b/src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj
@@ -38,7 +38,7 @@
    </PropertyGroup>

    <ItemGroup>
-        <!-- CVE-2018-8292 -->
+        <!-- CVE-2018-8292 / https://github.com/advisories/GHSA-7jgj-8wvc-jh57 -->
        <PackageReference Include="System.Net.Http " Version="4.3.4" />

        <!-- See also https://mstack.nl/blog/20210801-source-generators -->
@@ -50,34 +50,15 @@
            <PrivateAssets>all</PrivateAssets>
            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
        </PackageReference>
-        <!--<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="Stef.Validation" Version="0.1.1" />
-        <PackageReference Include="AnyOf" Version="0.4.0" />-->
    </ItemGroup>

    <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) and '$(TargetFramework)' != 'netstandard1.0'">
      <PackageReference Include="System.Security.Cryptography.X509Certificates" Version="4.3.0" />
    </ItemGroup>

-    <!--<ItemGroup>
-        <PackageReference Include="Nullable" Version="1.3.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>
-    </ItemGroup>-->

    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'net45' or '$(TargetFramework)' == 'net451' or '$(TargetFramework)' == 'net461'">
        <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-
-        <!--<PackageReference Include="Nullable" Version="1.3.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>-->
-
-        <!--<PackageReference Include="PolySharp" Version="1.14.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>-->
    </ItemGroup>

 </Project>
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockANumberOfCallsAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockANumberOfCallsAssertions.cs
@@ -4,11 +4,11 @@ using Stef.Validation;
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 /// <summary>
 /// Provides assertion methods to verify the number of calls made to a WireMock server.
-/// This class is used in the context of FluentAssertions.
+/// This class is used in the context of AwesomeAssertions.
 /// </summary>
 public class WireMockANumberOfCallsAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.AtPath.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.AtPath.cs
@@ -0,0 +1,83 @@
+// Copyright © WireMock.Net
+
+using WireMock.Extensions;
+using WireMock.Matchers;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.AwesomeAssertions;
+
+#pragma warning disable CS1591
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtAbsolutePath(string absolutePath, string because = "", params object[] becauseArgs)
+    {
+        _ = AtAbsolutePath(new ExactMatcher(true, absolutePath), because, becauseArgs);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, absolutePath);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, IStringMatcher> AtAbsolutePath(IStringMatcher absolutePathMatcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => absolutePathMatcher.IsPerfectMatch(request.AbsolutePath));
+
+        var absolutePath = absolutePathMatcher.GetPatterns().FirstOrDefault().GetPattern();
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute path {0}{reason}, but no calls were made.",
+                absolutePath
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute path {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => absolutePath,
+                requests => requests.Select(request => request.AbsolutePath)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, IStringMatcher>(this, absolutePathMatcher);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtPath(string path, string because = "", params object[] becauseArgs)
+    {
+        _ = AtPath(new ExactMatcher(true, path), because, becauseArgs);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, path);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, IStringMatcher> AtPath(IStringMatcher pathMatcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => pathMatcher.IsPerfectMatch(request.Path));
+
+        var path = pathMatcher.GetPatterns().FirstOrDefault().GetPattern();
+
+        _chain
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the path {0}{reason}, but no calls were made.",
+                path
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the path {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => path,
+                requests => requests.Select(request => request.Path)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, IStringMatcher>(this, pathMatcher);
+    }
+}
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.AtUrl.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.AtUrl.cs
@@ -4,7 +4,7 @@ using WireMock.Extensions;
 using WireMock.Matchers;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 #pragma warning disable CS1591
 public partial class WireMockAssertions
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.FromClientIP.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.FromClientIP.cs
@@ -4,7 +4,7 @@
 using System;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.UsingMethod.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.UsingMethod.cs
@@ -5,7 +5,7 @@ using System;
 using WireMock.Constants;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithBody.cs
@@ -11,7 +11,7 @@ using WireMock.Matchers;
 using WireMock.Models;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithHeader.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithHeader.cs
@@ -3,7 +3,7 @@
 #pragma warning disable CS1591

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithProxy.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.WithProxy.cs
@@ -4,7 +4,7 @@
 using System;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockAssertions.cs
@@ -7,7 +7,7 @@ using WireMock.Matchers;
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 public partial class WireMockAssertions
 {
--- a/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockReceivedAssertions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Assertions/WireMockReceivedAssertions.cs
@@ -4,7 +4,7 @@ using AwesomeAssertions.Primitives;
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions;
+namespace WireMock.AwesomeAssertions;

 /// <summary>
 /// Contains a number of methods to assert that the <see cref="IWireMockServer"/> is in the expected state.
--- a/src/WireMock.Net.AwesomeAssertions/Extensions/WireMockExtensions.cs
+++ b/src/WireMock.Net.AwesomeAssertions/Extensions/WireMockExtensions.cs
@@ -3,7 +3,7 @@
 using WireMock.Server;

 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions
+namespace WireMock.AwesomeAssertions
 {
    /// <summary>
    /// Contains extension methods for custom assertions in unit tests.
--- a/src/WireMock.Net.Extensions.Routing/Delegates/WireMockHttpRequestHandler.cs
+++ b/src/WireMock.Net.Extensions.Routing/Delegates/WireMockHttpRequestHandler.cs
@@ -7,4 +7,4 @@ namespace WireMock.Net.Extensions.Routing.Delegates;
 /// </summary>
 /// <param name="requestMessage">The incoming request message.</param>
 /// <returns>A task that resolves to a <see cref="ResponseMessage"/>.</returns>
-public delegate Task<ResponseMessage> WireMockHttpRequestHandler(IRequestMessage requestMessage);
+public delegate Task<IResponseMessage> WireMockHttpRequestHandler(IRequestMessage requestMessage);
--- a/src/WireMock.Net.Extensions.Routing/WireMock.Net.Extensions.Routing.csproj
+++ b/src/WireMock.Net.Extensions.Routing/WireMock.Net.Extensions.Routing.csproj
@@ -13,13 +13,17 @@
        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
        <PackageReadmeFile>README.md</PackageReadmeFile>
        <ImplicitUsings>enable</ImplicitUsings>
-        <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+        <!--<TreatWarningsAsErrors>true</TreatWarningsAsErrors>-->
    </PropertyGroup>

    <ItemGroup>
        <None Include="..\..\README.md" Link="README.md" Pack="true" PackagePath="" />
    </ItemGroup>

+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
    <ItemGroup>
      <PackageReference Include="JsonConverter.Newtonsoft.Json" Version="0.7.0" />
    </ItemGroup>
--- a/src/WireMock.Net.Extensions.Routing/WireMockRouter.cs
+++ b/src/WireMock.Net.Extensions.Routing/WireMockRouter.cs
@@ -105,7 +105,7 @@ public sealed class WireMockRouter(WireMockServer server)
        Func<IRequestMessage, object?> requestHandler) =>
        request => CreateResponseMessageAsync(requestHandler(request));

-    private static async Task<ResponseMessage> CreateResponseMessageAsync(object? response)
+    private static async Task<IResponseMessage> CreateResponseMessageAsync(object? response)
    {
        var awaitedResponse = response is Task task
            ? await task.ToGenericTaskAsync()
--- a/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.AtPath.cs
+++ b/src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.AtPath.cs
@@ -0,0 +1,83 @@
+// Copyright © WireMock.Net
+
+using WireMock.Extensions;
+using WireMock.Matchers;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+#pragma warning disable CS1591
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtAbsolutePath(string absolutePath, string because = "", params object[] becauseArgs)
+    {
+        _ = AtAbsolutePath(new ExactMatcher(true, absolutePath), because, becauseArgs);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, absolutePath);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, IStringMatcher> AtAbsolutePath(IStringMatcher absolutePathMatcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => absolutePathMatcher.IsPerfectMatch(request.AbsolutePath));
+
+        var absolutePath = absolutePathMatcher.GetPatterns().FirstOrDefault().GetPattern();
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute path {0}{reason}, but no calls were made.",
+                absolutePath
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute path {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => absolutePath,
+                requests => requests.Select(request => request.AbsolutePath)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, IStringMatcher>(this, absolutePathMatcher);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtPath(string path, string because = "", params object[] becauseArgs)
+    {
+        _ = AtPath(new ExactMatcher(true, path), because, becauseArgs);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, path);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, IStringMatcher> AtPath(IStringMatcher pathMatcher, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => pathMatcher.IsPerfectMatch(request.Path));
+
+        var path = pathMatcher.GetPatterns().FirstOrDefault().GetPattern();
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the path {0}{reason}, but no calls were made.",
+                path
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the path {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => path,
+                requests => requests.Select(request => request.Path)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, IStringMatcher>(this, pathMatcher);
+    }
+}
--- a/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs
+++ b/src/WireMock.Net.Minimal/Owin/Mappers/OwinResponseMapper.cs
@@ -177,11 +177,10 @@ namespace WireMock.Owin.Mappers
                    var jsonBody = JsonConvert.SerializeObject(bodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
                    return (bodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);

-#if PROTOBUF
                case BodyType.ProtoBuf:
                    var protoDefinitions = bodyData.ProtoDefinition?.Invoke().Texts;
-                    return await ProtoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);
-#endif
+                    var protoBufUtils = TypeLoader.LoadStaticInstance<IProtoBufUtils>();
+                    return await protoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinitions, bodyData.ProtoBufMessageType, bodyData.BodyAsJson).ConfigureAwait(false);

                case BodyType.Bytes:
                    return bodyData.BodyAsBytes;
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.WithBodyAsProtoBuf.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.WithBodyAsProtoBuf.cs
@@ -1,61 +0,0 @@
-// Copyright © WireMock.Net
-
-using System;
-using System.Collections.Generic;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-using WireMock.Models;
-
-namespace WireMock.RequestBuilders;
-
-public partial class Request
-{
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsProtoBuf([protoDefinition], messageType, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return WithBodyAsProtoBuf([protoDefinition], messageType, matcher, matchBehaviour);
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(IReadOnlyList<string> protoDefinitions, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new IdOrTexts(null, protoDefinitions), messageType));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(IReadOnlyList<string> protoDefinitions, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new IdOrTexts(null, protoDefinitions), messageType, matcher));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, ProtoDefinitionFunc(), messageType));
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsProtoBuf(string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, ProtoDefinitionFunc(), messageType, matcher));
-    }
-
-    private Func<IdOrTexts> ProtoDefinitionFunc()
-    {
-        return () =>
-        {
-            if (Mapping.ProtoDefinition == null)
-            {
-                throw new InvalidOperationException($"No ProtoDefinition defined on mapping '{Mapping.Guid}'. Please use the WireMockServerSettings to define ProtoDefinitions.");
-            }
-
-            return Mapping.ProtoDefinition.Value;
-        };
-    }
-}
--- a/src/WireMock.Net.Minimal/RequestBuilders/Request.cs
+++ b/src/WireMock.Net.Minimal/RequestBuilders/Request.cs
@@ -20,9 +20,7 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
 {
    private readonly IList<IRequestMatcher> _requestMatchers;

-    /// <summary>
-    /// The link back to the Mapping.
-    /// </summary>
+    /// <inheritdoc />
    public IMapping Mapping { get; set; } = null!;

    /// <summary>
@@ -73,6 +71,7 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
        return _requestMatchers.OfType<T>().FirstOrDefault(func);
    }

+    /// <inheritdoc />
    public IRequestBuilder Add<T>(T requestMatcher) where T : IRequestMatcher
    {
        foreach (var existing in _requestMatchers.OfType<T>().ToArray())
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IResponseBuilder.cs
@@ -1,10 +0,0 @@
-// Copyright © WireMock.Net
-
-namespace WireMock.ResponseBuilders;
-
-/// <summary>
-/// The ResponseBuilder interface.
-/// </summary>
-public interface IResponseBuilder : IProxyResponseBuilder
-{
-}
--- a/src/WireMock.Net.Minimal/ResponseBuilders/Response.WithBody.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/Response.WithBody.cs
@@ -1,12 +1,10 @@
 // Copyright © WireMock.Net

 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using JsonConverter.Abstractions;
 using Stef.Validation;
-using WireMock.Exceptions;
 using WireMock.Models;
 using WireMock.Types;
 using WireMock.Util;
@@ -235,72 +233,4 @@ public partial class Response

        return this;
    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithBodyAsProtoBuf(
-        string protoDefinition,
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    )
-    {
-        return WithBodyAsProtoBuf([protoDefinition], messageType, value, jsonConverter, options);
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithBodyAsProtoBuf(
-        IReadOnlyList<string> protoDefinitions,
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    )
-    {
-        Guard.NotNullOrEmpty(protoDefinitions);
-        Guard.NotNullOrWhiteSpace(messageType);
-        Guard.NotNull(value);
-
-#if !PROTOBUF
-        throw new NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#else
-        ResponseMessage.BodyDestination = null;
-        ResponseMessage.BodyData = new BodyData
-        {
-            DetectedBodyType = BodyType.ProtoBuf,
-            BodyAsJson = value,
-            ProtoDefinition = () => new IdOrTexts(null, protoDefinitions),
-            ProtoBufMessageType = messageType
-        };
-
-        return this;
-#endif
-    }
-
-    /// <inheritdoc />
-    public IResponseBuilder WithBodyAsProtoBuf(
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    )
-    {
-        Guard.NotNullOrWhiteSpace(messageType);
-        Guard.NotNull(value);
-
-#if !PROTOBUF
-        throw new NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#else
-        ResponseMessage.BodyDestination = null;
-        ResponseMessage.BodyData = new BodyData
-        {
-            DetectedBodyType = BodyType.ProtoBuf,
-            BodyAsJson = value,
-            ProtoDefinition = () => Mapping.ProtoDefinition ?? throw new WireMockException("ProtoDefinition cannot be resolved. You probably forgot to call .WithProtoDefinition(...) on the mapping."),
-            ProtoBufMessageType = messageType
-        };
-
-        return this;
-#endif
-    }
 }
--- a/src/WireMock.Net.Minimal/ResponseBuilders/Response.WithCallback.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/Response.WithCallback.cs
@@ -13,13 +13,13 @@ public partial class Response
    /// A delegate to execute to generate the response.
    /// </summary>
    [MemberNotNullWhen(true, nameof(WithCallbackUsed))]
-    public Func<IRequestMessage, ResponseMessage>? Callback { get; private set; }
+    public Func<IRequestMessage, IResponseMessage>? Callback { get; private set; }

    /// <summary>
    /// A delegate to execute to generate the response async.
    /// </summary>
    [MemberNotNullWhen(true, nameof(WithCallbackUsed))]
-    public Func<IRequestMessage, Task<ResponseMessage>>? CallbackAsync { get; private set; }
+    public Func<IRequestMessage, Task<IResponseMessage>>? CallbackAsync { get; private set; }

    /// <summary>
    /// Defines if the method WithCallback(...) is used.
@@ -27,7 +27,7 @@ public partial class Response
    public bool WithCallbackUsed { get; private set; }

    /// <inheritdoc />
-    public IResponseBuilder WithCallback(Func<IRequestMessage, ResponseMessage> callbackHandler)
+    public IResponseBuilder WithCallback(Func<IRequestMessage, IResponseMessage> callbackHandler)
    {
        Guard.NotNull(callbackHandler);

@@ -35,14 +35,14 @@ public partial class Response
    }

    /// <inheritdoc />
-    public IResponseBuilder WithCallback(Func<IRequestMessage, Task<ResponseMessage>> callbackHandler)
+    public IResponseBuilder WithCallback(Func<IRequestMessage, Task<IResponseMessage>> callbackHandler)
    {
        Guard.NotNull(callbackHandler);

        return WithCallbackInternal(true, callbackHandler);
    }

-    private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<IRequestMessage, ResponseMessage> callbackHandler)
+    private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<IRequestMessage, IResponseMessage> callbackHandler)
    {
        Guard.NotNull(callbackHandler);

@@ -52,7 +52,7 @@ public partial class Response
        return this;
    }

-    private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<IRequestMessage, Task<ResponseMessage>> callbackHandler)
+    private IResponseBuilder WithCallbackInternal(bool withCallbackUsed, Func<IRequestMessage, Task<IResponseMessage>> callbackHandler)
    {
        Guard.NotNull(callbackHandler);

--- a/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/Response.cs
@@ -28,9 +28,7 @@ public partial class Response : IResponseBuilder

    private TimeSpan? _delay;

-    /// <summary>
-    /// The link back to the mapping.
-    /// </summary>
+    /// <inheritdoc />
    public IMapping Mapping { get; set; } = null!;

    /// <summary>
@@ -81,10 +79,8 @@ public partial class Response : IResponseBuilder
    /// </summary>
    public ReplaceNodeOptions TransformerReplaceNodeOptions { get; private set; }

-    /// <summary>
-    /// Gets the response message.
-    /// </summary>
-    public ResponseMessage ResponseMessage { get; }
+    /// <inheritdoc />
+    public IResponseMessage ResponseMessage { get; }

    /// <summary>
    /// Creates this instance.
@@ -226,7 +222,7 @@ public partial class Response : IResponseBuilder
            ).ConfigureAwait(false);
        }

-        ResponseMessage responseMessage;
+        IResponseMessage responseMessage;
        if (!WithCallbackUsed)
        {
            responseMessage = ResponseMessage;
--- a/src/WireMock.Net.Minimal/Serialization/MappingConverter.cs
+++ b/src/WireMock.Net.Minimal/Serialization/MappingConverter.cs
@@ -126,12 +126,10 @@ internal class MappingConverter(MatcherMapper mapper)
            }
        }

-#if PROTOBUF
        if (requestMessageProtoBufMatcher?.Matcher != null)
        {
            sb.AppendLine("        // .WithBodyAsProtoBuf() is not yet supported");
        }
-#endif

        if (requestMessageBodyMatcher?.Matchers != null)
        {
@@ -188,7 +186,7 @@ internal class MappingConverter(MatcherMapper mapper)
            sb.AppendLine($"        .WithStatusCode({(int)httpStatusCode})");
        }

-        if (response.ResponseMessage.Headers is { })
+        if (response.ResponseMessage.Headers != null)
        {
            foreach (var header in response.ResponseMessage.Headers)
            {
@@ -196,7 +194,7 @@ internal class MappingConverter(MatcherMapper mapper)
            }
        }

-        if (response.ResponseMessage.TrailingHeaders is { })
+        if (response.ResponseMessage.TrailingHeaders != null)
        {
            foreach (var header in response.ResponseMessage.TrailingHeaders)
            {
@@ -400,13 +398,11 @@ internal class MappingConverter(MatcherMapper mapper)
        {
            void AfterMap(MatcherModel matcherModel)
            {
-#if PROTOBUF
                // In case the ProtoDefinition is defined at the Mapping level, clear the Pattern at the Matcher level
-                if (bodyMatchers?.OfType<ProtoBufMatcher>().Any() == true && mappingModel.ProtoDefinition != null)
+                if (bodyMatchers?.OfType<IProtoBufMatcher>().Any() == true && mappingModel.ProtoDefinition != null)
                {
                    matcherModel.Pattern = null;
                }
-#endif
            }

            mappingModel.Request.Body = new BodyModel();
--- a/src/WireMock.Net.Minimal/Serialization/MatcherMapper.cs
+++ b/src/WireMock.Net.Minimal/Serialization/MatcherMapper.cs
@@ -80,10 +80,9 @@ internal class MatcherMapper
            case "MimePartMatcher":
                return CreateMimePartMatcher(matchBehaviour, matcherModel);

-#if PROTOBUF
-            case nameof(ProtoBufMatcher):
+            case "ProtoBufMatcher":
                return CreateProtoBufMatcher(matchBehaviour, stringPatterns.GetPatterns(), matcherModel);
-#endif
+
            case nameof(RegexMatcher):
                return new RegexMatcher(matchBehaviour, stringPatterns, ignoreCase, useRegexExtended, matchOperator);

@@ -210,7 +209,7 @@ internal class MatcherMapper
                break;

 #if PROTOBUF
-            case ProtoBufMatcher protoBufMatcher:
+            case IProtoBufMatcher protoBufMatcher:
                protoBufMatcher.ProtoDefinition().Value(id => model.Pattern = id, texts =>
                {
                    if (texts.Count == 1)
@@ -286,17 +285,15 @@ internal class MatcherMapper
        return TypeLoader.LoadNewInstance<IMimePartMatcher>(matchBehaviour, contentTypeMatcher, contentDispositionMatcher, contentTransferEncodingMatcher, contentMatcher);
    }

-#if PROTOBUF
-    private ProtoBufMatcher CreateProtoBufMatcher(MatchBehaviour? matchBehaviour, IReadOnlyList<string> protoDefinitions, MatcherModel matcher)
+    private IProtoBufMatcher CreateProtoBufMatcher(MatchBehaviour? matchBehaviour, IReadOnlyList<string> protoDefinitions, MatcherModel matcher)
    {
        var objectMatcher = Map(matcher.ContentMatcher) as IObjectMatcher;

-        return new ProtoBufMatcher(
-            () => ProtoDefinitionHelper.GetIdOrTexts(_settings, protoDefinitions.ToArray()),
+        return TypeLoader.LoadNewInstance<IProtoBufMatcher>(
+            () => ProtoDefinitionUtils.GetIdOrTexts(_settings, protoDefinitions.ToArray()),
            matcher.ProtoBufMessageType!,
            matchBehaviour ?? MatchBehaviour.AcceptOnMatch,
            objectMatcher
        );
    }
-#endif
 }
--- a/src/WireMock.Net.Minimal/Server/RespondWithAProvider.cs
+++ b/src/WireMock.Net.Minimal/Server/RespondWithAProvider.cs
@@ -356,12 +356,9 @@ internal class RespondWithAProvider : IRespondWithAProvider
    {
        Guard.NotNull(protoDefinitionOrId);

-#if PROTOBUF
-        ProtoDefinition = ProtoDefinitionHelper.GetIdOrTexts(_settings, protoDefinitionOrId);
+        ProtoDefinition = ProtoDefinitionUtils.GetIdOrTexts(_settings, protoDefinitionOrId);
+
        return this;
-#else
-        throw new NotSupportedException("The WithProtoDefinition method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#endif
    }

    /// <inheritdoc />
--- a/src/WireMock.Net.Minimal/Server/WireMockServer.ConvertMapping.cs
+++ b/src/WireMock.Net.Minimal/Server/WireMockServer.ConvertMapping.cs
@@ -241,13 +241,13 @@ public partial class WireMockServer
        if (requestModel.Body?.Matcher != null)
        {
            var bodyMatcher = _matcherMapper.Map(requestModel.Body.Matcher)!;
-#if PROTOBUF
+
            // If the BodyMatcher is a ProtoBufMatcher, and if ProtoDefinition is defined on Mapping-level, set the ProtoDefinition from that Mapping.
-            if (bodyMatcher is ProtoBufMatcher protoBufMatcher && mappingModel?.ProtoDefinition != null)
+            if (bodyMatcher is IProtoBufMatcher protoBufMatcher && mappingModel?.ProtoDefinition != null)
            {
-                protoBufMatcher.ProtoDefinition = () => ProtoDefinitionHelper.GetIdOrTexts(_settings, mappingModel.ProtoDefinition);
+                protoBufMatcher.ProtoDefinition = () => ProtoDefinitionUtils.GetIdOrTexts(_settings, mappingModel.ProtoDefinition);
            }
-#endif
+
            requestBuilder = requestBuilder.WithBody(bodyMatcher);
        }
        else if (requestModel.Body?.Matchers != null)
@@ -368,18 +368,19 @@ public partial class WireMockServer
        {
            if (responseModel.ProtoBufMessageType != null)
            {
+                var protoBufUtils = TypeLoader.LoadStaticInstance<IProtoBufUtils>();
+
                if (responseModel.ProtoDefinition != null)
                {
-                    responseBuilder = responseBuilder.WithBodyAsProtoBuf(responseModel.ProtoDefinition, responseModel.ProtoBufMessageType, responseModel.BodyAsJson);
+                    responseBuilder = protoBufUtils.UpdateResponseBuilder(responseBuilder, responseModel.ProtoBufMessageType, responseModel.BodyAsJson, responseModel.ProtoDefinition);
                }
                else if (responseModel.ProtoDefinitions != null)
                {
-                    responseBuilder = responseBuilder.WithBodyAsProtoBuf(responseModel.ProtoDefinitions, responseModel.ProtoBufMessageType, responseModel.BodyAsJson);
+                    responseBuilder = protoBufUtils.UpdateResponseBuilder(responseBuilder, responseModel.ProtoBufMessageType, responseModel.BodyAsJson, responseModel.ProtoDefinitions);
                }
                else
                {
-                    // ProtoDefinition(s) is/are defined at Mapping/Server level
-                    responseBuilder = responseBuilder.WithBodyAsProtoBuf(responseModel.ProtoBufMessageType, responseModel.BodyAsJson);
+                    responseBuilder = protoBufUtils.UpdateResponseBuilder(responseBuilder, responseModel.ProtoBufMessageType, responseModel.BodyAsJson);
                }
            }
            else
--- a/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
+++ b/src/WireMock.Net.Minimal/WireMock.Net.Minimal.csproj
@@ -125,15 +125,7 @@
        <PackageReference Include="Scriban.Signed" Version="5.5.0" />
    </ItemGroup>

-    <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net46' and '$(TargetFramework)' != 'net461'">
-        <PackageReference Include="ProtoBufJsonConverter" Version="0.10.0" />
-    </ItemGroup>
-
    <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-        <!--<PackageReference Include="Nullable" Version="1.3.1">
-            <PrivateAssets>all</PrivateAssets>
-            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-        </PackageReference>-->
        <PackageReference Include="System.ComponentModel" Version="4.3.0" />
    </ItemGroup>

@@ -155,16 +147,6 @@
        </Compile>
    </ItemGroup>

-    <ItemGroup>
-        <PackageReference Include="Handlebars.Net.Helpers" Version="2.5.2" />
-        <!--<PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.5.2" />-->
-        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.5.2" />
-        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.5.2" />
-        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.5.2" />
-        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.5.2" />
-        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.5.2" />
-    </ItemGroup>
-
    <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' ">
        <PackageReference Include="Handlebars.Net.Helpers.Xslt" Version="2.5.2" />
    </ItemGroup>
--- a/src/WireMock.Net.ProtoBuf/Matchers/ProtoBufMatcher.cs
+++ b/src/WireMock.Net.ProtoBuf/Matchers/ProtoBufMatcher.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-#if PROTOBUF
 using System;
 using System.Threading;
 using System.Threading.Tasks;
@@ -24,19 +23,13 @@ public class ProtoBufMatcher : IProtoBufMatcher
    /// <inheritdoc />
    public MatchBehaviour MatchBehaviour { get; }

-    /// <summary>
-    /// The Func to define the proto definition as id or texts.
-    /// </summary>
-    public Func<IdOrTexts> ProtoDefinition { get; internal set; }
+    /// <inheritdoc />
+    public Func<IdOrTexts> ProtoDefinition { get; set; }

-    /// <summary>
-    /// The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
-    /// </summary>
+    /// <inheritdoc />
    public string MessageType { get; }

-    /// <summary>
-    /// The Matcher to use (optional).
-    /// </summary>
+    /// <inheritdoc />
    public IObjectMatcher? Matcher { get; }

    private static readonly Converter ProtoBufToJsonConverter = SingletonFactory<Converter>.GetInstance();
@@ -122,5 +115,4 @@ public class ProtoBufMatcher : IProtoBufMatcher
            return null;
        }
    }
-}
-#endif
+}
--- a/src/WireMock.Net.ProtoBuf/Models/ProtoDefinitionData.cs
+++ b/src/WireMock.Net.ProtoBuf/Models/ProtoDefinitionData.cs
--- a/src/WireMock.Net.ProtoBuf/Properties/AssemblyInfo.cs
+++ b/src/WireMock.Net.ProtoBuf/Properties/AssemblyInfo.cs
@@ -0,0 +1,8 @@
+// Copyright © WireMock.Net
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
+
+// Needed for Moq in the UnitTest project
+// [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
--- a/src/WireMock.Net.ProtoBuf/RequestBuilders/IRequestBuilderExtensions.cs
+++ b/src/WireMock.Net.ProtoBuf/RequestBuilders/IRequestBuilderExtensions.cs
@@ -0,0 +1,108 @@
+// Copyright © WireMock.Net
+
+using System;
+using System.Collections.Generic;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+using WireMock.Models;
+
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// IRequestBuilderExtensions extensions for ProtoBuf.
+/// </summary>
+// ReSharper disable once InconsistentNaming
+public static class IRequestBuilderExtensions
+{
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="protoDefinition">The proto definition as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.WithBodyAsProtoBuf([protoDefinition], messageType, matchBehaviour);
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="protoDefinition">The proto definition as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.WithBodyAsProtoBuf([protoDefinition], messageType, matcher, matchBehaviour);
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="protoDefinitions">The proto definitions as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, IReadOnlyList<string> protoDefinitions, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new IdOrTexts(null, protoDefinitions), messageType));
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="protoDefinitions">The proto definitions as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, IReadOnlyList<string> protoDefinitions, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new IdOrTexts(null, protoDefinitions), messageType, matcher));
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.Add(new RequestMessageProtoBufMatcher(matchBehaviour, ProtoDefinitionFunc(requestBuilder), messageType));
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf
+    /// </summary>
+    /// <param name="requestBuilder">The <see cref="IRequestBuilder"/>.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    public static IRequestBuilder WithBodyAsProtoBuf(this IRequestBuilder requestBuilder, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return requestBuilder.Add(new RequestMessageProtoBufMatcher(matchBehaviour, ProtoDefinitionFunc(requestBuilder), messageType, matcher));
+    }
+
+    private static Func<IdOrTexts> ProtoDefinitionFunc(IRequestBuilder requestBuilder)
+    {
+        return () =>
+        {
+            if (requestBuilder.Mapping.ProtoDefinition == null)
+            {
+                throw new InvalidOperationException($"No ProtoDefinition defined on mapping '{requestBuilder.Mapping.Guid}'. Please use the WireMockServerSettings to define ProtoDefinitions.");
+            }
+
+            return requestBuilder.Mapping.ProtoDefinition.Value;
+        };
+    }
+}
--- a/src/WireMock.Net.ProtoBuf/ResponseBuilders/IResponseBuilderExtensions.cs
+++ b/src/WireMock.Net.ProtoBuf/ResponseBuilders/IResponseBuilderExtensions.cs
@@ -0,0 +1,106 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using JsonConverter.Abstractions;
+using Stef.Validation;
+using WireMock.Exceptions;
+using WireMock.Models;
+using WireMock.Types;
+using WireMock.Util;
+
+namespace WireMock.ResponseBuilders;
+
+/// <summary>
+/// Extensions for <see cref="IResponseBuilder"/> to implement WithBodyAsProtoBuf.
+/// </summary>
+public static class IResponseBuilderExtensions
+{
+    /// <summary>
+    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on a proto definition, message type and the value.
+    /// </summary>
+    /// <param name="responseBuilder">The response builder.</param>
+    /// <param name="protoDefinition">The proto definition as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="value">The object to convert to protobuf byte[].</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+    public static IResponseBuilder WithBodyAsProtoBuf(
+        this IResponseBuilder responseBuilder,
+        string protoDefinition,
+        string messageType,
+        object value,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? options = null
+    )
+    {
+        return responseBuilder.WithBodyAsProtoBuf([protoDefinition], messageType, value, jsonConverter, options);
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on proto definitions, message type and the value.
+    /// </summary>
+    /// <param name="responseBuilder">The response builder.</param>
+    /// <param name="protoDefinitions">The proto definition as text.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="value">The object to convert to protobuf byte[].</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+    public static IResponseBuilder WithBodyAsProtoBuf(
+        this IResponseBuilder responseBuilder,
+        IReadOnlyList<string> protoDefinitions,
+        string messageType,
+        object value,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? options = null
+    )
+    {
+        Guard.NotNullOrEmpty(protoDefinitions);
+        Guard.NotNullOrWhiteSpace(messageType);
+        Guard.NotNull(value);
+
+        responseBuilder.ResponseMessage.BodyDestination = null;
+        responseBuilder.ResponseMessage.BodyData = new BodyData
+        {
+            DetectedBodyType = BodyType.ProtoBuf,
+            BodyAsJson = value,
+            ProtoDefinition = () => new IdOrTexts(null, protoDefinitions),
+            ProtoBufMessageType = messageType
+        };
+
+        return responseBuilder;
+    }
+
+    /// <summary>
+    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on a proto definition, message type and the value.
+    /// </summary>
+    /// <param name="responseBuilder">The response builder.</param>
+    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
+    /// <param name="value">The object to convert to protobuf byte[].</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
+    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
+    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
+    public static IResponseBuilder WithBodyAsProtoBuf(
+        this IResponseBuilder responseBuilder,
+        string messageType,
+        object value,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? options = null
+    )
+    {
+        Guard.NotNullOrWhiteSpace(messageType);
+        Guard.NotNull(value);
+
+        responseBuilder.ResponseMessage.BodyDestination = null;
+        responseBuilder.ResponseMessage.BodyData = new BodyData
+        {
+            DetectedBodyType = BodyType.ProtoBuf,
+            BodyAsJson = value,
+            ProtoDefinition = () => responseBuilder.Mapping.ProtoDefinition ?? throw new WireMockException("ProtoDefinition cannot be resolved. You probably forgot to call .WithProtoDefinition(...) on the mapping."),
+            ProtoBufMessageType = messageType
+        };
+
+        return responseBuilder;
+    }
+}
--- a/src/WireMock.Net.ProtoBuf/Util/ProtoBufUtils.cs
+++ b/src/WireMock.Net.ProtoBuf/Util/ProtoBufUtils.cs
@@ -1,18 +1,18 @@
 // Copyright © WireMock.Net

-#if PROTOBUF
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using JsonConverter.Abstractions;
 using ProtoBufJsonConverter;
 using ProtoBufJsonConverter.Models;
+using WireMock.ResponseBuilders;

 namespace WireMock.Util;

-internal static class ProtoBufUtils
+internal class ProtoBufUtils : IProtoBufUtils
 {
-    internal static async Task<byte[]> GetProtoBufMessageWithHeaderAsync(
+    public async Task<byte[]> GetProtoBufMessageWithHeaderAsync(
        IReadOnlyList<string>? protoDefinitions,
        string? messageType,
        object? value,
@@ -33,5 +33,15 @@ internal static class ProtoBufUtils
            .GetInstance()
            .ConvertAsync(request, cancellationToken).ConfigureAwait(false);
    }
-}
-#endif
+
+    public IResponseBuilder UpdateResponseBuilder(IResponseBuilder responseBuilder, string protoBufMessageType, object bodyAsJson, params string[] protoDefinitions)
+    {
+        if (protoDefinitions.Length > 0)
+        {
+            return responseBuilder.WithBodyAsProtoBuf(protoDefinitions, protoBufMessageType, bodyAsJson);
+        }
+
+        // ProtoDefinition(s) is/are defined at Mapping/Server level
+        return responseBuilder.WithBodyAsProtoBuf(protoBufMessageType, bodyAsJson);
+    }
+}
--- a/src/WireMock.Net.ProtoBuf/Util/ProtoDefinitionDataHelper.cs
+++ b/src/WireMock.Net.ProtoBuf/Util/ProtoDefinitionDataHelper.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-#if PROTOBUF
 using System.Collections.Generic;
 using System.IO;
 using System.Threading;
@@ -9,14 +8,13 @@ using ProtoBufJsonConverter;
 using ProtoBufJsonConverter.Models;
 using Stef.Validation;
 using WireMock.Models;
-using WireMock.Settings;

 namespace WireMock.Util;

 /// <summary>
 /// Some helper methods for Proto Definitions.
 /// </summary>
-public static class ProtoDefinitionHelper
+internal static class ProtoDefinitionDataHelper
 {
    /// <summary>
    /// Builds a dictionary of ProtoDefinitions from a directory.
@@ -42,7 +40,7 @@ public static class ProtoDefinitionHelper

            // Build comment and get content from file.
            var comment = $"// {protoRelativePath}";
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
            var content = File.ReadAllText(filePath);
 #else
            var content = await File.ReadAllTextAsync(filePath, cancellationToken);
@@ -79,23 +77,4 @@ public static class ProtoDefinitionHelper

        return new ProtoDefinitionData(fileNameMappedToProtoDefinition);
    }
-
-    internal static IdOrTexts GetIdOrTexts(WireMockServerSettings settings, params string[] protoDefinitionOrId)
-    {
-        switch (protoDefinitionOrId.Length)
-        {
-            case 1:
-                var idOrText = protoDefinitionOrId[0];
-                if (settings.ProtoDefinitions?.TryGetValue(idOrText, out var protoDefinitions) == true)
-                {
-                    return new(idOrText, protoDefinitions);
-                }
-
-                return new(null, protoDefinitionOrId);
-
-            default:
-                return new(null, protoDefinitionOrId);
-        }
-    }
-}
-#endif
+}
--- a/src/WireMock.Net.ProtoBuf/Util/WireMockProtoFileResolver.cs
+++ b/src/WireMock.Net.ProtoBuf/Util/WireMockProtoFileResolver.cs
@@ -1,6 +1,5 @@
 // Copyright © WireMock.Net

-#if PROTOBUF
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
@@ -30,10 +29,10 @@ internal class WireMockProtoFileResolver : IProtoFileResolver

        foreach (var extraProtoDefinition in protoDefinitions)
        {
-            var firstNonEmptyLine = extraProtoDefinition.Split(['\r', '\n']).FirstOrDefault(l => !string.IsNullOrEmpty(l));
+            var firstNonEmptyLine = extraProtoDefinition.Split('\r', '\n').FirstOrDefault(l => !string.IsNullOrEmpty(l));
            if (firstNonEmptyLine != null)
            {
-                if (TryGetValidPath(firstNonEmptyLine.TrimStart(['/', ' ']), out var validPath))
+                if (TryGetValidPath(firstNonEmptyLine.TrimStart('/', ' '), out var validPath))
                {
                    _files.Add(validPath, extraProtoDefinition);
                }
@@ -71,5 +70,4 @@ internal class WireMockProtoFileResolver : IProtoFileResolver
        validPath = null;
        return false;
    }
-}
-#endif
+}
--- a/src/WireMock.Net.ProtoBuf/WireMock.Net.ProtoBuf.csproj
+++ b/src/WireMock.Net.ProtoBuf/WireMock.Net.ProtoBuf.csproj
@@ -0,0 +1,36 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>ProtoBuf and gRPC support for WireMock.Net</Description>
+        <AssemblyTitle>WireMock.Net.ProtoBuf</AssemblyTitle>
+        <Authors>Stef Heyenrath</Authors>
+        <TargetFrameworks>netstandard2.1;net462;net6.0;net8.0</TargetFrameworks>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+        <PackageTags>wiremock;matchers;matcher;protobuf;grpc</PackageTags>
+        <RootNamespace>WireMock</RootNamespace>
+        <ProjectGuid>{B47413AA-55D3-49A7-896A-17ADBFF72407}</ProjectGuid>
+        <PublishRepositoryUrl>true</PublishRepositoryUrl>
+        <EmbedUntrackedSources>true</EmbedUntrackedSources>
+        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+        <CodeAnalysisRuleSet>../WireMock.Net/WireMock.Net.ruleset</CodeAnalysisRuleSet>
+        <SignAssembly>true</SignAssembly>
+        <AssemblyOriginatorKeyFile>../WireMock.Net/WireMock.Net.snk</AssemblyOriginatorKeyFile>
+        <!--<DelaySign>true</DelaySign>-->
+        <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
+        <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="ProtoBufJsonConverter" Version="0.10.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\WireMock.Net.Shared\WireMock.Net.Shared.csproj" />
+    </ItemGroup>
+
+</Project>
--- a/src/WireMock.Net.Minimal/Extensions/StringExtensions.cs
+++ b/src/WireMock.Net.Minimal/Extensions/StringExtensions.cs
--- a/src/WireMock.Net.Minimal/IMapping.cs
+++ b/src/WireMock.Net.Minimal/IMapping.cs
--- a/src/WireMock.Net.Shared/Matchers/IProtoBufMatcher.cs
+++ b/src/WireMock.Net.Shared/Matchers/IProtoBufMatcher.cs
@@ -1,5 +1,8 @@
 // Copyright © WireMock.Net

+using System;
+using WireMock.Models;
+
 namespace WireMock.Matchers;

 /// <summary>
@@ -7,4 +10,18 @@ namespace WireMock.Matchers;
 /// </summary>
 public interface IProtoBufMatcher : IDecodeBytesMatcher, IBytesMatcher
 {
+    /// <summary>
+    /// The Func to define the proto definition as id or texts.
+    /// </summary>
+    Func<IdOrTexts> ProtoDefinition { get; set; }
+
+    /// <summary>
+    /// The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
+    /// </summary>
+    string MessageType { get; }
+
+    /// <summary>
+    /// The Matcher to use (optional).
+    /// </summary>
+    IObjectMatcher? Matcher { get; }
 }
--- a/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageProtoBufMatcher.cs
+++ b/src/WireMock.Net.Minimal/Matchers/Request/RequestMessageProtoBufMatcher.cs
@@ -2,6 +2,7 @@

 using System;
 using WireMock.Models;
+using WireMock.Util;

 namespace WireMock.Matchers.Request;

@@ -24,11 +25,7 @@ public class RequestMessageProtoBufMatcher : IRequestMatcher
    /// <param name="matcher">The optional matcher to use to match the ProtoBuf as (json) object.</param>
    public RequestMessageProtoBufMatcher(MatchBehaviour matchBehaviour, Func<IdOrTexts> protoDefinition, string messageType, IObjectMatcher? matcher = null)
    {
-#if PROTOBUF
-        Matcher = new ProtoBufMatcher(protoDefinition, messageType, matchBehaviour, matcher);
-#else
-        throw new System.NotSupportedException("The ProtoBufMatcher can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
-#endif
+        Matcher = TypeLoader.LoadNewInstance<IProtoBufMatcher>(protoDefinition, messageType, matchBehaviour, matcher);
    }

    /// <inheritdoc />
--- a/src/WireMock.Net.Minimal/Models/GraphQLSchemaDetails.cs
+++ b/src/WireMock.Net.Minimal/Models/GraphQLSchemaDetails.cs
--- a/src/WireMock.Net.Shared/Properties/AssemblyInfo.cs
+++ b/src/WireMock.Net.Shared/Properties/AssemblyInfo.cs
@@ -5,6 +5,7 @@ using System.Runtime.CompilerServices;
 [assembly: InternalsVisibleTo("WireMock.Net.Minimal, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
 [assembly: InternalsVisibleTo("WireMock.Net.MimePart, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
 [assembly: InternalsVisibleTo("WireMock.Net.GraphQL, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
+[assembly: InternalsVisibleTo("WireMock.Net.ProtoBuf, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
 [assembly: InternalsVisibleTo("WireMock.Net.Matchers.CSharpCode, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
 // [assembly: InternalsVisibleTo("WireMock.Net.StandAlone, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
 [assembly: InternalsVisibleTo("WireMock.Net.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100e138ec44d93acac565953052636eb8d5e7e9f27ddb030590055cd1a0ab2069a5623f1f77ca907d78e0b37066ca0f6d63da7eecc3fcb65b76aa8ebeccf7ebe1d11264b8404cd9b1cbbf2c83f566e033b3e54129f6ef28daffff776ba7aebbc53c0d635ebad8f45f78eb3f7e0459023c218f003416e080f96a1a3c5ffeb56bee9e")]
--- a/src/WireMock.Net.Shared/RequestBuilders/IBodyRequestBuilder.cs
+++ b/src/WireMock.Net.Shared/RequestBuilders/IBodyRequestBuilder.cs
@@ -10,7 +10,7 @@ namespace WireMock.RequestBuilders;
 /// <summary>
 /// The BodyRequestBuilder interface.
 /// </summary>
-public interface IBodyRequestBuilder : IProtoBufRequestBuilder
+public interface IBodyRequestBuilder : IMultiPartRequestBuilder
 {
    /// <summary>
    /// WithBody: IMatcher
--- a/src/WireMock.Net.Shared/RequestBuilders/IProtoBufRequestBuilder.cs
+++ b/src/WireMock.Net.Shared/RequestBuilders/IProtoBufRequestBuilder.cs
@@ -1,67 +0,0 @@
-// Copyright © WireMock.Net
-
-using System.Collections.Generic;
-using WireMock.Matchers;
-
-namespace WireMock.RequestBuilders;
-
-/// <summary>
-/// The ProtoBufRequestBuilder interface.
-/// </summary>
-public interface IProtoBufRequestBuilder : IMultiPartRequestBuilder
-{
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="protoDefinitions">The proto definitions as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(IReadOnlyList<string> protoDefinitions, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="protoDefinitions">The proto definitions as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(IReadOnlyList<string> protoDefinitions, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf
-    /// </summary>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="matcher">The matcher to use to match the ProtoBuf as (json) object.</param>
-    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
-    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsProtoBuf(string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-}
--- a/src/WireMock.Net.Shared/RequestBuilders/IRequestBuilder.cs
+++ b/src/WireMock.Net.Shared/RequestBuilders/IRequestBuilder.cs
@@ -9,5 +9,16 @@ namespace WireMock.RequestBuilders;
 /// </summary>
 public interface IRequestBuilder : IClientIPRequestBuilder
 {
-    public IRequestBuilder Add<T>(T requestMatcher) where T : IRequestMatcher;
+    /// <summary>
+    /// Adds a request matcher to the builder.
+    /// </summary>
+    /// <typeparam name="T">The type of the request matcher.</typeparam>
+    /// <param name="requestMatcher">The request matcher to add.</param>
+    /// <returns>The current <see cref="IRequestBuilder"/> instance.</returns>
+    IRequestBuilder Add<T>(T requestMatcher) where T : IRequestMatcher;
+
+    /// <summary>
+    /// The link back to the Mapping.
+    /// </summary>
+    IMapping Mapping { get; set; }
 }
--- a/src/WireMock.Net.Minimal/ResponseBuilders/BodyDestinationFormat.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/BodyDestinationFormat.cs
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IBodyResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IBodyResponseBuilder.cs
@@ -1,7 +1,6 @@
 // Copyright © WireMock.Net

 using System;
-using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using JsonConverter.Abstractions;
@@ -84,7 +83,7 @@ public interface IBodyResponseBuilder : IFaultResponseBuilder
    IResponseBuilder WithBodyAsJson(Func<IRequestMessage, object> bodyFactory, Encoding? encoding = null);

    /// <summary>
-    /// WithBodyAsJson : Create a ... response based on a async callback function.
+    /// WithBodyAsJson : Create a ... response based on an async callback function.
    /// </summary>
    /// <param name="bodyFactory">The async delegate to build the body.</param>
    /// <param name="encoding">The body encoding.</param>
@@ -117,53 +116,4 @@ public interface IBodyResponseBuilder : IFaultResponseBuilder
    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
    IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter jsonConverter, JsonConverterOptions? options = null);
-
-    /// <summary>
-    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on a proto definition, message type and the value.
-    /// </summary>
-    /// <param name="protoDefinition">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="value">The object to convert to protobuf byte[].</param>
-    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
-    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
-    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBodyAsProtoBuf(
-        string protoDefinition,
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    );
-
-    /// <summary>
-    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on proto definitions, message type and the value.
-    /// </summary>
-    /// <param name="protoDefinitions">The proto definition as text.</param>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="value">The object to convert to protobuf byte[].</param>
-    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
-    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
-    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBodyAsProtoBuf(
-        IReadOnlyList<string> protoDefinitions,
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    );
-
-    /// <summary>
-    /// WithBodyAsProtoBuf : Create a ProtoBuf byte[] response based on a proto definition, message type and the value.
-    /// </summary>
-    /// <param name="messageType">The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".</param>
-    /// <param name="value">The object to convert to protobuf byte[].</param>
-    /// <param name="jsonConverter">The <see cref="IJsonConverter"/> [optional]. Default value is NewtonsoftJsonConverter.</param>
-    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
-    /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBodyAsProtoBuf(
-        string messageType,
-        object value,
-        IJsonConverter? jsonConverter = null,
-        JsonConverterOptions? options = null
-    );
 }
--- a/src/WireMock.Net.Minimal/ResponseBuilders/ICallbackResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/ICallbackResponseBuilder.cs
@@ -17,12 +17,12 @@ public interface ICallbackResponseBuilder : IResponseProvider
    /// </summary>
    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
    [PublicAPI]
-    IResponseBuilder WithCallback(Func<IRequestMessage, ResponseMessage> callbackHandler);
+    IResponseBuilder WithCallback(Func<IRequestMessage, IResponseMessage> callbackHandler);

    /// <summary>
    /// The async callback builder
    /// </summary>
    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
    [PublicAPI]
-    IResponseBuilder WithCallback(Func<IRequestMessage, Task<ResponseMessage>> callbackHandler);
+    IResponseBuilder WithCallback(Func<IRequestMessage, Task<IResponseMessage>> callbackHandler);
 }
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IDelayResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IDelayResponseBuilder.cs
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IFaultRequestBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IFaultRequestBuilder.cs
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IHeadersResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IHeadersResponseBuilder.cs
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IProxyResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IProxyResponseBuilder.cs
--- a/src/WireMock.Net.Shared/ResponseBuilders/IResponseBuilder.cs
+++ b/src/WireMock.Net.Shared/ResponseBuilders/IResponseBuilder.cs
@@ -0,0 +1,19 @@
+// Copyright © WireMock.Net
+
+namespace WireMock.ResponseBuilders;
+
+/// <summary>
+/// The ResponseBuilder interface.
+/// </summary>
+public interface IResponseBuilder : IProxyResponseBuilder
+{
+    /// <summary>
+    /// The link back to the mapping.
+    /// </summary>
+    IMapping Mapping { get; }
+
+    /// <summary>
+    /// Gets the response message.
+    /// </summary>
+    IResponseMessage ResponseMessage { get; }
+}
--- a/src/WireMock.Net.Minimal/ResponseBuilders/IStatusCodeResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/IStatusCodeResponseBuilder.cs
--- a/src/WireMock.Net.Minimal/ResponseBuilders/ITransformResponseBuilder.cs
+++ b/src/WireMock.Net.Minimal/ResponseBuilders/ITransformResponseBuilder.cs
--- a/src/WireMock.Net.Minimal/ResponseProviders/IResponseProvider.cs
+++ b/src/WireMock.Net.Minimal/ResponseProviders/IResponseProvider.cs
@@ -18,6 +18,6 @@ public interface IResponseProvider
    /// <param name="mapping">The used mapping.</param>
    /// <param name="requestMessage">The request.</param>
    /// <param name="settings">The WireMockServerSettings.</param>
-    /// <returns>The <see cref="ResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
+    /// <returns>The <see cref="IResponseMessage"/> including a new (optional) <see cref="IMapping"/>.</returns>
    Task<(IResponseMessage Message, IMapping? Mapping)> ProvideResponseAsync(IMapping mapping, IRequestMessage requestMessage, WireMockServerSettings settings);
 }
--- a/src/WireMock.Net.Minimal/Settings/HandlebarsSettings.cs
+++ b/src/WireMock.Net.Minimal/Settings/HandlebarsSettings.cs
--- a/src/WireMock.Net.Minimal/Settings/HttpClientSettings.cs
+++ b/src/WireMock.Net.Minimal/Settings/HttpClientSettings.cs
--- a/src/WireMock.Net.Minimal/Settings/ProxyAndRecordSettings.cs
+++ b/src/WireMock.Net.Minimal/Settings/ProxyAndRecordSettings.cs
--- a/src/WireMock.Net.Minimal/Settings/ProxySaveMappingSetting.cs
+++ b/src/WireMock.Net.Minimal/Settings/ProxySaveMappingSetting.cs
--- a/src/WireMock.Net.Minimal/Settings/ProxySaveMappingSettings.cs
+++ b/src/WireMock.Net.Minimal/Settings/ProxySaveMappingSettings.cs
--- a/src/WireMock.Net.Minimal/Settings/ProxyUrlReplaceSettings.cs
+++ b/src/WireMock.Net.Minimal/Settings/ProxyUrlReplaceSettings.cs
--- a/src/WireMock.Net.Minimal/Settings/WebProxySettings.cs
+++ b/src/WireMock.Net.Minimal/Settings/WebProxySettings.cs
--- a/src/WireMock.Net.Minimal/Settings/WebhookSettings.cs
+++ b/src/WireMock.Net.Minimal/Settings/WebhookSettings.cs
--- a/src/WireMock.Net.Minimal/Settings/WireMockCertificateSettings.cs
+++ b/src/WireMock.Net.Minimal/Settings/WireMockCertificateSettings.cs
--- a/src/WireMock.Net.Minimal/Settings/WireMockServerSettings.cs
+++ b/src/WireMock.Net.Minimal/Settings/WireMockServerSettings.cs
@@ -14,6 +14,7 @@ using WireMock.RegularExpressions;
 using WireMock.Types;
 using System.Globalization;
 using WireMock.Models;
+
 #if USE_ASPNETCORE
 using Microsoft.Extensions.DependencyInjection;
 #endif
--- a/src/WireMock.Net.Minimal/Util/FilePathUtils.cs
+++ b/src/WireMock.Net.Minimal/Util/FilePathUtils.cs
--- a/src/WireMock.Net.Shared/Util/IProtoBufUtils.cs
+++ b/src/WireMock.Net.Shared/Util/IProtoBufUtils.cs
@@ -0,0 +1,19 @@
+// Copyright © WireMock.Net
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using JsonConverter.Abstractions;
+using WireMock.ResponseBuilders;
+
+namespace WireMock.Util;
+
+/// <summary>
+/// Defines the interface for ProtoBufUtils.
+/// </summary>
+public interface IProtoBufUtils
+{
+    Task<byte[]> GetProtoBufMessageWithHeaderAsync(IReadOnlyList<string>? protoDefinitions, string? messageType, object? value, IJsonConverter? jsonConverter = null, CancellationToken cancellationToken = default);
+
+    IResponseBuilder UpdateResponseBuilder(IResponseBuilder responseBuilder, string protoBufMessageType, object bodyAsJson, params string[] protoDefinitions);
+}
--- a/src/WireMock.Net.Shared/Util/ProtoDefinitionUtils.cs
+++ b/src/WireMock.Net.Shared/Util/ProtoDefinitionUtils.cs
@@ -0,0 +1,30 @@
+// Copyright © WireMock.Net
+
+using WireMock.Models;
+using WireMock.Settings;
+
+namespace WireMock.Util;
+
+/// <summary>
+/// Some helper methods for Proto Definitions.
+/// </summary>
+public static class ProtoDefinitionUtils
+{
+    internal static IdOrTexts GetIdOrTexts(WireMockServerSettings settings, params string[] protoDefinitionOrId)
+    {
+        switch (protoDefinitionOrId.Length)
+        {
+            case 1:
+                var idOrText = protoDefinitionOrId[0];
+                if (settings.ProtoDefinitions?.TryGetValue(idOrText, out var protoDefinitions) == true)
+                {
+                    return new(idOrText, protoDefinitions);
+                }
+
+                return new(null, protoDefinitionOrId);
+
+            default:
+                return new(null, protoDefinitionOrId);
+        }
+    }
+}
--- a/src/WireMock.Net.Minimal/Util/SingletonFactory.cs
+++ b/src/WireMock.Net.Minimal/Util/SingletonFactory.cs
--- a/src/WireMock.Net.Shared/Util/TypeLoader.cs
+++ b/src/WireMock.Net.Shared/Util/TypeLoader.cs
@@ -119,13 +119,21 @@ internal static class TypeLoader

    private static bool TryGetImplementationTypeByInterfaceAndOptionalFullName<T>(Assembly assembly, string? implementationTypeFullName, [NotNullWhen(true)] out Type? type)
    {
-        type = assembly
-            .GetTypes()
-            .FirstOrDefault(t =>
-                typeof(T).IsAssignableFrom(t) && !t.GetTypeInfo().IsInterface &&
-                (implementationTypeFullName == null || string.Equals(t.FullName, implementationTypeFullName, StringComparison.OrdinalIgnoreCase))
-            );
+        try
+        {
+            type = assembly
+                .GetTypes()
+                .FirstOrDefault(t =>
+                    typeof(T).IsAssignableFrom(t) && !t.GetTypeInfo().IsInterface &&
+                    (implementationTypeFullName == null || string.Equals(t.FullName, implementationTypeFullName, StringComparison.OrdinalIgnoreCase))
+                );

-        return type != null;
+            return type != null;
+        }
+        catch
+        {
+            type = null;
+            return false;
+        }
    }
 }
--- a/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj
+++ b/src/WireMock.Net.Shared/WireMock.Net.Shared.csproj
@@ -29,6 +29,18 @@
        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    </PropertyGroup>

+    <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard1.3' or '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
+        <DefineConstants>$(DefineConstants);NETSTANDARD;USE_ASPNETCORE</DefineConstants>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' or '$(TargetFramework)' == 'netcoreapp2.2' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
+        <DefineConstants>$(DefineConstants);USE_ASPNETCORE</DefineConstants>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(TargetFramework)' == 'net461'">
+        <DefineConstants>$(DefineConstants);USE_ASPNETCORE;NET46</DefineConstants>
+    </PropertyGroup>
+
    <ItemGroup>
        <PackageReference Include="PolySharp" Version="1.15.0">
            <PrivateAssets>all</PrivateAssets>
@@ -37,6 +49,18 @@
        <PackageReference Include="Stef.Validation" Version="0.1.1" />
        <PackageReference Include="AnyOf" Version="0.4.0" />
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="1.1.0" />
+        <PackageReference Include="JsonConverter.Abstractions" Version="0.7.0" />
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Handlebars.Net.Helpers" Version="2.5.2" />
+        <!--<PackageReference Include="Handlebars.Net.Helpers.DynamicLinq" Version="2.5.2" />-->
+        <PackageReference Include="Handlebars.Net.Helpers.Humanizer" Version="2.5.2" />
+        <PackageReference Include="Handlebars.Net.Helpers.Json" Version="2.5.2" />
+        <PackageReference Include="Handlebars.Net.Helpers.Random" Version="2.5.2" />
+        <PackageReference Include="Handlebars.Net.Helpers.Xeger" Version="2.5.2" />
+        <PackageReference Include="Handlebars.Net.Helpers.XPath" Version="2.5.2" />
    </ItemGroup>

    <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
--- a/src/WireMock.Net/WireMock.Net.csproj
+++ b/src/WireMock.Net/WireMock.Net.csproj
@@ -35,5 +35,6 @@
    <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net46' and '$(TargetFramework)' != 'net461'">
        <ProjectReference Include="../WireMock.Net.MimePart/WireMock.Net.MimePart.csproj" />
        <ProjectReference Include="../WireMock.Net.GraphQL/WireMock.Net.GraphQL.csproj" />
+        <ProjectReference Include="../WireMock.Net.ProtoBuf/WireMock.Net.ProtoBuf.csproj" />
    </ItemGroup>
 </Project>
--- a/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs
+++ b/test/WireMock.Net.Tests/FluentAssertions/WireMockAssertionsTests.cs
@@ -108,7 +108,7 @@ public class WireMockAssertionsTests : IDisposable
    }

    [Fact]
-    public async Task HaveReceivedACall_AtAbsoluteUrlWilcardMAtcher_WhenACallWasMadeToAbsoluteUrl_Should_BeOK()
+    public async Task HaveReceivedACall_AtAbsoluteUrlWildcardMatcher_WhenACallWasMadeToAbsoluteUrl_Should_BeOK()
    {
        await _httpClient.GetAsync("anyurl").ConfigureAwait(false);

@@ -143,6 +143,106 @@ public class WireMockAssertionsTests : IDisposable
            .WithMessage($"Expected _server to have been called at address matching the absolute url \"anyurl\", but didn't find it among the calls to {{\"http://localhost:{_portUsed}/\"}}.");
    }

+    [Fact]
+    public async Task HaveReceivedNoCalls_AtAbsolutePath_WhenACallWasNotMadeToAbsolutePath_Should_BeOK()
+    {
+        await _httpClient.GetAsync("xxx").ConfigureAwait(false);
+
+        _server.Should()
+            .HaveReceivedNoCalls()
+            .AtAbsolutePath("anypath");
+    }
+
+    [Fact]
+    public async Task HaveReceived0Calls_AtAbsolutePath_WhenACallWasNotMadeToAbsolutePath_Should_BeOK()
+    {
+        await _httpClient.GetAsync("xxx").ConfigureAwait(false);
+
+        _server.Should()
+            .HaveReceived(0).Calls()
+            .AtAbsolutePath("anypath");
+    }
+
+    [Fact]
+    public async Task HaveReceived1Calls_AtAbsolutePath_WhenACallWasMadeToAbsolutePath_Should_BeOK()
+    {
+        await _httpClient.GetAsync("anypath").ConfigureAwait(false);
+
+        _server.Should()
+            .HaveReceived(1).Calls()
+            .AtAbsolutePath("/anypath");
+    }
+
+    [Fact]
+    public async Task HaveReceived1Calls_AtAbsolutePathUsingPost_WhenAPostCallWasMadeToAbsolutePath_Should_BeOK()
+    {
+        await _httpClient.PostAsync("anypath", new StringContent("")).ConfigureAwait(false);
+
+        _server.Should()
+            .HaveReceived(1).Calls()
+            .AtAbsolutePath("/anypath")
+            .And
+            .UsingPost();
+    }
+
+    [Fact]
+    public async Task HaveReceived2Calls_AtAbsolutePath_WhenACallWasMadeToAbsolutePath_Should_BeOK()
+    {
+        await _httpClient.GetAsync("anypath").ConfigureAwait(false);
+
+        await _httpClient.GetAsync("anypath").ConfigureAwait(false);
+
+        _server.Should()
+            .HaveReceived(2).Calls()
+            .AtAbsolutePath("/anypath");
+    }
+
+    [Fact]
+    public async Task HaveReceivedACall_AtAbsolutePath_WhenACallWasMadeToAbsolutePath_Should_BeOK()
+    {
+        await _httpClient.GetAsync("anypath").ConfigureAwait(false);
+
+        _server.Should()
+            .HaveReceivedACall()
+            .AtAbsolutePath(new WildcardMatcher("/any*"));
+    }
+
+    [Fact]
+    public async Task HaveReceivedACall_AtAbsolutePathWildcardMatcher_WhenACallWasMadeToAbsolutePath_Should_BeOK()
+    {
+        await _httpClient.GetAsync("anypath").ConfigureAwait(false);
+
+        _server.Should()
+            .HaveReceivedACall()
+            .AtAbsolutePath("/anypath");
+    }
+
+    [Fact]
+    public void HaveReceivedACall_AtAbsolutePath_Should_ThrowWhenNoCallsWereMade()
+    {
+        Action act = () => _server.Should()
+            .HaveReceivedACall()
+            .AtAbsolutePath("anypath");
+
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage("Expected _server to have been called at address matching the absolute path \"anypath\", but no calls were made.");
+    }
+
+    [Fact]
+    public async Task HaveReceivedACall_AtAbsolutePath_Should_ThrowWhenNoCallsMatchingTheAbsolutePathWereMade()
+    {
+        await _httpClient.GetAsync("").ConfigureAwait(false);
+
+        Action act = () => _server.Should()
+            .HaveReceivedACall()
+            .AtAbsolutePath("/anypath");
+
+        act.Should()
+            .Throw<Exception>()
+            .WithMessage($"Expected _server to have been called at address matching the absolute path \"/anypath\", but didn't find it among the calls to {{\"/\"}}.");
+    }
+
    [Fact]
    public async Task HaveReceivedACall_WithHeader_WhenACallWasMadeWithExpectedHeader_Should_BeOK()
    {
--- a/test/WireMock.Net.Tests/Grpc/ProtoBufUtilsTests.cs
+++ b/test/WireMock.Net.Tests/Grpc/ProtoBufUtilsTests.cs
@@ -12,6 +12,8 @@ namespace WireMock.Net.Tests.Grpc;

 public class ProtoBufUtilsTests
 {
+    private static readonly IProtoBufUtils ProtoBufUtils = new ProtoBufUtils();
+
    [Fact]
    public async Task GetProtoBufMessageWithHeader_MultipleProtoFiles()
    {
--- a/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs
+++ b/test/WireMock.Net.Tests/Grpc/ProtoDefinitionHelperTests.cs
@@ -12,6 +12,8 @@ namespace WireMock.Net.Tests.Grpc;

 public class ProtoDefinitionHelperTests
 {
+    private static readonly IProtoBufUtils ProtoBufUtils = new ProtoBufUtils();
+
    [Fact]
    public async Task FromDirectory_Greet_ShouldReturnModifiedProtoFiles()
    {
@@ -21,7 +23,7 @@ public class ProtoDefinitionHelperTests
        var expectedComment = $"// {expectedFilename}";

        // Act
-        var protoDefinitionData = await ProtoDefinitionHelper.FromDirectory(directory);
+        var protoDefinitionData = await ProtoDefinitionDataHelper.FromDirectory(directory);
        var protoDefinitions = protoDefinitionData.ToList("greet");

        // Assert
@@ -50,7 +52,7 @@ public class ProtoDefinitionHelperTests
        var directory = Path.Combine(Directory.GetCurrentDirectory(), "Grpc", "ot");

        // Act
-        var protoDefinitionData = await ProtoDefinitionHelper.FromDirectory(directory);
+        var protoDefinitionData = await ProtoDefinitionDataHelper.FromDirectory(directory);
        var protoDefinitions = protoDefinitionData.ToList("trace_service");

        // Assert
Author	SHA1	Message	Date
Stef Heyenrath	358590918e	1.11.2	2025-08-27 10:25:31 +02:00
Stef Heyenrath	32afea5d30	Revert JetBrains.Annotations and add System.Text.RegularExpressions to solve CVE (#1355 )	2025-08-27 10:04:36 +02:00
Stef Heyenrath	50b3d58a01	1.11.1	2025-08-27 08:47:58 +02:00
Stef Heyenrath	35bf5e94a5	Add System.Net.Http again to solve CVE warning (#1354 )	2025-08-27 08:45:24 +02:00
Stef Heyenrath	9fcc9ade10	Add additional try-catch to TypeLoader logic (#1352 )	2025-08-27 08:33:01 +02:00
Stef Heyenrath	865bbf2432	WireMock.Net.ProtoBuf: fix version	2025-08-26 15:42:23 +02:00
Stef Heyenrath	560540099e	1.11.0	2025-08-26 07:58:04 +02:00
Stef Heyenrath	e5c4605020	Create WireMock.Net.ProtoBuf project (#1350 ) * Create WireMock.Net.ProtoBuf project * ok * Update Directory.Build.props Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-08-26 07:55:02 +02:00
Stef Heyenrath	124d29c86a	1.10.1	2025-08-22 19:58:00 +02:00
Stef Heyenrath	08117e870b	Add AtPath and AtAbsolutePath to Assertions projects (#1349 ) * Add AtPath and AtAbsolutePath to Assertions projects * tst	2025-08-22 19:40:59 +02:00
Stef Heyenrath	ddb181cc52	WireMock.Net.Extensions.Routing	2025-08-18 20:47:10 +02:00