.

* Fix Request.Create().WithBodyAsJson(...)

* [CodeFactor] Apply fixes

---------

Co-authored-by: codefactor-io <support@codefactor.io>

CHANGELOG.md

@@ -1,3 +1,38 @@
+# 1.5.55 (22 May 2024)
+- [#1107](https://github.com/WireMock-Net/WireMock.Net/pull/1107) - When only Port is provided, bind to * (Fixes #1100) [bug] contributed by [StefH](https://github.com/StefH)
+
+# 1.5.54 (18 May 2024)
+- [#1100](https://github.com/WireMock-Net/WireMock.Net/pull/1100) - Add support to bind to ip-address instead of only localhost [feature] contributed by [StefH](https://github.com/StefH)
+- [#1104](https://github.com/WireMock-Net/WireMock.Net/pull/1104) - Use try..catch to set encoding in WireMockConsoleLogger [feature] contributed by [asherber](https://github.com/asherber)
+
+# 1.5.53 (08 May 2024)
+- [#1093](https://github.com/WireMock-Net/WireMock.Net/pull/1093) - Update Handlebars.Net [feature] contributed by [StefH](https://github.com/StefH)
+- [#1101](https://github.com/WireMock-Net/WireMock.Net/pull/1101) - Fix MappingConverter to support Body with JsonMatcher [bug] contributed by [StefH](https://github.com/StefH)
+- [#1095](https://github.com/WireMock-Net/WireMock.Net/issues/1095) - When using C# code generation WithBody() matcher is not generated for POST Request [bug]
+
+# 1.5.52 (06 April 2024)
+- [#1091](https://github.com/WireMock-Net/WireMock.Net/pull/1091) - Add RegEx support to JsonMatcher [feature] contributed by [StefH](https://github.com/StefH)
+- [#1088](https://github.com/WireMock-Net/WireMock.Net/issues/1088) - Regex support for JsonMatcher  [feature]
+
+# 1.5.51 (20 March 2024)
+- [#1085](https://github.com/WireMock-Net/WireMock.Net/pull/1085) - Fix FluentAssertions (actual body is not displayed in error message) [bug] contributed by [StefH](https://github.com/StefH)
+- [#1084](https://github.com/WireMock-Net/WireMock.Net/issues/1084) - FluentAssertions - Actual body is not displayed in error message when using Json Body [bug]
+
+# 1.5.50 (12 March 2024)
+- [#1080](https://github.com/WireMock-Net/WireMock.Net/pull/1080) - Fix FluentAssertions on Header(s) [bug] contributed by [StefH](https://github.com/StefH)
+- [#1082](https://github.com/WireMock-Net/WireMock.Net/pull/1082) - Make WireMockAssertions extendable [feature] contributed by [StefH](https://github.com/StefH)
+- [#1074](https://github.com/WireMock-Net/WireMock.Net/issues/1074) - FluentAssertions extensions do not filter headers correctly [bug]
+- [#1075](https://github.com/WireMock-Net/WireMock.Net/issues/1075) - FluentAssertions extensions are not open for extension [feature]
+
+# 1.5.49 (06 March 2024)
+- [#1069](https://github.com/WireMock-Net/WireMock.Net/pull/1069) - Extend TypeLoader [feature] contributed by [StefH](https://github.com/StefH)
+- [#1078](https://github.com/WireMock-Net/WireMock.Net/pull/1078) - Upgrade ProtoBufJsonConverter to fix issue with dot(s) in package name [bug] contributed by [StefH](https://github.com/StefH)
+- [#1077](https://github.com/WireMock-Net/WireMock.Net/issues/1077) - ProtoBufMatcher not working when proto package name contains dots [bug]
+
+# 1.5.48 (22 February 2024)
+- [#1047](https://github.com/WireMock-Net/WireMock.Net/pull/1047) - Add Grpc ProtoBuf support (request-response) [feature] contributed by [StefH](https://github.com/StefH)
+- [#1058](https://github.com/WireMock-Net/WireMock.Net/pull/1058) - Fix some SonarCloud issues [refactor] contributed by [StefH](https://github.com/StefH)
+
 # 1.5.47 (25 January 2024)
 - [#1049](https://github.com/WireMock-Net/WireMock.Net/pull/1049) - Add WithoutHeader to WireMock.FluentAssertions [feature] contributed by [StefH](https://github.com/StefH)
 - [#1053](https://github.com/WireMock-Net/WireMock.Net/pull/1053) - [Snyk] Security upgrade Microsoft.IdentityModel.Protocols.OpenIdConnect from 6.12.2 to 6.34.0 [security] contributed by [StefH](https://github.com/StefH)

Directory.Build.props

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

Generate-ReleaseNotes.cmd

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

PackageReleaseNotes.txt

@@ -1,10 +1,4 @@
-# 1.5.47 (25 January 2024)
+# 1.5.55 (22 May 2024)
-- #1049 Add WithoutHeader to WireMock.FluentAssertions [feature]
+- #1107 When only Port is provided, bind to * (Fixes #1100) [bug]
-- #1053 [Snyk] Security upgrade Microsoft.IdentityModel.Protocols.OpenIdConnect from 6.12.2 to 6.34.0 [security]
-- #1055 Bump System.IdentityModel.Tokens.Jwt from 6.25.0 to 6.34.0 in /examples/WireMock.Net.Console.Net472.Classic [example]
-- #1057 Pin the version from Testcontainers to 3.7.0 in WireMock.Net.Testcontainers [bug]
-- #1048 WithoutHeader fluent assertion [feature]
-- #1054 WireMock.Net 1.5.46 is incompatible with TestContainers 3.7.0 (issue 1) [bug]
-- #1059 WireMock.Net 1.5.46 is incompatible with TestContainers 3.7.0 (issue 2) [bug]
 
 The full release notes can be found here: https://github.com/WireMock-Net/WireMock.Net/blob/master/CHANGELOG.md

README.md

@@ -17,6 +17,7 @@ For more info, see also this WIKI page: [What is WireMock.Net](https://github.co
 ## :memo: Blogs
 - [mstack.nl : Generate C# Code from Mapping(s)](https://mstack.nl/blog/20230201-wiremock.net-tocode/)
 - [mstack.nl : Chaos Engineering with Fault Injections](https://mstack.nl/blogs/wiremock-net-chaos-engineering-with-fault-injections/)
+- [mstack.nl : gRPC / ProtoBuf Support](https://mstack.nl/blogs/wiremock-net-grpc/)
 
 
 ## :computer: Project Info

WireMock.Net Solution.sln

@@ -112,6 +112,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.NET8",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMockAzureQueueProxy", "examples\WireMockAzureQueueProxy\WireMockAzureQueueProxy.csproj", "{7FC0B409-2682-40EE-B3B9-3930D6769D01}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WireMock.Net.Console.GrpcClient", "examples\WireMock.Net.Console.GrpcClient\WireMock.Net.Console.GrpcClient.csproj", "{B1580A38-84E7-44BE-8FE7-3EE5031D74A1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -262,6 +264,10 @@ Global
 		{7FC0B409-2682-40EE-B3B9-3930D6769D01}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7FC0B409-2682-40EE-B3B9-3930D6769D01}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7FC0B409-2682-40EE-B3B9-3930D6769D01}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -305,6 +311,7 @@ Global
 		{941229D6-191B-4B5E-AC81-0905EBF4F19D} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{1EA72C0F-92E9-486B-8FFE-53F992BFC4AA} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 		{7FC0B409-2682-40EE-B3B9-3930D6769D01} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
+		{B1580A38-84E7-44BE-8FE7-3EE5031D74A1} = {985E0ADB-D4B4-473A-AA40-567E279B7946}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DC539027-9852-430C-B19F-FD035D018458}

WireMock.Net Solution.sln.DotSettings

@@ -23,14 +23,17 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=WWW/@EntryIndexedValue">WWW</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XMS/@EntryIndexedValue">XMS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=XUA/@EntryIndexedValue">XUA</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Dlls/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Flurl/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=funcs/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Grpc/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=guidb/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Guids/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Heyenrath/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jmes/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=openapi/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Pacticipant/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=protobuf/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Raml/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=randomizer/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Scriban/@EntryIndexedValue">True</s:Boolean>

examples/WireMock.Net.Console.GrpcClient/Program.cs

@@ -0,0 +1,21 @@
+using Greet;
+using Grpc.Net.Client;
+
+namespace WireMock.Net.Console.GrpcClient;
+
+internal class Program
+{
+    static async Task Main(string[] args)
+    {
+        var channel = GrpcChannel.ForAddress("http://localhost:9093/grpc3", new GrpcChannelOptions
+        {
+            Credentials = Grpc.Core.ChannelCredentials.Insecure
+        });
+
+        var client = new Greeter.GreeterClient(channel);
+
+        var reply = await client.SayHelloAsync(new HelloRequest { Name = "stef" });
+
+        System.Console.WriteLine("Greeting: " + reply.Message);
+    }
+}

examples/WireMock.Net.Console.GrpcClient/WireMock.Net.Console.GrpcClient.csproj

@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net8.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Google.Protobuf" Version="3.25.1" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
+        <PackageReference Include="Grpc.Tools" Version="2.60.0">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Protobuf Include="greet.proto" GrpcServices="Client" />
+    </ItemGroup>
+
+</Project>

examples/WireMock.Net.Console.GrpcClient/greet.proto

@@ -0,0 +1,33 @@
+// Copyright 2019 The gRPC Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+
+package greet;
+
+// The greeting service definition.
+service Greeter {
+  // Sends a greeting
+  rpc SayHello (HelloRequest) returns (HelloReply);
+}
+
+// The request message containing the user's name.
+message HelloRequest {
+  string name = 1;
+}
+
+// The response message containing the greetings
+message HelloReply {
+  string message = 1;
+}

examples/WireMock.Net.Console.NET7.UsingNuGet/Program.cs

@@ -1,6 +1,8 @@
 using System.Net;
+using System.Net.Http.Headers;
 using System.Text;
 using FluentAssertions;
+using MimeKit;
 using WireMock.Logging;
 using WireMock.RequestBuilders;
 using WireMock.ResponseBuilders;
@@ -18,17 +20,90 @@ internal class Program
             Logger = new WireMockConsoleLogger(),
         });
 
-        server.Given(Request.Create().UsingPost().WithPath("/some/endpoint"))
+        server
-            .RespondWith(Response.Create().WithStatusCode(HttpStatusCode.Created));
+            .Given(Request.Create()
+                .UsingPost()
+                .WithPath("/test")
+            )
+            .RespondWith(Response.Create()
+                .WithBody(requestMessage => requestMessage.BodyAsMimeMessage != null ?
+                    "BodyAsMimeMessage is present" :
+                    "BodyAsMimeMessage is not present")
+        );
 
-        var httpClient = new HttpClient { BaseAddress = new Uri(server.Url!) };
+        server
-        var requestUri = new Uri(httpClient.BaseAddress!, "some/endpoint");
+            .Given(Request.Create()
-        var content = new StringContent(string.Empty, Encoding.UTF8, "application/json");
+                .UsingPost()
+                .WithPath("/some/endpoint")
+            )
+            .RespondWith(Response.Create()
+                .WithStatusCode(HttpStatusCode.Created)
+            );
+
+        var httpClient = server.CreateClient();
+        var content = new StringContent("abc", Encoding.UTF8, "application/json");
+
+        await TestAsync(httpClient, content);
+
+        await TestNoMultiPartAsync(httpClient, content);
+
+        await TestMultiPartAsync(server);
+    }
+
+    private static async Task TestNoMultiPartAsync(HttpClient httpClient, StringContent content)
+    {
+        var response = await httpClient.PostAsync("/test", content);
+
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+        (await response.Content.ReadAsStringAsync()).Should().Be("BodyAsMimeMessage is not present");
+    }
+
+    private static async Task TestAsync(HttpClient httpClient, StringContent content)
+    {
+        var response = await httpClient.PostAsync("some/endpoint", content);
+
+        response.StatusCode.Should().Be(HttpStatusCode.Created);
+        (await response.Content.ReadAsStringAsync()).Should().BeEmpty();
+    }
+
+    private static async Task TestMultiPartAsync(WireMockServer server)
+    {
+        var textPlainContent = "This is some plain text";
+        var textPlainContentType = "text/plain";
+
+        var textJson = "{ \"Key\" : \"Value\" }";
+        var textJsonContentType = "text/json";
+
+        var imagePngBytes = Convert.FromBase64String("iVBORw0KGgoAAAANSUhEUgAAAAIAAAACAgMAAAAP2OW3AAAADFBMVEX/tID/vpH/pWX/sHidUyjlAAAADElEQVR4XmMQYNgAAADkAMHebX3mAAAAAElFTkSuQmCC");
+
+        server
+            .Given(
+                Request.Create()
+                    .UsingPost()
+                    .WithPath("/multipart")
+            )
+            .RespondWith(Response.Create()
+                .WithBody(requestMessage => requestMessage.BodyAsMimeMessage is MimeMessage mm ?
+                    "BodyAsMimeMessage is present: " + ((MimePart)mm.BodyParts.Last()).FileName :
+                    "BodyAsMimeMessage is not present")
+            );
 
         // Act
-        var actual = await httpClient.PostAsync(requestUri, content);
+        var formDataContent = new MultipartFormDataContent
+        {
+            { new StringContent(textPlainContent, Encoding.UTF8, textPlainContentType), "text" },
+            { new StringContent(textJson, Encoding.UTF8, textJsonContentType), "json" }
+        };
 
-        // Assert
+        var fileContent = new ByteArrayContent(imagePngBytes);
-        actual.StatusCode.Should().Be(HttpStatusCode.Created);
+        fileContent.Headers.ContentType = new MediaTypeHeaderValue("image/png");
+        formDataContent.Add(fileContent, "somefile", "image.png");
+
+        var client = server.CreateClient();
+
+        var response = await client.PostAsync("/multipart", formDataContent);
+
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
+        (await response.Content.ReadAsStringAsync()).Should().Be("BodyAsMimeMessage is present: image.png");
     }
 }

examples/WireMock.Net.Console.NET7.UsingNuGet/WireMock.Net.Console.NET7.UsingNuGet.csproj

@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.11.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="WireMock.Net" Version="1.5.42" />
+    <PackageReference Include="WireMock.Net" Version="1.5.51" />
   </ItemGroup>
 
 </Project>

examples/WireMock.Net.Console.NET8/WireMock.Net.Console.NET8.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net8.0</TargetFramework>
-      <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT</DefineConstants>
+      <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

examples/WireMock.Net.Console.Net452.Classic/MainApp.cs

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Net.Sockets;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using WireMock.Logging;
@@ -42,6 +43,24 @@ namespace WireMock.Net.ConsoleApplication
 
     public static class MainApp
     {
+        private const string ProtoDefinition = @"
+syntax = ""proto3"";
+
+package greet;
+
+service Greeter {
+  rpc SayHello (HelloRequest) returns (HelloReply);
+}
+
+message HelloRequest {
+  string name = 1;
+}
+
+message HelloReply {
+  string message = 1;
+}
+";
+
         private const string TestSchema = @"
   scalar DateTime
   scalar MyCustomScalar
@@ -76,8 +95,48 @@ namespace WireMock.Net.ConsoleApplication
    fullName:String 
   }";
 
+        private static void RunOnLocal()
+        {
+            try
+            {
+                var server = WireMockServer.Start(new WireMockServerSettings
+                {
+                    Port = 9091,
+                    StartAdminInterface = true,
+                    Logger = new WireMockConsoleLogger()
+                });
+                System.Console.WriteLine(string.Join(", ", server.Urls));
+
+                var requestJson = new { PricingContext = new { Market = "USA" } };
+                var responseJson = new { Market = "{{JsonPath.SelectToken request.body \"$.PricingContext.Market\"}}" };
+                server
+                    .Given(Request.Create()
+                        //.WithBody(new JsonMatcher(requestJson))
+                        .WithBodyAsJson(requestJson)
+                        .WithPath("/pricing")
+                        .UsingPost()
+                    )
+                    .RespondWith(Response.Create()
+                        .WithHeader("Content-Type", "application/json")
+                        .WithBodyAsJson(responseJson)
+                        .WithTransformer(true)
+                    );
+
+                System.Console.WriteLine("Press any key to stop...");
+                System.Console.ReadKey();
+                server.Stop();
+            }
+            catch (Exception e)
+            {
+                System.Console.WriteLine(e);
+            }
+        }
+
         public static void Run()
         {
+            RunOnLocal();
+            return;
+
             var mappingBuilder = new MappingBuilder();
             mappingBuilder
                 .Given(Request
@@ -115,17 +174,14 @@ namespace WireMock.Net.ConsoleApplication
                     .WithBodyAsJson(rm => todos[int.Parse(rm.Query!["id"].ToString())])
                 );
 
-            var httpClient = server.CreateClient();
+            using var httpAndHttpsWithPort = WireMockServer.Start(new WireMockServerSettings
-            //server.Stop();
-
-            var httpAndHttpsWithPort = WireMockServer.Start(new WireMockServerSettings
             {
                 HostingScheme = HostingScheme.HttpAndHttps,
                 Port = 12399
             });
             httpAndHttpsWithPort.Stop();
 
-            var httpAndHttpsFree = WireMockServer.Start(new WireMockServerSettings
+            using var httpAndHttpsFree = WireMockServer.Start(new WireMockServerSettings
             {
                 HostingScheme = HostingScheme.HttpAndHttps
             });
@@ -134,11 +190,14 @@ namespace WireMock.Net.ConsoleApplication
             string url1 = "http://localhost:9091/";
             string url2 = "http://localhost:9092/";
             string url3 = "https://localhost:9443/";
+            string urlGrpc = "grpc://localhost:9093/";
+            string urlGrpcSSL = "grpcs://localhost:9094/";
 
             server = WireMockServer.Start(new WireMockServerSettings
             {
+                // CorsPolicyOptions = CorsPolicyOptions.AllowAll,
                 AllowCSharpCodeMatcher = true,
-                Urls = new[] { url1, url2, url3 },
+                Urls = new[] { url1, url2, url3, urlGrpc, urlGrpcSSL },
                 StartAdminInterface = true,
                 ReadStaticMappings = true,
                 SaveUnmatchedRequests = true,
@@ -170,18 +229,95 @@ namespace WireMock.Net.ConsoleApplication
             server.SetBasicAuthentication("a", "b");
             //server.SetAzureADAuthentication("6c2a4722-f3b9-4970-b8fc-fac41e29stef", "8587fde1-7824-42c7-8592-faf92b04stef");
 
-            // server.AllowPartialMapping();
+
+            //var http = new HttpClient();
+            //var response = await http.GetAsync($"{_wireMockServer.Url}/pricing");
+            //var value = await response.Content.ReadAsStringAsync();
+
+#if PROTOBUF
+            var protoBufJsonMatcher = new JsonPartialWildcardMatcher(new { name = "*" });
+            server
+                .Given(Request.Create()
+                    .UsingPost()
+                    .WithHttpVersion("2")
+                    .WithPath("/grpc/greet.Greeter/SayHello")
+                    .WithBodyAsProtoBuf(ProtoDefinition, "greet.HelloRequest", protoBufJsonMatcher)
+                )
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/grpc")
+                    .WithBodyAsProtoBuf(ProtoDefinition, "greet.HelloReply",
+                        new
+                        {
+                            message = "hello {{request.BodyAsJson.name}}"
+                        }
+                    )
+                    .WithTrailingHeader("grpc-status", "0")
+                    .WithTransformer()
+                );
+
+            server
+                .Given(Request.Create()
+                    .UsingPost()
+                    .WithHttpVersion("2")
+                    .WithPath("/grpc2/greet.Greeter/SayHello")
+                    .WithBodyAsProtoBuf("greet.HelloRequest", protoBufJsonMatcher)
+                )
+                .WithProtoDefinition(ProtoDefinition)
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/grpc")
+                    .WithBodyAsProtoBuf("greet.HelloReply",
+                        new
+                        {
+                            message = "hello {{request.BodyAsJson.name}}"
+                        }
+                    )
+                    .WithTrailingHeader("grpc-status", "0")
+                    .WithTransformer()
+                );
+
+            server
+                .AddProtoDefinition("my-greeter", ProtoDefinition)
+                .Given(Request.Create()
+                    .UsingPost()
+                    .WithPath("/grpc3/greet.Greeter/SayHello")
+                    .WithBodyAsProtoBuf("greet.HelloRequest", protoBufJsonMatcher)
+                )
+                .WithProtoDefinition("my-greeter")
+                .RespondWith(Response.Create()
+                    .WithHeader("Content-Type", "application/grpc")
+                    .WithBodyAsProtoBuf("greet.HelloReply",
+                        new
+                        {
+                            message = "hello {{request.BodyAsJson.name}}"
+                        }
+                    )
+                    .WithTrailingHeader("grpc-status", "0")
+                    .WithTransformer()
+                );
+#endif
+
 #if GRAPHQL
             var customScalars = new Dictionary<string, Type> { { "MyCustomScalar", typeof(int) } };
             server
                 .Given(Request.Create()
                     .WithPath("/graphql")
                     .UsingPost()
-                    .WithGraphQLSchema(TestSchema, customScalars)
+                    .WithBodyAsGraphQL(TestSchema, customScalars)
                 )
                 .RespondWith(Response.Create()
                     .WithBody("GraphQL is ok")
                 );
+
+            //server
+            //    .AddGraphQLSchema("my-graphql", TestSchema, customScalars)
+            //    .Given(Request.Create()
+            //        .WithPath("/graphql2")
+            //        .UsingPost()
+            //    )
+            //    .WithGraphQLSchema("my-graphql")
+            //    .RespondWith(Response.Create()
+            //        .WithBody("GraphQL is ok")
+            //    );
 #endif
 
 #if MIMEKIT
@@ -240,7 +376,6 @@ namespace WireMock.Net.ConsoleApplication
                         .WithHeader("Content-Type", "text/plain")
                 );
 
-
             server
                 .Given(Request.Create()
                     .UsingMethod("GET")

examples/WireMock.Net.Console.Net452.Classic/WireMock.Net.Console.Net452.Classic.csproj

@@ -39,17 +39,17 @@
     <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
       <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+    <Reference Include="Handlebars, Version=2.1.6.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net452\Handlebars.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.2.1.6\lib\net451\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="Handlebars.Net.Helpers, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.0\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.3\lib\net452\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.0\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.3\lib\net452\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+    <Reference Include="log4net, Version=2.0.17.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
+      <HintPath>..\..\packages\log4net.2.0.17\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.Owin.Host.HttpListener, Version=3.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

examples/WireMock.Net.Console.Net452.Classic/packages.config

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net452" />
-  <package id="Handlebars.Net" version="2.1.4" targetFramework="net452" />
+  <package id="Handlebars.Net" version="2.1.6" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers" version="2.4.0" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers" version="2.4.3" targetFramework="net452" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.4.0" targetFramework="net452" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.4.3" targetFramework="net452" />
-  <package id="log4net" version="2.0.15" targetFramework="net452" />
+  <package id="log4net" version="2.0.17" targetFramework="net452" />
   <package id="Microsoft.Owin.Host.HttpListener" version="3.1.0" targetFramework="net452" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net452" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net452" />

examples/WireMock.Net.Console.Net461.Classic/WireMock.Net.Console.Net461.Classic.csproj

@@ -38,17 +38,17 @@
     <Reference Include="AnyOf, Version=0.3.0.0, Culture=neutral, PublicKeyToken=b35e6abbb527c6b1, processorArchitecture=MSIL">
       <HintPath>..\..\packages\AnyOf.0.3.0\lib\net45\AnyOf.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+    <Reference Include="Handlebars, Version=2.1.6.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net46\Handlebars.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.2.1.6\lib\net451\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="Handlebars.Net.Helpers, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.0\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.3\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.0.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.0\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.3\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+    <Reference Include="log4net, Version=2.0.17.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
+      <HintPath>..\..\packages\log4net.2.0.17\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>

examples/WireMock.Net.Console.Net461.Classic/packages.config

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net461" />
-  <package id="Handlebars.Net" version="2.1.4" targetFramework="net461" />
+  <package id="Handlebars.Net" version="2.1.6" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers" version="2.4.0" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers" version="2.4.3" targetFramework="net461" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.4.0" targetFramework="net461" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.4.3" targetFramework="net461" />
-  <package id="log4net" version="2.0.15" targetFramework="net461" />
+  <package id="log4net" version="2.0.17" targetFramework="net461" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.2.0" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net461" />
   <package id="SimMetrics.Net" version="1.0.5" targetFramework="net461" />

examples/WireMock.Net.Console.Net472.Classic/WireMock.Net.Console.Net472.Classic.csproj

@@ -46,32 +46,32 @@
     <Reference Include="Fare, Version=2.2.0.0, Culture=neutral, PublicKeyToken=ea68d375bf33a7c8, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Fare.2.2.1\lib\net35\Fare.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars, Version=2.1.4.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
+    <Reference Include="Handlebars, Version=2.1.6.0, Culture=neutral, PublicKeyToken=22225d0bf33cd661, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.2.1.4\lib\net46\Handlebars.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.2.1.6\lib\net451\Handlebars.dll</HintPath>
     </Reference>
-    <Reference Include="Handlebars.Net.Helpers, Version=2.4.1.2, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="Handlebars.Net.Helpers, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.1.2\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.2.4.3\lib\net46\Handlebars.Net.Helpers.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.1.2, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Core, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.1.2\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Core.2.4.3\lib\net46\HandlebarsDotNet.Helpers.Core.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.4.1.2, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.DynamicLinq, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.4.1.2\lib\net46\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.DynamicLinq.2.4.3\lib\net46\HandlebarsDotNet.Helpers.DynamicLinq.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.4.1.2, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Humanizer, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.4.1.2\lib\net46\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Humanizer.2.4.3\lib\net46\HandlebarsDotNet.Helpers.Humanizer.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.4.1.2, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Json, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.4.1.2\lib\net46\HandlebarsDotNet.Helpers.Json.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Json.2.4.3\lib\net46\HandlebarsDotNet.Helpers.Json.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.4.1.2, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Random, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.4.1.2\lib\net46\HandlebarsDotNet.Helpers.Random.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Random.2.4.3\lib\net46\HandlebarsDotNet.Helpers.Random.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.4.1.2, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.Xeger, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.4.1.2\lib\net46\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.Xeger.2.4.3\lib\net46\HandlebarsDotNet.Helpers.Xeger.dll</HintPath>
     </Reference>
-    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.4.1.2, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
+    <Reference Include="HandlebarsDotNet.Helpers.XPath, Version=2.4.3.0, Culture=neutral, PublicKeyToken=00d131fae0c250bc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.4.1.2\lib\net46\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
+      <HintPath>..\..\packages\Handlebars.Net.Helpers.XPath.2.4.3\lib\net46\HandlebarsDotNet.Helpers.XPath.dll</HintPath>
     </Reference>
     <Reference Include="Humanizer, Version=2.14.0.0, Culture=neutral, PublicKeyToken=979442b78dfc278e, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Humanizer.Core.2.14.1\lib\netstandard2.0\Humanizer.dll</HintPath>
@@ -79,8 +79,8 @@
     <Reference Include="JmesPath.Net, Version=1.0.125.0, Culture=neutral, PublicKeyToken=b29d616b7f4faff0, processorArchitecture=MSIL">
       <HintPath>..\..\packages\JmesPath.Net.1.0.125\lib\net45\JmesPath.Net.dll</HintPath>
     </Reference>
-    <Reference Include="log4net, Version=2.0.15.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+    <Reference Include="log4net, Version=2.0.17.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\log4net.2.0.15\lib\net45\log4net.dll</HintPath>
+      <HintPath>..\..\packages\log4net.2.0.17\lib\net45\log4net.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.AspNetCore, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Microsoft.AspNetCore.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.dll</HintPath>
@@ -307,8 +307,8 @@
     <Reference Include="System.IO.Pipelines, Version=4.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\packages\System.IO.Pipelines.4.5.3\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
     </Reference>
-    <Reference Include="System.Linq.Dynamic.Core, Version=1.3.1.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.3.14.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.3.1\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+      <HintPath>..\..\packages\System.Linq.Dynamic.Core.1.3.14\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
       <HintPath>..\..\packages/System.Memory.4.5.5/lib/net461/System.Memory.dll</HintPath>
@@ -358,11 +358,11 @@
     <Reference Include="TinyMapper, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\TinyMapper.3.0.3\lib\net40\TinyMapper.dll</HintPath>
     </Reference>
-    <Reference Include="XPath2, Version=1.1.4.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
+    <Reference Include="XPath2, Version=1.1.5.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XPath2.1.1.4\lib\net452\XPath2.dll</HintPath>
+      <HintPath>..\..\packages\XPath2.1.1.5\lib\net452\XPath2.dll</HintPath>
     </Reference>
-    <Reference Include="XPath2.Extensions, Version=1.1.4.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
+    <Reference Include="XPath2.Extensions, Version=1.1.5.0, Culture=neutral, PublicKeyToken=463c6d7fb740c7e5, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\XPath2.Extensions.1.1.4\lib\net452\XPath2.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\XPath2.Extensions.1.1.5\lib\net452\XPath2.Extensions.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

examples/WireMock.Net.Console.Net472.Classic/packages.config

@@ -2,15 +2,15 @@
 <packages>
   <package id="AnyOf" version="0.3.0" targetFramework="net472" />
   <package id="Fare" version="2.2.1" targetFramework="net472" />
-  <package id="Handlebars.Net" version="2.1.4" targetFramework="net472" />
+  <package id="Handlebars.Net" version="2.1.6" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers" version="2.4.1.2" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers" version="2.4.3" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Core" version="2.4.1.2" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Core" version="2.4.3" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.4.1.2" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.DynamicLinq" version="2.4.3" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Humanizer" version="2.4.1.2" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Humanizer" version="2.4.3" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Json" version="2.4.1.2" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Json" version="2.4.3" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Random" version="2.4.1.2" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Random" version="2.4.3" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.Xeger" version="2.4.1.2" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.Xeger" version="2.4.3" targetFramework="net472" />
-  <package id="Handlebars.Net.Helpers.XPath" version="2.4.1.2" targetFramework="net472" />
+  <package id="Handlebars.Net.Helpers.XPath" version="2.4.3" targetFramework="net472" />
   <package id="Humanizer" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core.af" version="2.14.1" targetFramework="net472" />
@@ -62,7 +62,7 @@
   <package id="Humanizer.Core.zh-Hans" version="2.14.1" targetFramework="net472" />
   <package id="Humanizer.Core.zh-Hant" version="2.14.1" targetFramework="net472" />
   <package id="JmesPath.Net" version="1.0.125" targetFramework="net472" />
-  <package id="log4net" version="2.0.15" targetFramework="net472" />
+  <package id="log4net" version="2.0.17" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.Client" version="5.2.8" targetFramework="net472" />
   <package id="Microsoft.AspNetCore" version="2.2.0" targetFramework="net472" />
   <package id="Microsoft.AspNetCore.Authentication.Abstractions" version="2.2.0" targetFramework="net472" />
@@ -138,7 +138,7 @@
   <package id="System.Diagnostics.DiagnosticSource" version="4.5.0" targetFramework="net472" />
   <package id="System.IdentityModel.Tokens.Jwt" version="6.34.0" targetFramework="net472" />
   <package id="System.IO.Pipelines" version="4.5.3" targetFramework="net472" />
-  <package id="System.Linq.Dynamic.Core" version="1.3.1" targetFramework="net472" />
+  <package id="System.Linq.Dynamic.Core" version="1.3.14" targetFramework="net472" />
   <package id="System.Memory" version="4.5.5" targetFramework="net472" />
   <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
   <package id="System.Reflection.Metadata" version="1.6.0" targetFramework="net472" />
@@ -151,6 +151,6 @@
   <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net472" />
   <package id="TinyMapper" version="3.0.3" targetFramework="net472" />
-  <package id="XPath2" version="1.1.4" targetFramework="net472" />
+  <package id="XPath2" version="1.1.5" targetFramework="net472" />
-  <package id="XPath2.Extensions" version="1.1.4" targetFramework="net472" />
+  <package id="XPath2.Extensions" version="1.1.5" targetFramework="net472" />
 </packages>

examples/WireMock.Net.OpenApiParser.ConsoleApp/DynamicDataGeneration.cs

@@ -18,6 +18,5 @@ public class DynamicDataGeneration : WireMockOpenApiParserDynamicExampleValues
                 Pattern = $"[0-9A-Z]{{{maxLength}}}"
             }).Generate() ?? "example-string";
         }
-        set { }
     }
 }

src/WireMock.Net.Abstractions/Admin/Mappings/MappingModel.cs

@@ -98,4 +98,9 @@ public class MappingModel
     /// The probability when this request should be matched. Value is between 0 and 1. [Optional]
     /// </summary>
     public double? Probability { get; set; }
+
+    /// <summary>
+    /// The Grpc ProtoDefinition which is used for this mapping (request and response). [Optional]
+    /// </summary>
+    public string? ProtoDefinition { get; set; }
 }

src/WireMock.Net.Abstractions/Admin/Mappings/MatcherModel.cs

@@ -48,7 +48,7 @@ public class MatcherModel
     /// </summary>
     public string? MatchOperator { get; set; }
 
-    #region JsonPartialMatcher and JsonPartialWildcardMatcher
+    #region JsonMatcher, JsonPartialMatcher and JsonPartialWildcardMatcher
     /// <summary>
     /// Support Regex.
     /// </summary>
@@ -70,13 +70,22 @@ public class MatcherModel
     /// ContentTransferEncoding Matcher (base64)
     /// </summary>
     public MatcherModel? ContentTransferEncodingMatcher { get; set; }
+    #endregion
 
+    #region MimePartMatcher + ProtoBufMatcher
     /// <summary>
     /// Content Matcher
     /// </summary>
     public MatcherModel? ContentMatcher { get; set; }
     #endregion
 
+    #region ProtoBufMatcher
+    /// <summary>
+    /// The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
+    /// </summary>
+    public string? ProtoBufMessageType { get; set; }
+    #endregion
+
     #region XPathMatcher
     /// <summary>
     /// Array of namespace prefix and uri. (optional)

src/WireMock.Net.Abstractions/Admin/Mappings/RequestModel.cs

@@ -28,6 +28,11 @@ public class RequestModel
     /// </summary>
     public string[]? Methods { get; set; }
 
+    /// <summary>
+    /// The HTTP Version
+    /// </summary>
+    public string? HttpVersion { get; set; }
+
     /// <summary>
     /// Reject on match for Methods.
     /// </summary>

src/WireMock.Net.Abstractions/Admin/Mappings/ResponseModel.cs

@@ -84,6 +84,11 @@ public class ResponseModel
     /// </summary>
     public string? HeadersRaw { get; set; }
 
+    /// <summary>
+    /// Gets or sets the Trailing Headers.
+    /// </summary>
+    public IDictionary<string, object>? TrailingHeaders { get; set; }
+
     /// <summary>
     /// Gets or sets the delay in milliseconds.
     /// </summary>
@@ -123,4 +128,16 @@ public class ResponseModel
     /// Gets or sets the WebProxy settings.
     /// </summary>
     public WebProxyModel? WebProxy { get; set; }
+
+    #region ProtoBuf
+    /// <summary>
+    /// Gets or sets the proto definition.
+    /// </summary>
+    public string? ProtoDefinition { get; set; }
+
+    /// <summary>
+    /// Gets or sets the full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
+    /// </summary>
+    public string? ProtoBufMessageType { get; set; }
+    #endregion
 }

src/WireMock.Net.Abstractions/Admin/Requests/LogRequestModel.cs

@@ -55,6 +55,11 @@ public class LogRequestModel
     /// </summary>
     public string Method { get; set; }
 
+    /// <summary>
+    /// The HTTP Version.
+    /// </summary>
+    public string HttpVersion { get; set; } = null!;
+
     /// <summary>
     /// The Headers.
     /// </summary>

src/WireMock.Net.Abstractions/Admin/Settings/SettingsModel.cs

@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using JetBrains.Annotations;
 using WireMock.Handlers;
 using WireMock.Types;
 
@@ -114,6 +116,11 @@ public class SettingsModel
     /// </summary>
     public QueryParameterMultipleValueSupport? QueryParameterMultipleValueSupport { get; set; }
 
+    /// <summary>
+    /// A list of Grpc ProtoDefinitions which can be used.
+    /// </summary>
+    public Dictionary<string, string>? ProtoDefinitions { get; set; }
+
 #if NETSTANDARD1_3_OR_GREATER || NET461
     /// <summary>
     /// Server client certificate mode

src/WireMock.Net.Abstractions/IRequestMessage.cs

@@ -63,6 +63,11 @@ public interface IRequestMessage
     /// </summary>
     string Method { get; }
 
+    /// <summary>
+    /// Gets the HTTP Version.
+    /// </summary>
+    string HttpVersion { get; }
+
     /// <summary>
     /// Gets the headers.
     /// </summary>
@@ -94,23 +99,27 @@ public interface IRequestMessage
     IBodyData? BodyData { get; }
 
     /// <summary>
-    /// The original body as string. Convenience getter for Handlebars and WireMockAssertions.
+    /// The original body as string.
+    /// Convenience getter for Handlebars and WireMockAssertions.
     /// </summary>
     string? Body { get; }
 
     /// <summary>
-    /// The body (as JSON object). Convenience getter for Handlebars and WireMockAssertions.
+    /// The body (as JSON object).
+    /// Convenience getter for Handlebars and WireMockAssertions.
     /// </summary>
     object? BodyAsJson { get; }
 
     /// <summary>
-    /// The body (as bytearray). Convenience getter for Handlebars and WireMockAssertions.
+    /// The body (as bytearray).
+    /// Convenience getter for Handlebars and WireMockAssertions.
     /// </summary>
     byte[]? BodyAsBytes { get; }
 
 #if MIMEKIT
     /// <summary>
-    /// The original body as MimeMessage. Convenience getter for Handlebars and WireMockAssertions.
+    /// The original body as MimeMessage.
+    /// Convenience getter for Handlebars and WireMockAssertions.
     /// </summary>
     object? BodyAsMimeMessage { get; }
 #endif

src/WireMock.Net.Abstractions/IResponseMessage.cs

@@ -40,6 +40,11 @@ public interface IResponseMessage
     /// </summary>
     IDictionary<string, WireMockList<string>>? Headers { get; }
 
+    /// <summary>
+    /// Gets the trailing headers.
+    /// </summary>
+    IDictionary<string, WireMockList<string>>? TrailingHeaders { get; }
+
     /// <summary>
     /// Gets or sets the status code.
     /// </summary>
@@ -53,9 +58,23 @@ public interface IResponseMessage
     void AddHeader(string name, string value);
 
     /// <summary>
-    /// Adds the header.
+    /// Adds the trailing header.
     /// </summary>
     /// <param name="name">The name.</param>
     /// <param name="values">The values.</param>
     void AddHeader(string name, params string[] values);
+
+    /// <summary>
+    /// Adds the trailing header.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="value">The value.</param>
+    void AddTrailingHeader(string name, string value);
+
+    /// <summary>
+    /// Adds the header.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="values">The values.</param>
+    void AddTrailingHeader(string name, params string[] values);
 }

src/WireMock.Net.Abstractions/Models/IBodyData.cs

@@ -1,7 +1,10 @@
+using System;
 using System.Collections.Generic;
 using System.Text;
+using WireMock.Models;
 using WireMock.Types;
 
+// ReSharper disable once CheckNamespace
 namespace WireMock.Util;
 
 /// <summary>
@@ -26,6 +29,7 @@ public interface IBodyData
 
     /// <summary>
     /// The body (as JSON object).
+    /// Also used for ProtoBuf.
     /// </summary>
     object? BodyAsJson { get; set; }
 
@@ -68,4 +72,16 @@ public interface IBodyData
     /// Defines if this BodyData is the result of a dynamically created response-string. (
     /// </summary>
     public string? IsFuncUsed { get; set; }
+
+    #region ProtoBuf
+    /// <summary>
+    /// Gets or sets the proto definition.
+    /// </summary>
+    public Func<IdOrText>? ProtoDefinition { get; set; }
+
+    /// <summary>
+    /// Gets or sets the full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
+    /// </summary>
+    public string? ProtoBufMessageType { get; set; }
+    #endregion
 }

src/WireMock.Net.Abstractions/Models/IdOrText.cs

@@ -0,0 +1,33 @@
+namespace WireMock.Models;
+
+/// <summary>
+/// A structure defining an (optional) Id and a Text.
+/// </summary>
+public readonly struct IdOrText
+{
+    /// <summary>
+    /// The Id [optional].
+    /// </summary>
+    public string? Id { get; }
+
+    /// <summary>
+    /// The Text.
+    /// </summary>
+    public string Text { get; }
+
+    /// <summary>
+    /// When Id is defined, return the Id, else the Text.
+    /// </summary>
+    public string Value => Id ?? Text;
+
+    /// <summary>
+    /// Create a IdOrText
+    /// </summary>
+    /// <param name="id">The Id [optional]</param>
+    /// <param name="text">The Text.</param>
+    public IdOrText(string? id, string text)
+    {
+        Id = id;
+        Text = text;
+    }
+}

src/WireMock.Net.Abstractions/Types/BodyType.cs

@@ -38,5 +38,10 @@ public enum BodyType
     /// <summary>
     /// Body is a String which is x-www-form-urlencoded.
     /// </summary>
-    FormUrlEncoded
+    FormUrlEncoded,
+
+    /// <summary>
+    /// Body is a ProtoBuf Byte array
+    /// </summary>
+    ProtoBuf
 }

src/WireMock.Net.Abstractions/WireMock.Net.Abstractions.csproj

@@ -31,7 +31,7 @@
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1'">
-        <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT</DefineConstants>
+        <DefineConstants>$(DefineConstants);GRAPHQL;MIMEKIT;PROTOBUF</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>

src/WireMock.Net.FluentAssertions/Assertions/WireMockANumberOfCallsAssertions.cs

@@ -2,22 +2,34 @@ using Stef.Validation;
 using WireMock.Server;
 
 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions
+namespace WireMock.FluentAssertions;
-{
+
+/// <summary>
+/// Provides assertion methods to verify the number of calls made to a WireMock server.
+/// This class is used in the context of FluentAssertions.
+/// </summary>
 public class WireMockANumberOfCallsAssertions
 {
     private readonly IWireMockServer _server;
     private readonly int _callsCount;
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WireMockANumberOfCallsAssertions"/> class.
+    /// </summary>
+    /// <param name="server">The WireMock server to assert against.</param>
+    /// <param name="callsCount">The expected number of calls to assert.</param>
     public WireMockANumberOfCallsAssertions(IWireMockServer server, int callsCount)
     {
         _server = Guard.NotNull(server);
         _callsCount = callsCount;
     }
 
+    /// <summary>
+    /// Returns an instance of <see cref="WireMockAssertions"/> which can be used to assert the expected number of calls.
+    /// </summary>
+    /// <returns>A <see cref="WireMockAssertions"/> instance for asserting the number of calls to the server.</returns>
     public WireMockAssertions Calls()
     {
         return new WireMockAssertions(_server, _callsCount);
     }
 }
-}

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.AtUrl.cs

@@ -0,0 +1,60 @@
+#pragma warning disable CS1591
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.AbsoluteUrl, absoluteUrl, StringComparison.OrdinalIgnoreCase));
+
+        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 url {0}{reason}, but no calls were made.",
+                absoluteUrl
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => absoluteUrl,
+                requests => requests.Select(request => request.AbsoluteUrl)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, absoluteUrl);
+    }
+
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> AtUrl(string url, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.Url, url, StringComparison.OrdinalIgnoreCase));
+
+        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 url {0}{reason}, but no calls were made.",
+                url
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but didn't find it among the calls to {1}.",
+                _ => url,
+                requests => requests.Select(request => request.Url)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, url);
+    }
+}

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.FromClientIP.cs

@@ -0,0 +1,33 @@
+#pragma warning disable CS1591
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ClientIP, clientIP, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but no calls were made.",
+                clientIP
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but didn't find it among the calls from IP(s) {1}.",
+                _ => clientIP, requests => requests.Select(request => request.ClientIP)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, clientIP);
+    }
+}

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.UsingMethod.cs

