Skip to content

WiX: Use uppercase for property names that are passed into the msi #467

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

Closed
wants to merge 2 commits into from
Closed

WiX: Use uppercase for property names that are passed into the msi #467

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
f7d25b7
Use upper case for property names that are passed into the msi
mhegazy Oct 6, 2025
5bbb8eb
Add defaults
mhegazy 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
24 changes: 12 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,14 @@
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="INSTALLARM64REDIST" Value="[OptionsInstallWindowsRedistARM64]" />

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

<MsiProperty Name="InstallX86SDK" Value="[OptionsInstallWindowsSDKX86]" />
<MsiProperty Name="InstallX86REDIST" Value="[OptionsInstallWindowsRedistX86]" />
<MsiProperty Name="INSTALLX86SDK" 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 @@ -11,6 +11,11 @@
<?define PlatformRoot = "$(ImageRoot)\Platforms\Android.platform"?>
<?define SDKRoot = "$(PlatformRoot)\Developer\SDKs\Android.sdk"?>

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

<Media Id="1" Cabinet="android.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
<?if $(IncludeARM64) = True?>
<Media Id="2" Cabinet="sdk.android.arm64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
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
28 changes: 19 additions & 9 deletions platforms/Windows/platforms/windows/windows.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,16 @@
<?define SDKRoot = "$(ExperimentalSDKRoot)"?>
<?endif?>

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

<Media Id="1" Cabinet="windows.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
<Media Id="5" Cabinet="windows.experimental.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
<?if $(IncludeARM64) = True?>
Expand Down Expand Up @@ -4155,7 +4165,7 @@

<?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" />
<Level Condition="INSTALLARM64SDK = 1 OR INSTALLARM64EXPERIMENTALSDK = 1" Value="1" />

<ComponentGroupRef Id="XCTest.arm64" />
<ComponentGroupRef Id="Testing.arm64" />
Expand All @@ -4164,7 +4174,7 @@

<?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" />
<Level Condition="INSTALLAMD64SDK = 1 OR INSTALLAMD64EXPERIMENTALSDK = 1" Value="1" />

<ComponentGroupRef Id="XCTest.x64" />
<ComponentGroupRef Id="Testing.x64" />
Expand All @@ -4173,7 +4183,7 @@

<?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" />
<Level Condition="INSTALLX86SDK = 1 OR INSTALLX86EXPERIMENTALSDK = 1" Value="1" />

<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 = 1" Value="1" />

<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="INSTALLX64EXPERIMENTALSDK = 1" Value="1" />

<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 = 1" Value="1" />

<ComponentGroupRef Id="BlocksRuntime.x86" />
<ComponentGroupRef Id="CRT.x86" />
Expand Down