Release 1.15.2

Author: Y-Sindo

docs/emulator.md

@@ -1,6 +1,6 @@
 # Azure SignalR Local Emulator
 
-When developing serverless applications, we provide an Azure SignalR Local Emulator to make the local development and integration easier. Please note that the emulator works only for serverless scenarios, for *Default* mode that the Azure SignalR Service acts as a proxy, you can directly use self-host SignalR to do local development.
+When developing serverless applications, we provide an Azure SignalR Local Emulator to make the local development and integration easier. Please note that the emulator works only for serverless scenarios, for *Default* mode that the Azure SignalR Service acts as a proxy, you can directly use self-host SignalR to do local development. Please also note that emulator only works for *Transient* transport type (the default one) and doesn't work for *Persistent* transport type.
 
 Features available
 ------------------

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

@@ -96,9 +96,13 @@ public async Task ThrowExceptionOnResponseFailureAsync(HttpResponseMessage respo
 
             var detail = await response.Content.ReadAsStringAsync();
 
+#if NET5_0_OR_GREATER
             var innerException = new HttpRequestException(
-                $"Response status code does not indicate success: {(int)response.StatusCode} ({response.ReasonPhrase})"); ;
-
+    $"Response status code does not indicate success: {(int)response.StatusCode} ({response.ReasonPhrase})", null, response.StatusCode);
+#else
+            var innerException = new HttpRequestException(
+                $"Response status code does not indicate success: {(int)response.StatusCode} ({response.ReasonPhrase})");
+#endif
             throw response.StatusCode switch
             {
                 HttpStatusCode.BadRequest => new AzureSignalRInvalidArgumentException(response.RequestMessage.RequestUri.ToString(), innerException, detail),

src/Microsoft.Azure.SignalR.Management/ServiceManagerImpl.cs

@@ -43,14 +43,12 @@ public async Task<IServiceHubContext> CreateHubContextAsync(string hubName, ILog
         public override Task<ServiceHubContext> CreateHubContextAsync(string hubName, CancellationToken cancellationToken)
         {
             var builder = new ServiceHubContextBuilder(_services);
-            builder.ConfigureServices(services => services.Configure<ServiceManagerOptions>(o => o.ConnectionCount = 3));
             return builder.CreateAsync(hubName, cancellationToken);
         }
 
         public override Task<ServiceHubContext<T>> CreateHubContextAsync<T>(string hubName, CancellationToken cancellation)
         {
             var builder = new ServiceHubContextBuilder(_services);
-            builder.ConfigureServices(services => services.Configure<ServiceManagerOptions>(o => o.ConnectionCount = 3));
             return builder.CreateAsync<T>(hubName, cancellation);
         }
 

test/Microsoft.Azure.SignalR.Common.Tests/RestClients/RestClientFacts.cs

@@ -0,0 +1,30 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.Net;
+using System.Net.Http;
+using System.Threading.Tasks;
+using Azure.Core.Serialization;
+using Microsoft.Azure.SignalR.Tests.Common;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace Microsoft.Azure.SignalR.Common.Tests.RestClients
+{
+    public class RestClientFacts
+    {
+#if NET5_0_OR_GREATER
+        [Fact]
+        public async Task TestHttpRequestExceptionWithStatusCodeSetAsync()
+        {
+            var httpClientFactory = new ServiceCollection()
+                .AddHttpClient("").ConfigurePrimaryHttpMessageHandler(() => new TestRootHandler(HttpStatusCode.InsufficientStorage)).Services
+                .BuildServiceProvider().GetRequiredService<IHttpClientFactory>();
+            var client = new RestClient(httpClientFactory, new JsonObjectSerializer(), true);
+            var exception = await Assert.ThrowsAsync<AzureSignalRRuntimeException>(() => client.SendAsync(new RestApiEndpoint("https://localhost.test.com", "token"), HttpMethod.Get, "", handleExpectedResponse: null));
+            var httpRequestException = Assert.IsType<HttpRequestException>(exception.InnerException);
+            Assert.Equal(HttpStatusCode.InsufficientStorage, httpRequestException.StatusCode);
+        }
+#endif
+    }
+}

test/Microsoft.Azure.SignalR.Management.Tests/ServiceManagerFacts.cs

@@ -192,7 +192,23 @@ public async Task TestCreateServiceHubContext()
                 .ConfigureServices(services => services.AddSingleton<RestClientFactory>(new TestRestClientFactory(UserAgent, HttpStatusCode.OK)))
                 .BuildServiceManager()
                 .CreateHubContextAsync(HubName, default);
-            Assert.Equal(3, (serviceHubContext as ServiceHubContextImpl).ServiceProvider.GetRequiredService<IOptions<ServiceManagerOptions>>().Value.ConnectionCount);
+            Assert.Equal(1, (serviceHubContext as ServiceHubContextImpl).ServiceProvider.GetRequiredService<IOptions<ServiceManagerOptions>>().Value.ConnectionCount);
+        }
+
+        [Fact]
+        public async Task TestConnectionCountCustomizable()
+        {
+            using var serviceHubContext = await new ServiceManagerBuilder()
+                .WithOptions(o =>
+                {
+                    o.ConnectionString = _testConnectionString;
+                    o.ConnectionCount = 5;
+                })
+                // avoid waiting for health check result for long time
+                .ConfigureServices(services => services.AddSingleton<RestClientFactory>(new TestRestClientFactory(UserAgent, HttpStatusCode.OK)))
+                .BuildServiceManager()
+                .CreateHubContextAsync(HubName, default);
+            Assert.Equal(5, (serviceHubContext as ServiceHubContextImpl).ServiceProvider.GetRequiredService<IOptions<ServiceManagerOptions>>().Value.ConnectionCount);
         }
     }
 }

test/Microsoft.Azure.SignalR.Tests.Common/TestRootHandler.cs

@@ -40,7 +40,10 @@ protected override void Dispose(bool disposing)
         protected override Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, CancellationToken cancellationToken)
         {
             //to avoid possible retry policy which dispose content, create new content each time
-            var response = new HttpResponseMessage(_code);
+            var response = new HttpResponseMessage(_code)
+            {
+                RequestMessage = request
+            };
             if (_content != null)
             {
                 response.Content = new ByteArrayContent(Encoding.UTF8.GetBytes(_content));

version.props

@@ -1,11 +1,11 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>1.15.1</VersionPrefix>
+    <VersionPrefix>1.15.2</VersionPrefix>
     <VersionSuffix>preview1</VersionSuffix>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' == 'rtm' ">$(VersionPrefix)</PackageVersion>
     <PackageVersion Condition="'$(IsFinalBuild)' == 'true' AND '$(VersionSuffix)' != 'rtm' ">$(VersionPrefix)-$(VersionSuffix)-final</PackageVersion>
     <BuildNumber Condition="'$(BuildNumber)' == ''">t000</BuildNumber>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(FeatureBranchVersionSuffix)' != ''">$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-'))</VersionSuffix>
     <VersionSuffix Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' != ''">$(VersionSuffix)-$(BuildNumber)</VersionSuffix>
   </PropertyGroup>
-</Project>
+</Project>