@@ -58,8 +58,8 @@ public partial class WireMockAssertions
 
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
+            .Given(() => RequestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
             .FailWith(
                 "Expected {context:wiremockserver} to have been called using method {0}{reason}, but no calls were made.",
                 method
@@ -72,7 +72,7 @@ public partial class WireMockAssertions
                 requests => requests.Select(request => request.Method)
             );
 
-        _requestMessages = filter(_requestMessages).ToList();
+        FilterRequestMessages(filter);
 
         return new AndConstraint<WireMockAssertions>(this);
     }

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithBody.cs

@@ -1,7 +1,12 @@
 #pragma warning disable CS1591
 using System;
 using System.Collections.Generic;
+using AnyOfTypes;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using WireMock.Extensions;
 using WireMock.Matchers;
+using WireMock.Models;
 
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions;
@@ -9,7 +14,7 @@ namespace WireMock.FluentAssertions;
 public partial class WireMockAssertions
 {
     private const string MessageFormatNoCalls = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but no calls were made.";
-    private const string MessageFormat = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but didn't find it among the body {1}.";
+    private const string MessageFormat = "Expected {context:wiremockserver} to have been called using body {0}{reason}, but didn't find it among the body/bodies {1}.";
 
     [CustomAssertion]
     public AndConstraint<WireMockAssertions> WithBody(string body, string because = "", params object[] becauseArgs)
@@ -44,11 +49,11 @@ public partial class WireMockAssertions
     }
 
     [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithBodyAsJson(IValueMatcher matcher, string because = "", params object[] becauseArgs)
+    public AndConstraint<WireMockAssertions> WithBodyAsJson(IObjectMatcher matcher, string because = "", params object[] becauseArgs)
     {
         var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsJson, matcher);
 
-        return ExecuteAssertionWithBodyAsJsonValueMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsJson);
+        return ExecuteAssertionWithBodyAsIObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsJson);
     }
 
     [CustomAssertion]
