diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 51f5dac1c677..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 - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 - + https://github.com/dotnet/aspnetcore - 00b6dbed5d8bb56caaa491c1cd4d3328edb78ef7 + 825daf664804598df9942499970bee5e0f2432d5 diff --git a/eng/Versions.props b/eng/Versions.props index dcba2a705894..fabdd93eb221 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -238,21 +238,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.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 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..8e80b7776073 --- /dev/null +++ b/src/SourceBuild/patches/aspnetcore/0001-only-build-target-platform.patch @@ -0,0 +1,206 @@ +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 + +Backport: https://github.com/dotnet/aspnetcore/pull/60910 + +--- + 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; + " /> + ++ ++ ++ ++ + + 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/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +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 +@@ -265,52 +265,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -324,11 +278,6 @@ + + + +- +- +- +- +- + + + +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 @@ + + + +- +- +- ++ ++ ++ ++ ++ + + +