Add net462 build to Grpc.Net.Client with WinHttpHandler default (#2220)

stephentoub · web-flow · commit 6a4bca703aee · 2023-08-02T10:53:02.000+08:00
diff --git a/src/Grpc.Net.Client/Balancer/Internal/ISubchannelTransport.cs b/src/Grpc.Net.Client/Balancer/Internal/ISubchannelTransport.cs
@@ -33,7 +33,7 @@ internal interface ISubchannelTransport : IDisposable
     ValueTask<Stream> GetStreamAsync(BalancerAddress address, CancellationToken cancellationToken);
 #endif
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
     ValueTask<ConnectResult>
 #else
     Task<ConnectResult>
diff --git a/src/Grpc.Net.Client/Balancer/Internal/PassiveSubchannelTransport.cs b/src/Grpc.Net.Client/Balancer/Internal/PassiveSubchannelTransport.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -52,7 +52,7 @@ public void Disconnect()
     }
 
     public
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
         ValueTask<ConnectResult>
 #else
         Task<ConnectResult>
@@ -68,7 +68,7 @@ public void Disconnect()
         _currentAddress = currentAddress;
         _subchannel.UpdateConnectivityState(ConnectivityState.Ready, "Passively connected.");
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
         return new ValueTask<ConnectResult>(ConnectResult.Success);
 #else
         return Task.FromResult(ConnectResult.Success);
diff --git a/src/Grpc.Net.Client/Grpc.Net.Client.csproj b/src/Grpc.Net.Client/Grpc.Net.Client.csproj
@@ -6,14 +6,18 @@
 
     <IsGrpcPublishedPackage>true</IsGrpcPublishedPackage>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0;netstandard2.1;net5.0;net6.0;net7.0</TargetFrameworks>
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1'">
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePackageVersion)" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
+    <PackageReference Include="System.Net.Http.WinHttpHandler" Version="$(SystemNetHttpWinHttpHandlerPackageVersion)" />
+  </ItemGroup>
+
   <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0' OR '$(TargetFramework)' == 'net6.0' OR '$(TargetFramework)' == 'net7.0'">
     <DefineConstants>SUPPORT_LOAD_BALANCING;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
diff --git a/src/Grpc.Net.Client/GrpcChannel.cs b/src/Grpc.Net.Client/GrpcChannel.cs
@@ -230,7 +230,11 @@ private static HttpHandlerContext CalculateHandlerContext(ILogger logger, Uri ad
         {
             // No way to know what handler a HttpClient is using so assume custom.
             var type = channelOptions.HttpClient == null
+#if NET462
+                ? HttpHandlerType.WinHttpHandler
+#else
                 ? HttpHandlerType.SocketsHttpHandler
+#endif
                 : HttpHandlerType.Custom;
 
             return new HttpHandlerContext(type);
diff --git a/src/Grpc.Net.Client/Internal/ArrayBufferWriter.cs b/src/Grpc.Net.Client/Internal/ArrayBufferWriter.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -18,7 +18,7 @@
 
 using System.Diagnostics;
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
 
 // Copied with permission from https://github.com/dotnet/runtime/blob/589d0dc326bf0699149f76033fa66d4b22b9a7fd/src/libraries/Common/src/System/Buffers/ArrayBufferWriter.cs
 // This copy of ArrayBufferWriter is only used with .NET Stardard 2.0. Later versions of .NET ship with this type.
@@ -227,4 +227,4 @@ private static void ThrowOutOfMemoryException(uint capacity)
     }
 }
 