@@ -56,7 +61,7 @@ public partial class WireMockAssertions
     {
         var (filter, condition) = BuildFilterAndCondition(r => r.BodyAsBytes, matcher);
 
-        return ExecuteAssertionWithBodyAsBytesExactObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsBytes);
+        return ExecuteAssertionWithBodyAsIObjectMatcher(matcher, because, becauseArgs, condition, filter, r => r.BodyAsBytes);
     }
 
     private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyStringMatcher(
@@ -70,27 +75,27 @@ public partial class WireMockAssertions
     {
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
+            .Given(() => RequestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
             .FailWith(
                 MessageFormatNoCalls,
-                matcher.GetPatterns()
+                FormatBody(matcher.GetPatterns())
             )
             .Then
             .ForCondition(condition)
             .FailWith(
                 MessageFormat,
-                _ => matcher.GetPatterns(),
+                _ => FormatBody(matcher.GetPatterns()),
-                requests => requests.Select(expression)
+                requests => FormatBodies(requests.Select(expression))
             );
 
-        _requestMessages = filter(_requestMessages).ToList();
+        FilterRequestMessages(filter);
 
         return new AndConstraint<WireMockAssertions>(this);
     }
 
-    private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyAsJsonValueMatcher(
+    private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyAsIObjectMatcher(
-        IValueMatcher matcher,
+        IObjectMatcher matcher,
         string because,
         object[] becauseArgs,
         Func<IReadOnlyList<IRequestMessage>, bool> condition,
@@ -100,52 +105,41 @@ public partial class WireMockAssertions
     {
         Execute.Assertion
             .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
+            .Given(() => RequestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
             .FailWith(
                 MessageFormatNoCalls,
-                matcher.Value
+                FormatBody(matcher.Value)
             )
             .Then
             .ForCondition(condition)
             .FailWith(
                 MessageFormat,
-                _ => matcher.Value,
+                _ => FormatBody(matcher.Value),
-                requests => requests.Select(expression)
+                requests => FormatBodies(requests.Select(expression))
             );
 
-        _requestMessages = filter(_requestMessages).ToList();
+        FilterRequestMessages(filter);
 
         return new AndConstraint<WireMockAssertions>(this);
     }
 
-    private AndConstraint<WireMockAssertions> ExecuteAssertionWithBodyAsBytesExactObjectMatcher(
+    private static string? FormatBody(object? body)
-        ExactObjectMatcher matcher,
-        string because,
-        object[] becauseArgs,
-        Func<IReadOnlyList<IRequestMessage>, bool> condition,
-        Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter,
-        Func<IRequestMessage, object?> expression
-    )
     {
-        Execute.Assertion
+        return body switch
-            .BecauseOf(because, becauseArgs)
+        {
-            .Given(() => _requestMessages)
+            null => null,
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
+            string str => str,
-            .FailWith(
+            AnyOf<string, StringPattern>[] stringPatterns => FormatBodies(stringPatterns.Select(p => p.GetPattern())),
-                MessageFormatNoCalls,
+            byte[] bytes => $"byte[{bytes.Length}] {{...}}",
-                matcher.ValueAsObject ?? matcher.ValueAsBytes
+            JToken jToken => jToken.ToString(Formatting.None),
-            )
+            _ => JToken.FromObject(body).ToString(Formatting.None)
-            .Then
+        };
-            .ForCondition(condition)
+    }
-            .FailWith(
-                MessageFormat,
-                _ => matcher.ValueAsObject ?? matcher.ValueAsBytes,
-                requests => requests.Select(expression)
-            );
 
-        _requestMessages = filter(_requestMessages).ToList();
+    private static string? FormatBodies(IEnumerable<object?> bodies)
-
+    {
-        return new AndConstraint<WireMockAssertions>(this);
+        var valueAsArray = bodies as object[] ?? bodies.ToArray();
+        return valueAsArray.Length == 1 ? FormatBody(valueAsArray.First()) : $"[ {string.Join(", ", valueAsArray.Select(FormatBody))} ]";
     }
 }

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithHeader.cs

@@ -0,0 +1,157 @@
+#pragma warning disable CS1591
+using System.Collections.Generic;
+using WireMock.Types;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> WitHeaderKey(string expectedKey, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            return request.Headers?.Any(h => h.Key == expectedKey) == true;
+        });
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0}{reason}.",
+                expectedKey
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0}{reason}, but didn't find it among the calls with Header(s) {1}.",
+                _ => expectedKey,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, expectedKey);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string value, string because = "", params object[] becauseArgs)
+        => WithHeader(expectedKey, new[] { value }, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            var headers = request.Headers?.ToArray() ?? new KeyValuePair<string, WireMockList<string>>[0];
+
+            var matchingHeaderValues = headers.Where(h => h.Key == expectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
+
+            if (expectedValues.Length == 1 && matchingHeaderValues.Length == 1)
+            {
+                return matchingHeaderValues[0] == expectedValues[0];
+            }
+
+            var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToArray();
+            return expectedValues.Any(trimmedHeaderValues.Contains);
+        });
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0} and Values {1}{reason}.",
+                expectedKey,
+                expectedValues
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with Header {0} and Values {1}{reason}, but didn't find it among the calls with Header(s) {2}.",
+                _ => expectedKey,
+                _ => expectedValues,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeaderKey(string unexpectedKey, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            return request.Headers?.Any(h => h.Key == unexpectedKey) != true;
+        });
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0}{reason}.",
+                unexpectedKey
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0}{reason}, but found it among the calls with Header(s) {1}.",
+                _ => unexpectedKey,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string value, string because = "", params object[] becauseArgs)
+        => WithoutHeader(unexpectedKey, new[] { value }, because, becauseArgs);
+
+    [CustomAssertion]
+    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request =>
+        {
+            var headers = request.Headers?.ToArray() ?? new KeyValuePair<string, WireMockList<string>>[0];
+
+            var matchingHeaderValues = headers.Where(h => h.Key == unexpectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
+
+            if (expectedValues.Length == 1 && matchingHeaderValues.Length == 1)
+            {
+                return matchingHeaderValues[0] != expectedValues[0];
+            }
+
+            var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToArray();
+            return !expectedValues.Any(trimmedHeaderValues.Contains);
+        });
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0} and Values {1}{reason}.",
+                unexpectedKey,
+                expectedValues
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} not to have been called with Header {0} and Values {1}{reason}, but found it among the calls with Header(s) {2}.",
+                _ => unexpectedKey,
+                _ => expectedValues,
+                requests => requests.Select(request => request.Headers)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndConstraint<WireMockAssertions>(this);
+    }
+}

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.WithProxy.cs

@@ -0,0 +1,34 @@
+#pragma warning disable CS1591
+using System;
+
+// ReSharper disable once CheckNamespace
+namespace WireMock.FluentAssertions;
+
+public partial class WireMockAssertions
+{
+    [CustomAssertion]
+    public AndWhichConstraint<WireMockAssertions, string> WithProxyUrl(string proxyUrl, string because = "", params object[] becauseArgs)
+    {
+        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ProxyUrl, proxyUrl, StringComparison.OrdinalIgnoreCase));
+
+        Execute.Assertion
+            .BecauseOf(because, becauseArgs)
+            .Given(() => RequestMessages)
+            .ForCondition(requests => CallsCount == 0 || requests.Any())
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but no calls were made.",
+                proxyUrl
+            )
+            .Then
+            .ForCondition(condition)
+            .FailWith(
+                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but didn't find it among the calls with {1}.",
+                _ => proxyUrl,
+                requests => requests.Select(request => request.ProxyUrl)
+            );
+
+        FilterRequestMessages(filter);
+
+        return new AndWhichConstraint<WireMockAssertions, string>(this, proxyUrl);
+    }
+}

src/WireMock.Net.FluentAssertions/Assertions/WireMockAssertions.cs

@@ -3,220 +3,42 @@ using System;
 using System.Collections.Generic;
 using WireMock.Matchers;
 using WireMock.Server;
-using WireMock.Types;
 
 // ReSharper disable once CheckNamespace
 namespace WireMock.FluentAssertions;
 
 public partial class WireMockAssertions
 {
-    private const string Any = "*";
+    public const string Any = "*";
-    private readonly int? _callsCount;
+
-    private IReadOnlyList<IRequestMessage> _requestMessages;
+    public int? CallsCount { get; }
-    private readonly IReadOnlyList<KeyValuePair<string, WireMockList<string>>> _headers;
+    public IReadOnlyList<IRequestMessage> RequestMessages { get; private set; }
 
     public WireMockAssertions(IWireMockServer subject, int? callsCount)
     {
-        _callsCount = callsCount;
+        CallsCount = callsCount;
-        _requestMessages = subject.LogEntries.Select(logEntry => logEntry.RequestMessage).ToList();
+        RequestMessages = subject.LogEntries.Select(logEntry => logEntry.RequestMessage).ToList();
-        _headers = _requestMessages.SelectMany(req => req.Headers).ToList();
     }
 
-    [CustomAssertion]
+    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, bool> predicate)
-    public AndWhichConstraint<WireMockAssertions, string> AtAbsoluteUrl(string absoluteUrl, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.AbsoluteUrl, absoluteUrl, StringComparison.OrdinalIgnoreCase));
-
-        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 url {0}{reason}, but no calls were made.",
-                absoluteUrl
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called at address matching the absolute url {0}{reason}, but didn't find it among the calls to {1}.",
-                _ => absoluteUrl, requests => requests.Select(request => request.AbsoluteUrl)
-            );
-
-        _requestMessages = filter(_requestMessages).ToList();
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, absoluteUrl);
-    }
-
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> AtUrl(string url, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.Url, url, StringComparison.OrdinalIgnoreCase));
-
-        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 url {0}{reason}, but no calls were made.",
-                url
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called at address matching the url {0}{reason}, but didn't find it among the calls to {1}.",
-                _ => url,
-                requests => requests.Select(request => request.Url)
-            );
-
-        _requestMessages = filter(_requestMessages).ToList();
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, url);
-    }
-
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> WithProxyUrl(string proxyUrl, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ProxyUrl, proxyUrl, StringComparison.OrdinalIgnoreCase));
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but no calls were made.",
-                proxyUrl
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called with proxy url {0}{reason}, but didn't find it among the calls with {1}.",
-                _ => proxyUrl,
-                requests => requests.Select(request => request.ProxyUrl)
-            );
-
-        _requestMessages = filter(_requestMessages).ToList();
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, proxyUrl);
-    }
-
-    [CustomAssertion]
-    public AndWhichConstraint<WireMockAssertions, string> FromClientIP(string clientIP, string because = "", params object[] becauseArgs)
-    {
-        var (filter, condition) = BuildFilterAndCondition(request => string.Equals(request.ClientIP, clientIP, StringComparison.OrdinalIgnoreCase));
-
-        Execute.Assertion
-            .BecauseOf(because, becauseArgs)
-            .Given(() => _requestMessages)
-            .ForCondition(requests => _callsCount == 0 || requests.Any())
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but no calls were made.",
-                clientIP
-            )
-            .Then
-            .ForCondition(condition)
-            .FailWith(
-                "Expected {context:wiremockserver} to have been called from client IP {0}{reason}, but didn't find it among the calls from IP(s) {1}.",
-                _ => clientIP, requests => requests.Select(request => request.ClientIP)
-            );
-
-        _requestMessages = filter(_requestMessages).ToList();
-
-        return new AndWhichConstraint<WireMockAssertions, string>(this, clientIP);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WitHeaderKey(string expectedKey, string because = "", params object[] becauseArgs)
-    {
-        using (new AssertionScope("headers from requests sent"))
-        {
-            _headers.Select(h => h.Key).Should().Contain(expectedKey, because, becauseArgs);
-        }
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string value, string because = "", params object[] becauseArgs)
-        => WithHeader(expectedKey, new[] { value }, because, becauseArgs);
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithHeader(string expectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
-    {
-        using (new AssertionScope($"header \"{expectedKey}\" from requests sent with value(s)"))
-        {
-            var matchingHeaderValues = _headers.Where(h => h.Key == expectedKey).SelectMany(h => h.Value.ToArray())
-                .ToArray();
-
-            if (expectedValues.Length == 1)
-            {
-                matchingHeaderValues.Should().Contain(expectedValues.First(), because, becauseArgs);
-            }
-            else
-            {
-                var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
-                foreach (var expectedValue in expectedValues)
-                {
-                    trimmedHeaderValues.Should().Contain(expectedValue, because, becauseArgs);
-                }
-            }
-        }
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithoutHeaderKey(string unexpectedKey, string because = "", params object[] becauseArgs)
-    {
-        using (new AssertionScope("headers from requests sent"))
-        {
-            _headers.Select(h => h.Key).Should().NotContain(unexpectedKey, because, becauseArgs);
-        }
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string value, string because = "", params object[] becauseArgs)
-        => WithoutHeader(unexpectedKey, new[] { value }, because, becauseArgs);
-
-    [CustomAssertion]
-    public AndConstraint<WireMockAssertions> WithoutHeader(string unexpectedKey, string[] expectedValues, string because = "", params object[] becauseArgs)
-    {
-        using (new AssertionScope($"header \"{unexpectedKey}\" from requests sent with value(s)"))
-        {
-            var matchingHeaderValues = _headers.Where(h => h.Key == unexpectedKey).SelectMany(h => h.Value.ToArray()).ToArray();
-
-            if (expectedValues.Length == 1)
-            {
-                matchingHeaderValues.Should().NotContain(expectedValues.First(), because, becauseArgs);
-            }
-            else
-            {
-                var trimmedHeaderValues = string.Join(",", matchingHeaderValues.Select(x => x)).Split(',').Select(x => x.Trim()).ToList();
-                foreach (var expectedValue in expectedValues)
-                {
-                    trimmedHeaderValues.Should().NotContain(expectedValue, because, becauseArgs);
-                }
-            }
-        }
-
-        return new AndConstraint<WireMockAssertions>(this);
-    }
-
-    private (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, bool> predicate)
     {
         Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter = requests => requests.Where(predicate).ToList();
 
-        return (filter, requests => (_callsCount is null && filter(requests).Any()) || _callsCount == filter(requests).Count);
+        return (filter, requests => (CallsCount is null && filter(requests).Any()) || CallsCount == filter(requests).Count);
     }
 
-    private (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, string?> expression, IStringMatcher matcher)
+    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, string?> expression, IStringMatcher matcher)
     {
         return BuildFilterAndCondition(r => matcher.IsMatch(expression(r)).IsPerfect());
     }
 
-    private (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, object?> expression, IObjectMatcher matcher)
+    public (Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> Filter, Func<IReadOnlyList<IRequestMessage>, bool> Condition) BuildFilterAndCondition(Func<IRequestMessage, object?> expression, IObjectMatcher matcher)
     {
         return BuildFilterAndCondition(r => matcher.IsMatch(expression(r)).IsPerfect());
     }
+
+    public void FilterRequestMessages(Func<IReadOnlyList<IRequestMessage>, IReadOnlyList<IRequestMessage>> filter)
+    {
+        RequestMessages = filter(RequestMessages).ToList();
+    }
 }

src/WireMock.Net.FluentAssertions/Assertions/WireMockReceivedAssertions.cs

@@ -2,8 +2,8 @@ using FluentAssertions.Primitives;
 using WireMock.Server;
 
 // ReSharper disable once CheckNamespace
-namespace WireMock.FluentAssertions
+namespace WireMock.FluentAssertions;
-{
+
 /// <summary>
 /// Contains a number of methods to assert that the <see cref="IWireMockServer"/> is in the expected state.
 /// </summary>
@@ -48,4 +48,3 @@ namespace WireMock.FluentAssertions
     /// <inheritdoc />
     protected override string Identifier => "wiremockserver";
 }
-}

src/WireMock.Net.Matchers.CSharpCode/Matchers/CSharpCodeMatcher.cs

@@ -33,6 +33,9 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
+    /// <inheritdoc />
+    public object Value { get; }
+
     private readonly AnyOf<string, StringPattern>[] _patterns;
 
     /// <summary>
@@ -54,6 +57,7 @@ internal class CSharpCodeMatcher : ICSharpCodeMatcher
         _patterns = Guard.NotNull(patterns);
         MatchBehaviour = matchBehaviour;
         MatchOperator = matchOperator;
+        Value = patterns;
     }
 
     public MatchResult IsMatch(string? input)

src/WireMock.Net.Matchers.CSharpCode/WireMock.Net.Matchers.CSharpCode.csproj

@@ -46,7 +46,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'netstandard2.1' or '$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
-    <PackageReference Include="CS-Script" Version="4.4.2" />
+    <PackageReference Include="CS-Script" Version="4.8.13" />
   </ItemGroup>
 
 </Project>

src/WireMock.Net.OpenApiParser/Settings/IWireMockOpenApiParserExampleValues.cs

@@ -11,47 +11,47 @@ public interface IWireMockOpenApiParserExampleValues
     /// <summary>
     /// An example value for a Boolean.
     /// </summary>
-    bool Boolean { get; set; }
+    bool Boolean { get; }
 
     /// <summary>
     /// An example value for an Integer.
     /// </summary>
-    int Integer { get; set; }
+    int Integer { get; }
 
     /// <summary>
     /// An example value for a Float.
     /// </summary>
-    float Float { get; set; }
+    float Float { get; }
 
     /// <summary>
     /// An example value for a Double.
     /// </summary>
-    double Double { get; set; }
+    double Double { get; }
 
     /// <summary>
     /// An example value for a Date.
     /// </summary>
-    Func<DateTime> Date { get; set; }
+    Func<DateTime> Date { get; }
 
     /// <summary>
     /// An example value for a DateTime.
     /// </summary>
-    Func<DateTime> DateTime { get; set; }
+    Func<DateTime> DateTime { get; }
 
     /// <summary>
     /// An example value for Bytes.
     /// </summary>
-    byte[] Bytes { get; set; }
+    byte[] Bytes { get; }
 
     /// <summary>
     /// An example value for a Object.
     /// </summary>
-    object Object { get; set; }
+    object Object { get; }
 
     /// <summary>
     /// An example value for a String.
     /// </summary>
-    string String { get; set; }
+    string String { get; }
 
     /// <summary>
     /// OpenApi Schema to generate dynamic examples more accurate

src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserDynamicExampleValues.cs

@@ -11,31 +11,31 @@ namespace WireMock.Net.OpenApiParser.Settings;
 public class WireMockOpenApiParserDynamicExampleValues : IWireMockOpenApiParserExampleValues
 {
     /// <inheritdoc />
-    public virtual bool Boolean { get => RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true; set { } }
+    public virtual bool Boolean => RandomizerFactory.GetRandomizer(new FieldOptionsBoolean()).Generate() ?? true;
 
     /// <inheritdoc />
-    public virtual int Integer { get => RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42; set { } }
+    public virtual int Integer => RandomizerFactory.GetRandomizer(new FieldOptionsInteger()).Generate() ?? 42;
 
     /// <inheritdoc />
-    public virtual float Float { get => RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f; set { } }
+    public virtual float Float => RandomizerFactory.GetRandomizer(new FieldOptionsFloat()).Generate() ?? 4.2f;
 
     /// <inheritdoc />
-    public virtual double Double { get => RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d; set { } }
+    public virtual double Double => RandomizerFactory.GetRandomizer(new FieldOptionsDouble()).Generate() ?? 4.2d;
 
     /// <inheritdoc />
-    public virtual Func<DateTime> Date { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow.Date; } set { } }
+    public virtual Func<DateTime> Date => () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow.Date;
 
     /// <inheritdoc />
-    public virtual Func<DateTime> DateTime { get { return () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow; } set { } }
+    public virtual Func<DateTime> DateTime => () => RandomizerFactory.GetRandomizer(new FieldOptionsDateTime()).Generate() ?? System.DateTime.UtcNow;
 
     /// <inheritdoc />
-    public virtual byte[] Bytes { get => RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate(); set { } }
+    public virtual byte[] Bytes => RandomizerFactory.GetRandomizer(new FieldOptionsBytes()).Generate();
 
     /// <inheritdoc />
-    public virtual object Object { get; set; } = "example-object";
+    public virtual object Object => "example-object";
 
     /// <inheritdoc />
