Merge branch 'release/2.2' -> 'master'

eng/PatchConfig.props

@@ -45,6 +45,10 @@ Later on, this will be checked using this condition:
       Microsoft.AspNetCore.AspNetCoreModuleV2;
       Microsoft.AspNetCore.Identity.UI;
       java:signalr;
+      Microsoft.AspNetCore.SignalR.Protocols.MessagePack;
+      Microsoft.AspNetCore.SignalR.Redis;
+      Microsoft.AspNetCore.SignalR.StackExchangeRedis;
+      Microsoft.AspNetCore.DataProtection.StackExchangeRedis;
       Microsoft.AspNetCore.Mvc.Core;
       Microsoft.AspNetCore.Mvc.RazorPages;
       Microsoft.AspNetCore.AzureAppServicesIntegration;

eng/Versions.props

@@ -182,7 +182,7 @@
     <IdentityServer4PackageVersion>3.0.0-preview3.4</IdentityServer4PackageVersion>
     <IdentityServer4StoragePackageVersion>3.0.0-preview3.4</IdentityServer4StoragePackageVersion>
     <IdentityServer4EntityFrameworkStoragePackageVersion>3.0.0-preview3.4</IdentityServer4EntityFrameworkStoragePackageVersion>
-    <MessagePackPackageVersion>1.7.3.4</MessagePackPackageVersion>
+    <MessagePackPackageVersion>1.7.3.7</MessagePackPackageVersion>
     <MoqPackageVersion>4.10.0</MoqPackageVersion>
     <MonoCecilPackageVersion>0.10.1</MonoCecilPackageVersion>
     <NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion>
@@ -193,7 +193,7 @@
     <SeleniumWebDriverPackageVersion>3.12.1</SeleniumWebDriverPackageVersion>
     <SerilogExtensionsLoggingPackageVersion>1.4.0</SerilogExtensionsLoggingPackageVersion>
     <SerilogSinksFilePackageVersion>4.0.0</SerilogSinksFilePackageVersion>
-    <StackExchangeRedisPackageVersion>2.0.513</StackExchangeRedisPackageVersion>
+    <StackExchangeRedisPackageVersion>2.0.593</StackExchangeRedisPackageVersion>
     <SystemReactiveLinqPackageVersion>3.1.1</SystemReactiveLinqPackageVersion>
     <XunitAbstractionsPackageVersion>2.0.3</XunitAbstractionsPackageVersion>
     <XunitAnalyzersPackageVersion>0.10.0</XunitAnalyzersPackageVersion>

src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs

@@ -272,14 +272,13 @@ namespace Microsoft.AspNetCore.SignalR.Protocol
             var headerCount = ReadMapLength(input, ref offset, "headers");
             if (headerCount > 0)
             {
-                // If headerCount is larger than int.MaxValue, things are going to go horribly wrong anyway :)
-                var headers = new Dictionary<string, string>((int)headerCount, StringComparer.Ordinal);
+                var headers = new Dictionary<string, string>(StringComparer.Ordinal);
 
                 for (var i = 0; i < headerCount; i++)
                 {
                     var key = ReadString(input, ref offset, $"headers[{i}].Key");
                     var value = ReadString(input, ref offset, $"headers[{i}].Value");
-                    headers[key] = value;
+                    headers.Add(key, value);
                 }
                 return headers;
             }