From 19943d28e49b332bbfcf6c31bde1d264e57ada0f Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <fabrice@thebrowser.company>
Date: Mon, 6 Oct 2025 15:58:53 -0400
Subject: [PATCH 1/2] WiX: Fix MSI custom properties

* MSI properties must be in CAPS_LOCK or they do not work properly.
* They must be introduced with a default value.
* Features should default to being installable (`Level=1`) and the
  override should set `Level` to 0 to skip installation of features.
  This is to prevent issues with uninstallation.
---
 platforms/Windows/bundle/installer.wxs        | 24 ++++++-------
 .../Windows/platforms/android/android.wxs     | 13 ++++---
 .../Windows/platforms/windows/windows.wxs     | 34 ++++++++++++-------
 platforms/Windows/rtl/legacy/msi/rtlmsi.wxs   |  1 +
 4 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 4ee8c319..885b6d38 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -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?>
 
@@ -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?>
 
@@ -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>
diff --git a/platforms/Windows/platforms/android/android.wxs b/platforms/Windows/platforms/android/android.wxs
index 7ea40a19..e5c5c229 100644
--- a/platforms/Windows/platforms/android/android.wxs
+++ b/platforms/Windows/platforms/android/android.wxs
@@ -8,6 +8,11 @@
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
+    <Property Id="INSTALLARM64SDK" Value="0" />
+    <Property Id="INSTALLARMSDK" Value="0" />
+    <Property Id="INSTALLAMD64SDK" Value="0" />
+    <Property Id="INSTALLX86SDK" Value="0" />
+
     <?define PlatformRoot = "$(ImageRoot)\Platforms\Android.platform"?>
     <?define SDKRoot = "$(PlatformRoot)\Developer\SDKs\Android.sdk"?>
 
@@ -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" />
@@ -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" />
@@ -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" />
@@ -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" />
diff --git a/platforms/Windows/platforms/windows/windows.wxs b/platforms/Windows/platforms/windows/windows.wxs
index b1b9cc34..fcab01d0 100644
--- a/platforms/Windows/platforms/windows/windows.wxs
+++ b/platforms/Windows/platforms/windows/windows.wxs
@@ -8,6 +8,16 @@
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
+    <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" />
+
     <?define PlatformRoot = "$(ImageRoot)\Platforms\Windows.platform"?>
 
     <?define ExperimentalSDKRoot = "$(PlatformRoot)\Developer\SDKs\WindowsExperimental.sdk"?>
@@ -4154,8 +4164,8 @@
     </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" />
@@ -4163,8 +4173,8 @@
     <?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" />
@@ -4172,8 +4182,8 @@
     <?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" />
@@ -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" />
 
@@ -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" />
 
@@ -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" />
 
@@ -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" />
@@ -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" />
@@ -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" />
diff --git a/platforms/Windows/rtl/legacy/msi/rtlmsi.wxs b/platforms/Windows/rtl/legacy/msi/rtlmsi.wxs
index 039ba057..e68b2dda 100644
--- a/platforms/Windows/rtl/legacy/msi/rtlmsi.wxs
+++ b/platforms/Windows/rtl/legacy/msi/rtlmsi.wxs
@@ -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)" />

From f1bfb30d6aa0b1c40188d7f2f670b4fd69337311 Mon Sep 17 00:00:00 2001
From: Fabrice de Gans <fabrice@thebrowser.company>
Date: Tue, 7 Oct 2025 13:15:43 -0400
Subject: [PATCH 2/2] Default MSIs to installing all archs

This also tweaks the installer to also install the corresponding
Experimental SDK on Windows.
---
 platforms/Windows/bundle/installer.wxs         |  3 +++
 .../Windows/platforms/android/android.wxs      |  8 ++++----
 .../Windows/platforms/windows/windows.wxs      | 18 +++++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 885b6d38..194300e8 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -188,12 +188,15 @@
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
 
           <MsiProperty Name="INSTALLARM64SDK" Value="[OptionsInstallWindowsSDKARM64]" />
+          <MsiProperty Name="INSTALLARM64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKARM64]" />
           <MsiProperty Name="INSTALLARM64REDIST" Value="[OptionsInstallWindowsRedistARM64]" />
 
           <MsiProperty Name="INSTALLAMD64SDK" Value="[OptionsInstallWindowsSDKAMD64]" />
+          <MsiProperty Name="INSTALLAMD64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKAMD64]" />
           <MsiProperty Name="INSTALLAMD64REDIST" Value="[OptionsInstallWindowsRedistAMD64]" />
 
           <MsiProperty Name="INSTALLX86SDK" Value="[OptionsInstallWindowsSDKX86]" />
+          <MsiProperty Name="INSTALLX86EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKX86]" />
           <MsiProperty Name="INSTALLX86REDIST" Value="[OptionsInstallWindowsRedistX86]" />
         </MsiPackage>
       <?endif?>
diff --git a/platforms/Windows/platforms/android/android.wxs b/platforms/Windows/platforms/android/android.wxs
index e5c5c229..f460ddf4 100644
--- a/platforms/Windows/platforms/android/android.wxs
+++ b/platforms/Windows/platforms/android/android.wxs
@@ -8,10 +8,10 @@
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Property Id="INSTALLARM64SDK" Value="0" />
-    <Property Id="INSTALLARMSDK" Value="0" />
-    <Property Id="INSTALLAMD64SDK" Value="0" />
-    <Property Id="INSTALLX86SDK" Value="0" />
+    <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"?>
diff --git a/platforms/Windows/platforms/windows/windows.wxs b/platforms/Windows/platforms/windows/windows.wxs
index fcab01d0..35fa2f45 100644
--- a/platforms/Windows/platforms/windows/windows.wxs
+++ b/platforms/Windows/platforms/windows/windows.wxs
@@ -8,15 +8,15 @@
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <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" />
+    <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"?>