From cd6a8451461327a5f6fca79b1dcee3c3ed954397 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Thu, 9 Nov 2023 16:33:06 +0000 Subject: [PATCH 01/14] [internal/release/7.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 8 ++++++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 30 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5a4f8306a391..4a1cd5b9ddfb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,12 @@ - + + + @@ -26,9 +28,11 @@ - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bf37fb721e5..ed57ed718e80 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 + 59c4359d7e224fe603cb6065f200d442d47bfe5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + 59c4359d7e224fe603cb6065f200d442d47bfe5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + 59c4359d7e224fe603cb6065f200d442d47bfe5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + 59c4359d7e224fe603cb6065f200d442d47bfe5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + 59c4359d7e224fe603cb6065f200d442d47bfe5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + 59c4359d7e224fe603cb6065f200d442d47bfe5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + 59c4359d7e224fe603cb6065f200d442d47bfe5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 31662b30f1a4497db482b3aed8ed4c4aa6de801b + 59c4359d7e224fe603cb6065f200d442d47bfe5d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e0ab58b8bdec..91835159ceb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.23556.6 7.0.0-beta.23556.6 From 8e37645448c14e3afd1893414830232c7bb864c1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Nov 2023 00:26:52 +0000 Subject: [PATCH 02/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20231114.14 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 7.0.15 -> To Version 7.0.15 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4a1cd5b9ddfb..d43cd04515b8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed57ed718e80..510eb25d19d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 59c4359d7e224fe603cb6065f200d442d47bfe5d + 66f32f40649b5916879d3b981d6024c7062cac48 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 59c4359d7e224fe603cb6065f200d442d47bfe5d + 66f32f40649b5916879d3b981d6024c7062cac48 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 59c4359d7e224fe603cb6065f200d442d47bfe5d + 66f32f40649b5916879d3b981d6024c7062cac48 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 59c4359d7e224fe603cb6065f200d442d47bfe5d + 66f32f40649b5916879d3b981d6024c7062cac48 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 59c4359d7e224fe603cb6065f200d442d47bfe5d + 66f32f40649b5916879d3b981d6024c7062cac48 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 59c4359d7e224fe603cb6065f200d442d47bfe5d + 66f32f40649b5916879d3b981d6024c7062cac48 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 59c4359d7e224fe603cb6065f200d442d47bfe5d + 66f32f40649b5916879d3b981d6024c7062cac48 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 59c4359d7e224fe603cb6065f200d442d47bfe5d + 66f32f40649b5916879d3b981d6024c7062cac48 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 749141e93ac2366f2af38337f96e27a1752f2191 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Nov 2023 10:37:55 +0000 Subject: [PATCH 03/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20231115.2 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 7.0.15 -> To Version 7.0.15 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index d43cd04515b8..a9816ffb12f8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 510eb25d19d8..438a6be996c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 66f32f40649b5916879d3b981d6024c7062cac48 + 14a081954a3e843b8c8f50b58234353f09cd8674 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 66f32f40649b5916879d3b981d6024c7062cac48 + 14a081954a3e843b8c8f50b58234353f09cd8674 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 66f32f40649b5916879d3b981d6024c7062cac48 + 14a081954a3e843b8c8f50b58234353f09cd8674 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 66f32f40649b5916879d3b981d6024c7062cac48 + 14a081954a3e843b8c8f50b58234353f09cd8674 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 66f32f40649b5916879d3b981d6024c7062cac48 + 14a081954a3e843b8c8f50b58234353f09cd8674 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 66f32f40649b5916879d3b981d6024c7062cac48 + 14a081954a3e843b8c8f50b58234353f09cd8674 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 66f32f40649b5916879d3b981d6024c7062cac48 + 14a081954a3e843b8c8f50b58234353f09cd8674 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 66f32f40649b5916879d3b981d6024c7062cac48 + 14a081954a3e843b8c8f50b58234353f09cd8674 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From dab546405aeecf5346f3f71c314f6a23b623952e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 15 Nov 2023 21:19:44 +0000 Subject: [PATCH 04/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20231115.8 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 7.0.15 -> To Version 7.0.15 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index a9816ffb12f8..37353b2c3fad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 438a6be996c2..428fbdcdcb36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 14a081954a3e843b8c8f50b58234353f09cd8674 + 521fb015b1a8d4328e4a31855874ddfb77fadecd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 14a081954a3e843b8c8f50b58234353f09cd8674 + 521fb015b1a8d4328e4a31855874ddfb77fadecd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 14a081954a3e843b8c8f50b58234353f09cd8674 + 521fb015b1a8d4328e4a31855874ddfb77fadecd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 14a081954a3e843b8c8f50b58234353f09cd8674 + 521fb015b1a8d4328e4a31855874ddfb77fadecd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 14a081954a3e843b8c8f50b58234353f09cd8674 + 521fb015b1a8d4328e4a31855874ddfb77fadecd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 14a081954a3e843b8c8f50b58234353f09cd8674 + 521fb015b1a8d4328e4a31855874ddfb77fadecd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 14a081954a3e843b8c8f50b58234353f09cd8674 + 521fb015b1a8d4328e4a31855874ddfb77fadecd https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 14a081954a3e843b8c8f50b58234353f09cd8674 + 521fb015b1a8d4328e4a31855874ddfb77fadecd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 0b4e225426872de333aba4b9b6cc2a8c944370e5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 Nov 2023 05:19:54 +0000 Subject: [PATCH 05/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20231115.20 Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport From Version 7.0.14-servicing.23519.10 -> To Version 7.0.15-servicing.23565.20 --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 37353b2c3fad..91aa8852d285 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,6 +10,7 @@ + @@ -31,6 +32,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 428fbdcdcb36..20ab1564e810 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 396f0fd2bb0476fd60df06b259fced3a8888da46 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 + 396f0fd2bb0476fd60df06b259fced3a8888da46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 396f0fd2bb0476fd60df06b259fced3a8888da46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 396f0fd2bb0476fd60df06b259fced3a8888da46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 396f0fd2bb0476fd60df06b259fced3a8888da46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 396f0fd2bb0476fd60df06b259fced3a8888da46 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 808851b07acfa1c5c94b0d4f9fb50debedb2df70 + 396f0fd2bb0476fd60df06b259fced3a8888da46 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 91835159ceb4..72dc159ac3dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.23565.20 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.23565.20 7.0.0 7.0.2 7.0.0 From 297c1bdd2c764bdcea4f64d1144b51d8be5f16d0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 17 Nov 2023 00:12:30 +0000 Subject: [PATCH 06/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20231116.10 Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport From Version 7.0.14-servicing.23519.10 -> To Version 7.0.15-servicing.23566.10 --- NuGet.config | 10 ++-------- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 91aa8852d285..16d2f6bca732 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,7 @@ - - - - + @@ -32,10 +29,7 @@ - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20ab1564e810..ad6290a13555 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 396f0fd2bb0476fd60df06b259fced3a8888da46 + 2e8cced7f6757f0faac13ca5a684086ad41b69ed https://github.com/dotnet/source-build-externals @@ -264,15 +264,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 396f0fd2bb0476fd60df06b259fced3a8888da46 + 2e8cced7f6757f0faac13ca5a684086ad41b69ed https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 396f0fd2bb0476fd60df06b259fced3a8888da46 + 2e8cced7f6757f0faac13ca5a684086ad41b69ed https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 396f0fd2bb0476fd60df06b259fced3a8888da46 + 2e8cced7f6757f0faac13ca5a684086ad41b69ed https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 396f0fd2bb0476fd60df06b259fced3a8888da46 + 2e8cced7f6757f0faac13ca5a684086ad41b69ed https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 396f0fd2bb0476fd60df06b259fced3a8888da46 + 2e8cced7f6757f0faac13ca5a684086ad41b69ed - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 396f0fd2bb0476fd60df06b259fced3a8888da46 + 2e8cced7f6757f0faac13ca5a684086ad41b69ed https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 72dc159ac3dd..199813e06bcd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.15 7.0.15 7.0.15 - 7.0.15-servicing.23565.20 + 7.0.15-servicing.23566.10 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.15-servicing.23565.20 + 7.0.15-servicing.23566.10 7.0.0 7.0.2 7.0.0 From bff34193ab17587252d43bdc8497f3a4e66fb597 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 17 Nov 2023 07:18:14 +0000 Subject: [PATCH 07/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20231116.28 Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport From Version 7.0.14-servicing.23519.10 -> To Version 7.0.15-servicing.23566.28 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 16d2f6bca732..2d3c2ac1a28f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ad6290a13555..3454c5603716 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2e8cced7f6757f0faac13ca5a684086ad41b69ed + 29f88296788f2031e4653b463d8f02d25db82b68 https://github.com/dotnet/source-build-externals @@ -264,15 +264,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2e8cced7f6757f0faac13ca5a684086ad41b69ed + 29f88296788f2031e4653b463d8f02d25db82b68 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2e8cced7f6757f0faac13ca5a684086ad41b69ed + 29f88296788f2031e4653b463d8f02d25db82b68 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2e8cced7f6757f0faac13ca5a684086ad41b69ed + 29f88296788f2031e4653b463d8f02d25db82b68 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2e8cced7f6757f0faac13ca5a684086ad41b69ed + 29f88296788f2031e4653b463d8f02d25db82b68 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2e8cced7f6757f0faac13ca5a684086ad41b69ed + 29f88296788f2031e4653b463d8f02d25db82b68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2e8cced7f6757f0faac13ca5a684086ad41b69ed + 29f88296788f2031e4653b463d8f02d25db82b68 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 199813e06bcd..ef625ba75af8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.15 7.0.15 7.0.15 - 7.0.15-servicing.23566.10 + 7.0.15-servicing.23566.28 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.15-servicing.23566.10 + 7.0.15-servicing.23566.28 7.0.0 7.0.2 7.0.0 From ba1fac82d552d98b7d97a001dab4a385aabf4ed1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 Nov 2023 22:26:11 +0000 Subject: [PATCH 08/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20231121.9 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 7.0.15 -> To Version 7.0.15 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2d3c2ac1a28f..8db7c4a58e48 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -26,7 +26,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00b677167d62..caa57550277c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 521fb015b1a8d4328e4a31855874ddfb77fadecd + ec0d745b900c6007fc93d16fbc70ab59729e6b1e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 521fb015b1a8d4328e4a31855874ddfb77fadecd + ec0d745b900c6007fc93d16fbc70ab59729e6b1e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 521fb015b1a8d4328e4a31855874ddfb77fadecd + ec0d745b900c6007fc93d16fbc70ab59729e6b1e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 521fb015b1a8d4328e4a31855874ddfb77fadecd + ec0d745b900c6007fc93d16fbc70ab59729e6b1e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 521fb015b1a8d4328e4a31855874ddfb77fadecd + ec0d745b900c6007fc93d16fbc70ab59729e6b1e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 521fb015b1a8d4328e4a31855874ddfb77fadecd + ec0d745b900c6007fc93d16fbc70ab59729e6b1e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 521fb015b1a8d4328e4a31855874ddfb77fadecd + ec0d745b900c6007fc93d16fbc70ab59729e6b1e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 521fb015b1a8d4328e4a31855874ddfb77fadecd + ec0d745b900c6007fc93d16fbc70ab59729e6b1e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From f966f8b26263c95167a6126e5c9816a2ce729472 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 04:26:41 +0000 Subject: [PATCH 09/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20231122.11 Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport From Version 7.0.15-servicing.23566.28 -> To Version 7.0.15-servicing.23572.11 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8db7c4a58e48..a022cf73480e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index caa57550277c..42e089cd6d9a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 29f88296788f2031e4653b463d8f02d25db82b68 + 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f https://github.com/dotnet/source-build-externals @@ -264,15 +264,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 29f88296788f2031e4653b463d8f02d25db82b68 + 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 29f88296788f2031e4653b463d8f02d25db82b68 + 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 29f88296788f2031e4653b463d8f02d25db82b68 + 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 29f88296788f2031e4653b463d8f02d25db82b68 + 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 29f88296788f2031e4653b463d8f02d25db82b68 + 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 29f88296788f2031e4653b463d8f02d25db82b68 + 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index 9edca67c80c8..c0932aaab251 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.15 7.0.15 7.0.15 - 7.0.15-servicing.23566.28 + 7.0.15-servicing.23572.11 7.0.0 7.0.0 7.0.0 @@ -103,7 +103,7 @@ 7.0.0 7.0.1 7.0.0 - 7.0.15-servicing.23566.28 + 7.0.15-servicing.23572.11 7.0.0 7.0.2 7.0.0 From 09c035792a79b7830bef16d6d70b0428ce2ab7af Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 23 Nov 2023 09:14:20 +0000 Subject: [PATCH 10/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-runtime build 20231122.26 Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport From Version 7.0.15-servicing.23566.28 -> To Version 7.0.15-servicing.23572.26 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index a022cf73480e..c2eaed275e07 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -29,7 +29,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42e089cd6d9a..cea59b6c63c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime d099f075e45d2aa6007a22b71b45a08758559f80 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 https://github.com/dotnet/source-build-externals @@ -264,15 +264,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 98fd5f3850ac46606ef7f3981a158b4c7dc2eb8f + 8f4568cdaa2f9654fd133a17cd2dcc55b5f42455 https://github.com/dotnet/xdt diff --git a/eng/Versions.props b/eng/Versions.props index c0932aaab251..6bd0b77bd395 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 7.0.15 7.0.15 7.0.15 - 7.0.15-servicing.23572.11 + 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.15-servicing.23572.11 + 7.0.15-servicing.23572.26 7.0.0 7.0.2 7.0.0 From 360f1564385745dd9e9acc53e697f8e63ff41126 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Mon, 27 Nov 2023 23:54:11 +0000 Subject: [PATCH 11/14] Merged PR 35425: Update IdentityModel to 6.34.0 --- eng/Versions.props | 8 ++++---- .../clients/csharp/Client/test/FunctionalTests/Startup.cs | 3 ++- src/SignalR/clients/ts/FunctionalTests/Startup.cs | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6bd0b77bd395..64b5e8c8dc31 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -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.34.0 + 6.34.0 + 6.34.0 2.2.1 1.0.1 3.0.1 3.0.1 11.1.0 - 6.21.0 + 6.34.0 6.2.4 6.2.4 6.2.4 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; From c49ccc8727c620ce1cb8fb431bb3fe8f2e747236 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 1 Dec 2023 18:13:54 +0000 Subject: [PATCH 12/14] Merged PR 35733: Update to 6.35.0 --- eng/Versions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 64b5e8c8dc31..5a87991ea312 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -214,15 +214,15 @@ 1.1.2-beta1.22276.1 1.1.2-beta1.22276.1 1.0.0-20200708.1 - 6.34.0 - 6.34.0 - 6.34.0 + 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.34.0 + 6.35.0 6.2.4 6.2.4 6.2.4 From c3295d5a1d786c9002fb3ec47c7f4066b64dc2c4 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 9 Jan 2024 12:58:22 -0800 Subject: [PATCH 13/14] 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 14/14] 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)