Skip to content

WiX: Fix MSI custom properties #468

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2025
Merged

WiX: Fix MSI custom properties #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19943d2
WiX: Fix MSI custom properties
Steelskin Oct 6, 2025
f1bfb30
Default MSIs to installing all archs
Steelskin Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions platforms/Windows/bundle/installer.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,14 +155,14 @@
SourceFile="!(bindpath.rtl)\rtl.msi"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtilities]" />
<MsiProperty Name="INSTALLUTILITIES" Value="[OptionsInstallUtilities]" />
</MsiPackage>
<?else?>
<MsiPackage
SourceFile="!(bindpath.rtl.shared)\rtl.$(ProductArchitecture).msi"
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
<MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtilities]" />
<MsiProperty Name="INSTALLUTILITIES" Value="[OptionsInstallUtilities]" />
</MsiPackage>
<?endif?>

Expand All @@ -173,10 +173,10 @@
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />

<MsiProperty Name="InstallARM64SDK" Value="[OptionsInstallAndroidSDKARM64]" />
<MsiProperty Name="InstallAMD64SDK" Value="[OptionsInstallAndroidSDKAMD64]" />
<MsiProperty Name="InstallARMSDK" Value="[OptionsInstallAndroidSDKARM]" />
<MsiProperty Name="InstallX86SDK" Value="[OptionsInstallAndroidSDKX86]" />
<MsiProperty Name="INSTALLARM64SDK" Value="[OptionsInstallAndroidSDKARM64]" />
<MsiProperty Name="INSTALLAMD64SDK" Value="[OptionsInstallAndroidSDKAMD64]" />
<MsiProperty Name="INSTALLARMSDK" Value="[OptionsInstallAndroidSDKARM]" />
<MsiProperty Name="INSTALLX86SDK" Value="[OptionsInstallAndroidSDKX86]" />
</MsiPackage>
<?endif?>

Expand All @@ -187,14 +187,17 @@
DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
<MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />

<MsiProperty Name="InstallARM64SDK" Value="[OptionsInstallWindowsSDKARM64]" />
<MsiProperty Name="InstallARM64REDIST" Value="[OptionsInstallWindowsRedistARM64]" />
<MsiProperty Name="INSTALLARM64SDK" Value="[OptionsInstallWindowsSDKARM64]" />
<MsiProperty Name="INSTALLARM64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKARM64]" />
<MsiProperty Name="INSTALLARM64REDIST" Value="[OptionsInstallWindowsRedistARM64]" />

<MsiProperty Name="InstallAMD64SDK" Value="[OptionsInstallWindowsSDKAMD64]" />
<MsiProperty Name="InstallAMD64REDIST" Value="[OptionsInstallWindowsRedistAMD64]" />
<MsiProperty Name="INSTALLAMD64SDK" Value="[OptionsInstallWindowsSDKAMD64]" />
<MsiProperty Name="INSTALLAMD64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKAMD64]" />
<MsiProperty Name="INSTALLAMD64REDIST" Value="[OptionsInstallWindowsRedistAMD64]" />

<MsiProperty Name="InstallX86SDK" Value="[OptionsInstallWindowsSDKX86]" />
<MsiProperty Name="InstallX86REDIST" Value="[OptionsInstallWindowsRedistX86]" />
<MsiProperty Name="INSTALLX86SDK" Value="[OptionsInstallWindowsSDKX86]" />
<MsiProperty Name="INSTALLX86EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKX86]" />
<MsiProperty Name="INSTALLX86REDIST" Value="[OptionsInstallWindowsRedistX86]" />
</MsiPackage>
<?endif?>
</Chain>
Expand Down
13 changes: 9 additions & 4 deletions platforms/Windows/platforms/android/android.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
Version="$(NonSemVerProductVersion)"
Scope="$(PackageScope)">

<Property Id="INSTALLARM64SDK" Value="1" />
<Property Id="INSTALLARMSDK" Value="1" />
<Property Id="INSTALLAMD64SDK" Value="1" />
<Property Id="INSTALLX86SDK" Value="1" />