-    public virtual string String { get => RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string"; set { } }
+    public virtual string String => RandomizerFactory.GetRandomizer(new FieldOptionsTextRegex { Pattern = @"^[0-9]{2}[A-Z]{5}[0-9]{2}" }).Generate() ?? "example-string";
 
     /// <inheritdoc />
     public virtual OpenApiSchema? Schema { get; set; }

src/WireMock.Net.OpenApiParser/Settings/WireMockOpenApiParserExampleValues.cs

@@ -9,31 +9,31 @@ namespace WireMock.Net.OpenApiParser.Settings;
 public class WireMockOpenApiParserExampleValues : IWireMockOpenApiParserExampleValues
 {
     /// <inheritdoc />
-    public virtual bool Boolean { get; set; } = true;
+    public virtual bool Boolean => true;
 
     /// <inheritdoc />
-    public virtual int Integer { get; set; } = 42;
+    public virtual int Integer => 42;
 
     /// <inheritdoc />
-    public virtual float Float { get; set; } = 4.2f;
+    public virtual float Float => 4.2f;
 
     /// <inheritdoc />
-    public virtual double Double { get; set; } = 4.2d;
+    public virtual double Double => 4.2d;
 
     /// <inheritdoc />
-    public virtual Func<DateTime> Date { get; set; } = () => System.DateTime.UtcNow.Date;
+    public virtual Func<DateTime> Date { get; } = () => System.DateTime.UtcNow.Date;
 
     /// <inheritdoc />
-    public virtual Func<DateTime> DateTime { get; set; } = () => System.DateTime.UtcNow;
+    public virtual Func<DateTime> DateTime { get; } = () => System.DateTime.UtcNow;
 
     /// <inheritdoc />
-    public virtual byte[] Bytes { get; set; } = { 48, 49, 50 };
+    public virtual byte[] Bytes { get; } = { 48, 49, 50 };
 
     /// <inheritdoc />
-    public virtual object Object { get; set; } = "example-object";
+    public virtual object Object => "example-object";
 
     /// <inheritdoc />
-    public virtual string String { get; set; } = "example-string";
+    public virtual string String => "example-string";
 
     /// <inheritdoc />
     public virtual OpenApiSchema? Schema { get; set; } = new();

src/WireMock.Net/Extensions/AnyOfExtensions.cs

@@ -5,18 +5,36 @@ using WireMock.Models;
 
 namespace WireMock.Extensions;
 
-internal static class AnyOfExtensions
+/// <summary>
+/// Some extensions for AnyOf.
+/// </summary>
+public static class AnyOfExtensions
 {
+    /// <summary>
+    /// Gets the pattern.
+    /// </summary>
+    /// <param name="value">AnyOf type</param>
+    /// <returns>string value</returns>
     public static string GetPattern(this AnyOf<string, StringPattern> value)
     {
         return value.IsFirst ? value.First : value.Second.Pattern;
     }
 
+    /// <summary>
+    /// Converts a string-patterns to AnyOf patterns.
+    /// </summary>
+    /// <param name="patterns">The string patterns</param>
+    /// <returns>The AnyOf patterns</returns>
     public static AnyOf<string, StringPattern>[] ToAnyOfPatterns(this IEnumerable<string> patterns)
     {
         return patterns.Select(p => p.ToAnyOfPattern()).ToArray();
     }
 
+    /// <summary>
+    /// Converts a string-pattern to AnyOf pattern.
+    /// </summary>
+    /// <param name="pattern">The string pattern</param>
+    /// <returns>The AnyOf pattern</returns>
     public static AnyOf<string, StringPattern> ToAnyOfPattern(this string pattern)
     {
         return new AnyOf<string, StringPattern>(pattern);

src/WireMock.Net/IMapping.cs

@@ -69,12 +69,12 @@ public interface IMapping
     int? StateTimes { get; }
 
     /// <summary>
-    /// The Request matcher.
+    /// The RequestMatcher.
     /// </summary>
     IRequestMatcher RequestMatcher { get; }
 
     /// <summary>
-    /// The Provider.
+    /// The ResponseProvider.
     /// </summary>
     IResponseProvider Provider { get; }
 
@@ -136,6 +136,11 @@ public interface IMapping
     /// </summary>
     double? Probability { get; }
 
+    /// <summary>
+    /// The Grpc ProtoDefinition which is used for this mapping (request and response). [Optional]
+    /// </summary>
+    IdOrText? ProtoDefinition { get; }
+
     /// <summary>
     /// ProvideResponseAsync
     /// </summary>
@@ -150,4 +155,44 @@ public interface IMapping
     /// <param name="nextState">The Next State.</param>
     /// <returns>The <see cref="IRequestMatchResult"/>.</returns>
     IRequestMatchResult GetRequestMatchResult(IRequestMessage requestMessage, string? nextState);
+
+    /// <summary>
+    /// Define the scenario.
+    /// </summary>
+    /// <param name="scenario">The scenario.</param>
+    /// <returns>The <see cref="IMapping"/>.</returns>
+    IMapping WithScenario(string scenario);
+
+    /// <summary>
+    /// Define the probability when this request should be matched. [Optional]
+    /// </summary>
+    /// <param name="probability">The probability.</param>
+    /// <returns>The <see cref="IMapping"/>.</returns>
+    IMapping WithProbability(double probability);
+
+    /// <summary>
+    /// Define a Grpc ProtoDefinition which is used for this mapping (request and response).
+    /// </summary>
+    /// <param name="protoDefinition">The proto definition as text.</param>
+    /// <returns>The <see cref="IMapping"/>.</returns>
+    IMapping WithProtoDefinition(IdOrText protoDefinition);
 }
+
+/*
+    executionConditionState">State in which the current mapping can occur. [Optional]
+    nextState">The next state which will occur after the current mapping execution. [Optional]
+    stateTimes">Only when the current state is executed this number, the next state which will occur. [Optional]
+    webhooks">The Webhooks. [Optional]
+    useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]
+    timeSettings">The TimeSettings. [Optional]
+    data">The data object. [Optional]
+    
+ 
+    string? executionConditionState,
+    string? nextState,
+    int? stateTimes,
+    IWebhook[]? webhooks,
+    bool? useWebhooksFireAndForget,
+    ITimeSettings? timeSettings,
+    object? data,
+*/

src/WireMock.Net/Logging/WireMockConsoleLogger.cs

@@ -14,9 +14,13 @@ public class WireMockConsoleLogger : IWireMockLogger
     /// Initializes a new instance of the <see cref="WireMockConsoleLogger"/> class.
     /// </summary>
     public WireMockConsoleLogger()
+    {
+        try
         {
             Console.OutputEncoding = System.Text.Encoding.UTF8;
         }
+        catch { }
+    }
 
     /// <see cref="IWireMockLogger.Debug"/>
     public void Debug(string formatString, params object[] args)

src/WireMock.Net/Mapping.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Threading.Tasks;
+using Stef.Validation;
 using WireMock.Matchers.Request;
 using WireMock.Models;
 using WireMock.ResponseProviders;
@@ -31,7 +32,7 @@ public class Mapping : IMapping
     public int Priority { get; }
 
     /// <inheritdoc />
-    public string? Scenario { get; }
+    public string? Scenario { get; private set; }
 
     /// <inheritdoc />
     public string? ExecutionConditionState { get; }
@@ -76,7 +77,10 @@ public class Mapping : IMapping
     public object? Data { get; }
 
     /// <inheritdoc />
-    public double? Probability { get; }
+    public double? Probability { get; private set; }
+
+    /// <inheritdoc />
+    public IdOrText? ProtoDefinition { get; private set; }
 
     /// <summary>
     /// Initializes a new instance of the <see cref="Mapping"/> class.
@@ -98,8 +102,8 @@ public class Mapping : IMapping
     /// <param name="useWebhooksFireAndForget">Use Fire and Forget for the defined webhook(s). [Optional]</param>
     /// <param name="timeSettings">The TimeSettings. [Optional]</param>
     /// <param name="data">The data object. [Optional]</param>
-    /// <param name="probability">Define the probability when this request should be matched. [Optional]</param>
+    public Mapping
-    public Mapping(
+    (
         Guid guid,
         DateTime updatedAt,
         string? title,
@@ -116,8 +120,8 @@ public class Mapping : IMapping
         IWebhook[]? webhooks,
         bool? useWebhooksFireAndForget,
         ITimeSettings? timeSettings,
-        object? data,
+        object? data
-        double? probability)
+    )
     {
         Guid = guid;
         UpdatedAt = updatedAt;
@@ -136,7 +140,6 @@ public class Mapping : IMapping
         UseWebhooksFireAndForget = useWebhooksFireAndForget;
         TimeSettings = timeSettings;
         Data = data;
-        Probability = probability;
     }
 
     /// <inheritdoc />
@@ -168,4 +171,25 @@ public class Mapping : IMapping
 
         return result;
     }
+
+    /// <inheritdoc />
+    public IMapping WithProbability(double probability)
+    {
+        Probability = Guard.NotNull(probability);
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IMapping WithScenario(string scenario)
+    {
+        Scenario = Guard.NotNullOrWhiteSpace(scenario);
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IMapping WithProtoDefinition(IdOrText protoDefinition)
+    {
+        ProtoDefinition = protoDefinition;
+        return this;
+    }
 }

src/WireMock.Net/MappingBuilder.cs

@@ -6,6 +6,8 @@ using Stef.Validation;
 using WireMock.Admin.Mappings;
 using WireMock.Matchers.Request;
 using WireMock.Owin;
+using WireMock.RequestBuilders;
+using WireMock.ResponseBuilders;
 using WireMock.Serialization;
 using WireMock.Server;
 using WireMock.Settings;
@@ -146,6 +148,15 @@ public class MappingBuilder : IMappingBuilder
         {
             _mappingToFileSaver.SaveMappingToFile(mapping);
         }
+
+        // Link this mapping to the Request
+        ((Request)mapping.RequestMatcher).Mapping = mapping;
+
+        // Link this mapping to the Response
+        if (mapping.Provider is Response response)
+        {
+            response.Mapping = mapping;
+        }
     }
 
     private static string ToJson(object value)

src/WireMock.Net/Matchers/AbstractJsonPartialMatcher.cs

@@ -10,20 +10,15 @@ namespace WireMock.Matchers;
 /// </summary>
 public abstract class AbstractJsonPartialMatcher : JsonMatcher
 {
-    /// <summary>
-    /// Support Regex
-    /// </summary>
-    public bool Regex { get; }
-
     /// <summary>
     /// Initializes a new instance of the <see cref="AbstractJsonPartialMatcher"/> class.
     /// </summary>
     /// <param name="value">The string value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    protected AbstractJsonPartialMatcher(string value, bool ignoreCase = false, bool regex = false) : base(value, ignoreCase)
+    protected AbstractJsonPartialMatcher(string value, bool ignoreCase = false, bool regex = false) :
+        base(value, ignoreCase, regex)
     {
-        Regex = regex;
     }
 
     /// <summary>
@@ -32,9 +27,9 @@ public abstract class AbstractJsonPartialMatcher : JsonMatcher
     /// <param name="value">The object value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    protected AbstractJsonPartialMatcher(object value, bool ignoreCase = false, bool regex = false) : base(value, ignoreCase)
+    protected AbstractJsonPartialMatcher(object value, bool ignoreCase = false, bool regex = false) :
+        base(value, ignoreCase, regex)
     {
-        Regex = regex;
     }
 
     /// <summary>
@@ -44,15 +39,15 @@ public abstract class AbstractJsonPartialMatcher : JsonMatcher
     /// <param name="value">The value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
     /// <param name="regex">Support Regex.</param>
-    protected AbstractJsonPartialMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false) : base(matchBehaviour, value, ignoreCase)
+    protected AbstractJsonPartialMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false) :
+        base(matchBehaviour, value, ignoreCase, regex)
     {
-        Regex = regex;
     }
 
     /// <inheritdoc />
-    protected override bool IsMatch(JToken? value, JToken? input)
+    protected override bool IsMatch(JToken value, JToken? input)
     {
-        if (value == null || value == input)
+        if (value == input)
         {
             return true;
         }
@@ -72,7 +67,7 @@ public abstract class AbstractJsonPartialMatcher : JsonMatcher
             ((value.Type == JTokenType.Guid && input.Type == JTokenType.String) ||
             (value.Type == JTokenType.String && input.Type == JTokenType.Guid)))
         {
-            return IsMatch(value.ToString(), input.ToString());
+            return IsMatch(value.ToString().ToUpperInvariant(), input.ToString().ToUpperInvariant());
         }
 
         if (input == null || value.Type != input.Type)

src/WireMock.Net/Matchers/ExactMatcher.cs

@@ -17,6 +17,15 @@ public class ExactMatcher : IStringMatcher, IIgnoreCaseMatcher
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param> 
+    /// <param name="value">The string value.</param>
+    public ExactMatcher(MatchBehaviour matchBehaviour, string value) : this(matchBehaviour, true, MatchOperator.Or, new AnyOf<string, StringPattern>(value))
+    {
+    }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="ExactMatcher"/> class.
     /// </summary>

src/WireMock.Net/Matchers/ExactObjectMatcher.cs

@@ -9,15 +9,8 @@ namespace WireMock.Matchers;
 /// <seealso cref="IObjectMatcher" />
 public class ExactObjectMatcher : IObjectMatcher
 {
-    /// <summary>
+    /// <inheritdoc />
-    /// Gets the value as object.
+    public object Value { get; }
-    /// </summary>
-    public object? ValueAsObject { get; }
-
-    /// <summary>
-    /// Gets the value as byte[].
-    /// </summary>
-    public byte[]? ValueAsBytes { get; }
 
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
@@ -37,7 +30,7 @@ public class ExactObjectMatcher : IObjectMatcher
     /// <param name="value">The value.</param>
     public ExactObjectMatcher(MatchBehaviour matchBehaviour, object value)
     {
-        ValueAsObject = Guard.NotNull(value);
+        Value = Guard.NotNull(value);
         MatchBehaviour = matchBehaviour;
     }
 
@@ -56,21 +49,21 @@ public class ExactObjectMatcher : IObjectMatcher
     /// <param name="value">The value.</param>
     public ExactObjectMatcher(MatchBehaviour matchBehaviour, byte[] value)
     {
-        ValueAsBytes = Guard.NotNull(value);
+        Value = Guard.NotNull(value);
         MatchBehaviour = matchBehaviour;
     }
 
     /// <inheritdoc />
     public MatchResult IsMatch(object? input)
     {
-        bool equals = false;
+        bool equals;
-        if (ValueAsObject != null)
+        if (Value is byte[] valueAsBytes && input is byte[] inputAsBytes)
         {
-            equals = Equals(ValueAsObject, input);
+            equals = valueAsBytes.SequenceEqual(inputAsBytes);
         }
-        else if (input != null)
+        else
         {
-            equals = ValueAsBytes?.SequenceEqual((byte[])input) == true;
+            equals = Equals(Value, input);
         }
 
         return MatchBehaviourHelper.Convert(MatchBehaviour, MatchScores.ToScore(equals));

src/WireMock.Net/Matchers/IBytesMatcher.cs

@@ -0,0 +1,18 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// IBytesMatcher
+/// </summary>
+public interface IBytesMatcher : IMatcher
+{
+    /// <summary>
+    /// Determines whether the specified input is match.
+    /// </summary>
+    /// <param name="input">The input byte array.</param>
+    /// <param name="cancellationToken">The CancellationToken [optional].</param>
+    /// <returns>MatchResult</returns>
+    Task<MatchResult> IsMatchAsync(byte[]? input, CancellationToken cancellationToken = default);
+}

src/WireMock.Net/Matchers/IDecodeMatcher.cs

@@ -0,0 +1,18 @@
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// IDecodeBytesMatcher
+/// </summary>
+public interface IDecodeBytesMatcher
+{
+    /// <summary>
+    /// Decode byte array to an object.
+    /// </summary>
+    /// <param name="input">The byte array</param>
+    /// <param name="cancellationToken">The CancellationToken [optional].</param>
+    /// <returns>object</returns>
+    Task<object?> DecodeAsync(byte[]? input, CancellationToken cancellationToken = default);
+}

src/WireMock.Net/Matchers/IJsonMatcher.cs

@@ -0,0 +1,9 @@
+namespace WireMock.Matchers;
+
+/// <summary>
+/// IJsonMatcher
+/// <seealso cref="IObjectMatcher"/> and <seealso cref="IIgnoreCaseMatcher"/>.
+/// </summary>
+public interface IJsonMatcher : IObjectMatcher, IIgnoreCaseMatcher
+{
+}

src/WireMock.Net/Matchers/IObjectMatcher.cs

@@ -5,6 +5,12 @@ namespace WireMock.Matchers;
 /// </summary>
 public interface IObjectMatcher : IMatcher
 {
+    /// <summary>
+    /// Gets the value (can be a string or an object).
+    /// </summary>
+    /// <returns>Value</returns>
+    object Value { get; }
+
     /// <summary>
     /// Determines whether the specified input is match.
     /// </summary>

src/WireMock.Net/Matchers/IProtoBufMatcher.cs

@@ -0,0 +1,8 @@
+namespace WireMock.Matchers;
+
+/// <summary>
+/// IProtoBufMatcher
+/// </summary>
+public interface IProtoBufMatcher : IDecodeBytesMatcher, IBytesMatcher
+{
+}

src/WireMock.Net/Matchers/IValueMatcher.cs

@@ -1,14 +0,0 @@
-namespace WireMock.Matchers;
-
-/// <summary>
-/// IValueMatcher
-/// </summary>
-/// <seealso cref="IObjectMatcher" />
-public interface IValueMatcher : IObjectMatcher
-{
-    /// <summary>
-    /// Gets the value (can be a string or an object).
-    /// </summary>
-    /// <returns>Value</returns>
-    object Value { get; }
-}

src/WireMock.Net/Matchers/JSONPathMatcher.cs

@@ -11,7 +11,7 @@ namespace WireMock.Matchers;
 /// <summary>
 /// JsonPathMatcher
 /// </summary>
-/// <seealso cref="IMatcher" />
+/// <seealso cref="IStringMatcher" />
 /// <seealso cref="IObjectMatcher" />
 public class JsonPathMatcher : IStringMatcher, IObjectMatcher
 {
@@ -20,6 +20,9 @@ public class JsonPathMatcher : IStringMatcher, IObjectMatcher
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
+    /// <inheritdoc />
+    public object Value { get; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="JsonPathMatcher"/> class.
     /// </summary>
@@ -52,6 +55,7 @@ public class JsonPathMatcher : IStringMatcher, IObjectMatcher
         _patterns = Guard.NotNull(patterns);
         MatchBehaviour = matchBehaviour;
         MatchOperator = matchOperator;
+        Value = patterns;
     }
 
     /// <inheritdoc />

src/WireMock.Net/Matchers/JmesPathMatcher.cs

@@ -16,6 +16,9 @@ public class JmesPathMatcher : IStringMatcher, IObjectMatcher
 {
     private readonly AnyOf<string, StringPattern>[] _patterns;
 
+    /// <inheritdoc />
+    public object Value { get; }
+
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
@@ -59,6 +62,7 @@ public class JmesPathMatcher : IStringMatcher, IObjectMatcher
         _patterns = Guard.NotNull(patterns);
         MatchBehaviour = matchBehaviour;
         MatchOperator = matchOperator;
+        Value = patterns;
     }
 
     /// <inheritdoc />

src/WireMock.Net/Matchers/JsonMatcher.cs

@@ -1,21 +1,22 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json.Linq;
 using Stef.Validation;
 using WireMock.Util;
+using JsonUtils = WireMock.Util.JsonUtils;
 
 namespace WireMock.Matchers;
 
 /// <summary>
 /// JsonMatcher
 /// </summary>
-public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
+public class JsonMatcher : IJsonMatcher
 {
     /// <inheritdoc />
-    public virtual string Name => "JsonMatcher";
+    public virtual string Name => nameof(JsonMatcher);
 
-    /// <inheritdoc cref="IValueMatcher.Value"/>
+    /// <inheritdoc />
     public object Value { get; }
 
     /// <inheritdoc />
@@ -24,6 +25,11 @@ public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
     /// <inheritdoc cref="IIgnoreCaseMatcher.IgnoreCase"/>
     public bool IgnoreCase { get; }
 
+    /// <summary>
+    /// Support Regex
+    /// </summary>
+    public bool Regex { get; }
+
     private readonly JToken _valueAsJToken;
     private readonly Func<JToken, JToken> _jTokenConverter;
 
@@ -32,7 +38,8 @@ public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
     /// </summary>
     /// <param name="value">The string value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    public JsonMatcher(string value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
+    /// <param name="regex">Support Regex.</param>
+    public JsonMatcher(string value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
     {
     }
 
@@ -41,7 +48,8 @@ public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
     /// </summary>
     /// <param name="value">The object value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    public JsonMatcher(object value, bool ignoreCase = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase)
+    /// <param name="regex">Support Regex.</param>
+    public JsonMatcher(object value, bool ignoreCase = false, bool regex = false) : this(MatchBehaviour.AcceptOnMatch, value, ignoreCase, regex)
     {
     }
 
@@ -51,15 +59,17 @@ public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="value">The value to check for equality.</param>
     /// <param name="ignoreCase">Ignore the case from the PropertyName and PropertyValue (string only).</param>
-    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false)
+    /// <param name="regex">Support Regex.</param>
+    public JsonMatcher(MatchBehaviour matchBehaviour, object value, bool ignoreCase = false, bool regex = false)
     {
         Guard.NotNull(value);
 
         MatchBehaviour = matchBehaviour;
         IgnoreCase = ignoreCase;
+        Regex = regex;
 
         Value = value;
-        _valueAsJToken = ConvertValueToJToken(value);
+        _valueAsJToken = JsonUtils.ConvertValueToJToken(value);
         _jTokenConverter = ignoreCase ? Rename : jToken => jToken;
     }
 
@@ -74,7 +84,7 @@ public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
         {
             try
             {
-                var inputAsJToken = ConvertValueToJToken(input);
+                var inputAsJToken = JsonUtils.ConvertValueToJToken(input);
 
                 var match = IsMatch(_jTokenConverter(_valueAsJToken), _jTokenConverter(inputAsJToken));
                 score = MatchScores.ToScore(match);
@@ -94,27 +104,78 @@ public class JsonMatcher : IValueMatcher, IIgnoreCaseMatcher
     /// <param name="value">Matcher value</param>
     /// <param name="input">Input value</param>
     /// <returns></returns>
-    protected virtual bool IsMatch(JToken value, JToken input)
+    protected virtual bool IsMatch(JToken value, JToken? input)
     {
-        return JToken.DeepEquals(value, input);
+        // If equal, return true.
+        if (input == value)
+        {
+            return true;
         }
 
-    private static JToken ConvertValueToJToken(object value)
+        // If input is null, return false.
+        if (input == null)
         {
-        // Check if JToken, string, IEnumerable or object
+            return false;
-        switch (value)
+        }
+
+        // If using Regex and the value is a string, use the MatchRegex method.
+        if (Regex && value.Type == JTokenType.String)
         {
-            case JToken tokenValue:
+            var valueAsString = value.ToString();
-                return tokenValue;
 
-            case string stringValue:
+            var (valid, result) = RegexUtils.MatchRegex(valueAsString, input.ToString());
-                return JsonUtils.Parse(stringValue);
+            if (valid)
+            {
+                return result;
+            }
+        }
 
-            case IEnumerable enumerableValue:
+        // If the value is a Guid and the input is a string, or vice versa, convert them to strings and compare the string values.
-                return JArray.FromObject(enumerableValue);
+        if ((value.Type == JTokenType.Guid && input.Type == JTokenType.String) || (value.Type == JTokenType.String && input.Type == JTokenType.Guid))
+        {
+            return JToken.DeepEquals(value.ToString().ToUpperInvariant(), input.ToString().ToUpperInvariant());
+        }
+
+        switch (value.Type)
+        {
+            // If the value is an object, compare all properties.
+            case JTokenType.Object:
+                var valueProperties = value.ToObject<Dictionary<string, JToken>>() ?? new Dictionary<string, JToken>();
+                var inputProperties = input.ToObject<Dictionary<string, JToken>>() ?? new Dictionary<string, JToken>();
+
+                // If the number of properties is different, return false.
+                if (valueProperties.Count != inputProperties.Count)
+                {
+                    return false;
+                }
+
+                // Compare all properties. The input must match all properties of the value.
+                foreach (var pair in valueProperties)
+                {
+                    if (!IsMatch(pair.Value, inputProperties[pair.Key]))
+                    {
+                        return false;
+                    }
+                }
+
+                return true;
+
+            // If the value is an array, compare all elements.
+            case JTokenType.Array:
+                var valueArray = value.ToObject<JToken[]>() ?? EmptyArray<JToken>.Value;
+                var inputArray = input.ToObject<JToken[]>() ?? EmptyArray<JToken>.Value;
+
+                // If the number of elements is different, return false.
+                if (valueArray.Length != inputArray.Length)
+                {
+                    return false;
+                }
+
+                return !valueArray.Where((valueToken, index) => !IsMatch(valueToken, inputArray[index])).Any();
 
             default:
-                return JObject.FromObject(value);
+                // Use JToken.DeepEquals() for all other types.
+                return JToken.DeepEquals(value, input);
         }
     }
 

src/WireMock.Net/Matchers/LinqMatcher.cs

@@ -22,6 +22,9 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
+    /// <inheritdoc />
+    public object Value { get; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="LinqMatcher"/> class.
     /// </summary>
@@ -61,6 +64,7 @@ public class LinqMatcher : IObjectMatcher, IStringMatcher
         _patterns = Guard.NotNull(patterns);
         MatchBehaviour = matchBehaviour;
         MatchOperator = matchOperator;
+        Value = patterns;
     }
 
     /// <inheritdoc />

src/WireMock.Net/Matchers/MatchBehaviourHelper.cs

@@ -23,4 +23,11 @@ internal static class MatchBehaviourHelper
 
         return match <= MatchScores.Tolerance ? MatchScores.Perfect : MatchScores.Mismatch;
     }
+
+    internal static MatchResult Convert(MatchBehaviour matchBehaviour, MatchResult result)
+    {
+        return matchBehaviour == MatchBehaviour.AcceptOnMatch ?
+            result :
+            new MatchResult(Convert(matchBehaviour, result.Score), result.Exception);
+    }
 }

src/WireMock.Net/Matchers/NotNullOrEmptyMatcher.cs

@@ -17,6 +17,9 @@ public class NotNullOrEmptyMatcher : IObjectMatcher, IStringMatcher
     /// <inheritdoc />
     public MatchBehaviour MatchBehaviour { get; }
 
+    /// <inheritdoc />
+    public object Value { get; }
+
     /// <summary>
     /// Initializes a new instance of the <see cref="NotNullOrEmptyMatcher"/> class.
     /// </summary>
@@ -24,6 +27,7 @@ public class NotNullOrEmptyMatcher : IObjectMatcher, IStringMatcher
     public NotNullOrEmptyMatcher(MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
         MatchBehaviour = matchBehaviour;
+        Value = string.Empty;
     }
 
     /// <inheritdoc />

src/WireMock.Net/Matchers/ProtoBufMatcher.cs

@@ -0,0 +1,114 @@
+#if PROTOBUF
+using System;
+using System.Threading;
+using System.Threading.Tasks;
+using ProtoBufJsonConverter;
+using ProtoBufJsonConverter.Models;
+using Stef.Validation;
+using WireMock.Models;
+using WireMock.Util;
+
+namespace WireMock.Matchers;
+
+/// <summary>
+/// Grpc ProtoBuf Matcher
+/// </summary>
+/// <inheritdoc cref="IProtoBufMatcher"/>
+public class ProtoBufMatcher : IProtoBufMatcher
+{
+    /// <inheritdoc />
+    public string Name => nameof(ProtoBufMatcher);
+
+    /// <inheritdoc />
+    public MatchBehaviour MatchBehaviour { get; }
+
+    /// <summary>
+    /// The Func to define The proto definition as text.
+    /// </summary>
+    public Func<IdOrText> ProtoDefinition { get; }
+
+    /// <summary>
+    /// The full type of the protobuf (request/response) message object. Format is "{package-name}.{type-name}".
+    /// </summary>
+    public string MessageType { get; }
+
+    /// <summary>
+    /// The Matcher to use (optional).
+    /// </summary>
+    public IObjectMatcher? Matcher { get; }
+
+    private static readonly Converter ProtoBufToJsonConverter = SingletonFactory<Converter>.GetInstance();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ProtoBufMatcher"/> class.
+    /// </summary>
+    /// <param name="protoDefinition">The proto definition.</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>
+    /// <param name="matcher">The optional jsonMatcher to use to match the ProtoBuf as (json) object.</param>
+    public ProtoBufMatcher(
+        Func<IdOrText> protoDefinition,
+        string messageType,
+        MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch,
+        IObjectMatcher? matcher = null
+    )
+    {
+        ProtoDefinition = Guard.NotNull(protoDefinition);
+        MessageType = Guard.NotNullOrWhiteSpace(messageType);
+        Matcher = matcher;
+        MatchBehaviour = matchBehaviour;
+    }
+
+    /// <inheritdoc />
+    public async Task<MatchResult> IsMatchAsync(byte[]? input, CancellationToken cancellationToken = default)
+    {
+        var result = new MatchResult();
+
+        if (input != null)
+        {
+            try
+            {
+                var instance = await DecodeAsync(input, true, cancellationToken).ConfigureAwait(false);
+
+                result = Matcher?.IsMatch(instance) ?? new MatchResult(MatchScores.Perfect);
+            }
+            catch (Exception e)
+            {
+                result = new MatchResult(MatchScores.Mismatch, e);
+            }
+        }
+
+        return MatchBehaviourHelper.Convert(MatchBehaviour, result);
+    }
+
+    /// <inheritdoc />
+    public Task<object?> DecodeAsync(byte[]? input, CancellationToken cancellationToken = default)
+    {
+        return DecodeAsync(input, false, cancellationToken);
+    }
+
+    private async Task<object?> DecodeAsync(byte[]? input, bool throwException, CancellationToken cancellationToken)
+    {
+        if (input == null)
+        {
+            return null;
+        }
+
+        var request = new ConvertToObjectRequest(ProtoDefinition().Text, MessageType, input);
+
+        try
+        {
+            return await ProtoBufToJsonConverter.ConvertAsync(request, cancellationToken).ConfigureAwait(false);
+        }
+        catch
+        {
+            if (throwException)
+            {
+                throw;
+            }
+
+            return null;
+        }
+    }
+}
+#endif

src/WireMock.Net/Matchers/Request/RequestMessageCompositeMatcher.cs

@@ -26,10 +26,8 @@ public abstract class RequestMessageCompositeMatcher : IRequestMatcher
     /// <param name="type">The CompositeMatcherType type (Defaults to 'And')</param>
     protected RequestMessageCompositeMatcher(IEnumerable<IRequestMatcher> requestMatchers, CompositeMatcherType type = CompositeMatcherType.And)
     {
-        Guard.NotNull(requestMatchers);
+        RequestMatchers = Guard.NotNull(requestMatchers);
-
         _type = type;
-        RequestMatchers = requestMatchers;
     }
 
     /// <inheritdoc />

src/WireMock.Net/Matchers/Request/RequestMessageGraphQLMatcher.cs

@@ -26,7 +26,7 @@ public class RequestMessageGraphQLMatcher : IRequestMatcher
     /// </summary>
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="schema">The schema.</param>
-    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. [optional]</param>
     public RequestMessageGraphQLMatcher(MatchBehaviour matchBehaviour, string schema, IDictionary<string, Type>? customScalars = null) :
         this(CreateMatcherArray(matchBehaviour, schema, customScalars))
     {
@@ -38,7 +38,7 @@ public class RequestMessageGraphQLMatcher : IRequestMatcher
     /// </summary>
     /// <param name="matchBehaviour">The match behaviour.</param>
     /// <param name="schema">The schema.</param>
-    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. [optional]</param>
     public RequestMessageGraphQLMatcher(MatchBehaviour matchBehaviour, GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars = null) :
         this(CreateMatcherArray(matchBehaviour, new AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern, GraphQL.Types.ISchema>(schema), customScalars))
     {
@@ -94,8 +94,7 @@ public class RequestMessageGraphQLMatcher : IRequestMatcher
 #if GRAPHQL
     private static IMatcher[] CreateMatcherArray(
         MatchBehaviour matchBehaviour,
-        AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern,
+        AnyOfTypes.AnyOf<string, WireMock.Models.StringPattern, GraphQL.Types.ISchema> schema,
-        GraphQL.Types.ISchema> schema,
         IDictionary<string, Type>? customScalars
     )
     {

src/WireMock.Net/Matchers/Request/RequestMessageHttpVersionMatcher.cs

@@ -0,0 +1,86 @@
+using System;
+using System.Linq;
+using Stef.Validation;
+
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request HTTP Version matcher.
+/// </summary>
+public class RequestMessageHttpVersionMatcher : IRequestMatcher
+{
+    /// <summary>
+    /// The matcher.
+    /// </summary>
+    public IStringMatcher? Matcher { get; }
+
+    /// <summary>
+    /// The func.
+    /// </summary>
+    public Func<string, bool>? Func { get; }
+
+    /// <summary>
+    /// The <see cref="MatchBehaviour"/>
+    /// </summary>
+    public MatchBehaviour Behaviour { get; }
+
+    /// <summary>
+    /// The HTTP Version
+    /// </summary>
+    public string? HttpVersion { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageHttpVersionMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="httpVersion">The HTTP Version.</param>
+    public RequestMessageHttpVersionMatcher(MatchBehaviour matchBehaviour, string httpVersion) :
+        this(matchBehaviour, new ExactMatcher(matchBehaviour, httpVersion))
+    {
+        HttpVersion = httpVersion;
+        Behaviour = matchBehaviour;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour.</param>
+    /// <param name="matcher">The matcher.</param>
+    public RequestMessageHttpVersionMatcher(MatchBehaviour matchBehaviour, IStringMatcher matcher)
+    {
+        Matcher = Guard.NotNull(matcher);
+        Behaviour = matchBehaviour;
+        HttpVersion = matcher.GetPatterns().FirstOrDefault();
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageClientIPMatcher"/> class.
+    /// </summary>
+    /// <param name="func">The function.</param>
+    public RequestMessageHttpVersionMatcher(Func<string, bool> func)
+    {
+        Func = Guard.NotNull(func);
+    }
+
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        var (score, exception) = GetMatchResult(requestMessage).Expand();
+        return requestMatchResult.AddScore(GetType(), score, exception);
+    }
+
+    private MatchResult GetMatchResult(IRequestMessage requestMessage)
+    {
+        if (Matcher != null)
+        {
+            return Matcher.IsMatch(requestMessage.HttpVersion);
+        }
+
+        if (Func != null)
+        {
+            return MatchScores.ToScore(Func(requestMessage.HttpVersion));
+        }
+
+        return default;
+    }
+}

src/WireMock.Net/Matchers/Request/RequestMessageProtoBufMatcher.cs

@@ -0,0 +1,43 @@
+using System;
+using WireMock.Models;
+
+namespace WireMock.Matchers.Request;
+
+/// <summary>
+/// The request body Grpc ProtoBuf matcher.
+/// </summary>
+public class RequestMessageProtoBufMatcher : IRequestMatcher
+{
+    /// <summary>
+    /// The ProtoBufMatcher.
+    /// </summary>
+    public IProtoBufMatcher? Matcher { get; }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RequestMessageProtoBufMatcher"/> class.
+    /// </summary>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <param name="protoDefinition">The Func to define 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 optional matcher to use to match the ProtoBuf as (json) object.</param>
+    public RequestMessageProtoBufMatcher(MatchBehaviour matchBehaviour, Func<IdOrText> 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
+    }
+
+    /// <inheritdoc />
+    public double GetMatchingScore(IRequestMessage requestMessage, IRequestMatchResult requestMatchResult)
+    {
+        var (score, exception) = GetMatchResult(requestMessage).Expand();
+        return requestMatchResult.AddScore(GetType(), score, exception);
+    }
+
+    private MatchResult GetMatchResult(IRequestMessage requestMessage)
+    {
+        return Matcher?.IsMatchAsync(requestMessage.BodyAsBytes).GetAwaiter().GetResult() ?? default;
+    }
+}

src/WireMock.Net/Models/BodyData.cs

@@ -1,7 +1,10 @@
+using System;
 using System.Collections.Generic;
 using System.Text;
+using WireMock.Models;
 using WireMock.Types;
 
+// ReSharper disable once CheckNamespace
 namespace WireMock.Util;
 
 /// <summary>
@@ -9,7 +12,7 @@ namespace WireMock.Util;
 /// </summary>
 public class BodyData : IBodyData
 {
-    /// <inheritdoc cref="IBodyData.Encoding" />
+    /// <inheritdoc />
     public Encoding? Encoding { get; set; }
 
     /// <inheritdoc />
@@ -18,30 +21,38 @@ public class BodyData : IBodyData
     /// <inheritdoc />
     public IDictionary<string, string>? BodyAsFormUrlEncoded { get; set; }
 
-    /// <inheritdoc cref="IBodyData.BodyAsJson" />
+    /// <inheritdoc />
     public object? BodyAsJson { get; set; }
 
-    /// <inheritdoc cref="IBodyData.BodyAsBytes" />
+    /// <inheritdoc />
     public byte[]? BodyAsBytes { get; set; }
     
-    /// <inheritdoc cref="IBodyData.BodyAsJsonIndented" />
+    /// <inheritdoc />
     public bool? BodyAsJsonIndented { get; set; }
 
-    /// <inheritdoc cref="IBodyData.BodyAsFile" />
+    /// <inheritdoc />
     public string? BodyAsFile { get; set; }
 
-    /// <inheritdoc cref="IBodyData.BodyAsFileIsCached" />
+    /// <inheritdoc />
     public bool? BodyAsFileIsCached { get; set; }
 
-    /// <inheritdoc cref="IBodyData.DetectedBodyType" />
+    /// <inheritdoc />
     public BodyType? DetectedBodyType { get; set; }
 
-    /// <inheritdoc cref="IBodyData.DetectedBodyTypeFromContentType" />
+    /// <inheritdoc />
     public BodyType? DetectedBodyTypeFromContentType { get; set; }
 
-    /// <inheritdoc cref="IRequestMessage.DetectedCompression" />
+    /// <inheritdoc />
     public string? DetectedCompression { get; set; }
 
     /// <inheritdoc />
     public string? IsFuncUsed { get; set; }
+
+    #region ProtoBuf
+    /// <inheritdoc />
+    public Func<IdOrText>? ProtoDefinition { get; set; }
+
+    /// <inheritdoc />
+    public string? ProtoBufMessageType { get; set; }
+    #endregion
 }

src/WireMock.Net/Models/GraphQLSchemaDetails.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using AnyOfTypes;
+using Newtonsoft.Json;
+
+namespace WireMock.Models;
+
+/// <summary>
+/// GraphQLSchemaDetails
+/// </summary>
+public class GraphQLSchemaDetails
+{
+    /// <summary>
+    /// The GraphQL schema as a string.
+    /// </summary>
+    public string? SchemaAsString { get; set; }
+
+    /// <summary>
+    /// The GraphQL schema as a StringPattern.
+    /// </summary>
+    public StringPattern? SchemaAsStringPattern { get; set; }
+
+#if GRAPHQL
+    /// <summary>
+    /// The GraphQL schema as a <seealso cref="GraphQL.Types.ISchema"/>.
+    /// </summary>
+    public GraphQL.Types.ISchema? SchemaAsISchema { get; set; }
+
+    /// <summary>
+    /// The GraphQL Schema.
+    /// </summary>
+    [JsonIgnore]
+    public AnyOf<string, StringPattern, GraphQL.Types.ISchema>? Schema
+    {
+        get
+        {
+            if (SchemaAsString != null)
+            {
+                return SchemaAsString;
+            }
+
+            if (SchemaAsStringPattern != null)
+            {
+                return SchemaAsStringPattern;
+            }
+
+            if (SchemaAsISchema != null)
+            {
+                return new AnyOf<string, StringPattern, GraphQL.Types.ISchema>(SchemaAsISchema);
+            }
+
+            return null;
+        }
+    }
+#endif
+
+    /// <summary>
+    /// The custom Scalars to define for this schema.
+    /// </summary>
+    public IDictionary<string, Type>? CustomScalars { get; set; }
+}

src/WireMock.Net/Owin/AspNetCoreSelfHost.NETStandard.cs

@@ -1,5 +1,7 @@
 #if USE_ASPNETCORE && !NETSTANDARD1_3
+using System;
 using System.Collections.Generic;
+using System.Net;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Server.Kestrel.Core;
 using Microsoft.AspNetCore.Server.Kestrel.Https;
@@ -25,7 +27,7 @@ namespace WireMock.Owin
             {
                 if (urlDetail.IsHttps)
                 {
-                    kestrelOptions.ListenAnyIP(urlDetail.Port, listenOptions =>
+                    Listen(kestrelOptions, urlDetail, listenOptions =>
                     {
                         listenOptions.UseHttps(options =>
                         {
@@ -37,7 +39,8 @@ namespace WireMock.Owin
                                     wireMockMiddlewareOptions.X509ThumbprintOrSubjectName,
                                     wireMockMiddlewareOptions.X509CertificateFilePath,
                                     wireMockMiddlewareOptions.X509CertificatePassword,
-                                    urlDetail.Host);
+                                    urlDetail.Host
+                                );
                             }
 
                             options.ClientCertificateMode = (ClientCertificateMode)wireMockMiddlewareOptions.ClientCertificateMode;
@@ -46,13 +49,46 @@ namespace WireMock.Owin
                                 options.ClientCertificateValidation = (_, _, _) => true;
                             }
                         });
-                    });
+
-                }
+                        if (urlDetail.IsHttp2)
-                else
                         {
-                    kestrelOptions.ListenAnyIP(urlDetail.Port);
+                            listenOptions.Protocols = HttpProtocols.Http2;
+                        }
+                    });
+                    continue;
+                }
+
+                if (urlDetail.IsHttp2)
+                {
+                    Listen(kestrelOptions, urlDetail, listenOptions =>
+                    {
+                        listenOptions.Protocols = HttpProtocols.Http2;
+                    });
+                    continue;
+                }
+
+                Listen(kestrelOptions, urlDetail, _ => { });
             }
         }
+
+        private static void Listen(KestrelServerOptions kestrelOptions, HostUrlDetails urlDetail, Action<ListenOptions> configure)
+        {
+            // Listens on ::1 and 127.0.0.1 with the given port.
+            if (urlDetail is { Port: > 0, Host: "localhost" or "127.0.0.1" or "0.0.0.0" or "::1" })
+            {
+                kestrelOptions.ListenLocalhost(urlDetail.Port, configure);
+                return;
+            }
+
+            // Try to parse the host as a valid IP address and bind to the given IP address and port.
+            if (IPAddress.TryParse(urlDetail.Host, out var ipAddress))
+            {
+                kestrelOptions.Listen(ipAddress, urlDetail.Port, configure);
+                return;
+            }
+
+            // Otherwise, listen on all IPs.
+            kestrelOptions.ListenAnyIP(urlDetail.Port, configure);
         }
     }
 

src/WireMock.Net/Owin/AspNetCoreSelfHost.cs

@@ -14,13 +14,13 @@ using WireMock.Owin.Mappers;
 using WireMock.Services;
 using WireMock.Util;
 
-namespace WireMock.Owin
+namespace WireMock.Owin;
-{
+
 internal partial class AspNetCoreSelfHost : IOwinSelfHost
 {
     private const string CorsPolicyName = "WireMock.Net - Policy";
 
-        private readonly CancellationTokenSource _cts = new CancellationTokenSource();
+    private readonly CancellationTokenSource _cts = new();
     private readonly IWireMockMiddlewareOptions _wireMockMiddlewareOptions;
     private readonly IWireMockLogger _logger;
     private readonly HostUrlOptions _urlOptions;
@@ -110,18 +110,22 @@ namespace WireMock.Owin
         {
             try
             {
+#if NETCOREAPP3_1 || NET5_0_OR_GREATER
+                var appLifetime = _host.Services.GetRequiredService<Microsoft.Extensions.Hosting.IHostApplicationLifetime>();
+#else
                 var appLifetime = _host.Services.GetRequiredService<IApplicationLifetime>();
+#endif
                 appLifetime.ApplicationStarted.Register(() =>
                 {
                     var addresses = _host.ServerFeatures
-                        .Get<Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature>()
+                        .Get<Microsoft.AspNetCore.Hosting.Server.Features.IServerAddressesFeature>()!
                         .Addresses;
 
-                    foreach (string address in addresses)
+                    foreach (var address in addresses)
                     {
                         Urls.Add(address.Replace("0.0.0.0", "localhost").Replace("[::]", "localhost"));
 
-                        PortUtils.TryExtract(address, out _, out _, out _, out int port);
+                        PortUtils.TryExtract(address, out _, out _, out _, out _, out var port);
                         Ports.Add(port);
                     }
 
@@ -174,11 +178,10 @@ namespace WireMock.Owin
 
         IsStarted = false;
 #if NETSTANDARD1_3
-            return Task.FromResult(true);
+        return Task.CompletedTask;
 #else
         return _host.StopAsync();
 #endif
     }
 }
-}
 #endif

src/WireMock.Net/Owin/HostUrlDetails.cs

@@ -7,6 +7,8 @@ internal struct HostUrlDetails
 {
     public bool IsHttps { get; set; }
 
+    public bool IsHttp2 { get; set; }
+
     public string Url { get; set; }
         
     public string Scheme { get; set; }

src/WireMock.Net/Owin/HostUrlOptions.cs

@@ -6,7 +6,7 @@ namespace WireMock.Owin;
 
 internal class HostUrlOptions
 {
-    private const string Localhost = "localhost";
+    private const string Star = "*";
 
     public ICollection<string>? Urls { get; set; }
 
@@ -14,6 +14,8 @@ internal class HostUrlOptions
 
     public HostingScheme HostingScheme { get; set; }
 
+    public bool? UseHttp2 { get; set; }
+
     public IReadOnlyList<HostUrlDetails> GetDetails()
     {
         var list = new List<HostUrlDetails>();
@@ -23,25 +25,25 @@ internal class HostUrlOptions
             {
                 var port = Port > 0 ? Port.Value : FindFreeTcpPort();
                 var scheme = HostingScheme == HostingScheme.Https ? "https" : "http";
-                list.Add(new HostUrlDetails { IsHttps = HostingScheme == HostingScheme.Https, Url = $"{scheme}://{Localhost}:{port}", Scheme = scheme, Host = Localhost, Port = port });
+                list.Add(new HostUrlDetails { IsHttps = HostingScheme == HostingScheme.Https, IsHttp2 = UseHttp2 == true, Url = $"{scheme}://{Star}:{port}", Scheme = scheme, Host = Star, Port = port });
             }
 
             if (HostingScheme == HostingScheme.HttpAndHttps)
             {
                 var httpPort = Port > 0 ? Port.Value : FindFreeTcpPort();
-                list.Add(new HostUrlDetails { IsHttps = false, Url = $"http://{Localhost}:{httpPort}", Scheme = "http", Host = Localhost, Port = httpPort });
+                list.Add(new HostUrlDetails { IsHttps = false, IsHttp2 = UseHttp2 == true, Url = $"http://{Star}:{httpPort}", Scheme = "http", Host = Star, Port = httpPort });
 
                 var httpsPort = FindFreeTcpPort(); // In this scenario, always get a free port for https.
-                list.Add(new HostUrlDetails { IsHttps = true, Url = $"https://{Localhost}:{httpsPort}", Scheme = "https", Host = Localhost, Port = httpsPort });
+                list.Add(new HostUrlDetails { IsHttps = true, IsHttp2 = UseHttp2 == true, Url = $"https://{Star}:{httpsPort}", Scheme = "https", Host = Star, Port = httpsPort });
             }
         }
         else
         {
-            foreach (string url in Urls)
+            foreach (var url in Urls)
             {
-                if (PortUtils.TryExtract(url, out var isHttps, out var protocol, out var host, out var port))
+                if (PortUtils.TryExtract(url, out var isHttps, out var isGrpc, out var protocol, out var host, out var port))
                 {
-                    list.Add(new HostUrlDetails { IsHttps = isHttps, Url = url, Scheme = protocol, Host = host, Port = port });
+                    list.Add(new HostUrlDetails { IsHttps = isHttps, IsHttp2 = isGrpc, Url = url, Scheme = protocol, Host = host, Port = port });
                 }
             }
         }

src/WireMock.Net/Owin/Mappers/IOwinResponseMapper.cs

@@ -5,8 +5,8 @@ using IResponse = Microsoft.Owin.IOwinResponse;
 using IResponse = Microsoft.AspNetCore.Http.HttpResponse;
 #endif
 
-namespace WireMock.Owin.Mappers
+namespace WireMock.Owin.Mappers;
-{
+
 /// <summary>
 /// IOwinResponseMapper
 /// </summary>
@@ -19,4 +19,3 @@ namespace WireMock.Owin.Mappers
     /// <param name="response">The OwinResponse/HttpResponse</param>
     Task MapAsync(IResponseMessage? responseMessage, IResponse response);
 }
-}

src/WireMock.Net/Owin/Mappers/OwinRequestMapper.cs

@@ -8,24 +8,24 @@ using WireMock.Util;
 #if !USE_ASPNETCORE
 using IRequest = Microsoft.Owin.IOwinRequest;
 #else
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Extensions;
 using IRequest = Microsoft.AspNetCore.Http.HttpRequest;
 #endif
 
-namespace WireMock.Owin.Mappers
+namespace WireMock.Owin.Mappers;
-{
+
 /// <summary>
 /// OwinRequestMapper
 /// </summary>
 internal class OwinRequestMapper : IOwinRequestMapper
 {
-        /// <inheritdoc cref="IOwinRequestMapper.MapAsync"/>
+    /// <inheritdoc />
     public async Task<RequestMessage> MapAsync(IRequest request, IWireMockMiddlewareOptions options)
     {
         var (urlDetails, clientIP) = ParseRequest(request);
 
-            string method = request.Method;
+        var method = request.Method;
+        var httpVersion = HttpVersionParser.Parse(request.Protocol);
 
         var headers = new Dictionary<string, string[]>();
         IEnumerable<string>? contentEncodingHeader = null;
@@ -42,7 +42,6 @@ namespace WireMock.Owin.Mappers
         var cookies = new Dictionary<string, string>();
         if (request.Cookies.Any())
         {
-                cookies = new Dictionary<string, string>();
             foreach (var cookie in request.Cookies)
             {
                 cookies.Add(cookie.Key, cookie.Value);
@@ -71,7 +70,8 @@ namespace WireMock.Owin.Mappers
             clientIP,
             body,
             headers,
-                cookies
+            cookies,
+            httpVersion
 #if USE_ASPNETCORE
             , await request.HttpContext.Connection.GetClientCertificateAsync()
 #endif
@@ -107,4 +107,3 @@ namespace WireMock.Owin.Mappers
         return (urlDetails, clientIP);
     }
 }
-}

src/WireMock.Net/Owin/Mappers/OwinResponseMapper.cs

@@ -13,6 +13,8 @@ using WireMock.Http;
 using WireMock.ResponseBuilders;
 using WireMock.Types;
 using Stef.Validation;
+using WireMock.Util;
+
 #if !USE_ASPNETCORE
 using IResponse = Microsoft.Owin.IOwinResponse;
 #else
@@ -62,11 +64,11 @@ namespace WireMock.Owin.Mappers
             switch (responseMessage.FaultType)
             {
                 case FaultType.EMPTY_RESPONSE:
-                    bytes = IsFault(responseMessage) ? EmptyArray<byte>.Value : GetNormalBody(responseMessage);
+                    bytes = IsFault(responseMessage) ? EmptyArray<byte>.Value : await GetNormalBodyAsync(responseMessage).ConfigureAwait(false);
                     break;
 
                 case FaultType.MALFORMED_RESPONSE_CHUNK:
-                    bytes = GetNormalBody(responseMessage) ?? EmptyArray<byte>.Value;
+                    bytes = await GetNormalBodyAsync(responseMessage).ConfigureAwait(false) ?? EmptyArray<byte>.Value;
                     if (IsFault(responseMessage))
                     {
                         bytes = bytes.Take(bytes.Length / 2).Union(_randomizerBytes.Generate()).ToArray();
@@ -74,18 +76,18 @@ namespace WireMock.Owin.Mappers
                     break;
 
                 default:
-                    bytes = GetNormalBody(responseMessage);
+                    bytes = await GetNormalBodyAsync(responseMessage).ConfigureAwait(false);
                     break;
             }
 
             var statusCodeType = responseMessage.StatusCode?.GetType();
             switch (statusCodeType)
             {
-                case { } typeAsIntOrEnum when typeAsIntOrEnum == typeof(int) || typeAsIntOrEnum == typeof(int?) || typeAsIntOrEnum.GetTypeInfo().IsEnum:
+                case { } when statusCodeType == typeof(int) || statusCodeType == typeof(int?) || statusCodeType.GetTypeInfo().IsEnum:
                     response.StatusCode = MapStatusCode((int)responseMessage.StatusCode!);
                     break;
 
-                case { } typeAsString when typeAsString == typeof(string):
+                case { } when statusCodeType == typeof(string):
                     // Note: this case will also match on null 
                     int.TryParse(responseMessage.StatusCode as string, out var result);
                     response.StatusCode = MapStatusCode(result);
@@ -108,6 +110,8 @@ namespace WireMock.Owin.Mappers
                     _options.Logger.Warn("Error writing response body. Exception : {0}", ex);
                 }
             }
+
+            SetResponseTrailingHeaders(responseMessage, response);
         }
 
         private int MapStatusCode(int code)
@@ -125,7 +129,7 @@ namespace WireMock.Owin.Mappers
             return responseMessage.FaultPercentage == null || _randomizerDouble.Generate() <= responseMessage.FaultPercentage;
         }
 
-        private byte[]? GetNormalBody(IResponseMessage responseMessage)
+        private async Task<byte[]?> GetNormalBodyAsync(IResponseMessage responseMessage)
         {
             switch (responseMessage.BodyData?.DetectedBodyType)
             {
@@ -138,6 +142,12 @@ namespace WireMock.Owin.Mappers
                     var jsonBody = JsonConvert.SerializeObject(responseMessage.BodyData.BodyAsJson, new JsonSerializerSettings { Formatting = formatting, NullValueHandling = NullValueHandling.Ignore });
                     return (responseMessage.BodyData.Encoding ?? _utf8NoBom).GetBytes(jsonBody);
 
+#if PROTOBUF
+                case BodyType.ProtoBuf:
+                    var protoDefinition = responseMessage.BodyData.ProtoDefinition?.Invoke().Text;
+                    return await ProtoBufUtils.GetProtoBufMessageWithHeaderAsync(protoDefinition, responseMessage.BodyData.ProtoBufMessageType, responseMessage.BodyData.BodyAsJson).ConfigureAwait(false);
+#endif
+
                 case BodyType.Bytes:
                     return responseMessage.BodyData.BodyAsBytes;
 
@@ -157,16 +167,17 @@ namespace WireMock.Owin.Mappers
                 new[]
                 {
                     DateTime.UtcNow.ToString(CultureInfo.InvariantCulture.DateTimeFormat.RFC1123Pattern, CultureInfo.InvariantCulture)
-                });
+                }
+            );
 
             // Set other headers
             foreach (var item in responseMessage.Headers!)
             {
                 var headerName = item.Key;
                 var value = item.Value;
-                if (ResponseHeadersToFix.ContainsKey(headerName))
+                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
                 {
-                    ResponseHeadersToFix[headerName]?.Invoke(response, value);
+                    action?.Invoke(response, value);
                 }
                 else
                 {
@@ -179,6 +190,34 @@ namespace WireMock.Owin.Mappers
             }
         }
 
+        private static void SetResponseTrailingHeaders(IResponseMessage responseMessage, IResponse response)
+        {
+            if (responseMessage.TrailingHeaders == null)
+            {
+                return;
+            }
+
+#if TRAILINGHEADERS
+            foreach (var item in responseMessage.TrailingHeaders)
+            {
+                var headerName = item.Key;
+                var value = item.Value;
+                if (ResponseHeadersToFix.TryGetValue(headerName, out var action))
+                {
+                    action?.Invoke(response, value);
+                }
+                else
+                {
+                    // Check if this trailing header can be added to the response
+                    if (response.SupportsTrailers() && !HttpKnownHeaderNames.IsRestrictedResponseHeader(headerName))
+                    {
+                        response.AppendTrailer(headerName, new Microsoft.Extensions.Primitives.StringValues(value.ToArray()));
+                    }
+                }
+            }
+#endif
+        }
+
         private static void AppendResponseHeader(IResponse response, string headerName, string[] values)
         {
 #if !USE_ASPNETCORE

src/WireMock.Net/Plugin/PluginLoader.cs

@@ -1,56 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace WireMock.Plugin;
-
-internal static class PluginLoader
-{
-    private static readonly ConcurrentDictionary<Type, Type> Assemblies = new();
-
-    public static T Load<T>(params object[] args) where T : class
-    {
-        var foundType = Assemblies.GetOrAdd(typeof(T), (type) =>
-        {
-            var files = Directory.GetFiles(Directory.GetCurrentDirectory(), "*.dll");
-
-            Type? pluginType = null;
-            foreach (var file in files)
-            {
-                try
-                {
-                    var assembly = Assembly.Load(new AssemblyName
-                    {
-                        Name = Path.GetFileNameWithoutExtension(file)
-                    });
-
-                    pluginType = GetImplementationTypeByInterface<T>(assembly);
-                    if (pluginType != null)
-                    {
-                        break;
-                    }
-                }
-                catch
-                {
-                    // no-op: just try next .dll
-                }
-            }
-
-            if (pluginType != null)
-            {
-                return pluginType;
-            }
-
-            throw new DllNotFoundException($"No dll found which implements type '{type}'");
-        });
-
-        return (T)Activator.CreateInstance(foundType, args);
-    }
-
-    private static Type? GetImplementationTypeByInterface<T>(Assembly assembly)
-    {
-        return assembly.GetTypes().FirstOrDefault(t => typeof(T).IsAssignableFrom(t) && !t.GetTypeInfo().IsInterface);
-    }
-}

src/WireMock.Net/RequestBuilders/IBodyRequestBuilder.cs

@@ -9,7 +9,7 @@ namespace WireMock.RequestBuilders;
 /// <summary>
 /// The BodyRequestBuilder interface.
 /// </summary>
-public interface IBodyRequestBuilder : IGraphQLRequestBuilder
+public interface IBodyRequestBuilder : IProtoBufRequestBuilder
 {
     /// <summary>
     /// WithBody: IMatcher
@@ -51,23 +51,13 @@ public interface IBodyRequestBuilder : IGraphQLRequestBuilder
     IRequestBuilder WithBody(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
     /// <summary>
-    /// WithBody : Body as a string response based on a object (which will be converted to a JSON string using NewtonSoft.Json).
+    /// WithBodyAsJson: A <see cref="JsonMatcher"/> will be used to match this object.
     /// </summary>
     /// <param name="body">The body.</param>
     /// <param name="matchBehaviour">The match behaviour [default is AcceptOnMatch].</param>
     /// <returns>A <see cref="IRequestBuilder"/>.</returns>
     IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
-    /// <summary>
-    /// WithBody : Body as a string response based on a object (which will be converted to a JSON string using the <see cref="IJsonConverter"/>).
-    /// </summary>
-    /// <param name="body">The body.</param>
-    /// <param name="converter">The JsonConverter.</param>
-    /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
-    /// <param name="matchBehaviour">The match behaviour [default is AcceptOnMatch].</param>
-    /// <returns>A <see cref="IRequestBuilder"/>.</returns>
-    IRequestBuilder WithBodyAsJson(object body, IJsonConverter converter, JsonConverterOptions? options = null, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
-
     /// <summary>
     /// WithBody: func (string)
     /// </summary>

src/WireMock.Net/RequestBuilders/IGraphQLRequestBuilder.cs

@@ -26,6 +26,23 @@ public interface IGraphQLRequestBuilder : IMultiPartRequestBuilder
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
     IRequestBuilder WithGraphQLSchema(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a string.
+    /// </summary>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBodyAsGraphQL(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a string.
+    /// </summary>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBodyAsGraphQL(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
 #if GRAPHQL
     /// <summary>
     /// WithGraphQLSchema: The GraphQL schema as a ISchema.
@@ -43,5 +60,22 @@ public interface IGraphQLRequestBuilder : IMultiPartRequestBuilder
     /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
     /// <returns>The <see cref="IRequestBuilder"/>.</returns>
     IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a ISchema.
+    /// </summary>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+
+    /// <summary>
+    /// WithBodyAsGraphQL: The GraphQL schema as a ISchema.
+    /// </summary>
+    /// <param name="schema">The GraphQL schema.</param>
+    /// <param name="customScalars">A dictionary defining the custom scalars used in this schema. (optional)</param>
+    /// <param name="matchBehaviour">The match behaviour. (Default is <c>MatchBehaviour.AcceptOnMatch</c>).</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
 #endif
 }

src/WireMock.Net/RequestBuilders/IHttpVersionBuilder.cs

@@ -0,0 +1,18 @@
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// The HttpVersionBuilder interface.
+/// </summary>
+public interface IHttpVersionBuilder : IRequestMatcher
+{
+    /// <summary>
+    /// WithHttpVersion
+    /// </summary>
+    /// <param name="version">The HTTP Version to match.</param>
+    /// <param name="matchBehaviour">The match behaviour. (default = "AcceptOnMatch")</param>
+    /// <returns>The <see cref="IRequestBuilder"/>.</returns>
+    IRequestBuilder WithHttpVersion(string version, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch);
+}

src/WireMock.Net/RequestBuilders/IMultiPartRequestBuilder.cs

@@ -6,7 +6,7 @@ namespace WireMock.RequestBuilders;
 /// <summary>
 /// The MultiPartRequestBuilder interface.
 /// </summary>
-public interface IMultiPartRequestBuilder : IRequestMatcher
+public interface IMultiPartRequestBuilder : IHttpVersionBuilder
 {
     /// <summary>
     /// WithMultiPart: IMatcher

src/WireMock.Net/RequestBuilders/IProtoBufRequestBuilder.cs

@@ -0,0 +1,45 @@
+using WireMock.Matchers;
+
+namespace WireMock.RequestBuilders;
+
+/// <summary>
+/// The ProtoBufRequestBuilder interface.
+/// </summary>
+public interface IProtoBufRequestBuilder : IGraphQLRequestBuilder
+{
+    /// <summary>
+    /// WithGrpcProto
+    /// </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>
+    /// WithGrpcProto
+    /// </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>
+    /// WithGrpcProto
+    /// </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>
+    /// WithGrpcProto
+    /// </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);
+}

src/WireMock.Net/RequestBuilders/Request.ClientIP.cs

@@ -23,17 +23,17 @@ public partial class Request
     }
 
     /// <inheritdoc />
-    public IRequestBuilder WithClientIP(params string[] paths)
+    public IRequestBuilder WithClientIP(params string[] clientIPs)
     {
-        return WithClientIP(MatchOperator.Or, paths);
+        return WithClientIP(MatchOperator.Or, clientIPs);
     }
 
     /// <inheritdoc />
-    public IRequestBuilder WithClientIP(MatchOperator matchOperator, params string[] paths)
+    public IRequestBuilder WithClientIP(MatchOperator matchOperator, params string[] clientIPs)
     {
-        Guard.NotNullOrEmpty(paths);
+        Guard.NotNullOrEmpty(clientIPs);
 
-        _requestMatchers.Add(new RequestMessageClientIPMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, paths));
+        _requestMatchers.Add(new RequestMessageClientIPMatcher(MatchBehaviour.AcceptOnMatch, matchOperator, clientIPs));
         return this;
     }
 

src/WireMock.Net/RequestBuilders/Request.WithBody.cs

@@ -2,8 +2,6 @@
 // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root.
 using System;
 using System.Collections.Generic;
-using JsonConverter.Abstractions;
-using Newtonsoft.Json;
 using Stef.Validation;
 using WireMock.Matchers;
 using WireMock.Matchers.Request;
@@ -37,19 +35,7 @@ public partial class Request
     /// <inheritdoc />
     public IRequestBuilder WithBodyAsJson(object body, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
     {
-        var bodyAsJsonString = JsonConvert.SerializeObject(body);
+        return WithBody(new IMatcher[] { new JsonMatcher(matchBehaviour, body) });
-        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, bodyAsJsonString));
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithBodyAsJson(object body, IJsonConverter converter, JsonConverterOptions? options = null, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        Guard.NotNull(converter);
-
-        var bodyAsJsonString = converter.Serialize(body, options);
-        _requestMatchers.Add(new RequestMessageBodyMatcher(matchBehaviour, bodyAsJsonString));
-        return this;
     }
 
     /// <inheritdoc />

src/WireMock.Net/RequestBuilders/Request.WithBodyAsProtoBuf.cs

@@ -0,0 +1,31 @@
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+
+namespace WireMock.RequestBuilders;
+
+public partial class Request
+{
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new (null, protoDefinition), messageType));
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsProtoBuf(string protoDefinition, string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => new(null, protoDefinition), messageType, matcher));
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsProtoBuf(string messageType, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => Mapping.ProtoDefinition!.Value, messageType));
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsProtoBuf(string messageType, IObjectMatcher matcher, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageProtoBufMatcher(matchBehaviour, () => Mapping.ProtoDefinition!.Value, messageType, matcher));
+    }
+}

src/WireMock.Net/RequestBuilders/Request.WithGraphQL.cs

@@ -1,39 +0,0 @@
-using System.Collections.Generic;
-using System;
-using WireMock.Matchers;
-using WireMock.Matchers.Request;
-
-namespace WireMock.RequestBuilders;
-
-public partial class Request
-{
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        _requestMatchers.Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        _requestMatchers.Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
-        return this;
-    }
-
-#if GRAPHQL
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        _requestMatchers.Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
-        return this;
-    }
-
-    /// <inheritdoc />
-    public IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
-    {
-        _requestMatchers.Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
-        return this;
-    }
-#endif
-}

src/WireMock.Net/RequestBuilders/Request.WithGraphQLSchema.cs

@@ -0,0 +1,59 @@
+using System.Collections.Generic;
+using System;
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+
+namespace WireMock.RequestBuilders;
+
+public partial class Request
+{
+    /// <inheritdoc />
+    public IRequestBuilder WithGraphQLSchema(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return WithBodyAsGraphQL(schema, matchBehaviour);
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithGraphQLSchema(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return WithBodyAsGraphQL(schema, customScalars, matchBehaviour);
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsGraphQL(string schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsGraphQL(string schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
+    }
+
+#if GRAPHQL
+    /// <inheritdoc />
+    public IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return WithBodyAsGraphQL(schema, matchBehaviour);
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithGraphQLSchema(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return WithBodyAsGraphQL(schema, customScalars, matchBehaviour);
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema));
+    }
+
+    /// <inheritdoc />
+    public IRequestBuilder WithBodyAsGraphQL(GraphQL.Types.ISchema schema, IDictionary<string, Type>? customScalars, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageGraphQLMatcher(matchBehaviour, schema, customScalars));
+    }
+#endif
+}

src/WireMock.Net/RequestBuilders/Request.WithHttpVersion.cs

@@ -0,0 +1,13 @@
+using WireMock.Matchers;
+using WireMock.Matchers.Request;
+
+namespace WireMock.RequestBuilders;
+
+public partial class Request
+{
+    /// <inheritdoc />
+    public IRequestBuilder WithHttpVersion(string version, MatchBehaviour matchBehaviour = MatchBehaviour.AcceptOnMatch)
+    {
+        return Add(new RequestMessageHttpVersionMatcher(matchBehaviour, version));
+    }
+}

src/WireMock.Net/RequestBuilders/Request.cs

@@ -16,6 +16,11 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
 {
     private readonly IList<IRequestMatcher> _requestMatchers;
 
+    /// <summary>
+    /// The link back to the Mapping.
+    /// </summary>
+    public IMapping Mapping { get; set; } = null!;
+
     /// <summary>
     /// Creates this instance.
     /// </summary>
@@ -63,4 +68,15 @@ public partial class Request : RequestMessageCompositeMatcher, IRequestBuilder
     {
         return _requestMatchers.OfType<T>().FirstOrDefault(func);
     }
+
+    private IRequestBuilder Add<T>(T requestMatcher) where T : IRequestMatcher
+    {
+        foreach (var existing in _requestMatchers.OfType<T>().ToArray())
+        {
+            _requestMatchers.Remove(existing);
+        }
+
+        _requestMatchers.Add(requestMatcher);
+        return this;
+    }
 }

src/WireMock.Net/RequestMessage.cs

@@ -4,7 +4,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Net;
-using Newtonsoft.Json;
 #if USE_ASPNETCORE
 using System.Security.Cryptography.X509Certificates;
 #endif
@@ -51,6 +50,9 @@ public class RequestMessage : IRequestMessage
     /// <inheritdoc />
     public string Method { get; }
 
+    /// <inheritdoc />
+    public string HttpVersion { get; }
+
     /// <inheritdoc />
     public IDictionary<string, WireMockList<string>>? Headers { get; }
 
@@ -73,14 +75,14 @@ public class RequestMessage : IRequestMessage
     public string? Body { get; }
 
     /// <inheritdoc />
-    public object? BodyAsJson { get; }
+    public object? BodyAsJson { get; set; }
 
     /// <inheritdoc />
     public byte[]? BodyAsBytes { get; }
 
 #if MIMEKIT
     /// <inheritdoc />
-    [JsonIgnore] // Issue 1001
+    [Newtonsoft.Json.JsonIgnore] // Issue 1001
     public object? BodyAsMimeMessage { get; }
 #endif
 
@@ -125,11 +127,13 @@ public class RequestMessage : IRequestMessage
 
     internal RequestMessage(
         IWireMockMiddlewareOptions? options,
-        UrlDetails urlDetails, string method,
+        UrlDetails urlDetails,
+        string method,
         string clientIP,
         IBodyData? bodyData = null,
         IDictionary<string, string[]>? headers = null,
-        IDictionary<string, string>? cookies = null
+        IDictionary<string, string>? cookies = null,
+        string httpVersion = "1.1"
 #if USE_ASPNETCORE
         , X509Certificate2? clientCertificate = null
 #endif
@@ -152,6 +156,7 @@ public class RequestMessage : IRequestMessage
         AbsolutePathSegments = AbsolutePath.Split('/').Skip(1).ToArray();
 
         Method = method;
+        HttpVersion = httpVersion;
         ClientIP = clientIP;
 
         BodyData = bodyData;

src/WireMock.Net/ResponseBuilders/IBodyResponseBuilder.cs

@@ -91,18 +91,50 @@ public interface IBodyResponseBuilder : IFaultResponseBuilder
     /// WithBody : Create a string response based on a object (which will be converted to a JSON string using the <see cref="IJsonConverter"/>).
     /// </summary>
     /// <param name="body">The body.</param>
-    /// <param name="converter">The JsonConverter.</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/>.</param>
     /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
     /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBody(object body, IJsonConverter converter, JsonConverterOptions? options = null);
+    IResponseBuilder WithBody(object body, IJsonConverter jsonConverter, JsonConverterOptions? options = null);
 
     /// <summary>
     /// WithBody : Create a string response based on a object (which will be converted to a JSON string using the <see cref="IJsonConverter"/>).
     /// </summary>
     /// <param name="body">The body.</param>
     /// <param name="encoding">The body encoding, can be <c>null</c>.</param>
-    /// <param name="converter">The JsonConverter.</param>
+    /// <param name="jsonConverter">The <see cref="IJsonConverter"/>.</param>
     /// <param name="options">The <see cref="JsonConverterOptions"/> [optional].</param>
     /// <returns>A <see cref="IResponseBuilder"/>.</returns>
-    IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter converter, JsonConverterOptions? options = null);
+    IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter jsonConverter, JsonConverterOptions? options = null);
+
+    /// <summary>
+    /// WithBody : 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>
+    /// WithBody : 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
+    );
 }