-#endif
+#endif
diff --git a/src/Grpc.Net.Client/Internal/GrpcCall.NonGeneric.cs b/src/Grpc.Net.Client/Internal/GrpcCall.NonGeneric.cs
@@ -193,7 +193,7 @@ private static StatusCode MapHttpStatusToGrpcCode(HttpStatusCode httpStatusCode)
         switch (httpStatusCode)
         {
             case HttpStatusCode.BadRequest:  // 400
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
             case HttpStatusCode.RequestHeaderFieldsTooLarge: // 431
 #else
             case (HttpStatusCode)431:
@@ -205,7 +205,7 @@ private static StatusCode MapHttpStatusToGrpcCode(HttpStatusCode httpStatusCode)
                 return StatusCode.PermissionDenied;
             case HttpStatusCode.NotFound:  // 404
                 return StatusCode.Unimplemented;
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
             case HttpStatusCode.TooManyRequests:  // 429
 #else
             case (HttpStatusCode)429:
diff --git a/src/Grpc.Net.Client/Internal/GrpcCall.cs b/src/Grpc.Net.Client/Internal/GrpcCall.cs
@@ -28,7 +28,7 @@
 using Grpc.Net.Client.Balancer.Internal;
 #endif
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
 using ValueTask = System.Threading.Tasks.Task;
 #endif
 
@@ -1116,7 +1116,7 @@ internal ValueTask WriteMessageAsync(
             callOptions);
     }
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
     internal async ValueTask<TResponse?> ReadMessageAsync(
 #else
     internal async Task<TResponse?> ReadMessageAsync(
diff --git a/src/Grpc.Net.Client/Internal/GrpcCallSerializationContext.cs b/src/Grpc.Net.Client/Internal/GrpcCallSerializationContext.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -295,7 +295,7 @@ private ReadOnlySpan<byte> CompressMessage(ReadOnlySpan<byte> messageData)
         // GZipStream writes final Adler32 at the end of the stream on dispose.
         using (var compressionStream = _compressionProvider.CreateCompressionStream(output, CompressionLevel.Fastest))
         {
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
             compressionStream.Write(messageData);
 #else
             var array = messageData.ToArray();
diff --git a/src/Grpc.Net.Client/Internal/GrpcEventSource.cs b/src/Grpc.Net.Client/Internal/GrpcEventSource.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -27,7 +27,7 @@ internal sealed class GrpcEventSource : EventSource
 {
     public static readonly GrpcEventSource Log = new GrpcEventSource();
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
     private PollingCounter? _totalCallsCounter;
     private PollingCounter? _currentCallsCounter;
     private PollingCounter? _messagesSentCounter;
@@ -146,7 +146,7 @@ protected override void OnEventCommand(EventCommandEventArgs command)
             // This is the convention for initializing counters in the RuntimeEventSource (lazily on the first enable command).
             // They aren't disabled afterwards...
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
             _totalCallsCounter ??= new PollingCounter("total-calls", this, () => Volatile.Read(ref _totalCalls))
             {
                 DisplayName = "Total Calls",
diff --git a/src/Grpc.Net.Client/Internal/GrpcProtocolConstants.cs b/src/Grpc.Net.Client/Internal/GrpcProtocolConstants.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -24,7 +24,7 @@ namespace Grpc.Net.Client.Internal;
 
 internal static class GrpcProtocolConstants
 {
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
     public static readonly Version Http2Version = System.Net.HttpVersion.Version20;
 #else
     public static readonly Version Http2Version = new Version(2, 0);
@@ -76,7 +76,7 @@ internal static class GrpcProtocolConstants
     internal static string GetMessageAcceptEncoding(Dictionary<string, ICompressionProvider> compressionProviders)
     {
         return IdentityGrpcEncoding + "," +
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
             string.Join(',', compressionProviders.Select(p => p.Key));
 #else
             string.Join(",", compressionProviders.Select(p => p.Key));
diff --git a/src/Grpc.Net.Client/Internal/Http/PushStreamContent.cs b/src/Grpc.Net.Client/Internal/Http/PushStreamContent.cs
@@ -18,7 +18,7 @@
 
 using System.Net;
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
 using ValueTask = System.Threading.Tasks.Task;
 #endif
 
diff --git a/src/Grpc.Net.Client/Internal/Http/PushUnaryContent.cs b/src/Grpc.Net.Client/Internal/Http/PushUnaryContent.cs
@@ -19,7 +19,7 @@
 using System.Net;
 using Grpc.Shared;
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
 using ValueTask = System.Threading.Tasks.Task;
 #endif
 
diff --git a/src/Grpc.Net.Client/Internal/Http/WinHttpUnaryContent.cs b/src/Grpc.Net.Client/Internal/Http/WinHttpUnaryContent.cs
@@ -19,7 +19,7 @@
 using Grpc.Shared;
 using System.Net;
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
 using ValueTask = System.Threading.Tasks.Task;
 #endif
 
diff --git a/src/Grpc.Net.Client/Internal/HttpContentClientStreamWriter.cs b/src/Grpc.Net.Client/Internal/HttpContentClientStreamWriter.cs
@@ -22,7 +22,7 @@
 using Grpc.Shared;
 using Log = Grpc.Net.Client.Internal.ClientStreamWriterBaseLog;
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
 using ValueTask = System.Threading.Tasks.Task;
 #endif
 
diff --git a/src/Grpc.Net.Client/Internal/IGrpcCall.cs b/src/Grpc.Net.Client/Internal/IGrpcCall.cs
@@ -19,7 +19,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Grpc.Core;
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
 using ValueTask = System.Threading.Tasks.Task;
 #endif
 
diff --git a/src/Grpc.Net.Client/Internal/Retry/RetryCallBase.cs b/src/Grpc.Net.Client/Internal/Retry/RetryCallBase.cs
@@ -24,7 +24,7 @@
 using Microsoft.Extensions.Logging;
 using Log = Grpc.Net.Client.Internal.Retry.RetryCallBaseLog;
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
 using ValueTask = System.Threading.Tasks.Task;
 #endif
 
@@ -202,7 +202,7 @@ private PushStreamContent<TRequest, TResponse> CreatePushStreamContent(GrpcCall<
 
                 if (BufferedMessages.Count == 0)
                 {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
                     writeTask = Task.CompletedTask;
 #else
                     writeTask = default;
diff --git a/src/Grpc.Net.Client/Internal/Retry/StatusGrpcCall.cs b/src/Grpc.Net.Client/Internal/Retry/StatusGrpcCall.cs
@@ -19,7 +19,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Grpc.Core;
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
 using ValueTask = System.Threading.Tasks.Task;
 #endif
 
diff --git a/src/Grpc.Net.Client/Internal/StreamExtensions.cs b/src/Grpc.Net.Client/Internal/StreamExtensions.cs
@@ -26,7 +26,7 @@
 using Grpc.Shared;
 using Microsoft.Extensions.Logging;
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
 using ValueTask = System.Threading.Tasks.Task;
 #endif
 
@@ -42,7 +42,7 @@ private static Status CreateUnknownMessageEncodingMessageStatus(string unsupport
         return new Status(StatusCode.Unimplemented, $"Unsupported grpc-encoding value '{unsupportedEncoding}'. Supported encodings: {string.Join(", ", supportedEncodings)}");
     }
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
     public static async ValueTask<TResponse?> ReadMessageAsync<TResponse>(
 #else
     public static async Task<TResponse?> ReadMessageAsync<TResponse>(
@@ -194,7 +194,7 @@ private static Status CreateUnknownMessageEncodingMessageStatus(string unsupport
         }
     }
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
     public static Task<int> ReadAsync(this Stream stream, Memory<byte> buffer, CancellationToken cancellationToken = default)
     {
         if (MemoryMarshal.TryGetArray<byte>(buffer, out var segment))
diff --git a/src/Grpc.Net.Client/Internal/UserAgentGenerator.cs b/src/Grpc.Net.Client/Internal/UserAgentGenerator.cs
@@ -136,7 +136,7 @@ private static string GetFrameworkName(string? frameworkName)
         }
 
         var splitFramework = frameworkName!.Split(',');
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
         var version = Version.Parse(splitFramework[1].AsSpan("Version=v".Length));
 #else
         var version = Version.Parse(splitFramework[1].Substring("Version=v".Length));
@@ -145,7 +145,7 @@ private static string GetFrameworkName(string? frameworkName)
         {
             ".NETCoreApp" when version.Major < 5 => $"netcoreapp{version.ToString(2)}",
             ".NETCoreApp" when version.Major >= 5 => $"net{version.ToString(2)}",
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
             ".NETFramework" => $"net{version.ToString().Replace(".", string.Empty, StringComparison.OrdinalIgnoreCase)}",
 #else
             ".NETFramework" => $"net{version.ToString().Replace(".", string.Empty)}",
diff --git a/src/Grpc.Net.Common/AsyncStreamReaderExtensions.cs b/src/Grpc.Net.Common/AsyncStreamReaderExtensions.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -16,7 +16,7 @@
 
 #endregion
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
 
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
@@ -55,4 +55,4 @@ private static async IAsyncEnumerable<T> ReadAllAsyncCore<T>(IAsyncStreamReader<
     }
 }
 
-#endif
+#endif
diff --git a/src/Shared/CompatibilityHelpers.cs b/src/Shared/CompatibilityHelpers.cs
@@ -1,4 +1,4 @@
-﻿// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
@@ -17,14 +17,14 @@ public static void Assert([DoesNotReturnIf(false)] bool condition, string? messa
     public static bool IsCompletedSuccessfully(this Task task)
     {
         // IsCompletedSuccessfully is the faster method, but only currently exposed on .NET Core 2.0+
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
         return task.IsCompletedSuccessfully;
 #else
         return task.Status == TaskStatus.RanToCompletion;
 #endif
     }
 
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET462
     public static bool IsCompletedSuccessfully(this ValueTask task)
     {
         return task.IsCompletedSuccessfully;
@@ -38,7 +38,7 @@ public static bool IsCompletedSuccessfully<T>(this ValueTask<T> task)
 
     public static int IndexOf(string s, char value, StringComparison comparisonType)
     {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET462
         return s.IndexOf(value);
 #else
         return s.IndexOf(value, comparisonType);
@@ -66,4 +66,4 @@ public static CancellationTokenRegistration RegisterWithCancellationTokenCallbac
         return cancellationToken.Register((state) => callback(state, cancellationToken), state);
 #endif
     }
-}
+}
diff --git a/src/Shared/HttpHandlerFactory.cs b/src/Shared/HttpHandlerFactory.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -37,7 +37,9 @@ public static HttpMessageHandler CreatePrimaryHandler()
         }
 #endif
 
-#if !NETSTANDARD2_0
+#if NET462
+        return new WinHttpHandler();
+#elif !NETSTANDARD2_0
         return new HttpClientHandler();
 #else
         var message =
diff --git a/src/Shared/IsExternalInit.cs b/src/Shared/IsExternalInit.cs
@@ -1,4 +1,4 @@
-﻿#region Copyright notice and license
+#region Copyright notice and license
 
 // Copyright 2019 The gRPC Authors
 //
@@ -18,7 +18,7 @@
 
 namespace System.Runtime.CompilerServices;
 
-#if NETCOREAPP3_0 || NETSTANDARD2_0_OR_GREATER
+#if NETCOREAPP3_0 || NETSTANDARD2_0_OR_GREATER || NET462
 internal static class IsExternalInit
 {
 }
diff --git a/src/Shared/NullableAttributes.cs b/src/Shared/NullableAttributes.cs
diff --git a/src/Shared/TrailingHeadersHelpers.cs b/src/Shared/TrailingHeadersHelpers.cs
diff --git a/test/Grpc.Net.Client.Tests/AsyncUnaryCallTests.cs b/test/Grpc.Net.Client.Tests/AsyncUnaryCallTests.cs
diff --git a/test/Grpc.Net.Client.Tests/GetTrailersTests.cs b/test/Grpc.Net.Client.Tests/GetTrailersTests.cs
diff --git a/test/Grpc.Net.Client.Tests/GrpcChannelTests.cs b/test/Grpc.Net.Client.Tests/GrpcChannelTests.cs

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#region Copyright notice and license`
	`1`	`+#region Copyright notice and license`
`2`	`2`
`3`	`3`	`// Copyright 2019 The gRPC Authors`
`4`	`4`	`//`
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`using System.Diagnostics;`
`20`	`20`
`21`		`-#if NETSTANDARD2_0`
	`21`	`+#if NETSTANDARD2_0 \|\| NET462`
`22`	`22`
`23`	`23`	`// Copied with permission from https://github.com/dotnet/runtime/blob/589d0dc326bf0699149f76033fa66d4b22b9a7fd/src/libraries/Common/src/System/Buffers/ArrayBufferWriter.cs`
`24`	`24`	`// This copy of ArrayBufferWriter is only used with .NET Stardard 2.0. Later versions of .NET ship with this type.`
`@@ -227,4 +227,4 @@ private static void ThrowOutOfMemoryException(uint capacity)`
`227`	`227`	`}`
`228`	`228`	`}`
`229`	`229`
`230`		`-#endif`
	`230`	`+#endif`