Skip to content

Commit a2531b2

Browse files
committed
Merge in 'release/6.0' changes
2 parents b357b22 + c606954 commit a2531b2

File tree

7 files changed

+345
-340
lines changed

7 files changed

+345
-340
lines changed

eng/Baseline.Designer.props

Lines changed: 229 additions & 226 deletions
Large diffs are not rendered by default.

eng/Baseline.xml

Lines changed: 107 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -4,111 +4,111 @@ This file contains a list of all the packages and their versions which were rele
44
Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="6.0.25">
8-
<Package Id="AspNetCoreRuntime.6.0.x64" Version="6.0.25" />
9-
<Package Id="AspNetCoreRuntime.6.0.x86" Version="6.0.25" />
10-
<Package Id="dotnet-sql-cache" Version="6.0.25" />
11-
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.25" />
12-
<Package Id="Microsoft.AspNetCore.App.Ref" Version="6.0.25" />
13-
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="6.0.25" />
14-
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="6.0.25" />
15-
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm" Version="6.0.25" />
16-
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="6.0.25" />
17-
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="6.0.25" />
18-
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="6.0.25" />
19-
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-arm64" Version="6.0.25" />
20-
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="6.0.25" />
21-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="6.0.25" />
22-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="6.0.25" />
23-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.25" />
24-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="6.0.25" />
25-
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.25" />
26-
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="6.0.25" />
27-
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="6.0.25" />
28-
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.25" />
29-
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="6.0.25" />
30-
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.25" />
31-
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.25" />
32-
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.25" />
33-
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.25" />
34-
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="6.0.25" />
35-
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="6.0.25" />
36-
<Package Id="Microsoft.AspNetCore.Authorization" Version="6.0.25" />
37-
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="6.0.25" />
38-
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="6.0.25" />
39-
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="6.0.25" />
40-
<Package Id="Microsoft.AspNetCore.Components" Version="6.0.25" />
41-
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.25" />
42-
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="6.0.25" />
43-
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="6.0.25" />
44-
<Package Id="Microsoft.AspNetCore.Components.Web" Version="6.0.25" />
45-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.25" />
46-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.25" />
47-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.25" />
48-
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.25" />
49-
<Package Id="Microsoft.AspNetCore.Components.WebView" Version="6.0.25" />
50-
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="6.0.25" />
51-
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="6.0.25" />
52-
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="6.0.25" />
53-
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.25" />
54-
<Package Id="Microsoft.AspNetCore.DataProtection" Version="6.0.25" />
55-
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="6.0.25" />
56-
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="6.0.25" />
57-
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="6.0.25" />
58-
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.25" />
59-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.25" />
60-
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="6.0.25" />
61-
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.25" />
62-
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="6.0.25" />
63-
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="6.0.25" />
64-
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.25" />
65-
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="6.0.25" />
66-
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="6.0.25" />
67-
<Package Id="Microsoft.AspNetCore.Metadata" Version="6.0.25" />
68-
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="6.0.25" />
69-
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.25" />
70-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.25" />
71-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.25" />
72-
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.25" />
73-
<Package Id="Microsoft.AspNetCore.Owin" Version="6.0.25" />
74-
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="6.0.25" />
75-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="6.0.25" />
76-
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="6.0.25" />
77-
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="6.0.25" />
78-
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="6.0.25" />
79-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="6.0.25" />
80-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.25" />
81-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.25" />
82-
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="6.0.25" />
83-
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.25" />
84-
<Package Id="Microsoft.AspNetCore.SpaProxy" Version="6.0.25" />
85-
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.25" />
86-
<Package Id="Microsoft.AspNetCore.TestHost" Version="6.0.25" />
87-
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="6.0.25" />
88-
<Package Id="Microsoft.CodeAnalysis.Razor" Version="6.0.25" />
89-
<Package Id="Microsoft.dotnet-openapi" Version="6.0.25" />
90-
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="6.0.25" />
91-
<Package Id="Microsoft.DotNet.Web.ItemTemplates.6.0" Version="6.0.25" />
92-
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.6.0" Version="6.0.25" />
93-
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0" Version="6.0.25" />
94-
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="6.0.25" />
95-
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="6.0.25" />
96-
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="6.0.25" />
97-
<Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.25" />
98-
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="6.0.25" />
99-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.25" />
100-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.25" />
101-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.25" />
102-
<Package Id="Microsoft.Extensions.Features" Version="6.0.25" />
103-
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.25" />
104-
<Package Id="Microsoft.Extensions.Http.Polly" Version="6.0.25" />
105-
<Package Id="Microsoft.Extensions.Identity.Core" Version="6.0.25" />
106-
<Package Id="Microsoft.Extensions.Identity.Stores" Version="6.0.25" />
107-
<Package Id="Microsoft.Extensions.Localization" Version="6.0.25" />
108-
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="6.0.25" />
109-
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.25" />
110-
<Package Id="Microsoft.Extensions.ObjectPool" Version="6.0.25" />
111-
<Package Id="Microsoft.Extensions.WebEncoders" Version="6.0.25" />
112-
<Package Id="Microsoft.JSInterop" Version="6.0.25" />
113-
<Package Id="Microsoft.JSInterop.WebAssembly" Version="6.0.25" />
7+
<Baseline Version="6.0.26">
8+
<Package Id="AspNetCoreRuntime.6.0.x64" Version="6.0.26" />
9+
<Package Id="AspNetCoreRuntime.6.0.x86" Version="6.0.26" />
10+
<Package Id="dotnet-sql-cache" Version="6.0.26" />
11+
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="6.0.26" />
12+
<Package Id="Microsoft.AspNetCore.App.Ref" Version="6.0.26" />
13+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm" Version="6.0.26" />
14+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-arm64" Version="6.0.26" />
15+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm" Version="6.0.26" />
16+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-arm64" Version="6.0.26" />
17+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-musl-x64" Version="6.0.26" />
18+
<Package Id="Microsoft.AspNetCore.App.Runtime.linux-x64" Version="6.0.26" />
19+
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-arm64" Version="6.0.26" />
20+
<Package Id="Microsoft.AspNetCore.App.Runtime.osx-x64" Version="6.0.26" />
21+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm" Version="6.0.26" />
22+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-arm64" Version="6.0.26" />
23+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="6.0.26" />
24+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x86" Version="6.0.26" />
25+
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="6.0.26" />
26+
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="6.0.26" />
27+
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="6.0.26" />
28+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="6.0.26" />
29+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="6.0.26" />
30+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.26" />
31+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="6.0.26" />
32+
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="6.0.26" />
33+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="6.0.26" />
34+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="6.0.26" />
35+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="6.0.26" />
36+
<Package Id="Microsoft.AspNetCore.Authorization" Version="6.0.26" />
37+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="6.0.26" />
38+
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="6.0.26" />
39+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="6.0.26" />
40+
<Package Id="Microsoft.AspNetCore.Components" Version="6.0.26" />
41+
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="6.0.26" />
42+
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="6.0.26" />
43+
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="6.0.26" />
44+
<Package Id="Microsoft.AspNetCore.Components.Web" Version="6.0.26" />
45+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.26" />
46+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.26" />
47+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.26" />
48+
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.26" />
49+
<Package Id="Microsoft.AspNetCore.Components.WebView" Version="6.0.26" />
50+
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="6.0.26" />
51+
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="6.0.26" />
52+
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="6.0.26" />
53+
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="6.0.26" />
54+
<Package Id="Microsoft.AspNetCore.DataProtection" Version="6.0.26" />
55+
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="6.0.26" />
56+
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="6.0.26" />
57+
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="6.0.26" />
58+
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.26" />
59+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="6.0.26" />
60+
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="6.0.26" />
61+
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.26" />
62+
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="6.0.26" />
63+
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="6.0.26" />
64+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="6.0.26" />
65+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="6.0.26" />
66+
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="6.0.26" />
67+
<Package Id="Microsoft.AspNetCore.Metadata" Version="6.0.26" />
68+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="6.0.26" />
69+
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.26" />
70+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.Extensions" Version="6.0.26" />
71+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.26" />
72+
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.26" />
73+
<Package Id="Microsoft.AspNetCore.Owin" Version="6.0.26" />
74+
<Package Id="Microsoft.AspNetCore.Razor.Language" Version="6.0.26" />
75+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="6.0.26" />
76+
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="6.0.26" />
77+
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="6.0.26" />
78+
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="6.0.26" />
79+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="6.0.26" />
80+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.26" />
81+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.26" />
82+
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="6.0.26" />
83+
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.26" />
84+
<Package Id="Microsoft.AspNetCore.SpaProxy" Version="6.0.26" />
85+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="6.0.26" />
86+
<Package Id="Microsoft.AspNetCore.TestHost" Version="6.0.26" />
87+
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="6.0.26" />
88+
<Package Id="Microsoft.CodeAnalysis.Razor" Version="6.0.26" />
89+
<Package Id="Microsoft.dotnet-openapi" Version="6.0.26" />
90+
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="6.0.26" />
91+
<Package Id="Microsoft.DotNet.Web.ItemTemplates.6.0" Version="6.0.26" />
92+
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.6.0" Version="6.0.26" />
93+
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.6.0" Version="6.0.26" />
94+
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="6.0.26" />
95+
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="6.0.26" />
96+
<Package Id="Microsoft.Extensions.Caching.SqlServer" Version="6.0.26" />
97+
<Package Id="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.26" />
98+
<Package Id="Microsoft.Extensions.Configuration.KeyPerFile" Version="6.0.26" />
99+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.26" />
100+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.26" />
101+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.26" />
102+
<Package Id="Microsoft.Extensions.Features" Version="6.0.26" />
103+
<Package Id="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.26" />
104+
<Package Id="Microsoft.Extensions.Http.Polly" Version="6.0.26" />
105+
<Package Id="Microsoft.Extensions.Identity.Core" Version="6.0.26" />
106+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="6.0.26" />
107+
<Package Id="Microsoft.Extensions.Localization" Version="6.0.26" />
108+
<Package Id="Microsoft.Extensions.Localization.Abstractions" Version="6.0.26" />
109+
<Package Id="Microsoft.Extensions.Logging.AzureAppServices" Version="6.0.26" />
110+
<Package Id="Microsoft.Extensions.ObjectPool" Version="6.0.26" />
111+
<Package Id="Microsoft.Extensions.WebEncoders" Version="6.0.26" />
112+
<Package Id="Microsoft.JSInterop" Version="6.0.26" />
113+
<Package Id="Microsoft.JSInterop.WebAssembly" Version="6.0.26" />
114114
</Baseline>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>6</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>27</AspNetCorePatchVersion>
12-
<ValidateBaseline>false</ValidateBaseline>
12+
<ValidateBaseline>true</ValidateBaseline>
1313
<!--
1414
When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
1515
-->

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"sdk": {
3-
"version": "6.0.125"
3+
"version": "6.0.126"
44
},
55
"tools": {
6-
"dotnet": "6.0.125",
6+
"dotnet": "6.0.126",
77
"runtimes": {
88
"dotnet/x64": [
99
"2.1.30",

src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
using System.Net.Http;
1414
using System.Net.WebSockets;
1515
using System.Security.Claims;
16+
using System.Security.Cryptography;
1617
using System.Security.Principal;
1718
using System.Text;
1819
using System.Threading;
@@ -2762,7 +2763,7 @@ public async Task ConnectionClosedRequestedTriggeredOnAuthExpiration()
27622763
[InlineData(HttpTransportType.WebSockets)]
27632764
public async Task AuthenticationExpirationSetOnAuthenticatedConnectionWithJWT(HttpTransportType transportType)
27642765
{
2765-
SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(Guid.NewGuid().ToByteArray());
2766+
SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(SHA256.HashData(Guid.NewGuid().ToByteArray()));
27662767
JwtSecurityTokenHandler JwtTokenHandler = new JwtSecurityTokenHandler();
27672768

27682769
using var host = CreateHost(services =>
@@ -2924,7 +2925,7 @@ public async Task AuthenticationExpirationSetOnAuthenticatedConnectionWithCookie
29242925
[InlineData(HttpTransportType.WebSockets)]
29252926
public async Task AuthenticationExpirationUsesCorrectScheme(HttpTransportType transportType)
29262927
{
2927-
var SecurityKey = new SymmetricSecurityKey(Guid.NewGuid().ToByteArray());
2928+
var SecurityKey = new SymmetricSecurityKey(SHA256.HashData(Guid.NewGuid().ToByteArray()));
29282929
var JwtTokenHandler = new JwtSecurityTokenHandler();
29292930

29302931
using var host = CreateHost(services =>

src/SignalR/samples/JwtSample/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace JwtSample
1818
{
1919
public class Startup
2020
{
21-
private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(RandomNumberGenerator.GetBytes(16));
21+
private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(RandomNumberGenerator.GetBytes(32));
2222
private readonly JwtSecurityTokenHandler JwtTokenHandler = new JwtSecurityTokenHandler();
2323

2424
public void ConfigureServices(IServiceCollection services)

src/SignalR/server/SignalR/test/Startup.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using System.IdentityModel.Tokens.Jwt;
66
using System.IO;
77
using System.Security.Claims;
8+
using System.Security.Cryptography;
89
using System.Threading.Tasks;
910
using Microsoft.AspNetCore.Authentication.JwtBearer;
1011
using Microsoft.AspNetCore.Authorization;
@@ -18,7 +19,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests
1819
{
1920
public class Startup
2021
{
21-
private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(Guid.NewGuid().ToByteArray());
22+
private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(SHA256.HashData(Guid.NewGuid().ToByteArray()));
2223
private readonly JwtSecurityTokenHandler JwtTokenHandler = new JwtSecurityTokenHandler();
2324

2425
public void ConfigureServices(IServiceCollection services)

0 commit comments

Comments
 (0)