From 7c4f02c7263bbba6d0ee656dcb18a99c709415c5 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Mon, 7 Jul 2025 09:24:40 -0700 Subject: [PATCH 1/8] Work around arm64 forwarder Linker bug --- .../Windows/AspNetCoreModule-Setup/Forwarders/build.cmd | 4 ++-- .../Windows/AspNetCoreModule-Setup/Forwarders/build.proj | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd index 7e150ccbd565..d56338aa8587 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd @@ -8,7 +8,7 @@ cl /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_x64.obj empty.cpp link /lib /nologo /machine:arm64 /def:aspnetcorev2_arm64.def /out:%objDir%\aspnetcorev2_arm64.lib link /lib /nologo /machine:x64 /def:aspnetcorev2_x64.def /out:%objDir%\aspnetcorev2_x64.lib -link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj %objDir%\..\AspNetCoreModuleShim\x64\%configuration%\aspnetcoremodule.res /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib +link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj %objDir%\..\AspNetCoreModuleShim\x64\%configuration%\aspnetcoremodule.res /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib /FORCE:UNRESOLVED cl /nologo /nologo /c /Fo%objDir%\aspnetcorev2_outofprocess_arm64.obj empty.cpp cl /nologo /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj empty.cpp @@ -16,4 +16,4 @@ cl /nologo /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj emp link /lib /nologo /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib link /lib /nologo /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib -link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib +link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib /FORCE:UNRESOLVED diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj index 012ea1d06ea2..a3496458abca 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj @@ -16,6 +16,7 @@ - + + From 24a843d3b0a8a443f32c1bd4bf309cc52cee8340 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 8 Jul 2025 09:50:08 -0700 Subject: [PATCH 2/8] Add msbuild dependencies to fix SourceBuild prebuilts --- eng/Version.Details.xml | 17 +++++++++++++++++ eng/Versions.props | 9 +++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19694d0c8cd0..2fd4fb51f9a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -440,5 +440,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-optimization bff9b4a349cfa7e3d83264d8953613d98a7b04eb + + + https://github.com/dotnet/msbuild + d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 + + + https://github.com/dotnet/msbuild + d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 + + + https://github.com/dotnet/msbuild + d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 + + + https://github.com/dotnet/msbuild + d1cce8d7cc03c23a4f1bad8e9240714fd9d199a3 + diff --git a/eng/Versions.props b/eng/Versions.props index db16e83965c4..36d83bdb73da 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -155,6 +155,11 @@ 10.0.0-preview.7.25351.105 10.0.0-preview.7.25351.105 10.0.0-preview.7.25351.105 + + 17.12.36 + 17.12.36 + 17.12.36 + 17.12.36 10.0.100-preview.7.25351.105 10.0.100-preview.7.25351.105 @@ -224,10 +229,6 @@ 1.2.0 1.2.6 - 17.8.29 - 17.8.29 - 17.8.29 - 17.8.29 - + From d204dac8779d229be7c4ddc6be35233d34a16b4f Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 29 Jul 2025 17:31:27 -0700 Subject: [PATCH 4/8] Exit 0 in all.cmd --- src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd index 80543b729c47..49c4ba0aab19 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd @@ -1,2 +1,3 @@ call %1 -host_arch=x64 -arch=arm64 -no_logo call build.cmd %2 %3 %4 +exit /b 0 From 5047067bf52cb52e8dd974112ebc84c501adc59d Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 29 Jul 2025 18:17:31 -0700 Subject: [PATCH 5/8] Update build.cmd --- .../Windows/AspNetCoreModule-Setup/Forwarders/build.cmd | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd index d56338aa8587..86c2f50c6d37 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd @@ -17,3 +17,5 @@ link /lib /nologo /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:% link /lib /nologo /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib /FORCE:UNRESOLVED + +exit /b 0 From 28192e31c76b2ae5642e34a5cb7f4f2659d541e8 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 29 Jul 2025 19:13:44 -0700 Subject: [PATCH 6/8] Update build.proj --- .../Windows/AspNetCoreModule-Setup/Forwarders/build.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj index b68cb9fb2638..729efa0f7c36 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj @@ -17,6 +17,6 @@ - + From 70b3f552e48d53d3b765c77d8dd6058072868778 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Tue, 29 Jul 2025 20:03:46 -0700 Subject: [PATCH 7/8] Update build.cmd --- .../Windows/AspNetCoreModule-Setup/Forwarders/build.cmd | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd index 86c2f50c6d37..d56338aa8587 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd @@ -17,5 +17,3 @@ link /lib /nologo /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:% link /lib /nologo /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib /FORCE:UNRESOLVED - -exit /b 0 From 9c39e1f49829147925e8b67c8d552cfd70be5026 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 30 Jul 2025 06:44:51 -0700 Subject: [PATCH 8/8] Update build.proj --- .../Windows/AspNetCoreModule-Setup/Forwarders/build.proj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj index 729efa0f7c36..947f3374f42d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj @@ -17,6 +17,7 @@ +