src/WireMock.Net/ResponseBuilders/IHeadersResponseBuilder.cs

@@ -9,7 +9,7 @@ namespace WireMock.ResponseBuilders;
 public interface IHeadersResponseBuilder : IBodyResponseBuilder
 {
     /// <summary>
-    /// The with header.
+    /// The WithHeader.
     /// </summary>
     /// <param name="name">The name.</param>
     /// <param name="values">The values.</param>
@@ -17,23 +17,52 @@ public interface IHeadersResponseBuilder : IBodyResponseBuilder
     IResponseBuilder WithHeader(string name, params string[] values);
 
     /// <summary>
-    /// The with headers.
+    /// The WithHeaders.
     /// </summary>
     /// <param name="headers">The headers.</param>
     /// <returns>The <see cref="IResponseBuilder"/>.</returns>
     IResponseBuilder WithHeaders(IDictionary<string, string> headers);
 
     /// <summary>
-    /// The with headers.
+    /// The WithHeaders.
     /// </summary>
     /// <param name="headers">The headers.</param>
     /// <returns>The <see cref="IResponseBuilder"/>.</returns>
     IResponseBuilder WithHeaders(IDictionary<string, string[]> headers);
 
     /// <summary>
-    /// The with headers.
+    /// The WithHeaders.
     /// </summary>
     /// <param name="headers">The headers.</param>
     /// <returns>The <see cref="IResponseBuilder"/>.</returns>
     IResponseBuilder WithHeaders(IDictionary<string, WireMockList<string>> headers);
+
+    /// <summary>
+    /// The WithTrailingHeader.
+    /// </summary>
+    /// <param name="name">The name.</param>
+    /// <param name="values">The values.</param>
+    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+    IResponseBuilder WithTrailingHeader(string name, params string[] values);
+
+    /// <summary>
+    /// The WithTrailingHeaders.
+    /// </summary>
+    /// <param name="headers">The headers.</param>
+    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+    IResponseBuilder WithTrailingHeaders(IDictionary<string, string> headers);
+
+    /// <summary>
+    /// The WithTrailingHeaders.
+    /// </summary>
+    /// <param name="headers">The headers.</param>
+    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+    IResponseBuilder WithTrailingHeaders(IDictionary<string, string[]> headers);
+
+    /// <summary>
+    /// The WithTrailingHeaders.
+    /// </summary>
+    /// <param name="headers">The headers.</param>
+    /// <returns>The <see cref="IResponseBuilder"/>.</returns>
+    IResponseBuilder WithTrailingHeaders(IDictionary<string, WireMockList<string>> headers);
 }

