From c3295d5a1d786c9002fb3ec47c7f4066b64dc2c4 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 9 Jan 2024 12:58:22 -0800 Subject: [PATCH 1/2] Update baseline, SDK --- eng/Baseline.Designer.props | 431 ++++++++++++++++++------------------ eng/Baseline.xml | 208 ++++++++--------- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 324 insertions(+), 321 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index b03207e20d0c..4b7db6834f0b 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,28 +2,28 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - - - + + + @@ -35,227 +35,227 @@ - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - - + + - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 - - + + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - - + + - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 - - - + + + - 7.0.14 + 7.0.15 - - + + - 7.0.14 + 7.0.15 - - + + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - - + + @@ -263,7 +263,7 @@ - 7.0.14 + 7.0.15 @@ -272,50 +272,50 @@ - 7.0.14 + 7.0.15 - + - + - + - + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - - + + @@ -325,8 +325,8 @@ - - + + @@ -334,8 +334,8 @@ - - + + @@ -346,58 +346,58 @@ - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - - + + - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 @@ -414,7 +414,7 @@ - 7.0.14 + 7.0.15 @@ -422,71 +422,71 @@ - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - + - + - + - + - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - - + + - 7.0.14 + 7.0.15 - - + + - 7.0.14 + 7.0.15 @@ -502,27 +502,27 @@ - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 @@ -531,151 +531,151 @@ - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - - + + - - + + - - + + - 7.0.14 + 7.0.15 - - + + - - + + - - + + - - + + - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - - - - + + + + - 7.0.14 + 7.0.15 @@ -684,79 +684,82 @@ - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 + + + - 7.0.14 + 7.0.15 @@ -778,7 +781,7 @@ - 7.0.14 + 7.0.15 @@ -794,46 +797,46 @@ - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - - - + + + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 @@ -843,7 +846,7 @@ - 7.0.14 + 7.0.15 @@ -852,73 +855,73 @@ - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - + - + - + - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 @@ -947,11 +950,11 @@ - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 @@ -969,13 +972,13 @@ - 7.0.14 + 7.0.15 - 7.0.14 + 7.0.15 - + \ No newline at end of file diff --git a/eng/Baseline.xml b/eng/Baseline.xml index c6150314843e..88f4634c3288 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,109 +4,109 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/eng/Versions.props b/eng/Versions.props index 5274b200b834..d8b8dd0cce6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 7 0 16 - false + true diff --git a/global.json b/global.json index cda3f57d23a4..0c09e7fb8345 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "7.0.114" + "version": "7.0.115" }, "tools": { - "dotnet": "7.0.114", + "dotnet": "7.0.115", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" From 0e9d77526f7e413436e1190cc4fe49f59d9e21b1 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Wed, 10 Jan 2024 16:43:29 -0800 Subject: [PATCH 2/2] Port fix --- .../Http.Connections/test/HttpConnectionDispatcherTests.cs | 5 +++-- src/SignalR/samples/JwtSample/Startup.cs | 2 +- src/SignalR/server/SignalR/test/Startup.cs | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs index 1247cddf6d64..2610fb45de30 100644 --- a/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs +++ b/src/SignalR/common/Http.Connections/test/HttpConnectionDispatcherTests.cs @@ -13,6 +13,7 @@ using System.Net.Http; using System.Net.WebSockets; using System.Security.Claims; +using System.Security.Cryptography; using System.Security.Principal; using System.Text; using System.Threading; @@ -2818,7 +2819,7 @@ public async Task ConnectionClosedRequestedTriggeredOnAuthExpiration() [InlineData(HttpTransportType.WebSockets)] public async Task AuthenticationExpirationSetOnAuthenticatedConnectionWithJWT(HttpTransportType transportType) { - SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(Guid.NewGuid().ToByteArray()); + SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(SHA256.HashData(Guid.NewGuid().ToByteArray())); JwtSecurityTokenHandler JwtTokenHandler = new JwtSecurityTokenHandler(); using var host = CreateHost(services => @@ -2980,7 +2981,7 @@ public async Task AuthenticationExpirationSetOnAuthenticatedConnectionWithCookie [InlineData(HttpTransportType.WebSockets)] public async Task AuthenticationExpirationUsesCorrectScheme(HttpTransportType transportType) { - var SecurityKey = new SymmetricSecurityKey(Guid.NewGuid().ToByteArray()); + var SecurityKey = new SymmetricSecurityKey(SHA256.HashData(Guid.NewGuid().ToByteArray())); var JwtTokenHandler = new JwtSecurityTokenHandler(); using var host = CreateHost(services => diff --git a/src/SignalR/samples/JwtSample/Startup.cs b/src/SignalR/samples/JwtSample/Startup.cs index 18b1ae21ea35..cefde00a4cd0 100644 --- a/src/SignalR/samples/JwtSample/Startup.cs +++ b/src/SignalR/samples/JwtSample/Startup.cs @@ -11,7 +11,7 @@ namespace JwtSample; public class Startup { - private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(RandomNumberGenerator.GetBytes(16)); + private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(RandomNumberGenerator.GetBytes(32)); private readonly JwtSecurityTokenHandler JwtTokenHandler = new JwtSecurityTokenHandler(); public void ConfigureServices(IServiceCollection services) diff --git a/src/SignalR/server/SignalR/test/Startup.cs b/src/SignalR/server/SignalR/test/Startup.cs index bdc2a50b9c45..30992d6fc552 100644 --- a/src/SignalR/server/SignalR/test/Startup.cs +++ b/src/SignalR/server/SignalR/test/Startup.cs @@ -5,6 +5,7 @@ using System.IdentityModel.Tokens.Jwt; using System.IO; using System.Security.Claims; +using System.Security.Cryptography; using System.Threading.Tasks; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authorization; @@ -18,7 +19,7 @@ namespace Microsoft.AspNetCore.SignalR.Tests; public class Startup { - private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(Guid.NewGuid().ToByteArray()); + private readonly SymmetricSecurityKey SecurityKey = new SymmetricSecurityKey(SHA256.HashData(Guid.NewGuid().ToByteArray())); private readonly JwtSecurityTokenHandler JwtTokenHandler = new JwtSecurityTokenHandler(); public void ConfigureServices(IServiceCollection services)