Skip to content

Commit 9323495

Browse files
committed
Make sure x64 installer cannot be installed on ARM64
In case if somebody manually tries to install x64 MSI on ARM64. This is not supported/working scenario.
1 parent 02cfdc6 commit 9323495

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

Src/Localization/English/OpenShellText-en-US.wxl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<WixLocalization Culture="en-US" Codepage="1252" xmlns="http://schemas.microsoft.com/wix/2006/localization">
33
<String Id="Error32bit" Overridable="yes">This installer is only for 32-bit version of Windows. For 64-bit Windows you need to run Setup64.</String>
4+
<String Id="Error64bit" Overridable="yes">This installer is only for 64-bit version of Windows. For ARM64 Windows you need to run SetupARM64.</String>
45
<String Id="ErrorWin7" Overridable="yes">Open-Shell requires Windows 7 or above.</String>
56
<String Id="ErrorNewVersion" Overridable="yes">A newer version of [ProductName] is already installed. The setup will now exit.</String>
67
<String Id="ExplorerTitle" Overridable="yes">Classic Explorer</String>

Src/Setup/Setup.wxs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,13 @@
2727
<Package Description="Open-Shell" Comments="Start Menu Replacement" InstallerVersion="500" Compressed="yes" Platform="$(var.CS_PLATFORM)" />
2828
<Media Id="1" Cabinet="cshell.cab" EmbedCab="yes" CompressionLevel="high" />
2929
<Media Id="2" Cabinet="simple.cab" EmbedCab="yes" CompressionLevel="high" />
30+
<PropertyRef Id="WIX_NATIVE_MACHINE" />
3031
<?if $(var.x64)=0 And $(var.ARM64)=0 ?>
3132
<Condition Message="!(loc.Error32bit)">not Msix64</Condition>
3233
<?endif ?>
34+
<?if $(var.x64)=1 ?>
35+
<Condition Message="!(loc.Error64bit)">NOT (WIX_NATIVE_MACHINE AND WIX_NATIVE_MACHINE="43620")</Condition>
36+
<?endif ?>
3337
<Condition Message="!(loc.ErrorWin7)">VersionNT&gt;=601</Condition>
3438
<Condition Message="!(loc.ErrorNewVersion)">NOT NEWERPRODUCTFOUND OR Installed</Condition>
3539
<Directory Id="TARGETDIR" Name="SourceDir">

0 commit comments

Comments
 (0)