huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merged PR 898: Update MessagePack dependency 

Update MessagePack dependency
This commit is contained in:
Brennan Conroy 2019-04-12 22:25:38 +00:00 committed by Andrew Stanton-Nurse
parent ec00758af9
commit 6ecdff7c68
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/dependencies.props
View File

@ -138,7 +138,7 @@
<IdentityServer4PackageVersion>2.3.0</IdentityServer4PackageVersion> <IdentityServer4PackageVersion>2.3.0</IdentityServer4PackageVersion>
<GoogleProtobufPackageVersion>3.1.0</GoogleProtobufPackageVersion> <GoogleProtobufPackageVersion>3.1.0</GoogleProtobufPackageVersion>
<LibuvPackageVersion>1.10.0</LibuvPackageVersion> <LibuvPackageVersion>1.10.0</LibuvPackageVersion>
<MessagePackPackageVersion>1.7.3.4</MessagePackPackageVersion> <MessagePackPackageVersion>1.7.3.7</MessagePackPackageVersion>
<MicrosoftApplicationInsightsAspNetCorePackageVersion>2.1.1</MicrosoftApplicationInsightsAspNetCorePackageVersion> <MicrosoftApplicationInsightsAspNetCorePackageVersion>2.1.1</MicrosoftApplicationInsightsAspNetCorePackageVersion>
<MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion> <MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleStablePackageVersion>
<MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion> <MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>2.2.0</MicrosoftAspNetCoreAspNetCoreModuleV2StablePackageVersion>

2
build/sources.props
View File

@ -22,7 +22,7 @@
https://dotnet.myget.org/F/roslyn/api/v3/index.json; https://dotnet.myget.org/F/roslyn/api/v3/index.json;
https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json; https://dotnet.myget.org/F/roslyn-tools/api/v3/index.json;
https://vside.myget.org/F/vssdk/api/v3/index.json; https://vside.myget.org/F/vssdk/api/v3/index.json;
https://vside.myget.org/F/vsmac/api/v3/index.json https://vside.myget.org/F/vsmac/api/v3/index.json;
</RestoreSources> </RestoreSources>
<PublicCoreFeedPrefix>https://dotnetcli.blob.core.windows.net/dotnet/</PublicCoreFeedPrefix> <PublicCoreFeedPrefix>https://dotnetcli.blob.core.windows.net/dotnet/</PublicCoreFeedPrefix>

1
eng/Dependencies.props
View File

@ -107,6 +107,7 @@ and are generated based on the last package release.
<LatestPackageReference Include="IdentityServer4.AspNetIdentity" Version="$(IdentityServer4AspNetIdentityPackageVersion)" /> <LatestPackageReference Include="IdentityServer4.AspNetIdentity" Version="$(IdentityServer4AspNetIdentityPackageVersion)" />
<LatestPackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" /> <LatestPackageReference Include="IdentityServer4.EntityFramework" Version="$(IdentityServer4EntityFrameworkPackageVersion)" />
<LatestPackageReference Include="IdentityServer4" Version="$(IdentityServer4PackageVersion)" /> <LatestPackageReference Include="IdentityServer4" Version="$(IdentityServer4PackageVersion)" />
<LatestPackageReference Include="MessagePack" Version="$(MessagePackPackageVersion)" />
<LatestPackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" /> <LatestPackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" />
<LatestPackageReference Include="Moq" Version="$(MoqPackageVersion)" /> <LatestPackageReference Include="Moq" Version="$(MoqPackageVersion)" />
<!-- This version is required by MSBuild tasks or Visual Studio extensions. --> <!-- This version is required by MSBuild tasks or Visual Studio extensions. -->

3
eng/PatchConfig.props
View File

@ -54,6 +54,9 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.AspNetCoreModule; Microsoft.AspNetCore.AspNetCoreModule;
Microsoft.AspNetCore.AspNetCoreModuleV2; Microsoft.AspNetCore.AspNetCoreModuleV2;
java:signalr; java:signalr;
Microsoft.AspNetCore.SignalR.Protocols.MessagePack;
Microsoft.AspNetCore.SignalR.Redis;
Microsoft.AspNetCore.SignalR.StackExchangeRedis;
</PackagesInPatch> </PackagesInPatch>
</PropertyGroup> </PropertyGroup>

5
src/SignalR/common/Protocols.MessagePack/src/Protocol/MessagePackHubProtocol.cs
View File

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