diff --git a/NuGet.config b/NuGet.config index 5a4f8306a391..c2eaed275e07 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - + - + @@ -26,10 +26,10 @@ - + - + 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/Version.Details.xml b/eng/Version.Details.xml index 8d4d33102c82..cea59b6c63c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + ec0d745b900c6007fc93d16fbc70ab59729e6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + ec0d745b900c6007fc93d16fbc70ab59729e6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + ec0d745b900c6007fc93d16fbc70ab59729e6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + ec0d745b900c6007fc93d16fbc70ab59729e6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + ec0d745b900c6007fc93d16fbc70ab59729e6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + ec0d745b900c6007fc93d16fbc70ab59729e6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + ec0d745b900c6007fc93d16fbc70ab59729e6b1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + ec0d745b900c6007fc93d16fbc70ab59729e6b1e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 https://github.com/dotnet/source-build-externals @@ -262,33 +262,33 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 1dc62cbe005c..d8b8dd0cce6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ 7 0 16 - false + true @@ -63,12 +63,12 @@ 7.0.0 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14-servicing.23519.10 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15-servicing.23572.26 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.14-servicing.23519.10 + 7.0.15-servicing.23572.26 7.0.0 7.0.2 7.0.0 @@ -125,14 +125,14 @@ 7.0.4 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 - 7.0.14 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 + 7.0.15 7.0.0-beta.23564.5 7.0.0-beta.23564.5 @@ -214,15 +214,15 @@ 1.1.2-beta1.22276.1 1.1.2-beta1.22276.1 1.0.0-20200708.1 - 6.15.1 - 6.15.1 - 6.15.1 + 6.35.0 + 6.35.0 + 6.35.0 2.2.1 1.0.1 3.0.1 3.0.1 11.1.0 - 6.21.0 + 6.35.0 6.2.4 6.2.4 6.2.4 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)" diff --git a/src/SignalR/clients/csharp/Client/test/FunctionalTests/Startup.cs b/src/SignalR/clients/csharp/Client/test/FunctionalTests/Startup.cs index bd414db74e21..ccad1a0a5311 100644 --- a/src/SignalR/clients/csharp/Client/test/FunctionalTests/Startup.cs +++ b/src/SignalR/clients/csharp/Client/test/FunctionalTests/Startup.cs @@ -5,6 +5,7 @@ using System.IdentityModel.Tokens.Jwt; using System.IO; using System.Security.Claims; +using System.Security.Cryptography; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authentication.Negotiate; using Microsoft.AspNetCore.Authorization; @@ -21,7 +22,7 @@ namespace Microsoft.AspNetCore.SignalR.Client.FunctionalTests; 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) diff --git a/src/SignalR/clients/ts/FunctionalTests/Startup.cs b/src/SignalR/clients/ts/FunctionalTests/Startup.cs index 67eb2878ade3..9e430a5ef545 100644 --- a/src/SignalR/clients/ts/FunctionalTests/Startup.cs +++ b/src/SignalR/clients/ts/FunctionalTests/Startup.cs @@ -5,6 +5,7 @@ using System.IdentityModel.Tokens.Jwt; using System.Reflection; using System.Security.Claims; +using System.Security.Cryptography; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Http.Connections; using Microsoft.AspNetCore.Http.Features; @@ -18,7 +19,7 @@ namespace FunctionalTests; 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(); private int _numRedirects; 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)