src/WireMock.Net/ResponseBuilders/Response.WithBody.cs

@@ -3,6 +3,7 @@ using System.Text;
 using System.Threading.Tasks;
 using JsonConverter.Abstractions;
 using Stef.Validation;
+using WireMock.Exceptions;
 using WireMock.Types;
 using WireMock.Util;
 
@@ -185,25 +186,79 @@ public partial class Response
     }
 
     /// <inheritdoc />
-    public IResponseBuilder WithBody(object body, IJsonConverter converter, JsonConverterOptions? options = null)
+    public IResponseBuilder WithBody(object body, IJsonConverter jsonConverter, JsonConverterOptions? options = null)
     {
-        return WithBody(body, null, converter, options);
+        return WithBody(body, null, jsonConverter, options);
     }
 
     /// <inheritdoc />
-    public IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter converter, JsonConverterOptions? options = null)
+    public IResponseBuilder WithBody(object body, Encoding? encoding, IJsonConverter jsonConverter, JsonConverterOptions? options = null)
     {
         Guard.NotNull(body);
-        Guard.NotNull(converter);
+        Guard.NotNull(jsonConverter);
 
         ResponseMessage.BodyDestination = null;
         ResponseMessage.BodyData = new BodyData
         {
             Encoding = encoding,
             DetectedBodyType = BodyType.String,
-            BodyAsString = converter.Serialize(body, options)
+            BodyAsString = jsonConverter.Serialize(body, options)
         };
 
         return this;
     }
