Cross-compile SignalR client libraries and enable platform compat ana…

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "5.0.100-rc.1.20452.10"
+    "version": "6.0.100-alpha.1.20472.11"
   },
   "tools": {
-    "dotnet": "5.0.100-rc.1.20452.10",
+    "dotnet": "6.0.100-alpha.1.20472.11",
     "runtimes": {
       "dotnet/x64": [
         "2.1.18",

src/Shared/OperatingSystem.cs

@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+#if NETCOREAPP
+#error Use System.OperatingSystem instead.
+#else
+
+using System.Runtime.InteropServices;
+
+namespace Microsoft.AspNetCore
+{
+    internal sealed class OperatingSystem
+    {
+        private static readonly bool _isBrowser = RuntimeInformation.IsOSPlatform(OSPlatform.Create("browser"));
+
+        public static bool IsBrowser() => _isBrowser;
+    }
+}
+#endif

src/SignalR/clients/csharp/Client.Core/src/HubConnection.cs

@@ -1459,7 +1459,7 @@ private async Task ReconnectAsync(Exception closeException)
 
         private OperationCanceledException GetOperationCanceledException(string message, Exception innerException, CancellationToken cancellationToken)
         {
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NETCOREAPP
             return new OperationCanceledException(message, innerException, _state.StopCts.Token);
 #else
             return new OperationCanceledException(message, innerException);

src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Client for ASP.NET Core SignalR</Description>
-    <TargetFrameworks>$(DefaultNetFxTargetFramework);netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0;netstandard2.1</TargetFrameworks>
     <RootNamespace>Microsoft.AspNetCore.SignalR.Client</RootNamespace>
   </PropertyGroup>
 
@@ -38,4 +38,8 @@
     <InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Client.Tests" />
   </ItemGroup>
 
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
+
 </Project>

src/SignalR/clients/csharp/Client/src/Microsoft.AspNetCore.SignalR.Client.csproj

@@ -1,8 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <Description>Client for ASP.NET Core SignalR</Description>
-    <TargetFrameworks>$(DefaultNetFxTargetFramework);netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework);netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -14,4 +14,8 @@
     <InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Client.Tests" />
     <InternalsVisibleTo Include="Microsoft.AspNetCore.SignalR.Client.FunctionalTests" />
   </ItemGroup>
+
+  <ItemGroup>
+    <SupportedPlatform Include="browser" />
+  </ItemGroup>
 </Project>

src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnection.cs

@@ -8,6 +8,7 @@
 using System.Linq;
 using System.Net.Http;
 using System.Net.WebSockets;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
@@ -38,7 +39,6 @@ public partial class HttpConnection : ConnectionContext, IConnectionInherentKeep
         private bool _started;
         private bool _disposed;
         private bool _hasInherentKeepAlive;
-        private bool _isRunningInBrowser;
 
         private readonly HttpClient _httpClient;
         private readonly HttpConnectionOptions _httpConnectionOptions;
@@ -152,9 +152,7 @@ public HttpConnection(HttpConnectionOptions httpConnectionOptions, ILoggerFactor
                 _httpClient = CreateHttpClient();
             }
 
-            _isRunningInBrowser = Utils.IsRunningInBrowser();
-
-            if (httpConnectionOptions.Transports == HttpTransportType.ServerSentEvents && _isRunningInBrowser)
+            if (httpConnectionOptions.Transports == HttpTransportType.ServerSentEvents && OperatingSystem.IsBrowser())
             {
                 throw new ArgumentException("ServerSentEvents can not be the only transport specified when running in the browser.", nameof(httpConnectionOptions));
             }
@@ -376,7 +374,7 @@ private async Task SelectAndStartTransport(TransferFormat transferFormat, Cancel
                         continue;
                     }
 
-                    if (transportType == HttpTransportType.ServerSentEvents && _isRunningInBrowser)
+                    if (transportType == HttpTransportType.ServerSentEvents && OperatingSystem.IsBrowser())
                     {
                         Log.ServerSentEventsNotSupportedByBrowser(_logger);
                         transportExceptions.Add(new TransportFailedException("ServerSentEvents", "The transport is not supported in the browser."));
@@ -529,42 +527,49 @@ private HttpClient CreateHttpClient()
             var httpClientHandler = new HttpClientHandler();
             HttpMessageHandler httpMessageHandler = httpClientHandler;
 
+            var isBrowser = OperatingSystem.IsBrowser();
+
             if (_httpConnectionOptions != null)
             {
-                if (_httpConnectionOptions.Proxy != null)
+                if (!isBrowser)
                 {
-                    httpClientHandler.Proxy = _httpConnectionOptions.Proxy;
-                }
+                    // Configure options that do not work in the browser inside this if-block
+                    if (_httpConnectionOptions.Proxy != null)
+                    {
+                        httpClientHandler.Proxy = _httpConnectionOptions.Proxy;
+                    }
 
-                try
-                {
-                    // On supported platforms, we need to pass the cookie container to the http client
-                    // so that we can capture any cookies from the negotiate response and give them to WebSockets.
-                    httpClientHandler.CookieContainer = _httpConnectionOptions.Cookies;
-                }
-                // Some variants of Mono do not support client certs or cookies and will throw NotImplementedException or NotSupportedException
-                // Also WASM doesn't support some settings in the browser
-                catch (Exception ex) when (ex is NotSupportedException || ex is NotImplementedException)
-                {
-                    Log.CookiesNotSupported(_logger);
-                }
+                    try
+                    {
+                        // On supported platforms, we need to pass the cookie container to the http client
+                        // so that we can capture any cookies from the negotiate response and give them to WebSockets.
+                        httpClientHandler.CookieContainer = _httpConnectionOptions.Cookies;
+                    }
+                    catch (Exception ex) when (ex is NotSupportedException || ex is NotImplementedException)
+                    {
+                        // Some variants of Mono do not support client certs or cookies and will throw NotImplementedException or NotSupportedException
+                        Log.CookiesNotSupported(_logger);
+                    }
 
-                // Only access HttpClientHandler.ClientCertificates
-                // if the user has configured those options
-                // https://github.com/aspnet/SignalR/issues/2232
-                var clientCertificates = _httpConnectionOptions.ClientCertificates;
-                if (clientCertificates?.Count > 0)
-                {
-                    httpClientHandler.ClientCertificates.AddRange(clientCertificates);
-                }
+                    // Only access HttpClientHandler.ClientCertificates
+                    // if the user has configured those options
+                    // https://github.com/aspnet/SignalR/issues/2232
 
-                if (_httpConnectionOptions.UseDefaultCredentials != null)
-                {
-                    httpClientHandler.UseDefaultCredentials = _httpConnectionOptions.UseDefaultCredentials.Value;
-                }
-                if (_httpConnectionOptions.Credentials != null)
-                {
-                    httpClientHandler.Credentials = _httpConnectionOptions.Credentials;
+                    var clientCertificates = _httpConnectionOptions.ClientCertificates;
+                    if (clientCertificates?.Count > 0)
+                    {
+                        httpClientHandler.ClientCertificates.AddRange(clientCertificates);
+                    }
+
+                    if (_httpConnectionOptions.UseDefaultCredentials != null)
+                    {
+                        httpClientHandler.UseDefaultCredentials = _httpConnectionOptions.UseDefaultCredentials.Value;
+                    }
+
+                    if (_httpConnectionOptions.Credentials != null)
+                    {
+                        httpClientHandler.Credentials = _httpConnectionOptions.Credentials;
+                    }
                 }
 
                 httpMessageHandler = httpClientHandler;
@@ -645,7 +650,7 @@ private void CheckDisposed()
 
         private static bool IsWebSocketsSupported()
         {
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NETCOREAPP
             // .NET Core 2.1 and above has a managed implementation
             return true;
 #else

src/SignalR/clients/csharp/Http.Connections.Client/src/HttpConnectionFactory.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Net;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Connections;
@@ -86,23 +87,22 @@ internal static HttpConnectionOptions ShallowCopyHttpConnectionOptions(HttpConne
             {
                 HttpMessageHandlerFactory = options.HttpMessageHandlerFactory,
                 Headers = options.Headers,
-                Cookies = options.Cookies,
                 Url = options.Url,
                 Transports = options.Transports,
                 SkipNegotiation = options.SkipNegotiation,
                 AccessTokenProvider = options.AccessTokenProvider,
                 CloseTimeout = options.CloseTimeout,
-                Credentials = options.Credentials,
-                Proxy = options.Proxy,
-                UseDefaultCredentials = options.UseDefaultCredentials,
                 DefaultTransferFormat = options.DefaultTransferFormat,
-                WebSocketConfiguration = options.WebSocketConfiguration,
             };
 
-            // WASM doesn't support Crypto APIs and our setter throws if you try to assign null
-            if (options.ClientCertificates != null)
+            if (!OperatingSystem.IsBrowser())
             {
+                newOptions.Cookies = options.Cookies;
                 newOptions.ClientCertificates = options.ClientCertificates;
+                newOptions.Credentials = options.Credentials;
+                newOptions.Proxy = options.Proxy;
+                newOptions.UseDefaultCredentials = options.UseDefaultCredentials;
+                newOptions.WebSocketConfiguration = options.WebSocketConfiguration;
             }
 
             return newOptions;