Fix .NET Standard 2.0 merge (#1204)

grpc · Feb 17, 2021 · 3c675be · 3c675be
1 parent 927c0e5
commit 3c675be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Grpc.Net.Client/Internal/GrpcCall.cs b/src/Grpc.Net.Client/Internal/GrpcCall.cs
@@ -480,7 +480,7 @@ private async Task RunCall(HttpRequestMessage request, TimeSpan? timeout)
                     {
                         // Don't log OperationCanceledException if deadline has exceeded.
                         if (ex is OperationCanceledException &&
-                            _callTcs.Task.IsCompletedSuccessfully &&
+                            _callTcs.Task.IsCompletedSuccessfully() &&
                             _callTcs.Task.Result.StatusCode == StatusCode.DeadlineExceeded)
                         {
                             throw;

diff --git a/test/Shared/ResponseUtils.cs b/test/Shared/ResponseUtils.cs
@@ -91,7 +91,7 @@ public static HttpResponseMessage CreateResponse(
             {
                 foreach (var customTrailer in customTrailers)
                 {
-                    message.TrailingHeaders.Add(customTrailer.Key, customTrailer.Value);
+                    message.TrailingHeaders().Add(customTrailer.Key, customTrailer.Value);
                 }
             }
 
@@ -111,6 +111,10 @@ public static HttpResponseMessage CreateHeadersOnlyResponse(
                 Version = version ?? ProtocolVersion
             };
 
+            message.RequestMessage = new HttpRequestMessage();
+#if NET472
+            message.RequestMessage.Properties[CompatibilityExtensions.ResponseTrailersKey] = new ResponseTrailers();
+#endif
             message.Headers.Add(MessageEncodingHeader, grpcEncoding ?? IdentityGrpcEncoding);
             if (retryPushbackHeader != null)
             {