Use predefined preprocessor symbols

Author: TalAloni

StandardSocketsHttpHandler.FunctionalTests/HttpClientHandlerTest.SslProtocols.cs

@@ -38,13 +38,11 @@ public void DefaultProtocols_MatchesExpected()
         [InlineData(SslProtocols.Tls11 | SslProtocols.Tls12)]
         [InlineData(SslProtocols.Tls | SslProtocols.Tls12)]
         [InlineData(SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12)]
-#if !netstandard
         [InlineData(Tls13Protocol)]
         [InlineData(SslProtocols.Tls11 | Tls13Protocol)]
         [InlineData(SslProtocols.Tls12 | Tls13Protocol)]
         [InlineData(SslProtocols.Tls | Tls13Protocol)]
         [InlineData(SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12 | Tls13Protocol)]
-#endif
         public void SetGetProtocols_Roundtrips(SslProtocols protocols)
         {
             using (StandardSocketsHttpHandler handler = CreateSocketsHttpHandler())
@@ -102,14 +100,12 @@ public static IEnumerable<object[]> GetAsync_AllowedSSLVersion_Succeeds_MemberDa
                 yield return new object[] { SslProtocols.Ssl2, true };
             }
 #pragma warning restore 0618
-#if !netstandard
             // These protocols are new, and might not be enabled everywhere yet
             if (PlatformDetection.IsUbuntu1810OrHigher)
             {
                 yield return new object[] { Tls13Protocol, false };
                 yield return new object[] { Tls13Protocol, true };
             }
-#endif
         }
 
         [OuterLoop] // TODO: Issue #11345

StandardSocketsHttpHandler.FunctionalTests/StandardSocketsHttpHandler.FunctionalTests.csproj

@@ -6,10 +6,6 @@
     <DefineConstants>TargetsWindows</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net472' ">
-    <DefineConstants>TargetsWindows;NET472</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <Compile Remove="TestUtilities\PlatformDetection.NetFx.cs" />
   </ItemGroup>

StandardSocketsHttpHandler/Net/Http/SocketsHttpHandler/CancellationHelper.cs

@@ -25,7 +25,7 @@ internal static bool ShouldWrapInOperationCanceledException(Exception exception,
         /// <param name="cancellationToken">The <see cref="CancellationToken"/> that triggered the cancellation.</param>
         /// <returns>The cancellation exception.</returns>
         internal static Exception CreateOperationCanceledException(Exception innerException, CancellationToken cancellationToken) =>
-#if NETSTANDARD20
+#if NETSTANDARD2_0
             new TaskCanceledException(s_cancellationMessage, innerException); // TCE for compatibility with other handlers that use TaskCompletionSource.TrySetCanceled()
 #else
             new TaskCanceledException(s_cancellationMessage, innerException, cancellationToken); // TCE for compatibility with other handlers that use TaskCompletionSource.TrySetCanceled()

StandardSocketsHttpHandler/Net/Http/SocketsHttpHandler/HttpConnection.cs

@@ -1167,7 +1167,7 @@ private Task FlushAsync()
         private Task WriteToStreamAsync(ReadOnlyMemory<byte> source)
         {
             if (NetEventSource.IsEnabled) Trace($"Writing {source.Length} bytes.");
-#if NETSTANDARD20
+#if NETSTANDARD2_0
             return _stream.WriteAsync(source);
 #else
             return _stream.WriteAsync(source).AsTask();

StandardSocketsHttpHandler/Net/Http/SocketsHttpHandler/RedirectHandler.cs

@@ -108,7 +108,7 @@ private Uri GetUriForRedirect(Uri requestUri, HttpResponseMessage response)
                 string redirectFragment = location.Fragment;
                 if (string.IsNullOrEmpty(redirectFragment))
                 {
-#if NETSTANDARD20
+#if NETSTANDARD2_0
                     // .NET Framework 4.7.2 / 4.8 UriBuilder will always append the fragment marker ('#') to fragment starting with '#',
                     // while .NET Core will only append the fragment marker if not already present.
                     if (requestFragment.StartsWith("#"))

StandardSocketsHttpHandler/Net/SecurityProtocol.cs

@@ -9,10 +9,8 @@ namespace System.Net
     internal static class SecurityProtocol
     {
         public const SslProtocols DefaultSecurityProtocols =
-#if !netstandard && !netfx
             // SP_PROT_TLS1_3 / SslProtocols.Tls13 in netcoreapp3.0
             ((SslProtocols)12288) |
-#endif
             SslProtocols.Tls | SslProtocols.Tls11 | SslProtocols.Tls12;
 
         public const SslProtocols SystemDefaultSecurityProtocols = SslProtocols.None;

StandardSocketsHttpHandler/StandardSocketsHttpHandler.csproj

@@ -13,10 +13,6 @@
     <RepositoryUrl>https://github.com/TalAloni/StandardSocketsHttpHandler</RepositoryUrl>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <DefineConstants>NETSTANDARD20</DefineConstants>
-  </PropertyGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
     <Compile Remove="HashCode.cs" />
     <Compile Remove="IO\Extensions\StreamExtensions.cs" />