+
+    /// <inheritdoc />
+    public IResponseBuilder WithBodyAsProtoBuf(
+        string protoDefinition,
+        string messageType,
+        object value,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? options = null
+    )
+    {
+        Guard.NotNullOrWhiteSpace(protoDefinition);
+        Guard.NotNullOrWhiteSpace(messageType);
+        Guard.NotNull(value);
+
+#if !PROTOBUF
+        throw new System.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 (null, protoDefinition),
+            ProtoBufMessageType = messageType
+        };
+#endif
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IResponseBuilder WithBodyAsProtoBuf(
+        string messageType,
+        object value,
+        IJsonConverter? jsonConverter = null,
+        JsonConverterOptions? options = null
+    )
+    {
+        Guard.NotNullOrWhiteSpace(messageType);
+        Guard.NotNull(value);
+
+#if !PROTOBUF
+        throw new System.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
+        };
+#endif
+        return this;
+    }
 }

src/WireMock.Net/ResponseBuilders/Response.WithHeaders.cs

@@ -0,0 +1,101 @@
+using System.Collections.Generic;
+using System.Linq;
+using Stef.Validation;
+using WireMock.Types;
+
+namespace WireMock.ResponseBuilders;
+
+public partial class Response
+{
+    /// <inheritdoc />
+    public IResponseBuilder WithHeader(string name, params string[] values)
+    {
+        Guard.NotNull(name);
+
+        ResponseMessage.AddHeader(name, values);
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IResponseBuilder WithHeaders(IDictionary<string, string> headers)
+    {
+        Guard.NotNull(headers);
+
+        ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IResponseBuilder WithHeaders(IDictionary<string, string[]> headers)
+    {
+        Guard.NotNull(headers);
+
+        ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IResponseBuilder WithHeaders(IDictionary<string, WireMockList<string>> headers)
+    {
+        Guard.NotNull(headers);
+
+        ResponseMessage.Headers = headers;
+        return this;
+    }
+
+    /// <inheritdoc />
+    public IResponseBuilder WithTrailingHeader(string name, params string[] values)
+    {
+#if !TRAILINGHEADERS
+        throw new System.NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
+#else
+
+        Guard.NotNull(name);
+
+        ResponseMessage.AddTrailingHeader(name, values);
+        return this;
+#endif
+    }
+
+    /// <inheritdoc />
+    public IResponseBuilder WithTrailingHeaders(IDictionary<string, string> headers)
+    {
+#if !TRAILINGHEADERS
+        throw new System.NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
+#else
+
+        Guard.NotNull(headers);
+
+        ResponseMessage.TrailingHeaders = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+        return this;
+#endif
+    }
+
+    /// <inheritdoc />
+    public IResponseBuilder WithTrailingHeaders(IDictionary<string, string[]> headers)
+    {
+#if !TRAILINGHEADERS
+        throw new System.NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
+#else
+
+        Guard.NotNull(headers);
+
+        ResponseMessage.TrailingHeaders = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
+        return this;
+#endif
+    }
+
+    /// <inheritdoc />
+    public IResponseBuilder WithTrailingHeaders(IDictionary<string, WireMockList<string>> headers)
+    {
+#if !TRAILINGHEADERS
+        throw new System.NotSupportedException("The WithBodyAsProtoBuf method can not be used for .NETStandard1.3 or .NET Framework 4.6.1 or lower.");
+#else
+
+        Guard.NotNull(headers);
+
+        ResponseMessage.TrailingHeaders = headers;
+        return this;
+#endif
+    }
+}

src/WireMock.Net/ResponseBuilders/Response.cs

@@ -1,19 +1,20 @@
 // This source file is based on mock4net by Alexandre Victoor which is licensed under the Apache 2.0 License.
 // For more details see 'mock4net/LICENSE.txt' and 'mock4net/readme.md' in this project root.
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using JetBrains.Annotations;
 using Stef.Validation;
+using WireMock.Matchers.Request;
 using WireMock.Proxy;
+using WireMock.RequestBuilders;
 using WireMock.Settings;
 using WireMock.Transformers;
 using WireMock.Transformers.Handlebars;
 using WireMock.Transformers.Scriban;
 using WireMock.Types;
+using WireMock.Util;
 
 namespace WireMock.ResponseBuilders;
 
@@ -26,6 +27,11 @@ public partial class Response : IResponseBuilder
 
     private TimeSpan? _delay;
 
+    /// <summary>
+    /// The link back to the mapping.
+    /// </summary>
+    public IMapping Mapping { get; set; } = null!;
+
     /// <summary>
     /// The minimum random delay in milliseconds.
     /// </summary>
@@ -156,42 +162,6 @@ public partial class Response : IResponseBuilder
         return WithStatusCode((int)HttpStatusCode.NotFound);
     }
 
-    /// <inheritdoc cref="IHeadersResponseBuilder.WithHeader(string, string[])"/>
-    public IResponseBuilder WithHeader(string name, params string[] values)
-    {
-        Guard.NotNull(name);
-
-        ResponseMessage.AddHeader(name, values);
-        return this;
-    }
-
-    /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, string})"/>
-    public IResponseBuilder WithHeaders(IDictionary<string, string> headers)
-    {
-        Guard.NotNull(headers);
-
-        ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
-        return this;
-    }
-
-    /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, string[]})"/>
-    public IResponseBuilder WithHeaders(IDictionary<string, string[]> headers)
-    {
-        Guard.NotNull(headers);
-
-        ResponseMessage.Headers = headers.ToDictionary(header => header.Key, header => new WireMockList<string>(header.Value));
-        return this;
-    }
-
-    /// <inheritdoc cref="IHeadersResponseBuilder.WithHeaders(IDictionary{string, WireMockList{string}})"/>
-    public IResponseBuilder WithHeaders(IDictionary<string, WireMockList<string>> headers)
-    {
-        Guard.NotNull(headers);
-
-        ResponseMessage.Headers = headers;
-        return this;
-    }
-
     /// <inheritdoc cref="ITransformResponseBuilder.WithTransformer(bool)"/>
     public IResponseBuilder WithTransformer(bool transformContentFromBodyAsFile)
     {
@@ -304,10 +274,30 @@ public partial class Response : IResponseBuilder
             {
                 responseMessage.Headers = ResponseMessage.Headers;
             }
+
+            // Copy TrailingHeaders from ResponseMessage (if defined)
+            if (ResponseMessage.TrailingHeaders?.Count > 0)
+            {
+                responseMessage.TrailingHeaders = ResponseMessage.TrailingHeaders;
+            }
         }
 
         if (UseTransformer)
         {
+            // Check if the body matcher is a RequestMessageProtoBufMatcher and try to to decode the byte-array to a BodyAsJson.
+            if (mapping.RequestMatcher is Request requestMatcher && requestMessage is RequestMessage request)
+            {
+                var protoBufMatcher = requestMatcher.GetRequestMessageMatcher<RequestMessageProtoBufMatcher>()?.Matcher;
+                if (protoBufMatcher != null)
+                {
+                    var decoded = await protoBufMatcher.DecodeAsync(request.BodyData?.BodyAsBytes).ConfigureAwait(false);
+                    if (decoded != null)
+                    {
+                        request.BodyAsJson = JsonUtils.ConvertValueToJToken(decoded);
+                    }
+                }
+            }
+
             ITransformer responseMessageTransformer;
             switch (TransformerType)
             {