Azure · JialinXin · Nov 8, 2022 · Sep 6, 2022 · Sep 6, 2022 · Sep 7, 2022
diff --git a/.editorconfig b/.editorconfig
@@ -247,3 +247,6 @@ dotnet_diagnostic.IDE0058.severity = none
 
 # IDE0022: Use block body for methods
 dotnet_diagnostic.IDE0022.severity = none
+
+# IDE0090: Use 'new(...)'
+dotnet_diagnostic.IDE0090.severity = silent
diff --git a/.github/workflows/osx.yml b/.github/workflows/osx.yml
@@ -1,8 +1,13 @@
 name: Gated-OSX
-on:
+on: 
  push:
    branches: 
-    - disable
+    - master
+    - dev
+ pull_request:
+   branches: 
+    - master
+    - dev
 jobs:
   build_osx:
     runs-on: macOS-latest
@@ -15,17 +20,30 @@ jobs:
           src:
           - 'src/**'
           - 'test/**'
+          - 'build/**'
+          - 'samples/**'
           - '*.cmd'
           - '*.ps1'
-          - '*.props'
-          - '*.targets'
+          - '**.props'
+          - '**.csproj'
+          - '**.targets'
           - '*.sh'
           - '*.sln'
 
     - name: Update SubModules
       if: steps.filter.outputs.src == 'true'
       run: git submodule update --init --recursive
-
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: |
+          7.0.x
+          6.0.x
+          5.0.x
+        include-prerelease: true
     - name: Build with dotnet
+      run:  "dotnet build AzureSignalR.sln /p:DisableNet461Tests=true"
+      if: steps.filter.outputs.src == 'true'
+    - name: Test
+      run:  "dotnet test --no-build"
       if: steps.filter.outputs.src == 'true'
-      run:  "./build.sh --ci /p:DisableNet461Tests=true"
diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml
@@ -20,15 +20,29 @@ jobs:
           src:
           - 'src/**'
           - 'test/**'
+          - 'build/**'
+          - 'samples/**'
           - '*.cmd'
           - '*.ps1'
-          - '*.props'
-          - '*.targets'
+          - '**.props'
+          - '**.csproj'
+          - '**.targets'
           - '*.sh'
           - '*.sln'
     - name: Update SubModules
       run: git submodule update --init --recursive
       if: steps.filter.outputs.src == 'true'
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: |
+          7.0.x
+          6.0.x
+          5.0.x
+        include-prerelease: true
     - name: Build with dotnet
-      run:  "./build.sh --ci /p:DisableNet461Tests=true"
+      run:  "dotnet build AzureSignalR.sln /p:DisableNet461Tests=true"
+      if: steps.filter.outputs.src == 'true'
+    - name: Test
+      run:  "dotnet test --no-build"
       if: steps.filter.outputs.src == 'true'
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -20,17 +20,28 @@ jobs:
           src:
           - 'src/**'
           - 'test/**'
+          - 'build/**'
+          - 'samples/**'
           - '*.cmd'
           - '*.ps1'
-          - '*.props'
-          - '*.targets'
+          - '**.props'
+          - '**.csproj'
+          - '**.targets'
           - '*.sh'
           - '*.sln'
     - name: Update SubModules
       run: git submodule update --init --recursive
       if: steps.filter.outputs.src == 'true'
 
-    - name: Build with dotnet
-      shell: powershell
-      run: .\run.ps1 default-build
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: |
+          7.0.x
+          6.0.x
+          5.0.x
+        include-prerelease: true
+
+    - name: Test
+      run: dotnet test
       if: steps.filter.outputs.src == 'true'
