diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj index 60e782886a35..4b7e16f9a211 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/AncmIISExpressV2.wixproj @@ -94,4 +94,8 @@ '$(PackageIconFullPath)' ^ '$(PackageLicenseExpression)' " /> + + + + 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 973049c973d6..df2e44ea40b2 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -164,6 +164,80 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -249,8 +324,17 @@ + + + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj index bfae51ff3fa7..f51cf66196e7 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/AncmV2.wixproj @@ -81,4 +81,8 @@ '$(PackageIconFullPath)' ^ '$(PackageLicenseExpression)' " /> + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs index 471f789666d1..f96c13979b5f 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMV2/aspnetcoremodulev2.wxs @@ -85,7 +85,7 @@ - + @@ -144,36 +144,102 @@ - - + + + + + + + + + + + + + + + + + + + + - + - + - - + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -215,68 +281,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - @@ -297,7 +323,11 @@ AspNetCoreModuleV2 + + AspNetCoreModuleV2Dll.forwarder + AspNetCoreModuleV2Dll + @@ -309,6 +339,7 @@ + WWW Server @@ -316,9 +347,14 @@ ANCM 65536 AncmMofFile + + AspNetCoreModuleV2.forwarder + AspNetCoreModuleV2 + + - diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd new file mode 100644 index 000000000000..b9152822828e --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd @@ -0,0 +1,2 @@ +call %1 -host_arch=x64 -arch=arm64 -no_logo +call build.cmd %2 %3 diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_arm64.def b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_arm64.def new file mode 100644 index 000000000000..a4e417b6374d --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_arm64.def @@ -0,0 +1,2 @@ +EXPORTS + RegisterModule = aspnetcorev2_arm64.RegisterModule diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_outofprocess_arm64.def b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_outofprocess_arm64.def new file mode 100644 index 000000000000..19c2607099fd --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_outofprocess_arm64.def @@ -0,0 +1,2 @@ +EXPORTS + CreateApplication = aspnetcorev2_outofprocess_arm64.CreateApplication diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_outofprocess_x64.def b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_outofprocess_x64.def new file mode 100644 index 000000000000..709c7f2c5f1f --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_outofprocess_x64.def @@ -0,0 +1,2 @@ +EXPORTS + CreateApplication = aspnetcorev2_outofprocess_x64.CreateApplication diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_x64.def b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_x64.def new file mode 100644 index 000000000000..10155d5a3c14 --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/aspnetcorev2_x64.def @@ -0,0 +1,2 @@ +EXPORTS + RegisterModule = aspnetcorev2_x64.RegisterModule diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd new file mode 100644 index 000000000000..a3ef34304dff --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd @@ -0,0 +1,18 @@ +SET objDir=%1 +SET binDir=%2 + +cl /nologo /c /Fo%objDir%\aspnetcorev2_arm64.obj empty.cpp +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 /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib + +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 + +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 /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj new file mode 100644 index 000000000000..cc058255fa7c --- /dev/null +++ b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj @@ -0,0 +1,21 @@ + + + Unicode + false + + + + + $(ArtifactsObjDir)\AspNetCoreModuleForwarders + $(ArtifactsBinDir)\AspNetCoreModuleForwarders + + + + "$(VSInstallDir)Common7\Tools\VsDevCmd" + + + + + + + diff --git a/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/empty.cpp b/src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/empty.cpp new file mode 100644 index 000000000000..e69de29bb2d1