Fix for Android, which returns true for IsLinux().

ManickaP · ManickaP · commit e969f29a0acc · 2021-04-14T11:39:13.000+02:00
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/ConnectHelper.cs
@@ -104,6 +104,7 @@ private static async ValueTask<SslStream> EstablishSslConnectionAsyncCore(bool a
         [SupportedOSPlatform("windows")]
         [SupportedOSPlatform("linux")]
         [SupportedOSPlatform("macos")]
+        [UnsupportedOSPlatform("android")]
         public static async ValueTask<QuicConnection> ConnectQuicAsync(QuicImplementationProvider quicImplementationProvider, DnsEndPoint endPoint, SslClientAuthenticationOptions? clientAuthenticationOptions, CancellationToken cancellationToken)
         {
             QuicConnection con = new QuicConnection(quicImplementationProvider, endPoint, clientAuthenticationOptions);
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3Connection.cs
@@ -17,6 +17,7 @@ namespace System.Net.Http
     [SupportedOSPlatform("windows")]
     [SupportedOSPlatform("linux")]
     [SupportedOSPlatform("macos")]
+    [UnsupportedOSPlatform("android")]
     internal sealed class Http3Connection : HttpConnectionBase, IDisposable
     {
         // TODO: once HTTP/3 is standardized, create APIs for this.
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3ConnectionException.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3ConnectionException.cs
@@ -10,6 +10,7 @@ namespace System.Net.Http
     [SupportedOSPlatform("windows")]
     [SupportedOSPlatform("linux")]
     [SupportedOSPlatform("macos")]
+    [UnsupportedOSPlatform("android")]
     internal sealed class Http3ConnectionException : Http3ProtocolException
     {
         public Http3ConnectionException(Http3ErrorCode errorCode)
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3ProtocolException.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3ProtocolException.cs
@@ -10,6 +10,7 @@ namespace System.Net.Http
     [SupportedOSPlatform("windows")]
     [SupportedOSPlatform("linux")]
     [SupportedOSPlatform("macos")]
+    [UnsupportedOSPlatform("android")]
     internal class Http3ProtocolException : Exception
     {
         public Http3ErrorCode ErrorCode { get; }
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/Http3RequestStream.cs
@@ -19,6 +19,7 @@ namespace System.Net.Http
     [SupportedOSPlatform("windows")]
     [SupportedOSPlatform("linux")]
     [SupportedOSPlatform("macos")]
+    [UnsupportedOSPlatform("android")]
     internal sealed class Http3RequestStream : IHttpHeadersHandler, IAsyncDisposable, IDisposable
     {
         private readonly HttpRequestMessage _request;
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionPool.cs
@@ -121,7 +121,7 @@ public HttpConnectionPool(HttpConnectionPoolManager poolManager, HttpConnectionK
 
             _http2Enabled = _poolManager.Settings._maxHttpVersion >= HttpVersion.Version20;
             // TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished
-            if (OperatingSystem.IsLinux() || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
+            if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
             {
                 _http3Enabled = _poolManager.Settings._maxHttpVersion >= HttpVersion.Version30 && (_poolManager.Settings._quicImplementationProvider ?? QuicImplementationProviders.Default).IsSupported;
             }
@@ -246,7 +246,7 @@ public HttpConnectionPool(HttpConnectionPoolManager poolManager, HttpConnectionK
                 }
 
                 // TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished
-                if (OperatingSystem.IsLinux() || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
+                if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
                 {
                     if (_http3Enabled)
                     {
@@ -272,9 +272,9 @@ public HttpConnectionPool(HttpConnectionPoolManager poolManager, HttpConnectionK
         private static List<SslApplicationProtocol> CreateHttp3ApplicationProtocols()
         {
             // TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished
-            if (OperatingSystem.IsLinux() || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
+            if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
             {
-                // TODO: Once the HTTP/3 versions are part of SslApplicationProtocol, move this back to field initialization.
+                // TODO: Once the HTTP/3 versions are part of SslApplicationProtocol, see https://github.com/dotnet/runtime/issues/1293, move this back to field initialization.
                 return new List<SslApplicationProtocol>() { Http3Connection.Http3ApplicationProtocol31, Http3Connection.Http3ApplicationProtocol30, Http3Connection.Http3ApplicationProtocol29 };
             }
 
@@ -374,7 +374,7 @@ public byte[] Http2AltSvcOriginUri
             }
 
             // TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished
-            if (OperatingSystem.IsLinux() || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
+            if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
             {
                 // Either H3 explicitly requested or secured upgraded allowed.
                 if (_http3Enabled && (request.Version.Major >= 3 || (request.VersionPolicy == HttpVersionPolicy.RequestVersionOrHigher && IsSecure)))
@@ -747,6 +747,7 @@ private void AddHttp2Connection(Http2Connection newConnection)
         [SupportedOSPlatform("windows")]
         [SupportedOSPlatform("linux")]
         [SupportedOSPlatform("macos")]
+        [UnsupportedOSPlatform("android")]
         private async ValueTask<(HttpConnectionBase connection, bool isNewConnection)>
             GetHttp3ConnectionAsync(HttpRequestMessage request, HttpAuthority authority, CancellationToken cancellationToken)
         {
@@ -920,7 +921,7 @@ public async ValueTask<HttpResponseMessage> SendWithRetryAsync(HttpRequestMessag
                 }
 
                 // TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished
-                if (OperatingSystem.IsLinux() || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
+                if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
                 {
                     // If an Alt-Svc authority returns 421, it means it can't actually handle the request.
                     // An authority is supposed to be able to handle ALL requests to the origin, so this is a server bug.
diff --git a/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs b/src/libraries/System.Net.Http/src/System/Net/Http/SocketsHttpHandler/HttpConnectionSettings.cs
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Net.Quic;
 using System.Net.Quic.Implementations;
+using System.Runtime.Versioning;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -86,7 +87,7 @@ public HttpConnectionSettings CloneAndNormalize()
                 _cookieContainer = new CookieContainer();
             }
 
-            return new HttpConnectionSettings()
+            var settings = new HttpConnectionSettings()
             {
                 _allowAutoRedirect = _allowAutoRedirect,
                 _automaticDecompression = _automaticDecompression,
@@ -118,9 +119,17 @@ public HttpConnectionSettings CloneAndNormalize()
                 _responseHeaderEncodingSelector = _responseHeaderEncodingSelector,
                 _enableMultipleHttp2Connections = _enableMultipleHttp2Connections,
                 _connectCallback = _connectCallback,
-                _plaintextStreamFilter = _plaintextStreamFilter,
-                _quicImplementationProvider = _quicImplementationProvider
+                _plaintextStreamFilter = _plaintextStreamFilter
             };
+
+            // TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished
+            // TODO: Remove if/when QuicImplementationProvider is removed from System.Net.Quic.
+            if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
+            {
+                settings._quicImplementationProvider = _quicImplementationProvider;
+            }
+
+            return settings;
         }
 
         private static bool AllowHttp2
@@ -178,6 +187,11 @@ private static bool AllowDraftHttp3
         public bool EnableMultipleHttp2Connections => _enableMultipleHttp2Connections;
 
         private byte[]? _http3SettingsFrame;
+
+        [SupportedOSPlatform("windows")]
+        [SupportedOSPlatform("linux")]
+        [SupportedOSPlatform("macos")]
+        [UnsupportedOSPlatform("android")]
         internal byte[] Http3SettingsFrame => _http3SettingsFrame ??= Http3Connection.BuildSettingsFrame(this);
     }
 }
diff --git a/src/libraries/System.Net.Http/tests/TrimmingTests/HttpClientTest.cs b/src/libraries/System.Net.Http/tests/TrimmingTests/HttpClientTest.cs
@@ -19,7 +19,7 @@ static async Task<int> Main(string[] args)
         var quicDllExists = File.Exists(Path.Combine(AppContext.BaseDirectory, quicDll));
 
         // TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished
-        if (OperatingSystem.IsLinux() || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
+        if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) || OperatingSystem.IsWindows() || OperatingSystem.IsMacOS())
         {
             Console.WriteLine($"Expected {quicDll} is {(quicDllExists ? "present - OK" : "missing - BAD")}.");
             return quicDllExists ? 100 : -1;
diff --git a/src/libraries/System.Net.Quic/Directory.Build.props b/src/libraries/System.Net.Quic/Directory.Build.props
@@ -4,5 +4,6 @@
     <StrongNameKeyId>Microsoft</StrongNameKeyId>
     <IncludePlatformAttributes>true</IncludePlatformAttributes>
     <SupportedOSPlatforms>windows;linux;macos</SupportedOSPlatforms>
+    <UnsupportedOSPlatforms>android</UnsupportedOSPlatforms>
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -104,6 +104,7 @@ private static async ValueTask<SslStream> EstablishSslConnectionAsyncCore(bool a`
`104`	`104`	`[SupportedOSPlatform("windows")]`
`105`	`105`	`[SupportedOSPlatform("linux")]`
`106`	`106`	`[SupportedOSPlatform("macos")]`
	`107`	`+ [UnsupportedOSPlatform("android")]`
`107`	`108`	`public static async ValueTask<QuicConnection> ConnectQuicAsync(QuicImplementationProvider quicImplementationProvider, DnsEndPoint endPoint, SslClientAuthenticationOptions? clientAuthenticationOptions, CancellationToken cancellationToken)`
`108`	`109`	`{`
`109`	`110`	`QuicConnection con = new QuicConnection(quicImplementationProvider, endPoint, clientAuthenticationOptions);`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ namespace System.Net.Http`
`17`	`17`	`[SupportedOSPlatform("windows")]`
`18`	`18`	`[SupportedOSPlatform("linux")]`
`19`	`19`	`[SupportedOSPlatform("macos")]`
	`20`	`+ [UnsupportedOSPlatform("android")]`
`20`	`21`	`internal sealed class Http3Connection : HttpConnectionBase, IDisposable`
`21`	`22`	`{`
`22`	`23`	`// TODO: once HTTP/3 is standardized, create APIs for this.`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ namespace System.Net.Http`
`10`	`10`	`[SupportedOSPlatform("windows")]`
`11`	`11`	`[SupportedOSPlatform("linux")]`
`12`	`12`	`[SupportedOSPlatform("macos")]`
	`13`	`+ [UnsupportedOSPlatform("android")]`
`13`	`14`	`internal sealed class Http3ConnectionException : Http3ProtocolException`
`14`	`15`	`{`
`15`	`16`	`public Http3ConnectionException(Http3ErrorCode errorCode)`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ namespace System.Net.Http`
`19`	`19`	`[SupportedOSPlatform("windows")]`
`20`	`20`	`[SupportedOSPlatform("linux")]`
`21`	`21`	`[SupportedOSPlatform("macos")]`
	`22`	`+ [UnsupportedOSPlatform("android")]`
`22`	`23`	`internal sealed class Http3RequestStream : IHttpHeadersHandler, IAsyncDisposable, IDisposable`
`23`	`24`	`{`
`24`	`25`	`private readonly HttpRequestMessage _request;`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public HttpConnectionPool(HttpConnectionPoolManager poolManager, HttpConnectionK`
`121`	`121`
`122`	`122`	`_http2Enabled = _poolManager.Settings._maxHttpVersion >= HttpVersion.Version20;`
`123`	`123`	`// TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished`
`124`		`- if (OperatingSystem.IsLinux() \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
	`124`	`+ if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
`125`	`125`	`{`
`126`	`126`	`_http3Enabled = _poolManager.Settings._maxHttpVersion >= HttpVersion.Version30 && (_poolManager.Settings._quicImplementationProvider ?? QuicImplementationProviders.Default).IsSupported;`
`127`	`127`	`}`
`@@ -246,7 +246,7 @@ public HttpConnectionPool(HttpConnectionPoolManager poolManager, HttpConnectionK`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`// TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished`
`249`		`- if (OperatingSystem.IsLinux() \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
	`249`	`+ if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
`250`	`250`	`{`
`251`	`251`	`if (_http3Enabled)`
`252`	`252`	`{`
`@@ -272,9 +272,9 @@ public HttpConnectionPool(HttpConnectionPoolManager poolManager, HttpConnectionK`
`272`	`272`	`private static List<SslApplicationProtocol> CreateHttp3ApplicationProtocols()`
`273`	`273`	`{`
`274`	`274`	`// TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished`
`275`		`- if (OperatingSystem.IsLinux() \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
	`275`	`+ if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
`276`	`276`	`{`
`277`		`- // TODO: Once the HTTP/3 versions are part of SslApplicationProtocol, move this back to field initialization.`
	`277`	`+ // TODO: Once the HTTP/3 versions are part of SslApplicationProtocol, see https://github.com/dotnet/runtime/issues/1293, move this back to field initialization.`
`278`	`278`	`return new List<SslApplicationProtocol>() { Http3Connection.Http3ApplicationProtocol31, Http3Connection.Http3ApplicationProtocol30, Http3Connection.Http3ApplicationProtocol29 };`
`279`	`279`	`}`
`280`	`280`
`@@ -374,7 +374,7 @@ public byte[] Http2AltSvcOriginUri`
`374`	`374`	`}`
`375`	`375`
`376`	`376`	`// TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished`
`377`		`- if (OperatingSystem.IsLinux() \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
	`377`	`+ if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
`378`	`378`	`{`
`379`	`379`	`// Either H3 explicitly requested or secured upgraded allowed.`
`380`	`380`	`if (_http3Enabled && (request.Version.Major >= 3 \|\| (request.VersionPolicy == HttpVersionPolicy.RequestVersionOrHigher && IsSecure)))`
`@@ -747,6 +747,7 @@ private void AddHttp2Connection(Http2Connection newConnection)`
`747`	`747`	`[SupportedOSPlatform("windows")]`
`748`	`748`	`[SupportedOSPlatform("linux")]`
`749`	`749`	`[SupportedOSPlatform("macos")]`
	`750`	`+ [UnsupportedOSPlatform("android")]`
`750`	`751`	`private async ValueTask<(HttpConnectionBase connection, bool isNewConnection)>`
`751`	`752`	`GetHttp3ConnectionAsync(HttpRequestMessage request, HttpAuthority authority, CancellationToken cancellationToken)`
`752`	`753`	`{`
`@@ -920,7 +921,7 @@ public async ValueTask<HttpResponseMessage> SendWithRetryAsync(HttpRequestMessag`
`920`	`921`	`}`
`921`	`922`
`922`	`923`	`// TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished`
`923`		`- if (OperatingSystem.IsLinux() \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
	`924`	`+ if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
`924`	`925`	`{`
`925`	`926`	`// If an Alt-Svc authority returns 421, it means it can't actually handle the request.`
`926`	`927`	`// An authority is supposed to be able to handle ALL requests to the origin, so this is a server bug.`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ static async Task<int> Main(string[] args)`
`19`	`19`	`var quicDllExists = File.Exists(Path.Combine(AppContext.BaseDirectory, quicDll));`
`20`	`20`
`21`	`21`	`// TODO: Replace with Platform-Guard Assertion Annotations once https://github.com/dotnet/runtime/issues/44922 is finished`
`22`		`- if (OperatingSystem.IsLinux() \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
	`22`	`+ if ((OperatingSystem.IsLinux() && !OperatingSystem.IsAndroid()) \|\| OperatingSystem.IsWindows() \|\| OperatingSystem.IsMacOS())`
`23`	`23`	`{`
`24`	`24`	`Console.WriteLine($"Expected {quicDll} is {(quicDllExists ? "present - OK" : "missing - BAD")}.");`
`25`	`25`	`return quicDllExists ? 100 : -1;`