fix

Author: StefH

src/WireMock.Net/WireMock.Net.csproj

@@ -146,7 +146,7 @@
     <ItemGroup Condition="'$(TargetFramework)' != 'netstandard1.3' and '$(TargetFramework)' != 'net451' and '$(TargetFramework)' != 'net452' and '$(TargetFramework)' != 'net46' and '$(TargetFramework)' != 'net461'">
         <PackageReference Include="GraphQL.NewtonsoftJson" Version="8.2.1" />
         <PackageReference Include="MimeKitLite" Version="4.1.0.1" />
-        <PackageReference Include="ProtoBufJsonConverter" Version="0.6.0" />
+        <PackageReference Include="ProtoBufJsonConverter" Version="0.7.0-preview-02" />
     </ItemGroup>
 
     <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">

test/WireMock.Net.Tests/Grpc/WireMockServerTests.Grpc.cs

@@ -227,8 +227,8 @@ public async Task WireMockServer_WithBodyAsProtoBuf_WithWellKnownTypes_Timestamp
                     {
                         ts = new
                         {
-                            seconds = 1722301323,
-                            nanos = 12300
+                            Seconds = 1722301323,
+                            Nanos = 12300
                         }
                     }
                 )
@@ -269,8 +269,8 @@ public async Task WireMockServer_WithBodyAsProtoBuf_WithWellKnownTypes_Duration(
                     {
                         du = new
                         {
-                            seconds = 1722301323,
-                            nanos = 12300
+                            Seconds = 1722301323,
+                            Nanos = 12300
                         }
                     }
                 )
@@ -539,12 +539,12 @@ public async Task WireMockServer_WithBodyAsProtoBuf_WithWellKnownTypes_Timestamp
                 .WithHeader("Content-Type", "application/grpc")
                 .WithTrailingHeader("grpc-status", "0")
                 .WithBodyAsProtoBuf(definition, "greet.MyMessageTimestamp",
-                    new
+                    new MyMessageTimestamp
                     {
-                        ts = new
+                        Ts = new Timestamp
                         {
-                            seconds,
-                            nanos
+                            Seconds = seconds,
+                            Nanos = nanos
                         }
                     }
                 )
@@ -580,12 +580,12 @@ public async Task WireMockServer_WithBodyAsProtoBuf_WithWellKnownTypes_Duration_
                 .WithHeader("Content-Type", "application/grpc")
                 .WithTrailingHeader("grpc-status", "0")
                 .WithBodyAsProtoBuf(definition, "greet.MyMessageDuration",
-                    new
+                    new MyMessageDuration
                     {
-                        du = new
+                        Du = new Duration
                         {
-                            seconds,
-                            nanos
+                            Seconds = seconds,
+                            Nanos = nanos
                         }
                     }
                 )

test/WireMock.Net.Tests/Grpc/policy.proto

@@ -0,0 +1,48 @@
+syntax = "proto3";
+
+import "google/protobuf/timestamp.proto";
+
+package Policy2;
+
+service PolicyService2 {	
+    rpc GetVersion (GetVersionRequest) returns (GetVersionResponse);
+	rpc GetVersion2 (GetVersion2Request) returns (GetVersion2Response);
+}
+
+// REQUEST/RESPONSE DEFINITIONS
+
+message GetVersion2Request {
+  Client Client = 1;
+
+}
+message GetVersion2Response {
+  string Version = 1;
+
+}
+message GetVersionRequest {
+  Client Client = 1;
+
+}
+message GetVersionResponse {
+  string Version = 1;
+  google.protobuf.Timestamp DateHired = 2;
+}
+
+message Client {
+	string CorrelationId = 1;
+	enum Clients {
+		Unknown = 0;
+        QMS = 1;
+        BillingCenter = 2;
+        PAS = 3;
+        Payroll = 4;
+        Portal = 5;
+        SFO = 6;
+        QuoteAndBind = 7;
+        LegacyConversion = 8;
+        BindNow = 9;
+		PaymentPortal = 10 ;
+		PricingEngine = 11;
+	}
+	Clients ClientName = 2;
+}

test/WireMock.Net.Tests/WireMock.Net.Tests.csproj

@@ -113,6 +113,7 @@
         </PackageReference>
 
         <Protobuf Include="Grpc\greet.proto" GrpcServices="Client" />
+        <Protobuf Include="Grpc\policy.proto" GrpcServices="Client" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0'">
@@ -132,6 +133,10 @@
         <None Update="cert.pem">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </None>
+        <None Update="Grpc\policy.proto">
+          <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+          <GrpcServices>Client</GrpcServices>
+        </None>
         <None Update="Grpc\greet.proto">
             <GrpcServices>Client</GrpcServices>
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>