Merge pull request #1587 from vicancy/r1.16.1

Release 1.16.1 - patch1

src/Microsoft.Azure.SignalR.Common/Endpoints/ServiceEndpoint.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-
+using System.ComponentModel;
 using Azure.Core;
 
 namespace Microsoft.Azure.SignalR
@@ -76,6 +76,7 @@ public Uri ClientEndpoint
         /// </summary>
         /// <param name="nameWithEndpointType"></param>
         /// <param name="connectionString"></param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public ServiceEndpoint(string nameWithEndpointType, string connectionString) : this(connectionString)
         {
             (Name, EndpointType) = Parse(nameWithEndpointType);
@@ -113,6 +114,7 @@ public ServiceEndpoint(string connectionString, EndpointType type = EndpointType
         /// <param name="nameWithEndpointType"></param>
         /// <param name="endpoint"></param>
         /// <param name="credential"></param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public ServiceEndpoint(string nameWithEndpointType, Uri endpoint, TokenCredential credential) : this(endpoint, credential)
         {
             (Name, EndpointType) = Parse(nameWithEndpointType);
@@ -121,11 +123,14 @@ public ServiceEndpoint(string nameWithEndpointType, Uri endpoint, TokenCredentia
         /// <summary>
         /// Azure active directory constructor
         /// </summary>
-        /// <param name="endpoint"></param>
-        /// <param name="credential"></param>
-        /// <param name="endpointType"></param>
-        /// <param name="name"></param>
-        public ServiceEndpoint(Uri endpoint, TokenCredential credential, EndpointType endpointType = EndpointType.Primary, string name = "")
+        /// <param name="endpoint">SignalR Service endpoint.</param>
+        /// <param name="credential">The Azure Active Directory credential.</param>
+        /// <param name="endpointType">The endpoint type.</param>
+        /// <param name="name">The endpoint name.</param>
+        /// <param name="serverEndpoint">The endpoint for servers to connect to Azure SignalR.</param>
+        /// <param name="clientEndpoint">The endpoint for clients to connect to Azure SignalR.</param>
+        public ServiceEndpoint(Uri endpoint, TokenCredential credential, EndpointType endpointType = EndpointType.Primary, string name = "",
+            Uri serverEndpoint = null, Uri clientEndpoint = null)
         {
             _serviceEndpoint = endpoint ?? throw new ArgumentNullException(nameof(endpoint));
             CheckScheme(endpoint);
@@ -139,6 +144,8 @@ public ServiceEndpoint(Uri endpoint, TokenCredential credential, EndpointType en
 
             AudienceBaseUrl = BuildAudienceBaseUrlEndWithSlash(_serviceEndpoint);
             Endpoint = BuildEndpointString(_serviceEndpoint);
+            ServerEndpoint = serverEndpoint;
+            ClientEndpoint = clientEndpoint;
         }
 
         /// <summary>

src/Microsoft.Azure.SignalR.Common/Utilities/IsExternalInit.cs

@@ -1,8 +1,5 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-#if NETSTANDARD2_0 || NETCOREAPP3_0
-
 using System.ComponentModel;
 
 namespace System.Runtime.CompilerServices
@@ -16,6 +13,4 @@ namespace System.Runtime.CompilerServices
     internal static class IsExternalInit
     {
     }
-}
-
-#endif
+}