<?define PlatformRoot = "$(ImageRoot)\Platforms\Android.platform"?>
<?define SDKRoot = "$(PlatformRoot)\Developer\SDKs\Android.sdk"?>

Expand Down Expand Up @@ -2125,7 +2130,7 @@

<?if $(IncludeARM64) = True?>
<Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_arm64)">
<Level Condition="InstallARM64SDK = 0" Value="0" />
<Level Condition="INSTALLARM64SDK = 0" Value="0" />

<ComponentGroupRef Id="XCTest.arm64" />
<ComponentGroupRef Id="Testing.arm64" />
Expand Down Expand Up @@ -2170,7 +2175,7 @@

<?if $(IncludeARM) = True?>
<Feature Id="armv7" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_armv7)">
<Level Condition="InstallARMSDK = 0" Value="0" />
<Level Condition="INSTALLARMSDK = 0" Value="0" />

<ComponentGroupRef Id="XCTest.arm" />
<ComponentGroupRef Id="Testing.arm" />
Expand Down Expand Up @@ -2215,7 +2220,7 @@

<?if $(IncludeX64) = True?>
<Feature Id="amd64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_amd64)">
<Level Condition="InstallAMD64SDK = 0" Value="0" />
<Level Condition="INSTALLAMD64SDK = 0" Value="0" />

<ComponentGroupRef Id="XCTest.x64" />
<ComponentGroupRef Id="Testing.x64" />
Expand Down Expand Up @@ -2260,7 +2265,7 @@

<?if $(IncludeX86) = True?>
<Feature Id="x86" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_x86)">
<Level Condition="InstallX86SDK = 0" Value="0" />
<Level Condition="INSTALLX86SDK = 0" Value="0" />

<ComponentGroupRef Id="XCTest.x86" />
<ComponentGroupRef Id="Testing.x86" />
Expand Down
34 changes: 22 additions & 12 deletions platforms/Windows/platforms/windows/windows.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
Version="$(NonSemVerProductVersion)"
Scope="$(PackageScope)">

<Property Id="INSTALLARM64SDK" Value="1" />
<Property Id="INSTALLARM64EXPERIMENTALSDK" Value="1" />
<Property Id="INSTALLARM64REDIST" Value="1" />
<Property Id="INSTALLAMD64SDK" Value="1" />
<Property Id="INSTALLAMD64EXPERIMENTALSDK" Value="1" />
<Property Id="INSTALLAMD64REDIST" Value="1" />
<Property Id="INSTALLX86SDK" Value="1" />
<Property Id="INSTALLX86EXPERIMENTALSDK" Value="1" />
<Property Id="INSTALLX86REDIST" Value="1" />

<?define PlatformRoot = "$(ImageRoot)\Platforms\Windows.platform"?>

<?define ExperimentalSDKRoot = "$(PlatformRoot)\Developer\SDKs\WindowsExperimental.sdk"?>
Expand Down Expand Up @@ -4154,26 +4164,26 @@
</Feature>

<?if $(IncludeARM64) = True?>
<Feature Display="hidden" Id="arm64.platform" Level="0" Title="!(loc.Plt_ProductName_Windows_arm64)">
<Level Condition="InstallARM64SDK = 1 OR InstallARM64ExperimentalSDK = 1" Value="1" />
<Feature Id="arm64.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_arm64)">
<Level Condition="INSTALLARM64SDK = 0 AND INSTALLARM64EXPERIMENTALSDK = 0" Value="0" />

<ComponentGroupRef Id="XCTest.arm64" />
<ComponentGroupRef Id="Testing.arm64" />
</Feature>
<?endif?>

<?if $(IncludeX64) = True?>
<Feature Display="hidden" Id="x64.platform" Level="0" Title="!(loc.Plt_ProductName_Windows_amd64)">
<Level Condition="InstallAMD64SDK = 1 OR InstallAMD64ExperimentalSDK = 1" Value="1" />
<Feature Id="x64.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_amd64)">
<Level Condition="INSTALLAMD64SDK = 0 AND INSTALLAMD64EXPERIMENTALSDK = 0" Value="0" />

