From 389c6dfdca00b95b5061d4af283639d7a865e1a5 Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Sat, 13 Nov 2021 19:20:56 -0800 Subject: [PATCH 01/26] Enable arm64 build of ANCM native binaries. --- .../AspNetCore/AspNetCore.vcxproj | 29 +- .../CommonLib/CommonLib.vcxproj | 16 +- .../AspNetCoreModuleV2/IISLib/IISLib.vcxproj | 58 +--- .../InProcessRequestHandler.vcxproj | 16 +- .../OutOfProcessRequestHandler.vcxproj | 16 +- .../RequestHandlerLib.vcxproj | 16 +- src/Servers/IIS/build/assets.props | 322 +++++++++--------- 7 files changed, 231 insertions(+), 242 deletions(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj index e9ef91dd35e5..542669fdaa9a 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj @@ -9,6 +9,10 @@ Debug x64 + + Debug + ARM64 + Debug x64 @@ -21,6 +25,10 @@ Release x64 + + Release + ARM64 + Release x64 @@ -43,26 +51,13 @@ - + DynamicLibrary true $(PlatformToolsetVersion) Unicode - - DynamicLibrary - true - $(PlatformToolsetVersion) - Unicode - - - DynamicLibrary - false - $(PlatformToolsetVersion) - true - Unicode - - + DynamicLibrary false $(PlatformToolsetVersion) @@ -122,7 +117,7 @@ ..\Commonlib - + Level4 Disabled @@ -198,7 +193,7 @@ ..\Commonlib - + Level4 NotUsing diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index b1a01e217205..91481db732ce 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -9,6 +9,10 @@ Debug x64 + + Debug + ARM64 + Debug x64 @@ -21,6 +25,10 @@ Release x64 + + Release + ARM64 + Release x64 @@ -53,13 +61,13 @@ true Unicode - + StaticLibrary true $(PlatformToolsetVersion) Unicode - + StaticLibrary false $(PlatformToolsetVersion) @@ -105,7 +113,7 @@ true - + Use Level4 @@ -158,7 +166,7 @@ true - + Use Level4 diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj index 4afa15048c7e..dfcdd0497b08 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/IISLib.vcxproj @@ -9,6 +9,10 @@ Debug x64 + + Debug + ARM64 + Debug x64 @@ -21,6 +25,10 @@ Release x64 + + Release + ARM64 + Release x64 @@ -46,7 +54,7 @@ $(PlatformToolsetVersion) Unicode - + StaticLibrary true $(PlatformToolsetVersion) @@ -59,7 +67,7 @@ true Unicode - + StaticLibrary false $(PlatformToolsetVersion) @@ -73,26 +81,7 @@ - - - - - Level3 - Disabled - WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) - true - ProgramDatabase - MultiThreadedDebug - false - true - true - - - Windows - true - - - + @@ -111,30 +100,7 @@ true - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - - - Windows - true - true - /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) - true - - - + Level3 diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj index b07df421f805..582c48ad9dd4 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/InProcessRequestHandler.vcxproj @@ -10,6 +10,10 @@ Debug x64 + + Debug + ARM64 + Debug x64 @@ -22,6 +26,10 @@ Release x64 + + Release + ARM64 + Release x64 @@ -55,13 +63,13 @@ true Unicode - + DynamicLibrary true $(PlatformToolsetVersion) Unicode - + DynamicLibrary false $(PlatformToolsetVersion) @@ -117,7 +125,7 @@ UseLinkTimeCodeGeneration - + Use Level4 @@ -188,7 +196,7 @@ UseLinkTimeCodeGeneration - + Level4 Use diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj index 23d655bf9596..6852e319039e 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/OutOfProcessRequestHandler.vcxproj @@ -10,6 +10,10 @@ Debug x64 + + Debug + ARM64 + Debug x64 @@ -22,6 +26,10 @@ Release x64 + + Release + ARM64 + Release x64 @@ -55,13 +63,13 @@ true Unicode - + DynamicLibrary true $(PlatformToolsetVersion) Unicode - + DynamicLibrary false $(PlatformToolsetVersion) @@ -117,7 +125,7 @@ UseLinkTimeCodeGeneration - + Use Level4 @@ -188,7 +196,7 @@ UseLinkTimeCodeGeneration - + Level4 Use diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj index 8168f9e547be..da17021d66d5 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/RequestHandlerLib.vcxproj @@ -9,6 +9,10 @@ Debug x64 + + Debug + ARM64 + Debug x64 @@ -21,6 +25,10 @@ Release x64 + + Release + ARM64 + Release x64 @@ -53,13 +61,13 @@ true Unicode - + StaticLibrary true $(PlatformToolsetVersion) Unicode - + StaticLibrary false $(PlatformToolsetVersion) @@ -104,7 +112,7 @@ true - + NotUsing Level4 @@ -155,7 +163,7 @@ true - + NotUsing Level4 diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props index 950a773257e1..9603d61e2695 100644 --- a/src/Servers/IIS/build/assets.props +++ b/src/Servers/IIS/build/assets.props @@ -1,227 +1,223 @@ - true true - false - x64 - $(TargetArchitecture) + x64 + $(Platform) Win32 $(NativePlatform) - $(ArtifactsBinDir)AspNetCoreModuleShim\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2.dll - $(ArtifactsBinDir)InProcessRequestHandler\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2_inprocess.dll + $(ArtifactsBinDir)AspNetCoreModuleShim\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2.dll + $(ArtifactsBinDir)InProcessRequestHandler\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2_inprocess.dll $(ArtifactsBinDir)OutOfProcessRequestHandler\$(NativeVCPlatform)\$(Configuration)\aspnetcorev2_outofprocess.dll From 383a918668246031333d6e791436471205fff70e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 13 Dec 2021 09:59:43 -0800 Subject: [PATCH 02/26] Add arm64 to tests and assets --- .azure/pipelines/ci.yml | 1 - AspNetCore.sln | 36 ++++----- eng/Build.props | 3 +- .../CommonLibTests/CommonLibTests.vcxproj | 66 +++++++++++++++ .../AspNetCoreModuleV2/gtest/gtest.vcxproj | 16 +++- src/Servers/IIS/build/assets.props | 81 +++++++++++++++++++ .../IIS/tools/GenerateNativeAssets.ps1 | 9 ++- 7 files changed, 186 insertions(+), 26 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 29333ca2053e..14627e7f92e2 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -325,7 +325,6 @@ stages: -sign -pack -noBuildJava - -noBuildNative /p:DotNetSignType=$(_SignType) /p:OnlyPackPlatformSpecificPackages=true $(_BuildArgs) diff --git a/AspNetCore.sln b/AspNetCore.sln index fe58cfff5cf3..64a58506413f 100644 --- a/AspNetCore.sln +++ b/AspNetCore.sln @@ -7526,8 +7526,8 @@ Global {D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Release|x86.Build.0 = Release|x86 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|Any CPU.ActiveCfg = Debug|x64 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|Any CPU.Build.0 = Debug|x64 - {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.ActiveCfg = Debug|Any CPU - {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.Build.0 = Debug|Any CPU + {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.ActiveCfg = Debug|x64 + {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.Build.0 = Debug|x64 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x64.ActiveCfg = Debug|Any CPU {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x64.Build.0 = Debug|Any CPU {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x86.ActiveCfg = Debug|x86 @@ -8110,8 +8110,8 @@ Global {8DA61885-B95E-4BA1-A752-C79B6597FC44}.Release|x86.Build.0 = Release|x86 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|Any CPU.ActiveCfg = Debug|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|Any CPU.Build.0 = Debug|x64 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|arm64.ActiveCfg = Debug|Any CPU - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|arm64.Build.0 = Debug|Any CPU + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|arm64.ActiveCfg = Debug|ARM64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|arm64.Build.0 = Debug|ARM64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.ActiveCfg = Debug|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x64.Build.0 = Debug|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.ActiveCfg = Debug|Win32 @@ -8128,8 +8128,8 @@ Global {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.Deploy.0 = Release|Win32 {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Any CPU.ActiveCfg = Debug|x64 {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|Any CPU.Build.0 = Debug|x64 - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|arm64.ActiveCfg = Debug|Any CPU - {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|arm64.Build.0 = Debug|Any CPU + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|arm64.ActiveCfg = Debug|ARM64 + {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|arm64.Build.0 = Debug|ARM64 {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.ActiveCfg = Debug|x64 {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x64.Build.0 = Debug|x64 {55494E58-E061-4C4C-A0A8-837008E72F85}.Debug|x86.ActiveCfg = Debug|Win32 @@ -8146,8 +8146,8 @@ Global {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.Deploy.0 = Release|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.Build.0 = Debug|x64 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|arm64.ActiveCfg = Debug|Any CPU - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|arm64.Build.0 = Debug|Any CPU + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|arm64.ActiveCfg = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|arm64.Build.0 = Debug|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.ActiveCfg = Debug|Win32 @@ -8164,8 +8164,8 @@ Global {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Deploy.0 = Release|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.Build.0 = Debug|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|arm64.ActiveCfg = Debug|Any CPU - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|arm64.Build.0 = Debug|Any CPU + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|arm64.ActiveCfg = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|arm64.Build.0 = Debug|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32 @@ -8182,8 +8182,8 @@ Global {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.Deploy.0 = Release|Win32 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|Any CPU.ActiveCfg = Debug|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|Any CPU.Build.0 = Debug|x64 - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|arm64.ActiveCfg = Debug|Any CPU - {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|arm64.Build.0 = Debug|Any CPU + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|arm64.ActiveCfg = Debug|ARM64 + {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|arm64.Build.0 = Debug|ARM64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.ActiveCfg = Debug|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x64.Build.0 = Debug|x64 {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Debug|x86.ActiveCfg = Debug|Win32 @@ -8200,8 +8200,8 @@ Global {09D9D1D6-2951-4E14-BC35-76A23CF9391A}.Release|x86.Deploy.0 = Release|Win32 {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.ActiveCfg = Debug|x64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|Any CPU.Build.0 = Debug|x64 - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|arm64.ActiveCfg = Debug|Any CPU - {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|arm64.Build.0 = Debug|Any CPU + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|arm64.ActiveCfg = Debug|ARM64 + {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|arm64.Build.0 = Debug|ARM64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.ActiveCfg = Debug|x64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x64.Build.0 = Debug|x64 {D57EA297-6DC2-4BC0-8C91-334863327863}.Debug|x86.ActiveCfg = Debug|Win32 @@ -8218,8 +8218,8 @@ Global {D57EA297-6DC2-4BC0-8C91-334863327863}.Release|x86.Deploy.0 = Release|Win32 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|Any CPU.ActiveCfg = Debug|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|Any CPU.Build.0 = Debug|x64 - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|arm64.ActiveCfg = Debug|Any CPU - {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|arm64.Build.0 = Debug|Any CPU + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|arm64.ActiveCfg = Debug|ARM64 + {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|arm64.Build.0 = Debug|ARM64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.ActiveCfg = Debug|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x64.Build.0 = Debug|x64 {7F87406C-A3C8-4139-A68D-E4C344294A67}.Debug|x86.ActiveCfg = Debug|Win32 @@ -8236,8 +8236,8 @@ Global {7F87406C-A3C8-4139-A68D-E4C344294A67}.Release|x86.Deploy.0 = Release|Win32 {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|Any CPU.ActiveCfg = Debug|x64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|Any CPU.Build.0 = Debug|x64 - {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|arm64.ActiveCfg = Debug|Any CPU - {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|arm64.Build.0 = Debug|Any CPU + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|arm64.ActiveCfg = Debug|ARM64 + {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|arm64.Build.0 = Debug|ARM64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.ActiveCfg = Debug|x64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x64.Build.0 = Debug|x64 {1533E271-F61B-441B-8B74-59FB61DF0552}.Debug|x86.ActiveCfg = Debug|Win32 diff --git a/eng/Build.props b/eng/Build.props index 775c67197032..a92b3f1c55d1 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -102,9 +102,10 @@ Include="$(RepoRoot)src\Installers\Rpm\**\*.*proj" /> - + + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 4542c713334f..2b20becaab25 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -11,6 +11,10 @@ Debug x64 + + Debug + x64 + Debug x64 @@ -23,6 +27,10 @@ Release x64 + + Release + x64 + Release x64 @@ -155,6 +163,34 @@ + + + NotUsing + Disabled + X64;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + EnableFastChecks + MultiThreadedDebug + Level3 + true + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\ + /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + stdcpp17 + true + + + true + Console + $(ArtifactsObjDir)InProcessRequestHandler\ARM64\$(Configuration)\; + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + + + + + + NotUsing @@ -215,4 +251,34 @@ + + + NotUsing + X64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(IntDir)$(TargetName).pch + stdafx.h + MultiThreaded + Level3 + true + ProgramDatabase + $(MSBuildThisFileDirectory)include;%(AdditionalIncludeDirectories);..\RequestHandlerLib;..\IISLib;..\CommonLib;$(GoogleTestSubmoduleRoot)googletest\include;$(GoogleTestSubmoduleRoot)googlemock\include;...\AspNetCore\Inc;..\InProcessRequestHandler\ + /D "_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING" + stdcpp17 + true + + + true + Console + /NODEFAULTLIB:libucrt.lib /DEFAULTLIB:ucrt.lib %(AdditionalOptions) + true + true + $(ArtifactsObjDir)InProcessRequestHandler\ARM64\$(Configuration)\; + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;inprocessapplication.obj;inprocesshandler.obj;ahadmin.lib;Rpcrt4.lib;inprocessapplicationbase.obj;stdafx.obj;version.lib;inprocessoptions.obj;%(AdditionalDependencies) + UseLinkTimeCodeGeneration + + + + + + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj index 016d4f6c4c58..10a02840f316 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj @@ -8,6 +8,10 @@ Debug x64 + + Debug + ARM64 + Debug x64 @@ -20,6 +24,10 @@ Release x64 + + Release + ARM64 + Release x64 @@ -58,14 +66,14 @@ Unicode gtest - + StaticLibrary true $(PlatformToolsetVersion) Unicode gtestd - + StaticLibrary false $(PlatformToolsetVersion) @@ -110,7 +118,7 @@ true - + NotUsing Level3 @@ -149,7 +157,7 @@ true - + NotUsing Level3 diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props index 9603d61e2695..a2a26c73ff09 100644 --- a/src/Servers/IIS/build/assets.props +++ b/src/Servers/IIS/build/assets.props @@ -3,6 +3,7 @@ true x64 + arm64 $(Platform) Win32 $(NativePlatform) @@ -21,6 +22,19 @@ Include="$(MSBuildThisFileDirectory)..\AspNetCoreModuleV2\AspNetCore\AspNetCore.vcxproj" PdbLocation="$(ArtifactsBinDir)AspNetCoreModuleShim\x64\$(Configuration)\aspnetcorev2.pdb" /> + + + + + + true - x64 + arm64 + arm64 `$(Platform) - Win32 + Win64 `$(NativePlatform) From c44327a9836e84b119ef1103a11ff28c6d9c8030 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 13 Dec 2021 10:01:59 -0800 Subject: [PATCH 03/26] Fixup --- src/Servers/IIS/tools/GenerateNativeAssets.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 index 782cfd6eeec9..13b71b5e5e60 100644 --- a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 +++ b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 @@ -129,10 +129,10 @@ $content = @" true - arm64 + x64 arm64 `$(Platform) - Win64 + Win32 `$(NativePlatform) From 61ef6e8358b148e8772d7c0b0680d5ac3ae614e0 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 13 Dec 2021 13:42:12 -0800 Subject: [PATCH 04/26] Split arm64 into its own group --- eng/Build.props | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index a92b3f1c55d1..71b1baf40a20 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -102,12 +102,15 @@ Include="$(RepoRoot)src\Installers\Rpm\**\*.*proj" /> - + - + + + + From 29eaedbfde5c4591cd9ca234b8813e073eb9d82e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 13 Dec 2021 17:08:39 -0800 Subject: [PATCH 05/26] Update assets.props --- src/Servers/IIS/build/assets.props | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props index a2a26c73ff09..32b6000508ea 100644 --- a/src/Servers/IIS/build/assets.props +++ b/src/Servers/IIS/build/assets.props @@ -1,9 +1,11 @@ + true true - x64 - arm64 + false + x64 + $(TargetArchitecture) $(Platform) Win32 $(NativePlatform) From 18679692e9f5700db1102bd1f9463cfdc46f5ecf Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 13 Dec 2021 17:09:52 -0800 Subject: [PATCH 06/26] Update assets.props --- src/Servers/IIS/build/assets.props | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Servers/IIS/build/assets.props b/src/Servers/IIS/build/assets.props index 32b6000508ea..0b42276a1203 100644 --- a/src/Servers/IIS/build/assets.props +++ b/src/Servers/IIS/build/assets.props @@ -6,7 +6,6 @@ false x64 $(TargetArchitecture) - $(Platform) Win32 $(NativePlatform) From 5badb65679b392b8ce48e052177d4da9af42ee77 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 13 Dec 2021 19:33:20 -0800 Subject: [PATCH 07/26] Update Build.props --- eng/Build.props | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/Build.props b/eng/Build.props index 71b1baf40a20..247d6d92f531 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -108,6 +108,8 @@ + + From a0ba13589d431d46642e3c20b3829574184f776e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 14 Dec 2021 07:52:31 -0800 Subject: [PATCH 08/26] Update Build.props --- eng/Build.props | 5 ----- 1 file changed, 5 deletions(-) diff --git a/eng/Build.props b/eng/Build.props index 247d6d92f531..ed25e877f129 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -105,11 +105,6 @@ - - - - - From ab5db1ff50cbbd74a7cb0ae47ddcb2c7b1865ed4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 14 Dec 2021 13:04:20 -0800 Subject: [PATCH 09/26] Try skipping common lib tests on arm64 --- .../IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 2b20becaab25..1561be7ed0d7 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -47,6 +47,7 @@ $(PlatformToolsetVersion) Unicode true + false true From 72cd5290a586ff26eff189b390ea1759436d6191 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 14 Dec 2021 13:05:51 -0800 Subject: [PATCH 10/26] Fix platform --- .../AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index 1561be7ed0d7..a55d3b90c1aa 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -13,7 +13,7 @@ Debug - x64 + arm64 Debug @@ -29,7 +29,7 @@ Release - x64 + arm64 Release @@ -47,7 +47,6 @@ $(PlatformToolsetVersion) Unicode true - false true From 1671c0fb214f646aed1078f2e0974e2bb2181df6 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 14 Dec 2021 14:19:07 -0800 Subject: [PATCH 11/26] Fix sln --- AspNetCore.sln | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/AspNetCore.sln b/AspNetCore.sln index 64a58506413f..9165665578f5 100644 --- a/AspNetCore.sln +++ b/AspNetCore.sln @@ -7526,15 +7526,15 @@ Global {D07B2752-8919-4CFE-8438-DFAFE91A4AB0}.Release|x86.Build.0 = Release|x86 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|Any CPU.ActiveCfg = Debug|x64 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|Any CPU.Build.0 = Debug|x64 - {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.ActiveCfg = Debug|x64 - {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.Build.0 = Debug|x64 + {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.ActiveCfg = Debug|ARM64 + {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|arm64.Build.0 = Debug|ARM64 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x64.ActiveCfg = Debug|Any CPU {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x64.Build.0 = Debug|Any CPU {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x86.ActiveCfg = Debug|x86 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Debug|x86.Build.0 = Debug|x86 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|Any CPU.ActiveCfg = Release|x64 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|Any CPU.Build.0 = Release|x64 - {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|arm64.ActiveCfg = Release|x86 + {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|arm64.ActiveCfg = Release|ARM64 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|x64.ActiveCfg = Release|x64 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|x64.Build.0 = Release|x64 {65EC29AD-91CA-49BA-B1FC-D3DF127BE887}.Release|x86.ActiveCfg = Release|x86 @@ -8119,8 +8119,8 @@ Global {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Debug|x86.Deploy.0 = Debug|Win32 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|Any CPU.ActiveCfg = Release|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|Any CPU.Build.0 = Release|x64 - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|arm64.ActiveCfg = Release|Any CPU - {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|arm64.Build.0 = Release|Any CPU + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|arm64.ActiveCfg = Release|ARM64 + {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|arm64.Build.0 = Release|ARM64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.ActiveCfg = Release|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x64.Build.0 = Release|x64 {EC82302F-D2F0-4727-99D1-EABC0DD9DC3B}.Release|x86.ActiveCfg = Release|Win32 @@ -8146,8 +8146,8 @@ Global {55494E58-E061-4C4C-A0A8-837008E72F85}.Release|x86.Deploy.0 = Release|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.ActiveCfg = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|Any CPU.Build.0 = Debug|x64 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|arm64.ActiveCfg = Debug|Win32 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|arm64.Build.0 = Debug|Win32 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|arm64.ActiveCfg = Debug|ARM64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|arm64.Build.0 = Debug|ARM64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.ActiveCfg = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x64.Build.0 = Debug|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.ActiveCfg = Debug|Win32 @@ -8155,8 +8155,8 @@ Global {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Debug|x86.Deploy.0 = Debug|Win32 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.ActiveCfg = Release|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|Any CPU.Build.0 = Release|x64 - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|arm64.ActiveCfg = Release|Any CPU - {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|arm64.Build.0 = Release|Any CPU + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|arm64.ActiveCfg = Release|ARM64 + {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|arm64.Build.0 = Release|ARM64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.ActiveCfg = Release|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x64.Build.0 = Release|x64 {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.ActiveCfg = Release|Win32 From 623659766c3ee958f47c65a1a7a8e590bc5935b8 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Tue, 14 Dec 2021 14:20:59 -0800 Subject: [PATCH 12/26] Fix sln --- AspNetCore.sln | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/AspNetCore.sln b/AspNetCore.sln index 9165665578f5..6c25562d5d15 100644 --- a/AspNetCore.sln +++ b/AspNetCore.sln @@ -8164,8 +8164,8 @@ Global {1EAC8125-1765-4E2D-8CBE-56DC98A1C8C1}.Release|x86.Deploy.0 = Release|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.ActiveCfg = Debug|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|Any CPU.Build.0 = Debug|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|arm64.ActiveCfg = Debug|Win32 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|arm64.Build.0 = Debug|Win32 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|arm64.ActiveCfg = Debug|ARM64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|arm64.Build.0 = Debug|ARM64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.ActiveCfg = Debug|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x64.Build.0 = Debug|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.ActiveCfg = Debug|Win32 @@ -8173,8 +8173,8 @@ Global {CAC1267B-8778-4257-AAC6-CAF481723B01}.Debug|x86.Deploy.0 = Debug|Win32 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.ActiveCfg = Release|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|Any CPU.Build.0 = Release|x64 - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|arm64.ActiveCfg = Release|Any CPU - {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|arm64.Build.0 = Release|Any CPU + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|arm64.ActiveCfg = Release|ARM64 + {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|arm64.Build.0 = Release|ARM64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.ActiveCfg = Release|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x64.Build.0 = Release|x64 {CAC1267B-8778-4257-AAC6-CAF481723B01}.Release|x86.ActiveCfg = Release|Win32 From a96254016963bf6edadc589044015997f3ab6abb Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Wed, 15 Dec 2021 10:10:59 -0800 Subject: [PATCH 13/26] Skip arm64 tests on non arm64 Undo --- eng/targets/Cpp.Common.targets | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/eng/targets/Cpp.Common.targets b/eng/targets/Cpp.Common.targets index d352173de37f..1be7f8306c6f 100644 --- a/eng/targets/Cpp.Common.targets +++ b/eng/targets/Cpp.Common.targets @@ -12,7 +12,10 @@ - + + Skipping arm64 test on non arm64. + + From 40cc695ab9a64641ff65e68e474b95aaa059706a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 16 Dec 2021 10:19:39 -0800 Subject: [PATCH 14/26] Add vs components for arm64 --- eng/scripts/vs.16.buildtools.json | 2 ++ eng/scripts/vs.16.buildtools.preview.json | 2 ++ eng/scripts/vs.16.json | 2 ++ eng/scripts/vs.16.preview.json | 2 ++ eng/scripts/vs.17.buildtools.json | 2 ++ eng/scripts/vs.17.buildtools.preview.json | 2 ++ eng/scripts/vs.17.json | 2 ++ eng/scripts/vs.17.preview.json | 2 ++ 8 files changed, 16 insertions(+) diff --git a/eng/scripts/vs.16.buildtools.json b/eng/scripts/vs.16.buildtools.json index e782d29f3586..548aae8b06dd 100644 --- a/eng/scripts/vs.16.buildtools.json +++ b/eng/scripts/vs.16.buildtools.json @@ -14,6 +14,8 @@ "Microsoft.VisualStudio.Component.NuGet.BuildTools", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.16.buildtools.preview.json b/eng/scripts/vs.16.buildtools.preview.json index 99ae10bb593a..2a6eb9795661 100644 --- a/eng/scripts/vs.16.buildtools.preview.json +++ b/eng/scripts/vs.16.buildtools.preview.json @@ -14,6 +14,8 @@ "Microsoft.VisualStudio.Component.NuGet.BuildTools", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.16.json b/eng/scripts/vs.16.json index b4b0283f426f..c4ac4c6daa60 100644 --- a/eng/scripts/vs.16.json +++ b/eng/scripts/vs.16.json @@ -11,6 +11,8 @@ "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", diff --git a/eng/scripts/vs.16.preview.json b/eng/scripts/vs.16.preview.json index 87ddb47a16fb..861c2cf946b7 100644 --- a/eng/scripts/vs.16.preview.json +++ b/eng/scripts/vs.16.preview.json @@ -11,6 +11,8 @@ "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", diff --git a/eng/scripts/vs.17.buildtools.json b/eng/scripts/vs.17.buildtools.json index bebc094c3afe..7ff5dc3bef0d 100644 --- a/eng/scripts/vs.17.buildtools.json +++ b/eng/scripts/vs.17.buildtools.json @@ -14,6 +14,8 @@ "Microsoft.VisualStudio.Component.NuGet.BuildTools", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.17.buildtools.preview.json b/eng/scripts/vs.17.buildtools.preview.json index 6ffcffc08136..656b9aaf0b1f 100644 --- a/eng/scripts/vs.17.buildtools.preview.json +++ b/eng/scripts/vs.17.buildtools.preview.json @@ -14,6 +14,8 @@ "Microsoft.VisualStudio.Component.NuGet.BuildTools", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.17.json b/eng/scripts/vs.17.json index fcf999c6a5ca..f438066d6519 100644 --- a/eng/scripts/vs.17.json +++ b/eng/scripts/vs.17.json @@ -11,6 +11,8 @@ "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", diff --git a/eng/scripts/vs.17.preview.json b/eng/scripts/vs.17.preview.json index e904808f6b44..a15341fec46b 100644 --- a/eng/scripts/vs.17.preview.json +++ b/eng/scripts/vs.17.preview.json @@ -11,6 +11,8 @@ "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", + "Microsoft.VisualStudio.Component.VC.ATL.ARM64", + "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", From 96819ba95d67ceba2d57eaa45962b26496674787 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 16 Dec 2021 10:20:08 -0800 Subject: [PATCH 15/26] msbuild tweaks --- Directory.Build.props | 2 +- eng/build.ps1 | 2 +- eng/targets/Cpp.Common.props | 6 ++++++ eng/targets/Cpp.Common.targets | 7 ++----- .../IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj | 1 + 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index e4139483ccc5..1083949f721f 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -225,7 +225,7 @@ $(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.targets <_MvcTestingTasksAssembly>$(ArtifactsBinDir)\Microsoft.AspNetCore.Mvc.Testing.Tasks\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.Tasks.dll - true + true $(ArtifactsObjDir)TargetingPack.Layout\$(Configuration)\ diff --git a/eng/build.ps1 b/eng/build.ps1 index 9e7fd3057ec8..af4f514475a3 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -299,7 +299,7 @@ if ($BuildNodeJS) { $dotnetBuildArguments += "/p:BuildNodeJS=true" } # "-Projects ... -NoBuildJava -NoBuildManaged -NoBuildNodeJS". An empty `./build.ps1` command will build both # managed and native projects. $performDesktopBuild = ($BuildInstallers -and $Architecture -ne "arm") -or ` - ($BuildNative -and -not $Architecture.StartsWith("arm", [System.StringComparison]::OrdinalIgnoreCase)) + ($BuildNative -and -not $Architecture.Equals("arm", [System.StringComparison]::OrdinalIgnoreCase)) $performDotnetBuild = $BuildJava -or $BuildManaged -or $BuildNodeJS -or ` ($All -and -not ($NoBuildJava -and $NoBuildManaged -and $NoBuildNodeJS)) -or ` ($Projects -and -not ($BuildInstallers -or $specifiedBuildNative)) diff --git a/eng/targets/Cpp.Common.props b/eng/targets/Cpp.Common.props index 782441b4d418..b11c00f03ec4 100644 --- a/eng/targets/Cpp.Common.props +++ b/eng/targets/Cpp.Common.props @@ -9,6 +9,12 @@ $(IntermediateOutputPath) + + + true + You cannot test native ARM64 projects on a x86/x64 machine + + diff --git a/eng/targets/Cpp.Common.targets b/eng/targets/Cpp.Common.targets index 1be7f8306c6f..d85bddec43af 100644 --- a/eng/targets/Cpp.Common.targets +++ b/eng/targets/Cpp.Common.targets @@ -11,11 +11,8 @@ - - - Skipping arm64 test on non arm64. - - + + 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 b575db4f9f1c..c4eb83186d53 100644 --- a/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj +++ b/src/Servers/IIS/IIS/src/Microsoft.AspNetCore.Server.IIS.csproj @@ -36,6 +36,7 @@ + From 93154f143a0f06bc3bc4b83aa16463a331e6ceb2 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 16 Dec 2021 12:06:10 -0800 Subject: [PATCH 16/26] Installer arm64 stuff --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 2 ++ .../AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 1 + .../CustomAction/aspnetcoreCA.vcxproj | 8 ++++++++ .../IIS-Common/lib/IISSetup.CommonLib.vcxproj | 8 ++++++++ .../IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj | 8 ++++++++ .../IIS-Setup/iisca/lib/iisca.vcxproj | 13 +++++++++++++ .../AspNetCoreModule-Setup/IIS-Setup/include.wxi | 6 ++++++ src/Servers/IIS/tools/GenerateNativeAssets.ps1 | 1 - 8 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 04f70e784cb0..fc9de94854d8 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -13,6 +13,7 @@ 2.0 x64 Win32 + ARM64 @@ -47,6 +48,7 @@ aspnetcoreCA Platform=Win32 + Platform=ARM64 {7c27e72f-54d0-4820-8cfa-5e4be640974b} True True diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index ecc897c78b3d..940e56befa85 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -45,6 +45,7 @@ aspnetcoreCA Platform=Win32 + Platform=ARM64 {7c27e72f-54d0-4820-8cfa-5e4be640974b} True True diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index 6fea1a5c0f8d..db4d7035c813 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -15,6 +15,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj index 08403fc70aac..1d0330550a8d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj @@ -4,6 +4,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj index e15fd87b8c15..deb96eb3dfa7 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj @@ -3,6 +3,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj index fa40ba039415..0b15cf6df931 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj @@ -3,6 +3,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -116,6 +124,11 @@ MachineX86 + + + $(VC_ReferencesPath_ARM64);$(WindowsSDK_LibraryPath)\$(PlatformTarget);$(WIX)sdk\$(WixPlatformToolset)\lib\arm64;%(AdditionalLibraryDirectories) + + $(VC_ReferencesPath_x64);$(WindowsSDK_LibraryPath)\$(PlatformTarget);$(WIX)sdk\$(WixPlatformToolset)\lib\x64;%(AdditionalLibraryDirectories) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi index e22cdce8a41d..c7ea5b9cbf12 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi @@ -23,6 +23,12 @@ + + + + + + diff --git a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 index 13b71b5e5e60..86324c6096ba 100644 --- a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 +++ b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 @@ -130,7 +130,6 @@ $content = @" true x64 - arm64 `$(Platform) Win32 `$(NativePlatform) From 193dd372a5ca6266db01183872fab729f966be70 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 16 Dec 2021 13:41:40 -0800 Subject: [PATCH 17/26] Revert "Installer arm64 stuff" This reverts commit 93154f143a0f06bc3bc4b83aa16463a331e6ceb2. --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 2 -- .../AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 1 - .../CustomAction/aspnetcoreCA.vcxproj | 8 -------- .../IIS-Common/lib/IISSetup.CommonLib.vcxproj | 8 -------- .../IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj | 8 -------- .../IIS-Setup/iisca/lib/iisca.vcxproj | 13 ------------- .../AspNetCoreModule-Setup/IIS-Setup/include.wxi | 6 ------ src/Servers/IIS/tools/GenerateNativeAssets.ps1 | 1 + 8 files changed, 1 insertion(+), 46 deletions(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index fc9de94854d8..04f70e784cb0 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -13,7 +13,6 @@ 2.0 x64 Win32 - ARM64 @@ -48,7 +47,6 @@ aspnetcoreCA Platform=Win32 - Platform=ARM64 {7c27e72f-54d0-4820-8cfa-5e4be640974b} True True diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index 940e56befa85..ecc897c78b3d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -45,7 +45,6 @@ aspnetcoreCA Platform=Win32 - Platform=ARM64 {7c27e72f-54d0-4820-8cfa-5e4be640974b} True True diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index db4d7035c813..6fea1a5c0f8d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -15,14 +15,6 @@ - - Debug - ARM64 - - - Release - ARM64 - Debug Win32 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj index 1d0330550a8d..08403fc70aac 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj @@ -4,14 +4,6 @@ - - Debug - ARM64 - - - Release - ARM64 - Debug Win32 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj index deb96eb3dfa7..e15fd87b8c15 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj @@ -3,14 +3,6 @@ - - Debug - ARM64 - - - Release - ARM64 - Debug Win32 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj index 0b15cf6df931..fa40ba039415 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj @@ -3,14 +3,6 @@ - - Debug - ARM64 - - - Release - ARM64 - Debug Win32 @@ -124,11 +116,6 @@ MachineX86 - - - $(VC_ReferencesPath_ARM64);$(WindowsSDK_LibraryPath)\$(PlatformTarget);$(WIX)sdk\$(WixPlatformToolset)\lib\arm64;%(AdditionalLibraryDirectories) - - $(VC_ReferencesPath_x64);$(WindowsSDK_LibraryPath)\$(PlatformTarget);$(WIX)sdk\$(WixPlatformToolset)\lib\x64;%(AdditionalLibraryDirectories) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi index c7ea5b9cbf12..e22cdce8a41d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi @@ -23,12 +23,6 @@ - - - - - - diff --git a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 index 86324c6096ba..13b71b5e5e60 100644 --- a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 +++ b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 @@ -130,6 +130,7 @@ $content = @" true x64 + arm64 `$(Platform) Win32 `$(NativePlatform) From ff1cae839456cdb8a610e27c2c6947d5152c1b5d Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 16 Dec 2021 13:41:53 -0800 Subject: [PATCH 18/26] Revert "Add vs components for arm64" This reverts commit 40cc695ab9a64641ff65e68e474b95aaa059706a. --- eng/scripts/vs.16.buildtools.json | 2 -- eng/scripts/vs.16.buildtools.preview.json | 2 -- eng/scripts/vs.16.json | 2 -- eng/scripts/vs.16.preview.json | 2 -- eng/scripts/vs.17.buildtools.json | 2 -- eng/scripts/vs.17.buildtools.preview.json | 2 -- eng/scripts/vs.17.json | 2 -- eng/scripts/vs.17.preview.json | 2 -- 8 files changed, 16 deletions(-) diff --git a/eng/scripts/vs.16.buildtools.json b/eng/scripts/vs.16.buildtools.json index 548aae8b06dd..e782d29f3586 100644 --- a/eng/scripts/vs.16.buildtools.json +++ b/eng/scripts/vs.16.buildtools.json @@ -14,8 +14,6 @@ "Microsoft.VisualStudio.Component.NuGet.BuildTools", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.16.buildtools.preview.json b/eng/scripts/vs.16.buildtools.preview.json index 2a6eb9795661..99ae10bb593a 100644 --- a/eng/scripts/vs.16.buildtools.preview.json +++ b/eng/scripts/vs.16.buildtools.preview.json @@ -14,8 +14,6 @@ "Microsoft.VisualStudio.Component.NuGet.BuildTools", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.16.json b/eng/scripts/vs.16.json index c4ac4c6daa60..b4b0283f426f 100644 --- a/eng/scripts/vs.16.json +++ b/eng/scripts/vs.16.json @@ -11,8 +11,6 @@ "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", diff --git a/eng/scripts/vs.16.preview.json b/eng/scripts/vs.16.preview.json index 861c2cf946b7..87ddb47a16fb 100644 --- a/eng/scripts/vs.16.preview.json +++ b/eng/scripts/vs.16.preview.json @@ -11,8 +11,6 @@ "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.17134", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", diff --git a/eng/scripts/vs.17.buildtools.json b/eng/scripts/vs.17.buildtools.json index 7ff5dc3bef0d..bebc094c3afe 100644 --- a/eng/scripts/vs.17.buildtools.json +++ b/eng/scripts/vs.17.buildtools.json @@ -14,8 +14,6 @@ "Microsoft.VisualStudio.Component.NuGet.BuildTools", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.17.buildtools.preview.json b/eng/scripts/vs.17.buildtools.preview.json index 656b9aaf0b1f..6ffcffc08136 100644 --- a/eng/scripts/vs.17.buildtools.preview.json +++ b/eng/scripts/vs.17.buildtools.preview.json @@ -14,8 +14,6 @@ "Microsoft.VisualStudio.Component.NuGet.BuildTools", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Workload.ManagedDesktopBuildTools", "Microsoft.VisualStudio.Workload.MSBuildTools", diff --git a/eng/scripts/vs.17.json b/eng/scripts/vs.17.json index f438066d6519..fcf999c6a5ca 100644 --- a/eng/scripts/vs.17.json +++ b/eng/scripts/vs.17.json @@ -11,8 +11,6 @@ "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", diff --git a/eng/scripts/vs.17.preview.json b/eng/scripts/vs.17.preview.json index a15341fec46b..e904808f6b44 100644 --- a/eng/scripts/vs.17.preview.json +++ b/eng/scripts/vs.17.preview.json @@ -11,8 +11,6 @@ "Microsoft.Net.Component.4.7.2.TargetingPack", "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", - "Microsoft.VisualStudio.Component.VC.ATL.ARM64", - "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.Windows10SDK.18362", "Microsoft.VisualStudio.Workload.ManagedDesktop", "Microsoft.VisualStudio.Workload.NativeDesktop", From c41019213fc1703245c89ce68681fe55fca3fe3a Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 16 Dec 2021 13:42:16 -0800 Subject: [PATCH 19/26] Revert uneeded stuff for this iteration --- eng/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.ps1 b/eng/build.ps1 index af4f514475a3..9e7fd3057ec8 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -299,7 +299,7 @@ if ($BuildNodeJS) { $dotnetBuildArguments += "/p:BuildNodeJS=true" } # "-Projects ... -NoBuildJava -NoBuildManaged -NoBuildNodeJS". An empty `./build.ps1` command will build both # managed and native projects. $performDesktopBuild = ($BuildInstallers -and $Architecture -ne "arm") -or ` - ($BuildNative -and -not $Architecture.Equals("arm", [System.StringComparison]::OrdinalIgnoreCase)) + ($BuildNative -and -not $Architecture.StartsWith("arm", [System.StringComparison]::OrdinalIgnoreCase)) $performDotnetBuild = $BuildJava -or $BuildManaged -or $BuildNodeJS -or ` ($All -and -not ($NoBuildJava -and $NoBuildManaged -and $NoBuildNodeJS)) -or ` ($Projects -and -not ($BuildInstallers -or $specifiedBuildNative)) From 2c6946e7f93cc06a67ecda1f298766533172fa9e Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Thu, 16 Dec 2021 13:42:32 -0800 Subject: [PATCH 20/26] Revert "Revert "Installer arm64 stuff"" This reverts commit 193dd372a5ca6266db01183872fab729f966be70. --- .../ANCMIISExpressV2/AncmIISExpressV2.wixproj | 2 ++ .../AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj | 1 + .../CustomAction/aspnetcoreCA.vcxproj | 8 ++++++++ .../IIS-Common/lib/IISSetup.CommonLib.vcxproj | 8 ++++++++ .../IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj | 8 ++++++++ .../IIS-Setup/iisca/lib/iisca.vcxproj | 13 +++++++++++++ .../AspNetCoreModule-Setup/IIS-Setup/include.wxi | 6 ++++++ src/Servers/IIS/tools/GenerateNativeAssets.ps1 | 1 - 8 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 04f70e784cb0..fc9de94854d8 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -13,6 +13,7 @@ 2.0 x64 Win32 + ARM64 @@ -47,6 +48,7 @@ aspnetcoreCA Platform=Win32 + Platform=ARM64 {7c27e72f-54d0-4820-8cfa-5e4be640974b} True True diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index ecc897c78b3d..940e56befa85 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -45,6 +45,7 @@ aspnetcoreCA Platform=Win32 + Platform=ARM64 {7c27e72f-54d0-4820-8cfa-5e4be640974b} True True diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj index 6fea1a5c0f8d..db4d7035c813 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/CustomAction/aspnetcoreCA.vcxproj @@ -15,6 +15,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj index 08403fc70aac..1d0330550a8d 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/lib/IISSetup.CommonLib.vcxproj @@ -4,6 +4,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj index e15fd87b8c15..deb96eb3dfa7 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/IIS-Common/reftrace/reftrace.vcxproj @@ -3,6 +3,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj index fa40ba039415..0b15cf6df931 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/iisca/lib/iisca.vcxproj @@ -3,6 +3,14 @@ + + Debug + ARM64 + + + Release + ARM64 + Debug Win32 @@ -116,6 +124,11 @@ MachineX86 + + + $(VC_ReferencesPath_ARM64);$(WindowsSDK_LibraryPath)\$(PlatformTarget);$(WIX)sdk\$(WixPlatformToolset)\lib\arm64;%(AdditionalLibraryDirectories) + + $(VC_ReferencesPath_x64);$(WindowsSDK_LibraryPath)\$(PlatformTarget);$(WIX)sdk\$(WixPlatformToolset)\lib\x64;%(AdditionalLibraryDirectories) diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi index e22cdce8a41d..c7ea5b9cbf12 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi +++ b/src/Installers/Windows/AspNetCoreModule-Setup/IIS-Setup/include.wxi @@ -23,6 +23,12 @@ + + + + + + diff --git a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 index 13b71b5e5e60..86324c6096ba 100644 --- a/src/Servers/IIS/tools/GenerateNativeAssets.ps1 +++ b/src/Servers/IIS/tools/GenerateNativeAssets.ps1 @@ -130,7 +130,6 @@ $content = @" true x64 - arm64 `$(Platform) Win32 `$(NativePlatform) From 15816d18eaf8b42870b5372cb42f9ac3225f1585 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 3 Jan 2022 10:03:51 -0800 Subject: [PATCH 21/26] Try building arm64 in main windows build --- .azure/pipelines/ci.yml | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 14627e7f92e2..c998f16db43d 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -151,12 +151,12 @@ stages: publishOnError: true includeForks: true - # Build Windows (x64/x86) + # Build Windows (x64/x86/arm64) - template: jobs/default-build.yml parameters: codeSign: true jobName: Windows_build - jobDisplayName: "Build: Windows x64/x86" + jobDisplayName: "Build: Windows x64/x86/arm64" agentOs: Windows steps: - ${{ if notIn(variables['Build.Reason'], 'PullRequest') }}: @@ -175,7 +175,7 @@ stages: $(_BuildArgs) $(_InternalRuntimeDownloadArgs) $(Windows64LogArgs) - displayName: Build x64 + displayName: Build x64/arm64 # Build the x86 shared framework # This is going to actually build x86 native assets. @@ -236,6 +236,22 @@ stages: $(WindowsInstallersLogArgs) displayName: Build Installers + # Windows installers bundle for arm64 + - script: ./eng/build.cmd + -ci + -noBuildRepoTasks + -arch arm64 + -sign + -buildInstallers + -noBuildNative + /p:DotNetSignType=$(_SignType) + /p:AssetManifestFileName=aspnetcore-win-arm64.xml + $(_BuildArgs) + $(_PublishArgs) + $(_InternalRuntimeDownloadArgs) + $(WindowsArm64InstallersLogArgs) + displayName: Build Arm64 Installers + # A few files must also go to the VS package feed. - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables.PostBuildSign, 'true')) }}: - task: NuGetCommand@2 @@ -358,7 +374,6 @@ stages: nuGetFeedType: external publishFeedCredentials: 'DevDiv - VS package feed' - # Build MacOS arm64 - template: jobs/default-build.yml parameters: From ae984678b182c5057870b15e909c548d8826a365 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 3 Jan 2022 10:05:21 -0800 Subject: [PATCH 22/26] Don't build native again on other arm64 job --- .azure/pipelines/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index c998f16db43d..1673bc095c5c 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -341,6 +341,7 @@ stages: -sign -pack -noBuildJava + -noBuildNative /p:DotNetSignType=$(_SignType) /p:OnlyPackPlatformSpecificPackages=true $(_BuildArgs) From 65a9df2e4e69d00fab025f1eb65175dcaf54e57c Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Mon, 3 Jan 2022 11:37:37 -0800 Subject: [PATCH 23/26] Build arm64 shared fx --- .azure/pipelines/ci.yml | 74 +++++++++-------------------------------- 1 file changed, 15 insertions(+), 59 deletions(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 1673bc095c5c..9ddd96ede9b3 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -193,6 +193,21 @@ stages: $(Windows86LogArgs) displayName: Build x86 + # Build the arm64 shared framework + - script: ./eng/build.cmd + -ci + -arch arm64 + -sign + -pack + -noBuildJava + -noBuildNative + /p:DotNetSignType=$(_SignType) + /p:OnlyPackPlatformSpecificPackages=true + $(_BuildArgs) + $(_InternalRuntimeDownloadArgs) + $(WindowsArm64LogArgs) + displayName: Build ARM64 + # Submit a manual build (in public or internal project) to validate changes to site extensions. - ${{ if ne(variables['Build.Reason'], 'PullRequest') }}: - script: .\src\SiteExtensions\build.cmd @@ -316,65 +331,6 @@ stages: - name: Windows_arm_SourceIndex path: $(Build.ArtifactStagingDirectory)/sourceIndex/ - # Build Windows ARM64 - - template: jobs/default-build.yml - parameters: - codeSign: true - jobName: Windows_arm64_build - jobDisplayName: "Build: Windows ARM64" - agentOs: Windows - installNodeJs: false - installJdk: false - artifacts: - - name: Windows_arm64_Logs - path: artifacts/log/ - publishOnError: true - includeForks: true - - name: Windows_arm64_Packages - path: artifacts/packages/ - - name: Windows_arm64_Installers - path: artifacts/installers/ - steps: - - script: ./eng/build.cmd - -ci - -arch arm64 - -sign - -pack - -noBuildJava - -noBuildNative - /p:DotNetSignType=$(_SignType) - /p:OnlyPackPlatformSpecificPackages=true - $(_BuildArgs) - $(_InternalRuntimeDownloadArgs) - $(WindowsArm64LogArgs) - displayName: Build ARM64 - - # Windows installers bundle for arm64 - - script: ./eng/build.cmd - -ci - -noBuildRepoTasks - -arch arm64 - -sign - -buildInstallers - -noBuildNative - /p:DotNetSignType=$(_SignType) - /p:AssetManifestFileName=aspnetcore-win-arm64.xml - $(_BuildArgs) - $(_PublishArgs) - $(_InternalRuntimeDownloadArgs) - $(WindowsArm64InstallersLogArgs) - displayName: Build Arm64 Installers - - # A few files must also go to the VS package feed. - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables.PostBuildSign, 'true')) }}: - - task: NuGetCommand@2 - displayName: Push Visual Studio packages - inputs: - command: push - packagesToPush: 'artifacts/packages/**/VS.Redist.Common.AspNetCore.*.nupkg' - nuGetFeedType: external - publishFeedCredentials: 'DevDiv - VS package feed' - # Build MacOS arm64 - template: jobs/default-build.yml parameters: From 661dad36477e008890d53fe2cb5a53f12ff79bd4 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 7 Jan 2022 11:47:03 -0800 Subject: [PATCH 24/26] Update Directory.Build.props --- Directory.Build.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 1083949f721f..e100d883e9b1 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -224,8 +224,8 @@ $(MSBuildThisFileDirectory)src\Mvc\Mvc.Testing\src\Microsoft.AspNetCore.Mvc.Testing.targets <_MvcTestingTasksAssembly>$(ArtifactsBinDir)\Microsoft.AspNetCore.Mvc.Testing.Tasks\$(Configuration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Testing.Tasks.dll - - true + + true $(ArtifactsObjDir)TargetingPack.Layout\$(Configuration)\ From feabeb32eb79d2ffe649b53aeb1038e7e83d20c7 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 7 Jan 2022 11:49:28 -0800 Subject: [PATCH 25/26] Update CommonLibTests.vcxproj --- .../AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index a55d3b90c1aa..dc0fcfef07ed 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -13,7 +13,7 @@ Debug - arm64 + ARM64 Debug @@ -29,7 +29,7 @@ Release - arm64 + ARM64 Release From f588bb67d9d52b8a98ccbf6aec006250f2468745 Mon Sep 17 00:00:00 2001 From: Hao Kung Date: Fri, 7 Jan 2022 14:40:33 -0800 Subject: [PATCH 26/26] Fix displayname --- .azure/pipelines/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 9ddd96ede9b3..282c28d02ec9 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -265,7 +265,7 @@ stages: $(_PublishArgs) $(_InternalRuntimeDownloadArgs) $(WindowsArm64InstallersLogArgs) - displayName: Build Arm64 Installers + displayName: Build ARM64 Installers # A few files must also go to the VS package feed. - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(variables.PostBuildSign, 'true')) }}: