From c94d840763b3b97fea613b92f201328acaf280b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 20 Feb 2025 23:22:03 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/aspnetcore build 20250220.5 dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authentication.Facebook , Microsoft.AspNetCore.Authentication.Google , Microsoft.AspNetCore.Authentication.MicrosoftAccount , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components , Microsoft.AspNetCore.Components.Analyzers , Microsoft.AspNetCore.Components.Forms , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.Components.WebAssembly , Microsoft.AspNetCore.Components.WebAssembly.Server , Microsoft.AspNetCore.Components.WebView , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Metadata , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.DotNet.Web.ItemTemplates.10.0 , Microsoft.DotNet.Web.ProjectTemplates.10.0 , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0 , Microsoft.SourceBuild.Intermediate.aspnetcore From Version 10.0.0-preview.2.25114.1 -> To Version 10.0.0-preview.2.25120.5 --- eng/Version.Details.xml | 124 ++++++++++++++++++++-------------------- eng/Versions.props | 30 +++++----- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99cebddd1115..a1456da4a0d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf fb7cf69e315f2277670dc991937da23c8e129be8 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 - + https://github.com/dotnet/aspnetcore - 9c410aaf1ef3db65374bf237589ae8bc6910d37c + 19938a1d711cd214bd46b15964c622bfde6ab271 diff --git a/eng/Versions.props b/eng/Versions.props index 946460388606..65adb00adfff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,21 +229,21 @@ - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 - 10.0.0-preview.2.25114.1 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25120.5 From 73c860c8e06d2da0b83db7992637fe80638c5cfb Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Fri, 21 Feb 2025 18:08:56 +0000 Subject: [PATCH 2/3] Remove aspnetcore patch --- ...ct-to-NuGet-package-pruning-warnings.patch | 150 ------------------ 1 file changed, 150 deletions(-) delete mode 100644 src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch diff --git a/src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch b/src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch deleted file mode 100644 index 8ef660fed8ce..000000000000 --- a/src/SourceBuild/patches/aspnetcore/0001-React-to-NuGet-package-pruning-warnings.patch +++ /dev/null @@ -1,150 +0,0 @@ -From ccc70ac49e1fc406b488e2c5347c6933073b2c67 Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Fri, 14 Feb 2025 16:11:41 +0100 -Subject: [PATCH] React to NuGet package pruning warnings - -Backport: https://github.com/dotnet/aspnetcore/pull/60395 - ---- - ...Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj | 1 - - ...icrosoft.AspNetCore.Components.WebAssembly.DevServer.csproj | 1 - - .../JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj | 2 +- - .../src/Microsoft.Extensions.Logging.AzureAppServices.csproj | 2 +- - .../Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj | 3 --- - .../src/Microsoft.AspNetCore.SignalR.Client.Core.csproj | 2 +- - src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj | 2 +- - src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj | 2 +- - .../src/Microsoft.dotnet-openapi.csproj | 2 -- - src/Tools/dotnet-sql-cache/src/dotnet-sql-cache.csproj | 2 -- - 10 files changed, 5 insertions(+), 14 deletions(-) - -diff --git a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj -index fe1c0f19275e..dbc464028962 100644 ---- a/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj -+++ b/src/Azure/AzureAppServices.HostingStartup/src/Microsoft.AspNetCore.AzureAppServices.HostingStartup.csproj -@@ -13,7 +13,6 @@ - - - -- - - - -diff --git a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj -index b24c6bd6ac9e..a320af38fa9c 100644 ---- a/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj -+++ b/src/Components/WebAssembly/DevServer/src/Microsoft.AspNetCore.Components.WebAssembly.DevServer.csproj -@@ -21,7 +21,6 @@ - - - -- - - - -diff --git a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj -index 57cc0737ff21..f4027ea5fd71 100644 ---- a/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj -+++ b/src/Features/JsonPatch/src/Microsoft.AspNetCore.JsonPatch.csproj -@@ -22,7 +22,7 @@ - - - -- -+ - - - -diff --git a/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj b/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj -index 8c75d85a4ff9..d3e91be03049 100644 ---- a/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj -+++ b/src/Logging.AzureAppServices/src/Microsoft.Extensions.Logging.AzureAppServices.csproj -@@ -18,7 +18,7 @@ - - - -- -+ - - - -diff --git a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj -index a3c025d7cb99..c6beee133ff7 100644 ---- a/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj -+++ b/src/Servers/IIS/IntegrationTesting.IIS/src/Microsoft.AspNetCore.Server.IntegrationTesting.IIS.csproj -@@ -70,9 +70,6 @@ - - - -- -- -- - - - -diff --git a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj -index 16c662419d25..93470d863615 100644 ---- a/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj -+++ b/src/SignalR/clients/csharp/Client.Core/src/Microsoft.AspNetCore.SignalR.Client.Core.csproj -@@ -33,7 +33,7 @@ - - - -- -+ - - - -diff --git a/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj b/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj -index b791c1e90861..179d80bbba73 100644 ---- a/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj -+++ b/src/Testing/src/Microsoft.AspNetCore.InternalTesting.csproj -@@ -28,7 +28,7 @@ - - - -- -+ - - - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 - + https://github.com/dotnet/aspnetcore - 19938a1d711cd214bd46b15964c622bfde6ab271 + 60011b0c3f218c6d3936c8e1863d047403321d79 diff --git a/eng/Versions.props b/eng/Versions.props index 65adb00adfff..43bf0775e445 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -229,21 +229,21 @@ - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 - 10.0.0-preview.2.25120.5 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1 + 10.0.0-preview.2.25121.1