Skip to content

Commit ecd58f3

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/7.0' changes
2 parents fabdff4 + 6187b6e commit ecd58f3

File tree

7 files changed

+330
-325
lines changed

7 files changed

+330
-325
lines changed

‎eng/Baseline.Designer.props

Lines changed: 217 additions & 214 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

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

‎eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AspNetCoreMajorVersion>7</AspNetCoreMajorVersion>
1010
<AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>16</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": "7.0.114"
3+
"version": "7.0.115"
44
},
55
"tools": {
6-
"dotnet": "7.0.114",
6+
"dotnet": "7.0.115",
77
"runtimes": {
88
"dotnet/x86": [
99
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"

‎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;
@@ -2818,7 +2819,7 @@ public async Task ConnectionClosedRequestedTriggeredOnAuthExpiration()
28182819
[InlineData(HttpTransportType.WebSockets)]
28192820
public async Task AuthenticationExpirationSetOnAuthenticatedConnectionWithJWT(HttpTransportType transportType)
28202821
{
2821-
SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(Guid.NewGuid().ToByteArray());
2822+
SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(SHA256.HashData(Guid.NewGuid().ToByteArray()));
28222823
JwtSecurityTokenHandler JwtTokenHandler = new JwtSecurityTokenHandler();
28232824

28242825
using var host = CreateHost(services =>
@@ -2980,7 +2981,7 @@ public async Task AuthenticationExpirationSetOnAuthenticatedConnectionWithCookie
29802981
[InlineData(HttpTransportType.WebSockets)]
29812982
public async Task AuthenticationExpirationUsesCorrectScheme(HttpTransportType transportType)
29822983
{
2983-
var SecurityKey = new SymmetricSecurityKey(Guid.NewGuid().ToByteArray());
2984+
var SecurityKey = new SymmetricSecurityKey(SHA256.HashData(Guid.NewGuid().ToByteArray()));
29842985
var JwtTokenHandler = new JwtSecurityTokenHandler();
29852986

29862987
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
@@ -11,7 +11,7 @@ namespace JwtSample;
1111

1212
public class Startup
1313
{
14-
private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(RandomNumberGenerator.GetBytes(16));
14+
private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(RandomNumberGenerator.GetBytes(32));
1515
private readonly JwtSecurityTokenHandler JwtTokenHandler = new JwtSecurityTokenHandler();
1616

1717
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)