diff --git a/AzureSignalR.sln b/AzureSignalR.sln
@@ -78,6 +78,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.Ser
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Azure.SignalR.Serverless.Protocols.Tests", "test\Microsoft.Azure.SignalR.Serverless.Protocols.Tests\Microsoft.Azure.SignalR.Serverless.Protocols.Tests.csproj", "{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.Net60", "samples\ChatSample\ChatSample.Net60\ChatSample.Net60.csproj", "{594EC59A-7305-4A36-8BE6-4A928FBFD71B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChatSample.Net70", "samples\ChatSample\ChatSample.Net70\ChatSample.Net70.csproj", "{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -184,6 +188,14 @@ Global
 		{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{594EC59A-7305-4A36-8BE6-4A928FBFD71B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{594EC59A-7305-4A36-8BE6-4A928FBFD71B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{594EC59A-7305-4A36-8BE6-4A928FBFD71B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{594EC59A-7305-4A36-8BE6-4A928FBFD71B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{49634EE4-A0F4-4672-A8B3-B994CF81C9AB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -216,6 +228,8 @@ Global
 		{870A10E3-D17A-4239-9715-5610FFE1FC76} = {2429FBD8-1FCE-4C42-AA28-DF32F7249E77}
 		{52944A80-44A9-48D4-919D-11AAAD55193E} = {DA69F624-5398-4884-87E4-B816698CDE65}
 		{82C1FF3D-EC6C-4B21-B6A4-E69E8D75D0D0} = {2429FBD8-1FCE-4C42-AA28-DF32F7249E77}
+		{594EC59A-7305-4A36-8BE6-4A928FBFD71B} = {C965ED06-6A17-4329-B3C6-811830F4F4ED}
+		{49634EE4-A0F4-4672-A8B3-B994CF81C9AB} = {C965ED06-6A17-4329-B3C6-811830F4F4ED}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7945A4E4-ACDB-4F6E-95CA-6AC6E7C2CD59}

diff --git a/build.cmd b/build.cmd
diff --git a/build.sh b/build.sh
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -4,10 +4,6 @@
   </PropertyGroup>
   <PropertyGroup Label="Package Versions">
     <!-- Azure ASP.NET Core SignalR -->
-    <MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>1.0.0</MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>
-    <MicrosoftAspNetCoreHttpConnectionsClientPackage3_0Version>3.0.0</MicrosoftAspNetCoreHttpConnectionsClientPackage3_0Version>
-    <MicrosoftAspNetCoreHttpConnectionsClientPackage3_1Version>3.1.9</MicrosoftAspNetCoreHttpConnectionsClientPackage3_1Version>
-    <MicrosoftAspNetCoreHttpConnectionsClientPackage5_0Version>5.0.1</MicrosoftAspNetCoreHttpConnectionsClientPackage5_0Version>
     <MicrosoftAspNetCoreHttpConnectionsCommonPackageVersion>1.0.4</MicrosoftAspNetCoreHttpConnectionsCommonPackageVersion>
     <MicrosoftAspNetCoreHttpConnectionsCommonPackage3_0Version>3.0.0</MicrosoftAspNetCoreHttpConnectionsCommonPackage3_0Version>
     <MicrosoftAspNetCoreHttpConnectionsCommonPackage3_1Version>3.1.9</MicrosoftAspNetCoreHttpConnectionsCommonPackage3_1Version>
@@ -61,7 +57,7 @@
     <MicrosoftExtensionsHostingVersion>2.1.0</MicrosoftExtensionsHostingVersion>
 
     <!-- SignalR Serverless Protocols-->
-    <NewtonsoftJsonPackageVersion>12.0.2</NewtonsoftJsonPackageVersion>
+    <NewtonsoftJsonPackageVersion>13.0.1</NewtonsoftJsonPackageVersion>
 
     <!-- Signing -->
     <MicrosoftVisualStudioEngMicroBuildCoreVersion>1.0.0</MicrosoftVisualStudioEngMicroBuildCoreVersion>
@@ -77,9 +73,10 @@
     <!--Emulator -->
     <MicrosoftExtensionsCommandLineUtilsPackageVersion>1.1.1</MicrosoftExtensionsCommandLineUtilsPackageVersion>
     <SystemIOPipelinesPackageForEmulatorVersion>4.7.5</SystemIOPipelinesPackageForEmulatorVersion>
-    <EmulatorMicrosoftPackageVersion>3.1.24</EmulatorMicrosoftPackageVersion>
+    <EmulatorMicrosoftPackageVersion>6.0.9</EmulatorMicrosoftPackageVersion>
 
     <!--Testing -->
+    <MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>1.0.0</MicrosoftAspNetCoreHttpConnectionsClientPackageVersion>
     <MessagePackPackage3_1Version>1.9.11</MessagePackPackage3_1Version>
     <MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion>3.1.24</MicrosoftAspNetCoreSignalRProtocolsMessagePackPackageVersion>
     <MicrosoftNETTestSdkPackageVersion>15.6.1</MicrosoftNETTestSdkPackageVersion>

diff --git a/docs/build-source.md b/docs/build-source.md
@@ -7,9 +7,9 @@ Building Azure SignalR Service SDK from source allows you tweak and customize th
 
 Building Azure SignalR Service SDK requires:
 
-* Latest Visual Studio. <https://visualstudio.com>
+* Latest Visual Studio (include pre-release). <https://visualstudio.com>
 * Git. <https://git-scm.org>
-* AspNetCore 3.0 SDK (Version >= 3.0.0). <https://dotnet.microsoft.com/download/dotnet-core/3.0>	
+* .NET SDK (Version >= 7.0.0-preview.7). <https://dotnet.microsoft.com/download/dotnet>	
 
 ## Clone the source code
 
@@ -25,34 +25,14 @@ git submodule update --init --recursive
 
 ## Building on command-line
 
-You can build the entire project on command line with the `build.cmd`/`.sh` scripts.
+You can build the entire project on command line with the [`dotnet` command](https://docs.microsoft.com/dotnet/core/tools/dotnet). Run command below in the repo's root folder.
 
-On Windows:
 ```
-.\build.cmd
-```
-
-On macOS/Linux:
-```
-./build.sh
+dotnet build
 ```
 
 ## Building in Visual Studio
 
-Before opening our .sln files in Visual Studio or VS Code, it is suggested to run `.\build.cmd` to make sure all the dependencies are restored correctly.
-
-The solution file is **AzureSignalR.sln** in the root.
-
-## Build properties
-
-Additional properties can be added as an argument in the form `/property:$name=$value`, or `/p:$name=$value` for short. For example:
-```
-.\build.cmd /p:Configuration=Release
-```
-
-Common properties include:
+Before opening our .sln files in Visual Studio or VS Code, it is suggested to run `dotnet restore` to make sure all the dependencies are restored correctly.
 
-Property                 | Description
--------------------------|-------------------------------------------------------------------------------------------------------------
-BuildNumber              | (string). A specific build number, typically from a CI counter, which is appended to the preview1 label.
-Configuration            | `Debug` or `Release`. Default = `Debug`.
+The solution file is **AzureSignalR.sln** in the root.
diff --git a/docs/management-sdk-guide.md b/docs/management-sdk-guide.md
@@ -1,8 +1,6 @@
 # Azure SignalR Service Management SDK
 
-> **NOTE**
->
-> Azure SignalR Service only supports this SDK for ASP.NET CORE SignalR clients.
+This SDK is for ASP.NET **Core** SignalR. For differences between ASP.NET SignalR and ASP.NET Core SignalR, see [here](https://learn.microsoft.com/aspnet/core/signalr/version-differences?view=aspnetcore-6.0).
 
 ## Build Status
 
@@ -190,4 +188,4 @@ This SDK can communicates to Azure SignalR Service with two transport types:
 
 
 ### Next steps
-* [Customizing Json Serialization in Management SDK](./advanced-topics/json-object-serializer.md)
+* [Customizing Json Serialization in Management SDK](./advanced-topics/json-object-serializer.md)
diff --git a/docs/run-asp-net-core.md b/docs/run-asp-net-core.md
@@ -5,7 +5,7 @@
   - [2. Configure Connection String](#2-configure-connection-string)
   - [3. Configure Service Options](#3-configure-service-options)
     - [`ConnectionString`](#connectionstring)
-    - [`ConnectionCount`](#connectioncount)
+    - [`InitialHubServerConnectionCount`](#initialhubserverconnectioncount)
     - [`ApplicationName`](#applicationname)
     - [`ClaimsProvider`](#claimsprovider)
     - [`AccessTokenLifetime`](#accesstokenlifetime)
@@ -23,7 +23,7 @@
 Run below command to install SignalR Service SDK to your ASP&#46;NET Core project.
 
 ```bash
-dotnet add package Microsoft.Azure.SignalR --version 1.0.*
+dotnet add package Microsoft.Azure.SignalR
 ```
 
 In your `Startup` class, use SignalR Service SDK as the following code snippet.
@@ -37,7 +37,7 @@ public void ConfigureServices(IServiceCollection services)
 
 public void Configure(IApplicationBuilder app)
 {
-    app.UseAzureSignalR(routes =>
+    app.UseEndpoints(routes =>
     {
         routes.MapHub<YourHubClass>("/path_for_your_hub");
     });
@@ -73,11 +73,16 @@ There are a few options you can customize when using Azure SignalR Service SDK.
 - Default value is the `Azure:SignalR:ConnectionString` `connectionString` or `appSetting` in `web.config` file.
 - It can be reconfigured, but please make sure the value is **NOT** hard coded.
 
-### `ConnectionCount`
+### `InitialHubServerConnectionCount`
 
 - Default value is `5`.
 - This option controls the initial count of connections per hub between application server and Azure SignalR Service. Usually keep it as the default value is enough. During runtime, the SDK might start new server connections for performance tuning or load balancing. When you have big number of clients, you can give it a larger number for better throughput. For example, if you have 100,000 clients in total, the connection count can be increased to `10` or `15`.
 
+### `MaxHubServerConnectionCount`
+
+- Default value is `null`.
+- This option controls the max count of connections allowed per hub between application server and Azure SignalR Service. During runtime, the SDK might start new server connections for performance tuning or load balancing. By default a new server connection starts whenever needed. When the max allowed server connection count is configured, the SDK does not start new connections when server connection count reaches the limit.
+
 ### `ApplicationName`
 
 - Default value is `null`.
@@ -150,7 +155,7 @@ You can configure above options like the following sample code.
 services.AddSignalR()
         .AddAzureSignalR(options =>
             {
-                options.ConnectionCount = 10;
+                options.InitialHubServerConnectionCount = 10;
                 options.AccessTokenLifetime = TimeSpan.FromDays(1);
                 options.ClaimsProvider = context => context.User.Claims;
 

diff --git a/docs/run-asp-net.md b/docs/run-asp-net.md
@@ -5,7 +5,7 @@
   - [2. Configure Connection String](#2-configure-connection-string)
   - [3. Configure Service Options](#3-configure-service-options)
     - [`ConnectionString`](#connectionstring)
-    - [`ConnectionCount`](#connectioncount)
+    - [`InitialHubServerConnectionCount`](#initialhubserverconnectioncount)
     - [`ApplicationName`](#applicationname)
     - [`ClaimProvider`](#claimprovider)
     - [`AccessTokenLifetime`](#accesstokenlifetime)
@@ -55,11 +55,16 @@ There are a few [options](https://github.com/Azure/azure-signalr/blob/dev/src/Mi
 - Default value is the `Azure:SignalR:ConnectionString` `connectionString` or `appSetting` in `web.config` file.
 - It can be reconfigured, but please make sure the value is **NOT** hard coded.
 
-### `ConnectionCount`
+### `InitialHubServerConnectionCount`
 
 - Default value is `5`.
 - This option controls the initial count of connections per hub between application server and Azure SignalR Service. Usually keep it as the default value is enough. During runtime, the SDK might start new server connections for performance tuning or load balancing. When you have big number of clients, you can give it a larger number for better throughput. For example, if you have 100,000 clients in total, the connection count can be increased to `10` or `15`.
 
+### `MaxHubServerConnectionCount`
+
+- Default value is `null`.
+- This option controls the max count of connections allowed per hub between application server and Azure SignalR Service. During runtime, the SDK might start new server connections for performance tuning or load balancing. By default a new server connection starts whenever needed. When the max allowed server connection count is configured, the SDK does not start new connections when server connection count reaches the limit.
+
 ### `ApplicationName`
 
 - Default value is `null`.
@@ -104,7 +109,7 @@ You can configure above options like the following sample code.
 ```csharp
 app.Map("/signalr",subApp => subApp.RunAzureSignalR(this.GetType().FullName, new HubConfiguration(), options =>
 {
-    options.ConnectionCount = 1;
+    options.InitialHubServerConnectionCount = 1;
     options.AccessTokenLifetime = TimeSpan.FromDays(1);
     options.ClaimProvider = context => context.Authentication?.User.Claims;
 }));

diff --git a/docs/use-signalr-service.md b/docs/use-signalr-service.md
@@ -20,12 +20,9 @@ Go to [Azure Portal](https://portal.azure.com) to provision a SignalR service in
 
 ## Scale Out Application Server
 
-With Azure SignalR Service, persistent connections are offloaded from application server.
-It only has to take care of business logics in your hub classes.
+With Azure SignalR Service, persistent connections are offloaded from application server so that you can focus on implementing your business logic in hub classes.
 But you still need to scale out application servers for better performance when handling massive client connections.
 Below are a few tips for scaling out application servers.
-
 - Multiple application servers can connect to the same Azure SignalR Service instance.
-- As long as name of the hub class is the same, connections from different application servers are grouped in the same hub.
-- Each client connection will only be created in **one** of the application servers, and messages from that client will only be sent to the same application server.
-- If you want to access client information globally (from all application servers), you have to use some storage to save client information from all application servers.
+- As long as the name of the hub class is the same, connections from different application servers are grouped in the same hub.
+- Each client connection will only be created in ***one*** of the application servers, and messages from that client will only be sent to that same application server. If you want to access client information globally *(from all application servers)*, you have to use some centralized storage to save client information from all application servers.
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
diff --git a/korebuild.json b/korebuild.json