diff options
| author | Hao Kung <HaoK@users.noreply.github.com> | 2022-04-04 22:06:53 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-04 22:06:53 +0300 |
| commit | c182b738402c84f7c41f292fa047034162dc2279 (patch) | |
| tree | 6726828ec10618cd9698cfa832c45c322a71eaaf | |
| parent | 0d7de9f3f8c6c0a4f0dfe1ab4baac9f38f360100 (diff) | |
Handle arm64 in ANCMIISExpress msihaok/iisexpress
| -rw-r--r-- | src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs | 16 |
1 files changed, 7 insertions, 9 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 a83d82063a..973049c973 100644 --- a/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs +++ b/src/Installers/Windows/AspNetCoreModule-Setup/ANCMIISExpressV2/ancm_iis_expressv2.wxs @@ -108,7 +108,7 @@ </Property> <Condition Message="!(loc.AspNetCoreModuleIISExpressPrereq)"><![CDATA[Installed Or IISEXPRESS_INSTALL_PATH]]></Condition> - <?if $(var.Platform) = "x64" ?> + <?if $(var.Platform) != "x86" ?> <Condition Message="!(loc.AspNetCoreModuleIISExpressPrereq)"><![CDATA[Installed Or IISEXPRESS_INSTALL_PATH32]]></Condition> <?endif?> @@ -120,13 +120,13 @@ <?endif ?> <!-- also prevent install of 64-bit product on 32-bit machine --> - <?if $(var.Platform) = "x64"?> + <?if $(var.Platform) != "x86"?> <Condition Message="!(loc.LaunchCondition_32BIT)"> <![CDATA[(Installed And NOT PATCH) Or VersionNT64]]> </Condition> <?endif ?> - <?if $(var.Platform) = "x64" ?> + <?if $(var.Platform) != "x86" ?> <Property Id="IISEXPRESS_INSTALL_PATH32" Secure="yes"> <DirectorySearch Id="ProgramFilesSearch32" Path="[ProgramFilesFolder]"> <DirectorySearch Id="IISExpressInstallPathSearch32" Path="IIS Express" AssignToProperty="yes"> @@ -160,7 +160,6 @@ </Directory> </Directory> - <!-- Directory Structure and Component Definitions --> <DirectoryRef Id="INSTALLDIR"> <Directory Id="INSTALLLOCATION" ShortName="ANCM" Name="$(var.ProductName)"> @@ -202,7 +201,7 @@ </Directory> <!-- WOW64 Support --> - <?if $(var.Platform) = "x64" ?> + <?if $(var.Platform) != "x86" ?> <Directory Id="$(var.ProgramFilesFolder32)"> <Directory Id="INSTALLDIR32" Name="IIS Express" > <Directory Id="INSTALLLOCATION32" ShortName="ANCM" Name="$(var.ProductName)"> @@ -253,7 +252,7 @@ <ComponentRef Id="AspNetCoreModule"/> <ComponentRef Id="AspNetCoreModuleHandler"/> <ComponentRef Id="AspNetCoreSchema"/> - <?if $(var.Platform) = "x64" ?> + <?if $(var.Platform) != "x86" ?> <ComponentRef Id="AspNetCoreModule.wow"/> <ComponentRef Id="AspNetCoreModuleHandler.wow"/> <ComponentRef Id="AspNetCoreSchema.wow"/> @@ -390,7 +389,7 @@ Value="[IISEXPRESS_APPHOST_CONFIG_TMP]"/> <CustomAction Id="CA_REMOVE_CONFIGSECTION_TMP" BinaryKey="IISCustomActionDll" DllEntry="RemoveConfigSection" Execute="deferred" Return="check" Impersonate="no" /> - <?if $(var.Platform) = "x64" ?> + <?if $(var.Platform) != "x86" ?> <CustomAction Id="CA_UNLOCK_HANDLER32_PROPERTY" Property="CA_UNLOCK_HANDLER32" Value=""[IISEXPRESS_INSTALL_PATH32]appcmd.exe" unlock config /section:system.webserver/handlers /apphostconfig:"[IISEXPRESS_APPHOST_CONFIG32]"" /> @@ -551,7 +550,7 @@ <Custom Action="CA_REMOVE_MODULE_TMP_PROPERTY" Before="CA_REMOVE_MODULE_TMP"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom> <Custom Action="CA_REMOVE_MODULE_TMP" Before="RemoveFiles"><![CDATA[(REMOVE~="ALL" AND NOT UPGRADINGPRODUCTCODE)]]></Custom> - <?if $(var.Platform) = "x64" ?> + <?if $(var.Platform) != "x86" ?> <Custom Action="CA_UNLOCK_HANDLER32_PROPERTY" After="InstallFiles"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom> <Custom Action="CA_UNLOCK_HANDLER32" After="CA_UNLOCK_HANDLER32_PROPERTY"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom> <Custom Action="CA_UNINSTALL_MODULE32_PROPERTY" After="CA_UNLOCK_HANDLER32"><![CDATA[(NOT REMOVE AND IISEXPRESS_INSTALL_PATH32)]]></Custom> @@ -618,4 +617,3 @@ </Fragment> </Wix> - |