<ComponentGroupRef Id="XCTest.x64" />
<ComponentGroupRef Id="Testing.x64" />
</Feature>
<?endif?>

<?if $(IncludeX86) = True?>
<Feature Display="hidden" Id="x86.platform" Level="0" Title="!(loc.Plt_ProductName_Windows_x86)">
<Level Condition="InstallX86SDK = 1 OR InstallX86ExperimentalSDK = 1" Value="1" />
<Feature Id="x86.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_x86)">
<Level Condition="INSTALLX86SDK = 0 AND INSTALLX86EXPERIMENTALSDK = 0" Value="0" />

<ComponentGroupRef Id="XCTest.x86" />
<ComponentGroupRef Id="Testing.x86" />
Expand All @@ -4197,7 +4207,7 @@

<?if $(IncludeARM64) = True?>
<Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_arm64)">
<Level Condition="InstallARM64SDK = 0" Value="0" />
<Level Condition="INSTALLARM64SDK = 0" Value="0" />

<ComponentGroupRef Id="LegacySwiftRemoteMirror.arm64" />

Expand Down Expand Up @@ -4238,7 +4248,7 @@

<?if $(IncludeX64) = True?>
<Feature Id="x64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_amd64)">
<Level Condition="InstallAMD64SDK = 0" Value="0" />
<Level Condition="INSTALLAMD64SDK = 0" Value="0" />

<ComponentGroupRef Id="LegacySwiftRemoteMirror.x64" />

Expand Down Expand Up @@ -4279,7 +4289,7 @@

<?if $(IncludeX86) = True?>
<Feature Id="x86" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_x86)">
<Level Condition="InstallX86SDK = 0" Value="0" />
<Level Condition="INSTALLX86SDK = 0" Value="0" />

<ComponentGroupRef Id="LegacySwiftRemoteMirror.x86" />

Expand Down Expand Up @@ -4334,7 +4344,7 @@

<?if $(IncludeARM64) = True?>
<Feature Id="ExperimentalARM64" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental_arm64)">
<Level Condition="InstallARM64ExperimentalSDK = 1" Value="1" />
<Level Condition="INSTALLARM64EXPERIMENTALSDK = 0" Value="0" />

<ComponentGroupRef Id="BlocksRuntime.arm64" />
<ComponentGroupRef Id="CRT.arm64" />
Expand Down Expand Up @@ -4405,7 +4415,7 @@

<?if $(IncludeX64) = True?>
<Feature Id="ExperimentalX64" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental_amd64)">
<Level Condition="InstallX64ExperimentalSDK = 1" Value="1" />
<Level Condition="INSTALLAMD64EXPERIMENTALSDK = 0" Value="0" />

<ComponentGroupRef Id="BlocksRuntime.x64" />
<ComponentGroupRef Id="CRT.x64" />
Expand Down Expand Up @@ -4476,7 +4486,7 @@

<?if $(IncludeX86) = True?>
<Feature Id="ExperimentalX86" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental_x86)">
<Level Condition="InstallX86ExperimentalSDK = 1" Value="1" />
<Level Condition="INSTALLX86EXPERIMENTALSDK = 0" Value="0" />

<ComponentGroupRef Id="BlocksRuntime.x86" />
<ComponentGroupRef Id="CRT.x86" />
Expand Down
1 change: 1 addition & 0 deletions platforms/Windows/rtl/legacy/msi/rtlmsi.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
Version="$(NonSemVerProductVersion)"
Scope="$(PackageScope)">

<Property Id="INSTALLUTILITIES" Value="0" />
<Media Id="1" Cabinet="rtl.cab" EmbedCab="$(ArePackageCabsEmbedded)" />

<WixVariable Id="SideBySidePackageUpgradeCode" Value="$(RtlUpgradeCode)" />
Expand Down