From e03a8cf483a4d9074227247ebc69f663bdc888a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Mar 2025 00:59:43 +0000 Subject: [PATCH 01/21] Update dependencies from https://github.com/dotnet/aspnetcore build 20250311.7 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.3.25161.2 -> To Version 10.0.0-preview.3.25161.7 --- 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 7dfe18c073fd..ca779d554904 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf b129327573e5f7babf24738aeda16e131a318ef5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + e6eb15181b94a6a431b98a9cfb338150bb4fe153 diff --git a/eng/Versions.props b/eng/Versions.props index 886b6898659d..7d23c2699184 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,21 +237,21 @@ - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 - 10.0.0-preview.3.25161.2 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.7 From ebc58927bcbbe4502e14362d3dd378453d4a14eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Mar 2025 03:41:32 +0000 Subject: [PATCH 02/21] Update dependencies from https://github.com/dotnet/aspnetcore build 20250311.16 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.3.25161.2 -> To Version 10.0.0-preview.3.25161.16 --- 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 ca779d554904..a41f6dbda761 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf b129327573e5f7babf24738aeda16e131a318ef5 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 - + https://github.com/dotnet/aspnetcore - e6eb15181b94a6a431b98a9cfb338150bb4fe153 + d42bdf68bc0ff8f871bf3b8d63a1466459244393 diff --git a/eng/Versions.props b/eng/Versions.props index 7d23c2699184..b5b2db90d968 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,21 +237,21 @@ - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 - 10.0.0-preview.3.25161.7 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25161.16 From 3c565dd8d7d4a814969333159f09af66ba5e39d6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Mar 2025 12:02:36 +0000 Subject: [PATCH 03/21] Update dependencies from https://github.com/dotnet/aspnetcore build 20250312.1 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.3.25161.2 -> To Version 10.0.0-preview.3.25162.1 --- 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 a41f6dbda761..bac8b4713132 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf b129327573e5f7babf24738aeda16e131a318ef5 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 - + https://github.com/dotnet/aspnetcore - d42bdf68bc0ff8f871bf3b8d63a1466459244393 + a03bad2b1746bd1edfb9be48afd0a0eb735f2665 diff --git a/eng/Versions.props b/eng/Versions.props index b5b2db90d968..217220378b74 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,21 +237,21 @@ - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 - 10.0.0-preview.3.25161.16 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.1 From 41227eda9b4c8cee30345b1fdee1f66c64b4dd06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Mar 2025 18:18:53 +0000 Subject: [PATCH 04/21] Update dependencies from https://github.com/dotnet/aspnetcore build 20250312.2 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.3.25161.2 -> To Version 10.0.0-preview.3.25162.2 --- 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 bac8b4713132..0a2b6d51fdde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf b129327573e5f7babf24738aeda16e131a318ef5 - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb - + https://github.com/dotnet/aspnetcore - a03bad2b1746bd1edfb9be48afd0a0eb735f2665 + 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb diff --git a/eng/Versions.props b/eng/Versions.props index 217220378b74..6529cfd265dc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,21 +237,21 @@ - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 - 10.0.0-preview.3.25162.1 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.2 From c7f7d8bf26fbc19b26178c19651614e5259afa8f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Mar 2025 03:10:15 +0000 Subject: [PATCH 05/21] Update dependencies from https://github.com/dotnet/aspnetcore build 20250312.8 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.3.25161.2 -> To Version 10.0.0-preview.3.25162.8 --- 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 0a2b6d51fdde..1b4c2c9317bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf b129327573e5f7babf24738aeda16e131a318ef5 - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae - + https://github.com/dotnet/aspnetcore - 8957ae8ec94b69afdea0c3339ef6fef8b0ae83bb + e6d943297f981ae68003b215f0cee66891cdf8ae diff --git a/eng/Versions.props b/eng/Versions.props index 6529cfd265dc..734b46491cb4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,21 +237,21 @@ - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 - 10.0.0-preview.3.25162.2 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.8 From 6cd33eb7da5b74ed90728f8fc17954ccc51e35c5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Mar 2025 05:43:54 +0000 Subject: [PATCH 06/21] Update dependencies from https://github.com/dotnet/aspnetcore build 20250312.9 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.3.25161.2 -> To Version 10.0.0-preview.3.25162.9 --- 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 1b4c2c9317bc..2a6233d80195 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf b129327573e5f7babf24738aeda16e131a318ef5 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 - + https://github.com/dotnet/aspnetcore - e6d943297f981ae68003b215f0cee66891cdf8ae + 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 diff --git a/eng/Versions.props b/eng/Versions.props index 734b46491cb4..0f2a37fec819 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,21 +237,21 @@ - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 - 10.0.0-preview.3.25162.8 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25162.9 From 4c05ea3355231958c386e4b167db96ecf058f45d Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:49:04 +0100 Subject: [PATCH 07/21] Only build the target platform for aspnetcore in VMR --- .../0001-only-build-target-platform.patch | 108 ++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch new file mode 100644 index 000000000000..68447d5e973a --- /dev/null +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -0,0 +1,108 @@ +From 067aa380724a6f57cc35a1b89843778a9583a0e5 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Thu, 13 Mar 2025 09:45:10 +0100 +Subject: [PATCH] Only build the target platform in native projs for the VMR + +Backport: https://github.com/dotnet/aspnetcore/pull/60910 + +--- + eng/Common.props | 4 ++++ + ...osoft.AspNetCore.App.Runtime.Composite.sfxproj | 4 ---- + .../src/Microsoft.AspNetCore.App.Runtime.sfxproj | 4 ---- + .../src/Microsoft.AspNetCore.Server.IIS.csproj | 8 +++++--- + ...spNetCore.Server.IntegrationTesting.IIS.csproj | 15 +++++++++------ + 5 files changed, 18 insertions(+), 17 deletions(-) + +diff --git a/eng/Common.props b/eng/Common.props +index eda62e2a1c94..925b967e12ca 100644 +--- a/eng/Common.props ++++ b/eng/Common.props +@@ -4,7 +4,11 @@ + osx + linux + freebsd ++ + x64 ++ $(TargetArchitecture) ++ Win32 ++ + $(TargetOsName)-$(TargetArchitecture) + true + $(TargetRuntimeIdentifier) +diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj +index b0ab3e00d967..7bef557274c4 100644 +--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj ++++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.Composite.sfxproj +@@ -70,10 +70,6 @@ + + + +- +- $(TargetArchitecture) +- Win32 +- + + +diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +index 3b743bd3f4ed..294ca282e845 100644 +--- a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj ++++ b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj +@@ -68,10 +68,6 @@ + + + +- +- $(TargetArchitecture) +- Win32 +- + + +diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +index d9ffb24a0867..ef46ff81213d 100644 +--- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj ++++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +@@ -45,9 +45,11 @@ + + + +- +- +- ++ ++ ++ ++ ++ + + + +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 c6beee133ff7..db5b1e238697 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 +@@ -36,14 +36,17 @@ + + + +- +- ++ ++ + +- +- ++ ++ + +- +- ++ ++ ++ ++ ++ + + + From 1039e521d2b5279e70a64df8869a81ddb5b70293 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 12:16:01 +0100 Subject: [PATCH 08/21] Update patch --- .../0001-only-build-target-platform.patch | 85 +++++++++++++++++-- 1 file changed, 76 insertions(+), 9 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch index 68447d5e973a..7504a00ebbe0 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -1,4 +1,4 @@ -From 067aa380724a6f57cc35a1b89843778a9583a0e5 Mon Sep 17 00:00:00 2001 +From d55847e83339919ddd713d3a03aa1b1ad1dd1329 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:45:10 +0100 Subject: [PATCH] Only build the target platform in native projs for the VMR @@ -6,12 +6,13 @@ Subject: [PATCH] Only build the target platform in native projs for the VMR Backport: https://github.com/dotnet/aspnetcore/pull/60910 --- - eng/Common.props | 4 ++++ - ...osoft.AspNetCore.App.Runtime.Composite.sfxproj | 4 ---- - .../src/Microsoft.AspNetCore.App.Runtime.sfxproj | 4 ---- - .../src/Microsoft.AspNetCore.Server.IIS.csproj | 8 +++++--- - ...spNetCore.Server.IntegrationTesting.IIS.csproj | 15 +++++++++------ - 5 files changed, 18 insertions(+), 17 deletions(-) + eng/Common.props | 4 ++++ + ...t.AspNetCore.App.Runtime.Composite.sfxproj | 4 ---- + .../Microsoft.AspNetCore.App.Runtime.sfxproj | 4 ---- + .../Directory.Build.props | 21 ++++++++++++------- + .../Microsoft.AspNetCore.Server.IIS.csproj | 8 ++++--- + ...tCore.Server.IntegrationTesting.IIS.csproj | 16 ++++++++------ + 6 files changed, 33 insertions(+), 24 deletions(-) diff --git a/eng/Common.props b/eng/Common.props index eda62e2a1c94..925b967e12ca 100644 @@ -59,6 +60,70 @@ index 3b743bd3f4ed..294ca282e845 100644 +diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +index 1b02ebf435b2..baf8bf6f5d91 100644 +--- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props ++++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +@@ -40,45 +40,52 @@ + + + ++ + + + AspNetCoreV2 + True + True + false +- Platform=x64 ++ Platform=x64 ++ Platform=$(NativePlatform) + + + AspNetCoreV2Handler + True + True + false +- Platform=x64 ++ Platform=x64 ++ Platform=$(NativePlatform) + + +- ++ + AspNetCoreV2WoW64 + True + True + false + Platform=Win32 + +- ++ + AspNetCoreV2HandlerWoW64 + True + True + false + Platform=Win32 + +- +- ++ ++ + AspNetCoreV2ARM64 + True + True + false + Platform=ARM64 + +- ++ + AspNetCoreV2HandlerARM64 + True + True diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj index d9ffb24a0867..ef46ff81213d 100644 --- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj @@ -79,12 +144,14 @@ index d9ffb24a0867..ef46ff81213d 100644 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 c6beee133ff7..db5b1e238697 100644 +index c6beee133ff7..1e84bdfe76f4 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 -@@ -36,14 +36,17 @@ +@@ -35,15 +35,19 @@ + Condition="!Exists('$(AspNetCoreModuleV2ShimDll)') OR !Exists('$(AspNetCoreModuleV2OutOfProcessHandlerDll)')" /> ++ - - From 5113f07a06ea4de8d91f7fcf9ffd83021c6ec493 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 13 Mar 2025 08:26:19 -0700 Subject: [PATCH 09/21] Update build scripts for target platform --- .../0001-only-build-target-platform.patch | 176 +++++++++++++++++- 1 file changed, 173 insertions(+), 3 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch index 7504a00ebbe0..34cb114c358c 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -1,9 +1,8 @@ From d55847e83339919ddd713d3a03aa1b1ad1dd1329 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:45:10 +0100 -Subject: [PATCH] Only build the target platform in native projs for the VMR - -Backport: https://github.com/dotnet/aspnetcore/pull/60910 +Subject: [PATCH 1/5] Only build the target platform in native projs for the + VMR --- eng/Common.props | 4 ++++ @@ -173,3 +172,174 @@ index c6beee133ff7..1e84bdfe76f4 100644 + +From 4a0e84caac9a03e1abbe7927e420d6ca50648034 Mon Sep 17 00:00:00 2001 +From: Viktor Hofer +Date: Thu, 13 Mar 2025 15:45:57 +0100 +Subject: [PATCH 2/5] PR feedback - undo BP2 project move + +--- + eng/Build.props | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/eng/Build.props b/eng/Build.props +index 391054e3a329..af2876659b40 100644 +--- a/eng/Build.props ++++ b/eng/Build.props +@@ -55,12 +55,6 @@ + $(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj; + $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj; + " /> +- +- +- + + + + +From 683f7946861584d2fe5d2cce683a3ba7e45b11d2 Mon Sep 17 00:00:00 2001 +From: wtgodbe +Date: Thu, 13 Mar 2025 08:20:41 -0700 +Subject: [PATCH 3/5] Only build ANCM native bits in pass 2 + +--- + eng/Build.props | 6 +++++ + .../Directory.Build.props | 23 +++++++------------ + 2 files changed, 14 insertions(+), 15 deletions(-) + +diff --git a/eng/Build.props b/eng/Build.props +index af2876659b40..fff3753783ad 100644 +--- a/eng/Build.props ++++ b/eng/Build.props +@@ -55,6 +55,12 @@ + $(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj; + $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj; + " /> ++ ++ ++ + + + +diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +index baf8bf6f5d91..1dbd04f6ed90 100644 +--- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props ++++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +@@ -40,52 +40,45 @@ + + + +- + + + AspNetCoreV2 + True + True + false +- Platform=x64 +- Platform=$(NativePlatform) ++ Platform=x64 + + + AspNetCoreV2Handler + True + True + false +- Platform=x64 +- Platform=$(NativePlatform) ++ Platform=x64 + + +- ++ + AspNetCoreV2WoW64 + True + True + false + Platform=Win32 + +- ++ + AspNetCoreV2HandlerWoW64 + True + True + false + Platform=Win32 + +- +- ++ ++ + AspNetCoreV2ARM64 + True + True + false + Platform=ARM64 + +- ++ + AspNetCoreV2HandlerARM64 + True + True +@@ -99,4 +92,4 @@ + + + +- ++ +\ No newline at end of file + +From d03d4ea6a36dd50f7500d379b097f77a7c666b4b Mon Sep 17 00:00:00 2001 +From: wtgodbe +Date: Thu, 13 Mar 2025 08:21:41 -0700 +Subject: [PATCH 4/5] Fixup + +--- + eng/Build.props | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/eng/Build.props b/eng/Build.props +index fff3753783ad..ec515d5b3e2d 100644 +--- a/eng/Build.props ++++ b/eng/Build.props +@@ -82,9 +82,6 @@ + Platform=x86 + $(DotNetBuildPass) + +- +- $(DotNetBuildPass) +- + + + + +From 889c767c2d578ab78946efb8f18592ba2bae6a36 Mon Sep 17 00:00:00 2001 +From: wtgodbe +Date: Thu, 13 Mar 2025 08:23:26 -0700 +Subject: [PATCH 5/5] LF + +--- + .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +index 1dbd04f6ed90..1b02ebf435b2 100644 +--- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props ++++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +@@ -92,4 +92,4 @@ + + + +- +\ No newline at end of file ++ From aea2ef269f22a680b46a3451afdd9af33e87da13 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 13 Mar 2025 08:29:36 -0700 Subject: [PATCH 10/21] Add backport link to patch header --- .../patches/aspnetcore/0001-only-build-target-platform.patch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch index 34cb114c358c..e613458c9a98 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -1,8 +1,9 @@ From d55847e83339919ddd713d3a03aa1b1ad1dd1329 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:45:10 +0100 -Subject: [PATCH 1/5] Only build the target platform in native projs for the - VMR +Subject: [PATCH 1/5] Only build the target platform in native projs for the VMR + +Backport: https://github.com/dotnet/aspnetcore/pull/60910 --- eng/Common.props | 4 ++++ From 31e06e80afbd92b5583d47acf387c08fc7f0b96d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Mar 2025 18:11:41 +0000 Subject: [PATCH 11/21] Update dependencies from https://github.com/dotnet/aspnetcore build 20250313.1 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.3.25161.2 -> To Version 10.0.0-preview.3.25163.1 --- 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 2a6233d80195..3b37be66fd42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf b129327573e5f7babf24738aeda16e131a318ef5 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 - + https://github.com/dotnet/aspnetcore - 652bc2b13f910b1b1fb4e5efb4b5ebc0b14d6047 + 3dbc55945a401b96990b824e950ef81ccec07205 diff --git a/eng/Versions.props b/eng/Versions.props index 0f2a37fec819..fe52831c5123 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,21 +237,21 @@ - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 - 10.0.0-preview.3.25162.9 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.1 From 92af37f0f03b72f01b5c8081beefc99f358d21bb Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 13 Mar 2025 12:00:40 -0700 Subject: [PATCH 12/21] Update patch subject lines and integration testing --- .../0001-only-build-target-platform.patch | 88 +++++++++++++++++-- 1 file changed, 83 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch index e613458c9a98..6ad4b3d8f4f8 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -1,7 +1,7 @@ From d55847e83339919ddd713d3a03aa1b1ad1dd1329 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:45:10 +0100 -Subject: [PATCH 1/5] Only build the target platform in native projs for the VMR +Subject: [PATCH 1/7] Only build the target platform in native projs for the VMR Backport: https://github.com/dotnet/aspnetcore/pull/60910 @@ -177,7 +177,7 @@ index c6beee133ff7..1e84bdfe76f4 100644 From 4a0e84caac9a03e1abbe7927e420d6ca50648034 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 15:45:57 +0100 -Subject: [PATCH 2/5] PR feedback - undo BP2 project move +Subject: [PATCH 2/7] PR feedback - undo BP2 project move --- eng/Build.props | 6 ------ @@ -204,7 +204,7 @@ index 391054e3a329..af2876659b40 100644 From 683f7946861584d2fe5d2cce683a3ba7e45b11d2 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:20:41 -0700 -Subject: [PATCH 3/5] Only build ANCM native bits in pass 2 +Subject: [PATCH 3/7] Only build ANCM native bits in pass 2 --- eng/Build.props | 6 +++++ @@ -303,7 +303,7 @@ index baf8bf6f5d91..1dbd04f6ed90 100644 From d03d4ea6a36dd50f7500d379b097f77a7c666b4b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:21:41 -0700 -Subject: [PATCH 4/5] Fixup +Subject: [PATCH 4/7] Fixup --- eng/Build.props | 3 --- @@ -327,7 +327,7 @@ index fff3753783ad..ec515d5b3e2d 100644 From 889c767c2d578ab78946efb8f18592ba2bae6a36 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:23:26 -0700 -Subject: [PATCH 5/5] LF +Subject: [PATCH 5/7] LF --- .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 2 +- @@ -344,3 +344,81 @@ index 1dbd04f6ed90..1b02ebf435b2 100644 - \ No newline at end of file + + +From e6665a1af0c5b8532135e269255a1fe4ebf360ae Mon Sep 17 00:00:00 2001 +From: wtgodbe +Date: Thu, 13 Mar 2025 11:57:17 -0700 +Subject: [PATCH 6/7] Put IIS Integration Testing back in pass 2 + +--- + eng/Build.props | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/eng/Build.props b/eng/Build.props +index ec515d5b3e2d..75292f7dd962 100644 +--- a/eng/Build.props ++++ b/eng/Build.props +@@ -61,6 +61,13 @@ + $(RepoRoot)src\Installers\**\*.vcxproj; + " + Condition=" '$(BuildNative)' == 'true' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " /> ++ ++ ++ ++ + + + +@@ -82,6 +89,9 @@ + Platform=x86 + $(DotNetBuildPass) + ++ ++ $(DotNetBuildPass) ++ + + + + +From 92e9c827a74445a06699c73cea4cc0c6bf0e9085 Mon Sep 17 00:00:00 2001 +From: wtgodbe +Date: Thu, 13 Mar 2025 11:59:14 -0700 +Subject: [PATCH 7/7] Revert IntegrationTesting change + +--- + ...pNetCore.Server.IntegrationTesting.IIS.csproj | 16 ++++++---------- + 1 file changed, 6 insertions(+), 10 deletions(-) + +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 1e84bdfe76f4..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 +@@ -35,19 +35,15 @@ + Condition="!Exists('$(AspNetCoreModuleV2ShimDll)') OR !Exists('$(AspNetCoreModuleV2OutOfProcessHandlerDll)')" /> + + +- + +- +- ++ ++ + +- +- ++ ++ + +- +- +- +- +- ++ ++ + + + From fb9d8597387b54d8d8e3fc0b8aa6f7958cbbc2ce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 13 Mar 2025 22:07:35 +0000 Subject: [PATCH 13/21] Update dependencies from https://github.com/dotnet/aspnetcore build 20250313.7 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.3.25161.2 -> To Version 10.0.0-preview.3.25163.7 --- 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 3b37be66fd42..06d93b9507b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf b129327573e5f7babf24738aeda16e131a318ef5 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 - + https://github.com/dotnet/aspnetcore - 3dbc55945a401b96990b824e950ef81ccec07205 + e88f8d63b134969756b3ff49f419156895214c30 diff --git a/eng/Versions.props b/eng/Versions.props index fe52831c5123..7a15c8b42c22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,21 +237,21 @@ - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 - 10.0.0-preview.3.25163.1 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.7 From cc5e160249474510e20c84c172c39c550c6a7a6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 14 Mar 2025 02:50:13 +0000 Subject: [PATCH 14/21] Update dependencies from https://github.com/dotnet/aspnetcore build 20250313.10 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.3.25161.2 -> To Version 10.0.0-preview.3.25163.10 --- 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 06d93b9507b1..0a01ae22ff12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf b129327573e5f7babf24738aeda16e131a318ef5 - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e - + https://github.com/dotnet/aspnetcore - e88f8d63b134969756b3ff49f419156895214c30 + f3555640d3b0d049856947c4f2bd0b869adf5c5e diff --git a/eng/Versions.props b/eng/Versions.props index 7a15c8b42c22..5eef5a148f5e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -237,21 +237,21 @@ - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 - 10.0.0-preview.3.25163.7 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25163.10 From 86a446ab6f5be3f5da60d74d4bc78dc4810ef681 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 13 Mar 2025 20:08:28 -0700 Subject: [PATCH 15/21] Update patch to build target platform only --- .../0001-only-build-target-platform.patch | 61 ++++++++++++++++--- 1 file changed, 54 insertions(+), 7 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch index 6ad4b3d8f4f8..09b967a6de93 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -1,7 +1,7 @@ From d55847e83339919ddd713d3a03aa1b1ad1dd1329 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:45:10 +0100 -Subject: [PATCH 1/7] Only build the target platform in native projs for the VMR +Subject: [PATCH 1/8] Only build the target platform in native projs for the VMR Backport: https://github.com/dotnet/aspnetcore/pull/60910 @@ -177,7 +177,7 @@ index c6beee133ff7..1e84bdfe76f4 100644 From 4a0e84caac9a03e1abbe7927e420d6ca50648034 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 15:45:57 +0100 -Subject: [PATCH 2/7] PR feedback - undo BP2 project move +Subject: [PATCH 2/8] PR feedback - undo BP2 project move --- eng/Build.props | 6 ------ @@ -204,7 +204,7 @@ index 391054e3a329..af2876659b40 100644 From 683f7946861584d2fe5d2cce683a3ba7e45b11d2 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:20:41 -0700 -Subject: [PATCH 3/7] Only build ANCM native bits in pass 2 +Subject: [PATCH 3/8] Only build ANCM native bits in pass 2 --- eng/Build.props | 6 +++++ @@ -303,7 +303,7 @@ index baf8bf6f5d91..1dbd04f6ed90 100644 From d03d4ea6a36dd50f7500d379b097f77a7c666b4b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:21:41 -0700 -Subject: [PATCH 4/7] Fixup +Subject: [PATCH 4/8] Fixup --- eng/Build.props | 3 --- @@ -327,7 +327,7 @@ index fff3753783ad..ec515d5b3e2d 100644 From 889c767c2d578ab78946efb8f18592ba2bae6a36 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:23:26 -0700 -Subject: [PATCH 5/7] LF +Subject: [PATCH 5/8] LF --- .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 2 +- @@ -348,7 +348,7 @@ index 1dbd04f6ed90..1b02ebf435b2 100644 From e6665a1af0c5b8532135e269255a1fe4ebf360ae Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 11:57:17 -0700 -Subject: [PATCH 6/7] Put IIS Integration Testing back in pass 2 +Subject: [PATCH 6/8] Put IIS Integration Testing back in pass 2 --- eng/Build.props | 10 ++++++++++ @@ -386,7 +386,7 @@ index ec515d5b3e2d..75292f7dd962 100644 From 92e9c827a74445a06699c73cea4cc0c6bf0e9085 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 11:59:14 -0700 -Subject: [PATCH 7/7] Revert IntegrationTesting change +Subject: [PATCH 7/8] Revert IntegrationTesting change --- ...pNetCore.Server.IntegrationTesting.IIS.csproj | 16 ++++++---------- @@ -422,3 +422,50 @@ index 1e84bdfe76f4..c6beee133ff7 100644 + +From 8976b15f3083b7fa13b194fe5c64318b9fd5cbf6 Mon Sep 17 00:00:00 2001 +From: Will Godbe +Date: Thu, 13 Mar 2025 20:07:08 -0700 +Subject: [PATCH 8/8] Only build RID specific assets in ANCM + +--- + .../Directory.Build.props | 19 ++++++++++++++++++- + 1 file changed, 18 insertions(+), 1 deletion(-) + +diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +index 1b02ebf435b2..efa1cdb09a63 100644 +--- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props ++++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +@@ -40,7 +40,7 @@ + + + +- ++ + + AspNetCoreV2 + True +@@ -87,6 +87,23 @@ + + + ++ ++ ++ AspNetCoreV2 ++ True ++ True ++ false ++ Platform=$(NativePlatform) ++ ++ ++ AspNetCoreV2Handler ++ True ++ True ++ false ++ Platform=$(NativePlatform) ++ ++ ++ + + + From d35c29aa1dedcd301736cfd1c1411f1aa69cf484 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Thu, 13 Mar 2025 22:17:09 -0700 Subject: [PATCH 16/21] Update patch subject lines and fix syntax --- .../0001-only-build-target-platform.patch | 48 +++++++++++++++---- 1 file changed, 40 insertions(+), 8 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch index 09b967a6de93..3486e375caf9 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -1,7 +1,7 @@ From d55847e83339919ddd713d3a03aa1b1ad1dd1329 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:45:10 +0100 -Subject: [PATCH 1/8] Only build the target platform in native projs for the VMR +Subject: [PATCH 1/9] Only build the target platform in native projs for the VMR Backport: https://github.com/dotnet/aspnetcore/pull/60910 @@ -177,7 +177,7 @@ index c6beee133ff7..1e84bdfe76f4 100644 From 4a0e84caac9a03e1abbe7927e420d6ca50648034 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 15:45:57 +0100 -Subject: [PATCH 2/8] PR feedback - undo BP2 project move +Subject: [PATCH 2/9] PR feedback - undo BP2 project move --- eng/Build.props | 6 ------ @@ -204,7 +204,7 @@ index 391054e3a329..af2876659b40 100644 From 683f7946861584d2fe5d2cce683a3ba7e45b11d2 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:20:41 -0700 -Subject: [PATCH 3/8] Only build ANCM native bits in pass 2 +Subject: [PATCH 3/9] Only build ANCM native bits in pass 2 --- eng/Build.props | 6 +++++ @@ -303,7 +303,7 @@ index baf8bf6f5d91..1dbd04f6ed90 100644 From d03d4ea6a36dd50f7500d379b097f77a7c666b4b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:21:41 -0700 -Subject: [PATCH 4/8] Fixup +Subject: [PATCH 4/9] Fixup --- eng/Build.props | 3 --- @@ -327,7 +327,7 @@ index fff3753783ad..ec515d5b3e2d 100644 From 889c767c2d578ab78946efb8f18592ba2bae6a36 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:23:26 -0700 -Subject: [PATCH 5/8] LF +Subject: [PATCH 5/9] LF --- .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 2 +- @@ -348,7 +348,7 @@ index 1dbd04f6ed90..1b02ebf435b2 100644 From e6665a1af0c5b8532135e269255a1fe4ebf360ae Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 11:57:17 -0700 -Subject: [PATCH 6/8] Put IIS Integration Testing back in pass 2 +Subject: [PATCH 6/9] Put IIS Integration Testing back in pass 2 --- eng/Build.props | 10 ++++++++++ @@ -386,7 +386,7 @@ index ec515d5b3e2d..75292f7dd962 100644 From 92e9c827a74445a06699c73cea4cc0c6bf0e9085 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 11:59:14 -0700 -Subject: [PATCH 7/8] Revert IntegrationTesting change +Subject: [PATCH 7/9] Revert IntegrationTesting change --- ...pNetCore.Server.IntegrationTesting.IIS.csproj | 16 ++++++---------- @@ -426,7 +426,7 @@ index 1e84bdfe76f4..c6beee133ff7 100644 From 8976b15f3083b7fa13b194fe5c64318b9fd5cbf6 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 13 Mar 2025 20:07:08 -0700 -Subject: [PATCH 8/8] Only build RID specific assets in ANCM +Subject: [PATCH 8/9] Only build RID specific assets in ANCM --- .../Directory.Build.props | 19 ++++++++++++++++++- @@ -469,3 +469,35 @@ index 1b02ebf435b2..efa1cdb09a63 100644 + +From e98f3f96eddb80a425bea373c03f4c2a86ff71fa Mon Sep 17 00:00:00 2001 +From: wtgodbe +Date: Thu, 13 Mar 2025 22:16:17 -0700 +Subject: [PATCH 9/9] Fix syntax + +--- + .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +index efa1cdb09a63..12c34a240d5f 100644 +--- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props ++++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +@@ -40,7 +40,7 @@ + + + +- ++ + + AspNetCoreV2 + True +@@ -87,7 +87,7 @@ + + + +- ++ + + AspNetCoreV2 + True From 7b69978c2f6d792c1566990057bde9c2be522ca7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 15 Mar 2025 05:02:31 +0000 Subject: [PATCH 17/21] Update dependencies from https://github.com/dotnet/aspnetcore build 20250314.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.3.25161.2 -> To Version 10.0.0-preview.3.25164.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 cfc3c166a0a6..460760a40273 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -299,131 +299,131 @@ https://github.com/dotnet/wpf b129327573e5f7babf24738aeda16e131a318ef5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - f3555640d3b0d049856947c4f2bd0b869adf5c5e + 825daf664804598df9942499970bee5e0f2432d5 diff --git a/eng/Versions.props b/eng/Versions.props index 104aaa651ba7..fabdd93eb221 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,21 +238,21 @@ - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 - 10.0.0-preview.3.25163.10 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 + 10.0.0-preview.3.25164.5 From 4338c26412619fdd63e35eab3159ea107ed3c3a1 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 17 Mar 2025 09:07:11 -0700 Subject: [PATCH 18/21] Update patch subjects and remove wow64 support --- .../0001-only-build-target-platform.patch | 85 +++++++++++++++++-- 1 file changed, 76 insertions(+), 9 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch index 3486e375caf9..d16998198200 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -1,7 +1,7 @@ From d55847e83339919ddd713d3a03aa1b1ad1dd1329 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:45:10 +0100 -Subject: [PATCH 1/9] Only build the target platform in native projs for the VMR +Subject: [PATCH 01/10] Only build the target platform in native projs for the VMR Backport: https://github.com/dotnet/aspnetcore/pull/60910 @@ -177,7 +177,7 @@ index c6beee133ff7..1e84bdfe76f4 100644 From 4a0e84caac9a03e1abbe7927e420d6ca50648034 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 15:45:57 +0100 -Subject: [PATCH 2/9] PR feedback - undo BP2 project move +Subject: [PATCH 02/10] PR feedback - undo BP2 project move --- eng/Build.props | 6 ------ @@ -204,7 +204,7 @@ index 391054e3a329..af2876659b40 100644 From 683f7946861584d2fe5d2cce683a3ba7e45b11d2 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:20:41 -0700 -Subject: [PATCH 3/9] Only build ANCM native bits in pass 2 +Subject: [PATCH 03/10] Only build ANCM native bits in pass 2 --- eng/Build.props | 6 +++++ @@ -303,7 +303,7 @@ index baf8bf6f5d91..1dbd04f6ed90 100644 From d03d4ea6a36dd50f7500d379b097f77a7c666b4b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:21:41 -0700 -Subject: [PATCH 4/9] Fixup +Subject: [PATCH 04/10] Fixup --- eng/Build.props | 3 --- @@ -327,7 +327,7 @@ index fff3753783ad..ec515d5b3e2d 100644 From 889c767c2d578ab78946efb8f18592ba2bae6a36 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:23:26 -0700 -Subject: [PATCH 5/9] LF +Subject: [PATCH 05/10] LF --- .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 2 +- @@ -348,7 +348,7 @@ index 1dbd04f6ed90..1b02ebf435b2 100644 From e6665a1af0c5b8532135e269255a1fe4ebf360ae Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 11:57:17 -0700 -Subject: [PATCH 6/9] Put IIS Integration Testing back in pass 2 +Subject: [PATCH 06/10] Put IIS Integration Testing back in pass 2 --- eng/Build.props | 10 ++++++++++ @@ -386,7 +386,7 @@ index ec515d5b3e2d..75292f7dd962 100644 From 92e9c827a74445a06699c73cea4cc0c6bf0e9085 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 11:59:14 -0700 -Subject: [PATCH 7/9] Revert IntegrationTesting change +Subject: [PATCH 07/10] Revert IntegrationTesting change --- ...pNetCore.Server.IntegrationTesting.IIS.csproj | 16 ++++++---------- @@ -426,7 +426,7 @@ index 1e84bdfe76f4..c6beee133ff7 100644 From 8976b15f3083b7fa13b194fe5c64318b9fd5cbf6 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 13 Mar 2025 20:07:08 -0700 -Subject: [PATCH 8/9] Only build RID specific assets in ANCM +Subject: [PATCH 08/10] Only build RID specific assets in ANCM --- .../Directory.Build.props | 19 ++++++++++++++++++- @@ -473,7 +473,7 @@ index 1b02ebf435b2..efa1cdb09a63 100644 From e98f3f96eddb80a425bea373c03f4c2a86ff71fa Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 22:16:17 -0700 -Subject: [PATCH 9/9] Fix syntax +Subject: [PATCH 09/10] Fix syntax --- .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 4 ++-- @@ -501,3 +501,70 @@ index efa1cdb09a63..12c34a240d5f 100644 AspNetCoreV2 True + +From 52d4135ee2057e943e564937e1e745170b3e308f Mon Sep 17 00:00:00 2001 +From: William Godbe +Date: Mon, 17 Mar 2025 09:05:51 -0700 +Subject: [PATCH 10/10] Temporarily remove wow64 support for ANCMIISExpressV2 + +--- + .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 46 ------------------- + 1 file changed, 46 deletions(-) + +diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +index df2e44ea40b2..0b43654c5b6f 100644 +--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs ++++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +@@ -274,52 +274,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + From 0c4bd7e44245413ee8d741137e6ecf00e5b44089 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 17 Mar 2025 10:01:43 -0700 Subject: [PATCH 19/21] Update patch subjects and remove redundant components --- .../0001-only-build-target-platform.patch | 47 ++++++++++++++----- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch index d16998198200..5d373ae8b903 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -1,10 +1,9 @@ From d55847e83339919ddd713d3a03aa1b1ad1dd1329 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:45:10 +0100 -Subject: [PATCH 01/10] Only build the target platform in native projs for the VMR +Subject: [PATCH 01/11] Only build the target platform in native projs for the VMR Backport: https://github.com/dotnet/aspnetcore/pull/60910 - --- eng/Common.props | 4 ++++ ...t.AspNetCore.App.Runtime.Composite.sfxproj | 4 ---- @@ -177,7 +176,7 @@ index c6beee133ff7..1e84bdfe76f4 100644 From 4a0e84caac9a03e1abbe7927e420d6ca50648034 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 15:45:57 +0100 -Subject: [PATCH 02/10] PR feedback - undo BP2 project move +Subject: [PATCH 02/11] PR feedback - undo BP2 project move --- eng/Build.props | 6 ------ @@ -204,7 +203,7 @@ index 391054e3a329..af2876659b40 100644 From 683f7946861584d2fe5d2cce683a3ba7e45b11d2 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:20:41 -0700 -Subject: [PATCH 03/10] Only build ANCM native bits in pass 2 +Subject: [PATCH 03/11] Only build ANCM native bits in pass 2 --- eng/Build.props | 6 +++++ @@ -303,7 +302,7 @@ index baf8bf6f5d91..1dbd04f6ed90 100644 From d03d4ea6a36dd50f7500d379b097f77a7c666b4b Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:21:41 -0700 -Subject: [PATCH 04/10] Fixup +Subject: [PATCH 04/11] Fixup --- eng/Build.props | 3 --- @@ -327,7 +326,7 @@ index fff3753783ad..ec515d5b3e2d 100644 From 889c767c2d578ab78946efb8f18592ba2bae6a36 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 08:23:26 -0700 -Subject: [PATCH 05/10] LF +Subject: [PATCH 05/11] LF --- .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 2 +- @@ -348,7 +347,7 @@ index 1dbd04f6ed90..1b02ebf435b2 100644 From e6665a1af0c5b8532135e269255a1fe4ebf360ae Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 11:57:17 -0700 -Subject: [PATCH 06/10] Put IIS Integration Testing back in pass 2 +Subject: [PATCH 06/11] Put IIS Integration Testing back in pass 2 --- eng/Build.props | 10 ++++++++++ @@ -386,7 +385,7 @@ index ec515d5b3e2d..75292f7dd962 100644 From 92e9c827a74445a06699c73cea4cc0c6bf0e9085 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 11:59:14 -0700 -Subject: [PATCH 07/10] Revert IntegrationTesting change +Subject: [PATCH 07/11] Revert IntegrationTesting change --- ...pNetCore.Server.IntegrationTesting.IIS.csproj | 16 ++++++---------- @@ -426,7 +425,7 @@ index 1e84bdfe76f4..c6beee133ff7 100644 From 8976b15f3083b7fa13b194fe5c64318b9fd5cbf6 Mon Sep 17 00:00:00 2001 From: Will Godbe Date: Thu, 13 Mar 2025 20:07:08 -0700 -Subject: [PATCH 08/10] Only build RID specific assets in ANCM +Subject: [PATCH 08/11] Only build RID specific assets in ANCM --- .../Directory.Build.props | 19 ++++++++++++++++++- @@ -473,7 +472,7 @@ index 1b02ebf435b2..efa1cdb09a63 100644 From e98f3f96eddb80a425bea373c03f4c2a86ff71fa Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Thu, 13 Mar 2025 22:16:17 -0700 -Subject: [PATCH 09/10] Fix syntax +Subject: [PATCH 09/11] Fix syntax --- .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 4 ++-- @@ -505,7 +504,7 @@ index efa1cdb09a63..12c34a240d5f 100644 From 52d4135ee2057e943e564937e1e745170b3e308f Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 17 Mar 2025 09:05:51 -0700 -Subject: [PATCH 10/10] Temporarily remove wow64 support for ANCMIISExpressV2 +Subject: [PATCH 10/11] Temporarily remove wow64 support for ANCMIISExpressV2 --- .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 46 ------------------- @@ -568,3 +567,29 @@ index df2e44ea40b2..0b43654c5b6f 100644 + +From dff917527969f002399ce4309d42b5feae6bc08c Mon Sep 17 00:00:00 2001 +From: William Godbe +Date: Mon, 17 Mar 2025 10:00:43 -0700 +Subject: [PATCH 11/11] Remove redundant component references for x86 platform + +--- + .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +index 0b43654c5b6f..4f8951ece3b3 100644 +--- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs ++++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +@@ -290,11 +290,6 @@ + + + +- +- +- +- +- + + + From 898a38bef1d247aa735b17faf6a89fb744a4c2ad Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 17 Mar 2025 10:39:53 -0700 Subject: [PATCH 20/21] Update patch --- .../0001-only-build-target-platform.patch | 563 +++--------------- 1 file changed, 87 insertions(+), 476 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch index 5d373ae8b903..8606326b4e63 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -1,18 +1,38 @@ -From d55847e83339919ddd713d3a03aa1b1ad1dd1329 Mon Sep 17 00:00:00 2001 +From df60bf78d5bd30e541860c26efd06da717227127 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:45:10 +0100 -Subject: [PATCH 01/11] Only build the target platform in native projs for the VMR +Subject: [PATCH] Only build the target platform in native projs for the VMR Backport: https://github.com/dotnet/aspnetcore/pull/60910 + --- - eng/Common.props | 4 ++++ - ...t.AspNetCore.App.Runtime.Composite.sfxproj | 4 ---- - .../Microsoft.AspNetCore.App.Runtime.sfxproj | 4 ---- - .../Directory.Build.props | 21 ++++++++++++------- - .../Microsoft.AspNetCore.Server.IIS.csproj | 8 ++++--- - ...tCore.Server.IntegrationTesting.IIS.csproj | 16 ++++++++------ - 6 files changed, 33 insertions(+), 24 deletions(-) + eng/Build.props | 7 +++ + eng/Common.props | 4 ++ + ...t.AspNetCore.App.Runtime.Composite.sfxproj | 4 -- + .../Microsoft.AspNetCore.App.Runtime.sfxproj | 4 -- + .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 51 ------------------- + .../Directory.Build.props | 19 ++++++- + .../Microsoft.AspNetCore.Server.IIS.csproj | 8 +-- + 7 files changed, 34 insertions(+), 63 deletions(-) +diff --git a/eng/Build.props b/eng/Build.props +index 391054e3a329..75292f7dd962 100644 +--- a/eng/Build.props ++++ b/eng/Build.props +@@ -56,6 +56,13 @@ + $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj; + " /> + ++ ++ ++ ++ + + -diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -index 1b02ebf435b2..baf8bf6f5d91 100644 ---- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -@@ -40,45 +40,52 @@ - - - -+ - - - AspNetCoreV2 - True - True - false -- Platform=x64 -+ Platform=x64 -+ Platform=$(NativePlatform) - - - AspNetCoreV2Handler - True - True - false -- Platform=x64 -+ Platform=x64 -+ Platform=$(NativePlatform) - - -- -+ - AspNetCoreV2WoW64 - True - True - false - Platform=Win32 - -- -+ - AspNetCoreV2HandlerWoW64 - True - True - false - Platform=Win32 - -- -- -+ -+ - AspNetCoreV2ARM64 - True - True - false - Platform=ARM64 - -- -+ - AspNetCoreV2HandlerARM64 - True - True -diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj -index d9ffb24a0867..ef46ff81213d 100644 ---- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj -+++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj -@@ -45,9 +45,11 @@ - - - -- -- -- -+ -+ -+ -+ -+ - - - -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 c6beee133ff7..1e84bdfe76f4 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 -@@ -35,15 +35,19 @@ - Condition="!Exists('$(AspNetCoreModuleV2ShimDll)') OR !Exists('$(AspNetCoreModuleV2OutOfProcessHandlerDll)')" /> - - -+ - -- -- -+ -+ - -- -- -+ -+ - -- -- -+ -+ -+ -+ -+ - - - - -From 4a0e84caac9a03e1abbe7927e420d6ca50648034 Mon Sep 17 00:00:00 2001 -From: Viktor Hofer -Date: Thu, 13 Mar 2025 15:45:57 +0100 -Subject: [PATCH 02/11] PR feedback - undo BP2 project move - ---- - eng/Build.props | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/eng/Build.props b/eng/Build.props -index 391054e3a329..af2876659b40 100644 ---- a/eng/Build.props -+++ b/eng/Build.props -@@ -55,12 +55,6 @@ - $(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj; - $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj; - " /> -- -- -- - - - - -From 683f7946861584d2fe5d2cce683a3ba7e45b11d2 Mon Sep 17 00:00:00 2001 -From: wtgodbe -Date: Thu, 13 Mar 2025 08:20:41 -0700 -Subject: [PATCH 03/11] Only build ANCM native bits in pass 2 - ---- - eng/Build.props | 6 +++++ - .../Directory.Build.props | 23 +++++++------------ - 2 files changed, 14 insertions(+), 15 deletions(-) - -diff --git a/eng/Build.props b/eng/Build.props -index af2876659b40..fff3753783ad 100644 ---- a/eng/Build.props -+++ b/eng/Build.props -@@ -55,6 +55,12 @@ - $(RepoRoot)src\Servers\Kestrel\perf\PlatformBenchmarks\**\*.csproj; - $(RepoRoot)src\SignalR\perf\benchmarkapps\**\*.csproj; - " /> -+ -+ -+ - - - -diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -index baf8bf6f5d91..1dbd04f6ed90 100644 ---- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -@@ -40,52 +40,45 @@ - - - -- - - - AspNetCoreV2 - True - True - false -- Platform=x64 -- Platform=$(NativePlatform) -+ Platform=x64 - - - AspNetCoreV2Handler - True - True - false -- Platform=x64 -- Platform=$(NativePlatform) -+ Platform=x64 - - -- -+ - AspNetCoreV2WoW64 - True - True - false - Platform=Win32 - -- -+ - AspNetCoreV2HandlerWoW64 - True - True - false - Platform=Win32 - -- -- -+ -+ - AspNetCoreV2ARM64 - True - True - false - Platform=ARM64 - -- -+ - AspNetCoreV2HandlerARM64 - True - True -@@ -99,4 +92,4 @@ - - - -- -+ -\ No newline at end of file - -From d03d4ea6a36dd50f7500d379b097f77a7c666b4b Mon Sep 17 00:00:00 2001 -From: wtgodbe -Date: Thu, 13 Mar 2025 08:21:41 -0700 -Subject: [PATCH 04/11] Fixup - ---- - eng/Build.props | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/eng/Build.props b/eng/Build.props -index fff3753783ad..ec515d5b3e2d 100644 ---- a/eng/Build.props -+++ b/eng/Build.props -@@ -82,9 +82,6 @@ - Platform=x86 - $(DotNetBuildPass) - -- -- $(DotNetBuildPass) -- - - - - -From 889c767c2d578ab78946efb8f18592ba2bae6a36 Mon Sep 17 00:00:00 2001 -From: wtgodbe -Date: Thu, 13 Mar 2025 08:23:26 -0700 -Subject: [PATCH 05/11] LF - ---- - .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -index 1dbd04f6ed90..1b02ebf435b2 100644 ---- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -@@ -92,4 +92,4 @@ - - - -- -\ No newline at end of file -+ - -From e6665a1af0c5b8532135e269255a1fe4ebf360ae Mon Sep 17 00:00:00 2001 -From: wtgodbe -Date: Thu, 13 Mar 2025 11:57:17 -0700 -Subject: [PATCH 06/11] Put IIS Integration Testing back in pass 2 - ---- - eng/Build.props | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/eng/Build.props b/eng/Build.props -index ec515d5b3e2d..75292f7dd962 100644 ---- a/eng/Build.props -+++ b/eng/Build.props -@@ -61,6 +61,13 @@ - $(RepoRoot)src\Installers\**\*.vcxproj; - " - Condition=" '$(BuildNative)' == 'true' and '$(DotNetBuild)' == 'true' and ('$(DotNetBuildPass)' == '' or '$(DotNetBuildPass)' == '1') " /> -+ -+ -+ -+ - - - -@@ -82,6 +89,9 @@ - Platform=x86 - $(DotNetBuildPass) - -+ -+ $(DotNetBuildPass) -+ - - - - -From 92e9c827a74445a06699c73cea4cc0c6bf0e9085 Mon Sep 17 00:00:00 2001 -From: wtgodbe -Date: Thu, 13 Mar 2025 11:59:14 -0700 -Subject: [PATCH 07/11] Revert IntegrationTesting change - ---- - ...pNetCore.Server.IntegrationTesting.IIS.csproj | 16 ++++++---------- - 1 file changed, 6 insertions(+), 10 deletions(-) - -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 1e84bdfe76f4..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 -@@ -35,19 +35,15 @@ - Condition="!Exists('$(AspNetCoreModuleV2ShimDll)') OR !Exists('$(AspNetCoreModuleV2OutOfProcessHandlerDll)')" /> - - -- - -- -- -+ -+ - -- -- -+ -+ - -- -- -- -- -- -+ -+ - - - - -From 8976b15f3083b7fa13b194fe5c64318b9fd5cbf6 Mon Sep 17 00:00:00 2001 -From: Will Godbe -Date: Thu, 13 Mar 2025 20:07:08 -0700 -Subject: [PATCH 08/11] Only build RID specific assets in ANCM - ---- - .../Directory.Build.props | 19 ++++++++++++++++++- - 1 file changed, 18 insertions(+), 1 deletion(-) - -diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -index 1b02ebf435b2..efa1cdb09a63 100644 ---- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -@@ -40,7 +40,7 @@ - - - -- -+ - - AspNetCoreV2 - True -@@ -87,6 +87,23 @@ - - - -+ -+ -+ AspNetCoreV2 -+ True -+ True -+ false -+ Platform=$(NativePlatform) -+ -+ -+ AspNetCoreV2Handler -+ True -+ True -+ false -+ Platform=$(NativePlatform) -+ -+ -+ - - - - -From e98f3f96eddb80a425bea373c03f4c2a86ff71fa Mon Sep 17 00:00:00 2001 -From: wtgodbe -Date: Thu, 13 Mar 2025 22:16:17 -0700 -Subject: [PATCH 09/11] Fix syntax - ---- - .../Windows/AspNetCoreModule-Setup/Directory.Build.props | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -index efa1cdb09a63..12c34a240d5f 100644 ---- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -+++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props -@@ -40,7 +40,7 @@ - - - -- -+ - - AspNetCoreV2 - True -@@ -87,7 +87,7 @@ - - - -- -+ - - AspNetCoreV2 - True - -From 52d4135ee2057e943e564937e1e745170b3e308f Mon Sep 17 00:00:00 2001 -From: William Godbe -Date: Mon, 17 Mar 2025 09:05:51 -0700 -Subject: [PATCH 10/11] Temporarily remove wow64 support for ANCMIISExpressV2 - ---- - .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 46 ------------------- - 1 file changed, 46 deletions(-) - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs -index df2e44ea40b2..0b43654c5b6f 100644 +index df2e44ea40b2..4f8951ece3b3 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -274,52 +274,6 @@ @@ -567,21 +136,7 @@ index df2e44ea40b2..0b43654c5b6f 100644 - -From dff917527969f002399ce4309d42b5feae6bc08c Mon Sep 17 00:00:00 2001 -From: William Godbe -Date: Mon, 17 Mar 2025 10:00:43 -0700 -Subject: [PATCH 11/11] Remove redundant component references for x86 platform - ---- - .../ANCMIISExpressV2/ancm_iis_expressv2.wxs | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs -index 0b43654c5b6f..4f8951ece3b3 100644 ---- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs -+++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs -@@ -290,11 +290,6 @@ +@@ -336,11 +290,6 @@ @@ -593,3 +148,59 @@ index 0b43654c5b6f..4f8951ece3b3 100644 +diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +index 1b02ebf435b2..12c34a240d5f 100644 +--- a/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props ++++ b/src/Installers/Windows/AspNetCoreModule-Setup/Directory.Build.props +@@ -40,7 +40,7 @@ + + + +- ++ + + AspNetCoreV2 + True +@@ -87,6 +87,23 @@ + + + ++ ++ ++ AspNetCoreV2 ++ True ++ True ++ false ++ Platform=$(NativePlatform) ++ ++ ++ AspNetCoreV2Handler ++ True ++ True ++ false ++ Platform=$(NativePlatform) ++ ++ ++ + + + +diff --git a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +index d9ffb24a0867..ef46ff81213d 100644 +--- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj ++++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +@@ -45,9 +45,11 @@ + + + +- +- +- ++ ++ ++ ++ ++ + + + From f5b4b8f05dee7c8980bf3c18ba7fba22f23adc84 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Mon, 17 Mar 2025 11:06:56 -0700 Subject: [PATCH 21/21] Update patch to build target platform only --- .../aspnetcore/0001-only-build-target-platform.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch index 8606326b4e63..8e80b7776073 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -1,4 +1,4 @@ -From df60bf78d5bd30e541860c26efd06da717227127 Mon Sep 17 00:00:00 2001 +From 206a8585f80474a12e852162c577fb351bc807e9 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Thu, 13 Mar 2025 09:45:10 +0100 Subject: [PATCH] Only build the target platform in native projs for the VMR @@ -80,10 +80,10 @@ index 3b743bd3f4ed..294ca282e845 100644 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs -index df2e44ea40b2..4f8951ece3b3 100644 +index 9aa2c78478e0..1a4f69ef1de7 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs -@@ -274,52 +274,6 @@ +@@ -265,52 +265,6 @@ @@ -136,8 +136,8 @@ index df2e44ea40b2..4f8951ece3b3 100644 -@@ -336,11 +290,6 @@ - +@@ -324,11 +278,6 @@ + -