From 5ffba7efbcb1ac5457d971ee8dc428848631cec9 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 11:26:53 -0700
Subject: [PATCH 01/27] Add option to install no-assert toolchain variant to
 installer ui

---
 platforms/Windows/bundle/installer.wxs   | 5 +++++
 platforms/Windows/bundle/theme.xml       | 6 ++++--
 platforms/Windows/shared/swift.en-us.wxl | 3 +++
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 717a719b..9a7e661a 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -54,6 +54,9 @@
     <Variable Name="OptionsInstallAndroidSDKARM" bal:Overridable="yes" Persisted="yes" Value="0" />
     <Variable Name="OptionsInstallAndroidSDKX86" bal:Overridable="yes" Persisted="yes" Value="0" />
 
+    <Variable Name="OptionsInstallAssertsToolchain" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <Variable Name="OptionsInstallNoAssertsToolchain" bal:Overridable="yes" Persisted="yes" Value="0" />
+
     <!--
     For the online bundle, we need to provide a download URL for each package and its .cabs.
     (The SourceFile attribute is also required, both for the offline bundle and for Burn
@@ -85,6 +88,8 @@
         SourceFile="!(bindpath.bld)\bld.msi"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        <MsiProperty Name="InstallAssertsToolchain" Value="[OptionsInstallAssertsToolchain]" />
+        <MsiProperty Name="InstallNoAssertsToolchain" Value="[OptionsInstallNoAssertsToolchain]" />
       </MsiPackage>
 
       <MsiPackage
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index 22100e47..e92e9226 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -9,7 +9,7 @@
     <Font Id="2" Height="-18" Weight="500" Foreground="graytext">Segoe UI</Font>
     <Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
 
-    <Window Width="614" Height="456" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
+    <Window Width="614" Height="496" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
         <ImageControl X="0" Y="0" Width="165" Height="456" ImageFile="swift_side.png"/>
         <Label X="176" Y="11" Width="-11" Height="32" FontId="1" DisablePrefix="yes">#(loc.Title)</Label>
 
@@ -73,7 +73,9 @@
             <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="194" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox>
             <Checkbox Name="OptionsInstallAndroidSDKARM" X="194" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox>
             <Checkbox Name="OptionsInstallAndroidSDKX86" X="194" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox>
-
+            <Checkbox Name="OptionsInstallAssertsToolchain" X="176" Y="417" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Asserts_Toolchain_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallNoAssertsToolchain" X="176" Y="435" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="1">#(loc.NoAsserts_Toolchain_ProductName)</Checkbox>
+            
             <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.OptionsOkButton)</Text>
                 <ChangePageAction Page="Install" />
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index 7b6517ea..51e29232 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -3,6 +3,7 @@
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
   <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
   <String Id="Bld_ProductName" Value="Swift Build Tools" />
+  <String Id="Bld_NoAsserts_ProductName" Value="Swift Build Tools (Asserts disabled)" />
   <String Id="Cli_ProductName" Value="Swift Command Line Tools" />
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
   <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
@@ -25,6 +26,8 @@
   <String Id="Utl_ProductName_arm64" Value="Swift Windows Utilities (ARM64)" />
   <String Id="Utl_ProductName_amd64" Value="Swift Windows Utilities (AMD64)" />
   <String Id="Utl_ProductName_x86" Value="Swift Windows Utilities (X86)" />
+  <String Id="Asserts_Toolchain_ProductName" Value="Swift Toolchain (Asserts enabled)" />
+  <String Id="NoAsserts_Toolchain_ProductName" Value="Swift Toolchain (Asserts disabled)" />
   <String Id="BundleName" Value="Swift Developer Toolkit" />
   <String Id="ManufacturerName" Value="swift.org" />
 

From 61d631249bbe9a276c4b0cb2498ad7f66a356e2b Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 11:59:05 -0700
Subject: [PATCH 02/27] Split cli.msi into two msi's by variant

---
 .../Windows/SideBySideUpgradeStrategy.props   |  2 ++
 platforms/Windows/bundle/installer.wixproj    |  3 ++-
 platforms/Windows/bundle/installer.wxs        | 13 ++++++---
 .../cli.asserts.wixproj}                      |  1 +
 platforms/Windows/cli/asserts/cli.asserts.wxs |  9 +++++++
 platforms/Windows/cli/{cli.wxs => cli.wxi}    | 17 ++++++------
 .../Windows/cli/noasserts/cli.noasserts..wxs  | 10 +++++++
 .../cli/noasserts/cli.noasserts.wixproj       | 27 +++++++++++++++++++
 platforms/Windows/shared/swift.en-us.wxl      |  1 +
 9 files changed, 69 insertions(+), 14 deletions(-)
 rename platforms/Windows/cli/{cli.wixproj => asserts/cli.asserts.wixproj} (96%)
 create mode 100644 platforms/Windows/cli/asserts/cli.asserts.wxs
 rename platforms/Windows/cli/{cli.wxs => cli.wxi} (95%)
 create mode 100644 platforms/Windows/cli/noasserts/cli.noasserts..wxs
 create mode 100644 platforms/Windows/cli/noasserts/cli.noasserts.wixproj

diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props
index ae79f273..647767a9 100644
--- a/platforms/Windows/SideBySideUpgradeStrategy.props
+++ b/platforms/Windows/SideBySideUpgradeStrategy.props
@@ -19,6 +19,7 @@
   <PropertyGroup>
     <BldUpgradeCode>{7E95DC06-7F84-4E8E-A038-8304AF0468FB}</BldUpgradeCode>
     <CliUpgradeCode>{87019842-3F3E-4227-B5C5-23A8EF72AD89}</CliUpgradeCode>
+    <CliNoAssertsUpgradeCode>{BBF4E043-FAB3-4E7A-9E6D-714E3F3EBA9C}</CliNoAssertsUpgradeCode>
     <DbgUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgUpgradeCode>
     <IdeUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeUpgradeCode>
     <RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
@@ -56,6 +57,7 @@
       BundleUpgradeCode=$(BundleUpgradeCode);
       BldUpgradeCode=$(BldUpgradeCode);
       CliUpgradeCode=$(CliUpgradeCode);
+      CliNoAssertsUpgradeCode=$(CliNoAssertsUpgradeCode);
       DbgUpgradeCode=$(DbgUpgradeCode);
       IdeUpgradeCode=$(IdeUpgradeCode);
       RtlUpgradeCode=$(RtlUpgradeCode);
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index b62f1e58..dcdaf460 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -17,7 +17,8 @@
 
   <ItemGroup>
     <ProjectReference Include="..\bld\bld.wixproj" BindName="bld" />
-    <ProjectReference Include="..\cli\cli.wixproj" BindName="cli" />
+    <ProjectReference Include="..\cli\asserts\cli.asserts.wixproj" BindName="cli.asserts" />
+    <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" />
     <ProjectReference Include="..\dbg\dbg.wixproj" BindName="dbg" />
     <ProjectReference Include="..\ide\ide.wixproj" BindName="ide" />
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 9a7e661a..83fa6ca3 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -88,13 +88,18 @@
         SourceFile="!(bindpath.bld)\bld.msi"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-        <MsiProperty Name="InstallAssertsToolchain" Value="[OptionsInstallAssertsToolchain]" />
-        <MsiProperty Name="InstallNoAssertsToolchain" Value="[OptionsInstallNoAssertsToolchain]" />
       </MsiPackage>
 
       <MsiPackage
-        SourceFile="!(bindpath.cli)\cli.msi"
-        InstallCondition="OptionsInstallCLI = 1"
+        SourceFile="!(bindpath.cli.asserts)\cli.asserts.msi"
+        InstallCondition="OptionsInstallCLI = 1 and OptionsInstallAssertsToolchain = 1"
+        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+      </MsiPackage>
+
+      <MsiPackage
+        SourceFile="!(bindpath.cli.noasserts)\cli.noasserts.msi"
+        InstallCondition="OptionsInstallCLI = 1 and OptionsInstallNoAssertsToolchain = 1"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
diff --git a/platforms/Windows/cli/cli.wixproj b/platforms/Windows/cli/asserts/cli.asserts.wixproj
similarity index 96%
rename from platforms/Windows/cli/cli.wixproj
rename to platforms/Windows/cli/asserts/cli.asserts.wixproj
index 5dda6e00..01937894 100644
--- a/platforms/Windows/cli/cli.wixproj
+++ b/platforms/Windows/cli/asserts/cli.asserts.wixproj
@@ -7,6 +7,7 @@
       SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
       SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST=$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist;
     </DefineConstants>
+    <OutputName>cli.asserts</OutputName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/platforms/Windows/cli/asserts/cli.asserts.wxs b/platforms/Windows/cli/asserts/cli.asserts.wxs
new file mode 100644
index 00000000..c65da11d
--- /dev/null
+++ b/platforms/Windows/cli/asserts/cli.asserts.wxs
@@ -0,0 +1,9 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define VariantSuffix ?>
+  <?define VariantUpgradeCode = $(CliUpgradeCode)?>
+  <?define VariantProductName = !(loc.Cli_ProductName)?>
+  <?define VariantCabName = cli.asserts.cab?>
+
+  <?include ../cli.wxi ?>
+</Wix>
diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxi
similarity index 95%
rename from platforms/Windows/cli/cli.wxs
rename to platforms/Windows/cli/cli.wxi
index 41ac6fd3..aeafe549 100644
--- a/platforms/Windows/cli/cli.wxs
+++ b/platforms/Windows/cli/cli.wxi
@@ -1,18 +1,17 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.Cli_ProductName)"
-      UpgradeCode="$(CliUpgradeCode)"
+      Name="$(VariantProductName)"
+      UpgradeCode="$(VariantUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="cli.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(CliUpgradeCode)" />
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
     <DirectoryRef Id="_usr_include">
@@ -261,7 +260,7 @@
       </Component>
     </ComponentGroup>
 
-    <Feature Id="CLITools" AllowAbsent="no" Title="!(loc.Cli_ProductName)">
+    <Feature Id="CLITools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="clang" />
       <ComponentGroupRef Id="libclang" />
       <ComponentGroupRef Id="IndexStore" />
@@ -282,4 +281,4 @@
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
   </Package>
-</Wix>
+</Include>
diff --git a/platforms/Windows/cli/noasserts/cli.noasserts..wxs b/platforms/Windows/cli/noasserts/cli.noasserts..wxs
new file mode 100644
index 00000000..e95cf6e1
--- /dev/null
+++ b/platforms/Windows/cli/noasserts/cli.noasserts..wxs
@@ -0,0 +1,10 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define ToolchainRoot-noasserts = $(ImageRoot)\Toolchains\$(ProductVersion)+NoAsserts?>
+  <?define VariantSuffix = _noasserts?>
+  <?define VariantUpgradeCode = $(CliNoAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.CliNoAsserts_ProductName)?>
+  <?define VariantCabName = cli.noasserts.cab?>
+
+  <?include ../cli.wxi ?>
+</Wix>
diff --git a/platforms/Windows/cli/noasserts/cli.noasserts.wixproj b/platforms/Windows/cli/noasserts/cli.noasserts.wixproj
new file mode 100644
index 00000000..ea20e678
--- /dev/null
+++ b/platforms/Windows/cli/noasserts/cli.noasserts.wixproj
@@ -0,0 +1,27 @@
+<Project Sdk="WixToolset.Sdk/4.0.5">
+  <PropertyGroup>
+    <DefineConstants>
+      $(DefineConstants);
+      SWIFT_DOCC_BUILD=$(SWIFT_DOCC_BUILD);
+      INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);
+      SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
+      SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST=$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist;
+    </DefineConstants>
+    <OutputName>cli.noasserts</OutputName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(INCLUDE_SWIFT_DOCC)' == 'True' ">
+    <HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
+      <ComponentGroupName>DocCRender</ComponentGroupName>
+      <DirectoryRefId>_usr_share_docc_render</DirectoryRefId>
+      <PreprocessorVariable>var.SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST</PreprocessorVariable>
+      <SuppressCom>true</SuppressCom>
+      <SuppressRegistry>true</SuppressRegistry>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestDirectory>
+  </ItemGroup>
+</Project>
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index 51e29232..b50de3c4 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -5,6 +5,7 @@
   <String Id="Bld_ProductName" Value="Swift Build Tools" />
   <String Id="Bld_NoAsserts_ProductName" Value="Swift Build Tools (Asserts disabled)" />
   <String Id="Cli_ProductName" Value="Swift Command Line Tools" />
+  <String Id="CliNoAsserts_ProductName" Value="Swift Command Line Tools" />
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
   <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
   <String Id="Rtl_ProductName" Value="Swift Windows Runtime" />

From dab2c7a87cbeafcb17d6154da3705d3c7dfba27d Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 12:32:15 -0700
Subject: [PATCH 03/27] Install cli.noassert files to noassert directory layout

---
 platforms/Windows/cli/cli.wxi                 | 52 +++++++++----------
 .../cli/noasserts/cli.noasserts.wixproj       |  4 +-
 platforms/Windows/shared/shared.wxs           | 33 +++++++++++-
 3 files changed, 60 insertions(+), 29 deletions(-)

diff --git a/platforms/Windows/cli/cli.wxi b/platforms/Windows/cli/cli.wxi
index aeafe549..ef1e6a99 100644
--- a/platforms/Windows/cli/cli.wxi
+++ b/platforms/Windows/cli/cli.wxi
@@ -14,20 +14,20 @@
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
-    <DirectoryRef Id="_usr_include">
-      <Directory Id="_usr_include__InternalSwiftScan" Name="_InternalSwiftScan" />
-      <Directory Id="_usr_include_clang_c" Name="clang-c" />
-      <Directory Id="_usr_include_indexstore" Name="indexstore" />
+    <DirectoryRef Id="_usr_include$(VariantSuffix)">
+      <Directory Id="_usr_include__InternalSwiftScan$(VariantSuffix)" Name="_InternalSwiftScan" />
+      <Directory Id="_usr_include_clang_c$(VariantSuffix)" Name="clang-c" />
+      <Directory Id="_usr_include_indexstore$(VariantSuffix)" Name="indexstore" />
     </DirectoryRef>
 
-    <DirectoryRef Id="_usr_lib_swift">
+    <DirectoryRef Id="_usr_lib_swift$(VariantSuffix)">
       <Directory Name="pm">
-        <Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI" />
-        <Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI" />
+        <Directory Id="_usr_lib_swift_pm_ManifestAPI$(VariantSuffix)" Name="ManifestAPI" />
+        <Directory Id="_usr_lib_swift_pm_PluginAPI$(VariantSuffix)" Name="PluginAPI" />
       </Directory>
     </DirectoryRef>
 
-    <ComponentGroup Id="clang" Directory="_usr_bin">
+    <ComponentGroup Id="clang" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\clang-format.exe" />
       </Component>
@@ -41,12 +41,12 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="libclang" Directory="_usr_include_clang_c">
-      <Component Directory="_usr_bin">
+    <ComponentGroup Id="libclang" Directory="_usr_include_clang_c$(VariantSuffix)">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\libclang.dll" />
       </Component>
 
-      <Component Directory="_usr_lib">
+      <Component Directory="_usr_lib$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\libclang.lib" />
       </Component>
 
@@ -79,12 +79,12 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="IndexStore" Directory="_usr_include_indexstore">
-      <Component Directory="_usr_bin">
+    <ComponentGroup Id="IndexStore" Directory="_usr_include_indexstore$(VariantSuffix)">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\libIndexStore.dll" />
       </Component>
 
-      <Component Directory="_usr_lib">
+      <Component Directory="_usr_lib$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\libIndexStore.lib" />
       </Component>
 
@@ -96,12 +96,12 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="_InternalSwiftScan" Directory="_usr_include__InternalSwiftScan">
-      <Component Directory="_usr_bin">
+    <ComponentGroup Id="_InternalSwiftScan" Directory="_usr_include__InternalSwiftScan$(VariantSuffix)">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\_InternalSwiftScan.dll" />
       </Component>
 
-      <Component Directory="_usr_lib">
+      <Component Directory="_usr_lib$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\swift\windows\_InternalSwiftScan.lib" />
       </Component>
 
@@ -116,7 +116,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="collections" Directory="_usr_bin">
+    <ComponentGroup Id="collections" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\Collections.dll" />
       </Component>
@@ -131,13 +131,13 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="llbuild" Directory="_usr_bin">
+    <ComponentGroup Id="llbuild" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\llbuildSwift.dll" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="CompilerPluginSupport" Directory="_usr_lib_swift_pm_ManifestAPI">
+    <ComponentGroup Id="CompilerPluginSupport" Directory="_usr_lib_swift_pm_ManifestAPI$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
       </Component>
@@ -152,7 +152,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="PackageDescription" Directory="_usr_lib_swift_pm_ManifestAPI">
+    <ComponentGroup Id="PackageDescription" Directory="_usr_lib_swift_pm_ManifestAPI$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
       </Component>
@@ -167,7 +167,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="PackagePlugin" Directory="_usr_lib_swift_pm_PluginAPI">
+    <ComponentGroup Id="PackagePlugin" Directory="_usr_lib_swift_pm_PluginAPI$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
       </Component>
@@ -182,7 +182,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="package_manager" Directory="_usr_bin">
+    <ComponentGroup Id="package_manager" Directory="_usr_bin$(VariantSuffix)">
       <ComponentGroupRef Id="CompilerPluginSupport" />
       <ComponentGroupRef Id="PackageDescription" />
       <ComponentGroupRef Id="PackagePlugin" />
@@ -243,7 +243,7 @@
       <!-- FIXME(compnerd) we should include the SPM import libraries -->
     </ComponentGroup>
 
-    <ComponentGroup Id="DocC" Directory="_usr_bin">
+    <ComponentGroup Id="DocC" Directory="_usr_bin$(VariantSuffix)">
       <?if $(INCLUDE_SWIFT_DOCC) = True?>
         <Component>
           <File Source="$(SWIFT_DOCC_BUILD)\docc.exe" />
@@ -251,7 +251,7 @@
       <?endif?>
     </ComponentGroup>
 
-    <ComponentGroup Id="swift_format" Directory="_usr_bin">
+    <ComponentGroup Id="swift_format" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\swift-format.exe" />
       </Component>
@@ -273,7 +273,7 @@
 
       <ComponentGroupRef Id="DocC" />
       <?if $(INCLUDE_SWIFT_DOCC) = True?>
-        <ComponentGroupRef Id="DocCRender" />
+        <ComponentGroupRef Id="DocCRender$(VariantSuffix)" />
       <?endif?>
 
       <ComponentGroupRef Id="swift_format" />
diff --git a/platforms/Windows/cli/noasserts/cli.noasserts.wixproj b/platforms/Windows/cli/noasserts/cli.noasserts.wixproj
index ea20e678..5547e347 100644
--- a/platforms/Windows/cli/noasserts/cli.noasserts.wixproj
+++ b/platforms/Windows/cli/noasserts/cli.noasserts.wixproj
@@ -16,8 +16,8 @@
 
   <ItemGroup Condition=" '$(INCLUDE_SWIFT_DOCC)' == 'True' ">
     <HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
-      <ComponentGroupName>DocCRender</ComponentGroupName>
-      <DirectoryRefId>_usr_share_docc_render</DirectoryRefId>
+      <ComponentGroupName>DocCRender_noasserts</ComponentGroupName>
+      <DirectoryRefId>_usr_share_docc_render_noasserts</DirectoryRefId>
       <PreprocessorVariable>var.SWIFT_DOCC_RENDER_ARTIFACT_ROOT_DIST</PreprocessorVariable>
       <SuppressCom>true</SuppressCom>
       <SuppressRegistry>true</SuppressRegistry>
diff --git a/platforms/Windows/shared/shared.wxs b/platforms/Windows/shared/shared.wxs
index b1dd1330..f82ce7b4 100644
--- a/platforms/Windows/shared/shared.wxs
+++ b/platforms/Windows/shared/shared.wxs
@@ -37,7 +37,7 @@
 
   <Fragment>
     <DirectoryRef Id="INSTALLROOT">
-        <Directory Name="Toolchains">
+        <Directory Id="Toolchains" Name="Toolchains">
           <Directory Id="ToolchainsVersioned" Name="$(ProductVersion)+Asserts">
             <Directory Id="_usr" Name="usr">
               <Directory Id="_usr_bin" Name="bin" />
@@ -59,6 +59,28 @@
     </DirectoryRef>
   </Fragment>
 
+  <Fragment>
+    <DirectoryRef Id="Toolchains">
+      <Directory Id="ToolchainsVersioned_noasserts" Name="$(ProductVersion)+NoAsserts">
+        <Directory Id="_usr_noasserts" Name="usr">
+          <Directory Id="_usr_bin_noasserts" Name="bin" />
+          <Directory Id="_usr_include_noasserts" Name="include" />
+          <Directory Id="_usr_lib_noasserts" Name="lib">
+            <Directory Id="_usr_lib_clang_noasserts" Name="clang" />
+            <Directory Id="_usr_lib_swift_noasserts" Name="swift">
+              <Directory Id="_usr_lib_swift_clang_noasserts" Name="clang" />
+            </Directory>
+          </Directory>
+          <Directory Id="_usr_share_noasserts" Name="share">
+            <Directory Id="_usr_share_docc_noasserts" Name="docc">
+              <Directory Id="_usr_share_docc_render_noasserts" Name="render" />
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+  </Fragment>
+
   <!--
   Use RemoveFolderEx to clean up the empty subdirectories Windows Installer
   leaves when there are other directory siblings left behind, as happens when
@@ -86,6 +108,11 @@
         <RegistryValue Root="HKCU" Key="SOFTWARE\!(loc.ManufacturerName)\Installer\$(ProductVersion)\!(bind.Property.UpgradeCode)" Name="ToolchainsVersioned" Value="[ToolchainsVersioned]" />
         <util:RemoveFolderEx Property="TOOLCHAINSVERSIONED" Condition="TOOLCHAINSVERSIONED" />
       </Component>
+
+      <Component Id="VersionedDirectoryCleanupToolchains_noasserts">
+        <RegistryValue Root="HKCU" Key="SOFTWARE\!(loc.ManufacturerName)\Installer\$(ProductVersion)\!(bind.Property.UpgradeCode)" Name="ToolchainsVersionedNoAsserts" Value="[ToolchainsVersionedNoAsserts]" />
+        <util:RemoveFolderEx Property="TOOLCHAINSVERSIONEDNOASSERTS" Condition="TOOLCHAINSVERSIONEDNOASSERTS" />
+      </Component>
     </ComponentGroup>
 
     <Property Id="PLATFORMSVERSIONED">
@@ -103,6 +130,10 @@
     <Property Id="TOOLCHAINSVERSIONED">
       <RegistrySearch Root="HKCU" Key="SOFTWARE\!(loc.ManufacturerName)\Installer\$(ProductVersion)\!(bind.Property.UpgradeCode)" Name="ToolchainsVersioned" Type="directory" />
     </Property>
+
+    <Property Id="TOOLCHAINSVERSIONEDNOASSERTS">
+      <RegistrySearch Root="HKCU" Key="SOFTWARE\!(loc.ManufacturerName)\Installer\$(ProductVersion)\!(bind.Property.UpgradeCode)" Name="ToolchainsVersionedNoAsserts" Type="directory" />
+    </Property>
   </Fragment>
 
   <!--

From 6d43ed44e72513f8ab53243529a0b0199102fc42 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 12:48:28 -0700
Subject: [PATCH 04/27] Pull cli.noassert files from the noaassert build output
 directory when applicaple

---
 platforms/Windows/cli/asserts/cli.asserts.wxs |  1 +
 platforms/Windows/cli/cli.wxi                 | 46 +++++++++----------
 .../Windows/cli/noasserts/cli.noasserts..wxs  |  2 +-
 3 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/platforms/Windows/cli/asserts/cli.asserts.wxs b/platforms/Windows/cli/asserts/cli.asserts.wxs
index c65da11d..3296182d 100644
--- a/platforms/Windows/cli/asserts/cli.asserts.wxs
+++ b/platforms/Windows/cli/asserts/cli.asserts.wxs
@@ -1,5 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define ToolchainVariantRoot = $(ToolchainRoot)?>
   <?define VariantSuffix ?>
   <?define VariantUpgradeCode = $(CliUpgradeCode)?>
   <?define VariantProductName = !(loc.Cli_ProductName)?>
diff --git a/platforms/Windows/cli/cli.wxi b/platforms/Windows/cli/cli.wxi
index ef1e6a99..8c7d45f8 100644
--- a/platforms/Windows/cli/cli.wxi
+++ b/platforms/Windows/cli/cli.wxi
@@ -29,90 +29,90 @@
 
     <ComponentGroup Id="clang" Directory="_usr_bin$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\clang-format.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\clang-format.exe" />
       </Component>
 
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\git-clang-format" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\git-clang-format" />
       </Component>
 
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\clang-tidy.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\clang-tidy.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="libclang" Directory="_usr_include_clang_c$(VariantSuffix)">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\libclang.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\libclang.dll" />
       </Component>
 
       <Component Directory="_usr_lib$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\libclang.lib" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\libclang.lib" />
       </Component>
 
       <Component>
-        <File Source="$(ToolchainRoot)\usr\include\clang-c\BuildSystem.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\clang-c\BuildSystem.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\include\clang-c\CXCompilationDatabase.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\clang-c\CXCompilationDatabase.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\include\clang-c\CXErrorCode.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\clang-c\CXErrorCode.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\include\clang-c\CXString.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\clang-c\CXString.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\include\clang-c\Documentation.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\clang-c\Documentation.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\include\clang-c\FatalErrorHandler.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\clang-c\FatalErrorHandler.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\include\clang-c\Index.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\clang-c\Index.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\include\clang-c\Platform.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\clang-c\Platform.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\include\clang-c\Refactor.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\clang-c\Refactor.h" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="IndexStore" Directory="_usr_include_indexstore$(VariantSuffix)">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\libIndexStore.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\libIndexStore.dll" />
       </Component>
 
       <Component Directory="_usr_lib$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\libIndexStore.lib" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\libIndexStore.lib" />
       </Component>
 
       <Component>
-        <File Source="$(ToolchainRoot)\usr\local\include\indexstore\indexstore.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\local\include\indexstore\indexstore.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\local\include\indexstore\IndexStoreCXX.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\local\include\indexstore\IndexStoreCXX.h" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="_InternalSwiftScan" Directory="_usr_include__InternalSwiftScan$(VariantSuffix)">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\_InternalSwiftScan.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_InternalSwiftScan.dll" />
       </Component>
 
       <Component Directory="_usr_lib$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\swift\windows\_InternalSwiftScan.lib" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\windows\_InternalSwiftScan.lib" />
       </Component>
 
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftScan\DependencyScan.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\_InternalSwiftScan\DependencyScan.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftScan\DependencyScanMacros.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\_InternalSwiftScan\DependencyScanMacros.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftScan\module.modulemap" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\_InternalSwiftScan\module.modulemap" />
       </Component>
     </ComponentGroup>
 
diff --git a/platforms/Windows/cli/noasserts/cli.noasserts..wxs b/platforms/Windows/cli/noasserts/cli.noasserts..wxs
index e95cf6e1..11e34234 100644
--- a/platforms/Windows/cli/noasserts/cli.noasserts..wxs
+++ b/platforms/Windows/cli/noasserts/cli.noasserts..wxs
@@ -1,6 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
-  <?define ToolchainRoot-noasserts = $(ImageRoot)\Toolchains\$(ProductVersion)+NoAsserts?>
+  <?define ToolchainVariantRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+NoAsserts?>
   <?define VariantSuffix = _noasserts?>
   <?define VariantUpgradeCode = $(CliNoAssertsUpgradeCode)?>
   <?define VariantProductName = !(loc.CliNoAsserts_ProductName)?>

From 9d10e4a3b811759989d64a7d608b933bcc00c829 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 13:22:40 -0700
Subject: [PATCH 05/27] Split dbg.msi into two separate msi's by variant

---
 .../Windows/SideBySideUpgradeStrategy.props     |  2 ++
 platforms/Windows/bundle/installer.wixproj      |  3 ++-
 platforms/Windows/bundle/installer.wxs          | 11 +++++++++--
 .../Windows/dbg/asserts/dbg.asserts.wixproj     |  5 +++++
 platforms/Windows/dbg/asserts/dbg.asserts.wxs   | 10 ++++++++++
 platforms/Windows/dbg/dbg.wixproj               |  2 --
 platforms/Windows/dbg/{dbg.wxs => dbg.wxi}      | 17 ++++++++---------
 .../Windows/dbg/noasserts/dbg.noasserts.wixproj |  5 +++++
 .../Windows/dbg/noasserts/dbg.noasserts.wxs     | 10 ++++++++++
 platforms/Windows/shared/swift.en-us.wxl        |  1 +
 10 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 platforms/Windows/dbg/asserts/dbg.asserts.wixproj
 create mode 100644 platforms/Windows/dbg/asserts/dbg.asserts.wxs
 delete mode 100644 platforms/Windows/dbg/dbg.wixproj
 rename platforms/Windows/dbg/{dbg.wxs => dbg.wxi} (93%)
 create mode 100644 platforms/Windows/dbg/noasserts/dbg.noasserts.wixproj
 create mode 100644 platforms/Windows/dbg/noasserts/dbg.noasserts.wxs

diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props
index 647767a9..7cce5a78 100644
--- a/platforms/Windows/SideBySideUpgradeStrategy.props
+++ b/platforms/Windows/SideBySideUpgradeStrategy.props
@@ -21,6 +21,7 @@
     <CliUpgradeCode>{87019842-3F3E-4227-B5C5-23A8EF72AD89}</CliUpgradeCode>
     <CliNoAssertsUpgradeCode>{BBF4E043-FAB3-4E7A-9E6D-714E3F3EBA9C}</CliNoAssertsUpgradeCode>
     <DbgUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgUpgradeCode>
+    <DbgNoAssertsUpgradeCode>{6F26625B-7662-4631-8E0E-F2244339ED37}</DbgNoAssertsUpgradeCode>
     <IdeUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeUpgradeCode>
     <RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
     <AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
@@ -59,6 +60,7 @@
       CliUpgradeCode=$(CliUpgradeCode);
       CliNoAssertsUpgradeCode=$(CliNoAssertsUpgradeCode);
       DbgUpgradeCode=$(DbgUpgradeCode);
+      DbgNoAssertsUpgradeCode=$(DbgNoAssertsUpgradeCode);
       IdeUpgradeCode=$(IdeUpgradeCode);
       RtlUpgradeCode=$(RtlUpgradeCode);
       AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index dcdaf460..f81f1a35 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -19,7 +19,8 @@
     <ProjectReference Include="..\bld\bld.wixproj" BindName="bld" />
     <ProjectReference Include="..\cli\asserts\cli.asserts.wixproj" BindName="cli.asserts" />
     <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" />
-    <ProjectReference Include="..\dbg\dbg.wixproj" BindName="dbg" />
+    <ProjectReference Include="..\dbg\asserts\dbg.asserts.wixproj" BindName="dbg.asserts" />
+    <ProjectReference Include="..\dbg\noasserts\dbg.noasserts.wixproj" BindName="dbg.noasserts" />
     <ProjectReference Include="..\ide\ide.wixproj" BindName="ide" />
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
   </ItemGroup>
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 83fa6ca3..1324fe46 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -105,12 +105,19 @@
       </MsiPackage>
 
       <MsiPackage
-        SourceFile="!(bindpath.dbg)\dbg.msi"
-        InstallCondition="OptionsInstallDBG = 1"
+        SourceFile="!(bindpath.dbg.asserts)\dbg.asserts.msi"
+        InstallCondition="OptionsInstallDBG = 1 and OptionsInstallAssertsToolchain = 1"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
+      <MsiPackage
+        SourceFile="!(bindpath.dbg.noasserts)\dbg.noasserts.msi"
+        InstallCondition="OptionsInstallDBG = 1 and OptionsInstallNoAssertsToolchain = 1"
+        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+      </MsiPackage>
+  
       <MsiPackage
         SourceFile="!(bindpath.ide)\ide.msi"
         InstallCondition="OptionsInstallIDE = 1"
diff --git a/platforms/Windows/dbg/asserts/dbg.asserts.wixproj b/platforms/Windows/dbg/asserts/dbg.asserts.wixproj
new file mode 100644
index 00000000..aa21e7f8
--- /dev/null
+++ b/platforms/Windows/dbg/asserts/dbg.asserts.wixproj
@@ -0,0 +1,5 @@
+<Project Sdk="WixToolset.Sdk/4.0.5">
+  <PropertyGroup>
+    <OutputName>dbg.asserts</OutputName>
+  </PropertyGroup>
+</Project>
diff --git a/platforms/Windows/dbg/asserts/dbg.asserts.wxs b/platforms/Windows/dbg/asserts/dbg.asserts.wxs
new file mode 100644
index 00000000..b159ca8d
--- /dev/null
+++ b/platforms/Windows/dbg/asserts/dbg.asserts.wxs
@@ -0,0 +1,10 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define ToolchainVariantRoot = $(ToolchainRoot)?>
+  <?define VariantSuffix ?>
+  <?define VariantUpgradeCode = $(DbgUpgradeCode)?>
+  <?define VariantProductName = !(loc.Dbg_ProductName)?>
+  <?define VariantCabName = dbg.asserts.cab?>
+
+  <?include ../dbg.wxi ?>
+</Wix>
diff --git a/platforms/Windows/dbg/dbg.wixproj b/platforms/Windows/dbg/dbg.wixproj
deleted file mode 100644
index 8a93eeab..00000000
--- a/platforms/Windows/dbg/dbg.wixproj
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project Sdk="WixToolset.Sdk/4.0.5">
-</Project>
diff --git a/platforms/Windows/dbg/dbg.wxs b/platforms/Windows/dbg/dbg.wxi
similarity index 93%
rename from platforms/Windows/dbg/dbg.wxs
rename to platforms/Windows/dbg/dbg.wxi
index 94848bc2..3df02c9f 100644
--- a/platforms/Windows/dbg/dbg.wxs
+++ b/platforms/Windows/dbg/dbg.wxi
@@ -1,18 +1,17 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.Dbg_ProductName)"
-      UpgradeCode="$(DbgUpgradeCode)"
+      Name="$(VariantProductName)"
+      UpgradeCode="$(VariantUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="dbg.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(DbgUpgradeCode)" />
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
     <DirectoryRef Id="_usr_include">
@@ -140,7 +139,7 @@
       </Component>
     </ComponentGroup>
 
-    <Feature Id="DebuggingTools" AllowAbsent="no" Title="!(loc.Dbg_ProductName)">
+    <Feature Id="DebuggingTools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="LLDB" />
       <ComponentGroupRef Id="LLDBServer" />
 
@@ -153,4 +152,4 @@
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
   </Package>
-</Wix>
+</Include>
diff --git a/platforms/Windows/dbg/noasserts/dbg.noasserts.wixproj b/platforms/Windows/dbg/noasserts/dbg.noasserts.wixproj
new file mode 100644
index 00000000..ac16dbb5
--- /dev/null
+++ b/platforms/Windows/dbg/noasserts/dbg.noasserts.wixproj
@@ -0,0 +1,5 @@
+<Project Sdk="WixToolset.Sdk/4.0.5">
+  <PropertyGroup>
+    <OutputName>dbg.noasserts</OutputName>
+  </PropertyGroup>
+</Project>
diff --git a/platforms/Windows/dbg/noasserts/dbg.noasserts.wxs b/platforms/Windows/dbg/noasserts/dbg.noasserts.wxs
new file mode 100644
index 00000000..fd1ea6a1
--- /dev/null
+++ b/platforms/Windows/dbg/noasserts/dbg.noasserts.wxs
@@ -0,0 +1,10 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define ToolchainVariantRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+NoAsserts?>
+  <?define VariantSuffix = _noasserts?>
+  <?define VariantUpgradeCode = $(DbgNoAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.DbgNoAsserts_ProductName)?>
+  <?define VariantCabName = dbg.noasserts.cab?>
+
+  <?include ../dbg.wxi ?>
+</Wix>
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index b50de3c4..bb319fb1 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -7,6 +7,7 @@
   <String Id="Cli_ProductName" Value="Swift Command Line Tools" />
   <String Id="CliNoAsserts_ProductName" Value="Swift Command Line Tools" />
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
+  <String Id="DbgNoAsserts_ProductName" Value="Swift Debugging Tools" />
   <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
   <String Id="Rtl_ProductName" Value="Swift Windows Runtime" />
   <String Id="VCRuntime_ProductName_arm64" Value="Visual C++ Runtime (ARM64)" />

From e97f5141e078b1366aad4c181c4dac77e210c57d Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 13:30:38 -0700
Subject: [PATCH 06/27] Install dbg.noassert files to the noassert toolchain
 folder structure

---
 platforms/Windows/dbg/dbg.wxi | 70 +++++++++++++++++------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/platforms/Windows/dbg/dbg.wxi b/platforms/Windows/dbg/dbg.wxi
index 3df02c9f..bb112a21 100644
--- a/platforms/Windows/dbg/dbg.wxi
+++ b/platforms/Windows/dbg/dbg.wxi
@@ -14,117 +14,117 @@
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
-    <DirectoryRef Id="_usr_include">
-      <Directory Id="_usr_include__InternalSwiftStaticMirror" Name="_InternalSwiftStaticMirror" />
+    <DirectoryRef Id="_usr_include$(VariantSuffix)">
+      <Directory Id="_usr_include__InternalSwiftStaticMirror$(VariantSuffix)" Name="_InternalSwiftStaticMirror" />
     </DirectoryRef>
 
-    <DirectoryRef Id="_usr_lib">
-      <Directory Name="site-packages">
-        <Directory Id="_usr_lib_site_packages_lldb" Name="lldb">
-          <Directory Id="_usr_lib_site_packages_lldb_formatters" Name="formatters">
-            <Directory Id="_usr_lib_site_packages_lldb_formatters_cpp" Name="cpp" />
+    <DirectoryRef Id="_usr_lib$(VariantSuffix)">
+      <Directory Name="site-packages$(VariantSuffix)">
+        <Directory Id="_usr_lib_site_packages_lldb$(VariantSuffix)" Name="lldb">
+          <Directory Id="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)" Name="formatters">
+            <Directory Id="_usr_lib_site_packages_lldb_formatters_cpp$(VariantSuffix)" Name="cpp" />
           </Directory>
-          <Directory Id="_usr_lib_site_packages_lldb_utils" Name="utils" />
+          <Directory Id="_usr_lib_site_packages_lldb_utils$(VariantSuffix)" Name="utils" />
         </Directory>
       </Directory>
-    </DirectoryRef>
+    </DirectoryRef> 
 
     <ComponentGroup Id="LLDB">
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\lldb.exe" />
       </Component>
 
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\liblldb.dll" />
       </Component>
 
-      <Component Directory="_usr_lib">
+      <Component Directory="_usr_lib$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\liblldb.lib" />
       </Component>
 
-      <Component Directory="_usr_lib_site_packages_lldb">
+      <Component Directory="_usr_lib_site_packages_lldb$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\__init__.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb">
+      <Component Directory="_usr_lib_site_packages_lldb$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\_lldb.pyd" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb">
+      <Component Directory="_usr_lib_site_packages_lldb$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\embedded_interpreter.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb">
+      <Component Directory="_usr_lib_site_packages_lldb$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\lldb-argdumper.exe" />
       </Component>
 
-      <Component Directory="_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\Logger.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\__init__.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\attrib_fromdict.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cache.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\metrics.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\synth.py" />
       </Component>
 
-      <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp">
+      <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\__init__.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp">
+      <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\gnu_libstdcpp.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp">
+      <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\libcxx.py" />
       </Component>
 
-      <Component Directory="_usr_lib_site_packages_lldb_utils">
+      <Component Directory="_usr_lib_site_packages_lldb_utils$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\__init__.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb_utils">
+      <Component Directory="_usr_lib_site_packages_lldb_utils$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\in_call_stack.py" />
       </Component>
-      <Component Directory="_usr_lib_site_packages_lldb_utils">
+      <Component Directory="_usr_lib_site_packages_lldb_utils$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\symbolication.py" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="LLDBServer">
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\lldb-server.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftREPL">
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\repl_swift.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftSynthesizeInterface">
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\swift-synthesize-interface.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftInspect">
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\swift-inspect.exe" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="_InternalSwiftStaticMirror" Directory="_usr_include__InternalSwiftStaticMirror">
-      <Component Directory="_usr_bin">
+    <ComponentGroup Id="_InternalSwiftStaticMirror" Directory="_usr_include__InternalSwiftStaticMirror$(VariantSuffix)">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\_InternalSwiftStaticMirror.dll" />
       </Component>
 
-      <Component Directory="_usr_lib">
+      <Component Directory="_usr_lib$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\swift\windows\_InternalSwiftStaticMirror.lib" />
       </Component>
 

From ba99d5168588e2fcf9a6767aad53285d9650bae9 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 13:36:52 -0700
Subject: [PATCH 07/27] Pull dbg.noassert files from the noassert toolchain
 output folder when available

---
 platforms/Windows/dbg/dbg.wxi | 54 +++++++++++++++++------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/platforms/Windows/dbg/dbg.wxi b/platforms/Windows/dbg/dbg.wxi
index bb112a21..399013c7 100644
--- a/platforms/Windows/dbg/dbg.wxi
+++ b/platforms/Windows/dbg/dbg.wxi
@@ -31,85 +31,85 @@
 
     <ComponentGroup Id="LLDB">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\lldb.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\lldb.exe" />
       </Component>
 
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\liblldb.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\liblldb.dll" />
       </Component>
 
       <Component Directory="_usr_lib$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\liblldb.lib" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\liblldb.lib" />
       </Component>
 
       <Component Directory="_usr_lib_site_packages_lldb$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\__init__.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\__init__.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\_lldb.pyd" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\_lldb.pyd" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\embedded_interpreter.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\embedded_interpreter.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\lldb-argdumper.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\lldb-argdumper.exe" />
       </Component>
 
       <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\Logger.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\formatters\Logger.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\__init__.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\formatters\__init__.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\attrib_fromdict.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\formatters\attrib_fromdict.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cache.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\formatters\cache.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\metrics.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\formatters\metrics.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\synth.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\formatters\synth.py" />
       </Component>
 
       <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\__init__.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\formatters\cpp\__init__.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\gnu_libstdcpp.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\formatters\cpp\gnu_libstdcpp.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\libcxx.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\formatters\cpp\libcxx.py" />
       </Component>
 
       <Component Directory="_usr_lib_site_packages_lldb_utils$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\__init__.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\utils\__init__.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_utils$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\in_call_stack.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\utils\in_call_stack.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_utils$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\symbolication.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\site-packages\lldb\utils\symbolication.py" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="LLDBServer">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\lldb-server.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\lldb-server.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftREPL">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\repl_swift.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\repl_swift.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftSynthesizeInterface">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\swift-synthesize-interface.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\swift-synthesize-interface.exe" />
       </Component>
     </ComponentGroup>
 
@@ -121,21 +121,21 @@
 
     <ComponentGroup Id="_InternalSwiftStaticMirror" Directory="_usr_include__InternalSwiftStaticMirror$(VariantSuffix)">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\_InternalSwiftStaticMirror.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_InternalSwiftStaticMirror.dll" />
       </Component>
 
       <Component Directory="_usr_lib$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\swift\windows\_InternalSwiftStaticMirror.lib" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\windows\_InternalSwiftStaticMirror.lib" />
       </Component>
 
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftStaticMirror\BinaryScan.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\_InternalSwiftStaticMirror\BinaryScan.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftStaticMirror\module.modulemap" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\_InternalSwiftStaticMirror\module.modulemap" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftStaticMirror\StaticMirrorMacros.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\_InternalSwiftStaticMirror\StaticMirrorMacros.h" />
       </Component>
     </ComponentGroup>
 

From f3be6a70421f84979c904b88faf90125f4e9d46d Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 13:59:38 -0700
Subject: [PATCH 08/27] Split ide.msi into two separate msi's by variant

---
 .../Windows/SideBySideUpgradeStrategy.props     |  2 ++
 platforms/Windows/bundle/installer.wixproj      |  3 ++-
 platforms/Windows/bundle/installer.wxs          | 11 +++++++++--
 .../Windows/ide/asserts/ide.asserts.wixproj     |  5 +++++
 platforms/Windows/ide/asserts/ide.asserts.wxs   | 10 ++++++++++
 platforms/Windows/ide/ide.wixproj               |  2 --
 platforms/Windows/ide/{ide.wxs => ide.wxi}      | 17 ++++++++---------
 .../Windows/ide/noasserts/ide.noasserts.wixproj |  5 +++++
 .../Windows/ide/noasserts/ide.noasserts.wxs     | 10 ++++++++++
 platforms/Windows/shared/swift.en-us.wxl        |  1 +
 10 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 platforms/Windows/ide/asserts/ide.asserts.wixproj
 create mode 100644 platforms/Windows/ide/asserts/ide.asserts.wxs
 delete mode 100644 platforms/Windows/ide/ide.wixproj
 rename platforms/Windows/ide/{ide.wxs => ide.wxi} (80%)
 create mode 100644 platforms/Windows/ide/noasserts/ide.noasserts.wixproj
 create mode 100644 platforms/Windows/ide/noasserts/ide.noasserts.wxs

diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props
index 7cce5a78..f82e8a65 100644
--- a/platforms/Windows/SideBySideUpgradeStrategy.props
+++ b/platforms/Windows/SideBySideUpgradeStrategy.props
@@ -23,6 +23,7 @@
     <DbgUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgUpgradeCode>
     <DbgNoAssertsUpgradeCode>{6F26625B-7662-4631-8E0E-F2244339ED37}</DbgNoAssertsUpgradeCode>
     <IdeUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeUpgradeCode>
+    <IdeNoAssertsUpgradeCode>{C5519168-CF7B-4127-98B7-D886D9789B42}</IdeNoAssertsUpgradeCode>
     <RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
     <AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
     <WindowsPlatformUpgradeCode>{01AFF1CF-A025-41B6-BCBC-728D794353FD}</WindowsPlatformUpgradeCode>
@@ -62,6 +63,7 @@
       DbgUpgradeCode=$(DbgUpgradeCode);
       DbgNoAssertsUpgradeCode=$(DbgNoAssertsUpgradeCode);
       IdeUpgradeCode=$(IdeUpgradeCode);
+      IdeNoAssertsUpgradeCode=$(IdeNoAssertsUpgradeCode);
       RtlUpgradeCode=$(RtlUpgradeCode);
       AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
       WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index f81f1a35..1f096365 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -21,7 +21,8 @@
     <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" />
     <ProjectReference Include="..\dbg\asserts\dbg.asserts.wixproj" BindName="dbg.asserts" />
     <ProjectReference Include="..\dbg\noasserts\dbg.noasserts.wixproj" BindName="dbg.noasserts" />
-    <ProjectReference Include="..\ide\ide.wixproj" BindName="ide" />
+    <ProjectReference Include="..\ide\asserts\ide.asserts.wixproj" BindName="ide.asserts" />
+    <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" />
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
   </ItemGroup>
 
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 1324fe46..131bc3ec 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -119,8 +119,15 @@
       </MsiPackage>
   
       <MsiPackage
-        SourceFile="!(bindpath.ide)\ide.msi"
-        InstallCondition="OptionsInstallIDE = 1"
+        SourceFile="!(bindpath.ide.asserts)\ide.asserts.msi"
+        InstallCondition="OptionsInstallIDE = 1 OptionsInstallAssertsToolchain = 1"
+        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+      </MsiPackage>
+
+      <MsiPackage
+        SourceFile="!(bindpath.ide.noasserts)\ide.noasserts.msi"
+        InstallCondition="OptionsInstallIDE = 1 and OptionsInstallNoAssertsToolchain = 1"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
diff --git a/platforms/Windows/ide/asserts/ide.asserts.wixproj b/platforms/Windows/ide/asserts/ide.asserts.wixproj
new file mode 100644
index 00000000..1e311f8c
--- /dev/null
+++ b/platforms/Windows/ide/asserts/ide.asserts.wixproj
@@ -0,0 +1,5 @@
+<Project Sdk="WixToolset.Sdk/4.0.5">
+  <PropertyGroup>
+    <OutputName>ide.asserts</OutputName>
+  </PropertyGroup>
+</Project>
diff --git a/platforms/Windows/ide/asserts/ide.asserts.wxs b/platforms/Windows/ide/asserts/ide.asserts.wxs
new file mode 100644
index 00000000..7f764a65
--- /dev/null
+++ b/platforms/Windows/ide/asserts/ide.asserts.wxs
@@ -0,0 +1,10 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define ToolchainVariantRoot = $(ToolchainRoot)?>
+  <?define VariantSuffix ?>
+  <?define VariantUpgradeCode = $(IdeUpgradeCode)?>
+  <?define VariantProductName = !(loc.Ide_ProductName)?>
+  <?define VariantCabName = ide.asserts.cab?>
+
+  <?include ../ide.wxi ?>
+</Wix>
diff --git a/platforms/Windows/ide/ide.wixproj b/platforms/Windows/ide/ide.wixproj
deleted file mode 100644
index 8a93eeab..00000000
--- a/platforms/Windows/ide/ide.wixproj
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project Sdk="WixToolset.Sdk/4.0.5">
-</Project>
diff --git a/platforms/Windows/ide/ide.wxs b/platforms/Windows/ide/ide.wxi
similarity index 80%
rename from platforms/Windows/ide/ide.wxs
rename to platforms/Windows/ide/ide.wxi
index 97170e15..f64783cf 100644
--- a/platforms/Windows/ide/ide.wxs
+++ b/platforms/Windows/ide/ide.wxi
@@ -1,18 +1,17 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.Ide_ProductName)"
-      UpgradeCode="$(IdeUpgradeCode)"
+      Name="$(VariantProductName)"
+      UpgradeCode="$(VariantUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="ide.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(IdeUpgradeCode)" />
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
     <DirectoryRef Id="_usr_include">
@@ -59,7 +58,7 @@
       </Component>
     </ComponentGroup>
 
-    <Feature Id="IDETools" AllowAbsent="no" Title="!(loc.Ide_ProductName)">
+    <Feature Id="IDETools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="clangd" />
       <ComponentGroupRef Id="lldb" />
       <ComponentGroupRef Id="sourcekitd" />
@@ -68,4 +67,4 @@
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
   </Package>
-</Wix>
+</Include>
diff --git a/platforms/Windows/ide/noasserts/ide.noasserts.wixproj b/platforms/Windows/ide/noasserts/ide.noasserts.wixproj
new file mode 100644
index 00000000..fa37d563
--- /dev/null
+++ b/platforms/Windows/ide/noasserts/ide.noasserts.wixproj
@@ -0,0 +1,5 @@
+<Project Sdk="WixToolset.Sdk/4.0.5">
+  <PropertyGroup>
+    <OutputName>ide.noasserts</OutputName>
+  </PropertyGroup>
+</Project>
diff --git a/platforms/Windows/ide/noasserts/ide.noasserts.wxs b/platforms/Windows/ide/noasserts/ide.noasserts.wxs
new file mode 100644
index 00000000..9a1244ab
--- /dev/null
+++ b/platforms/Windows/ide/noasserts/ide.noasserts.wxs
@@ -0,0 +1,10 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define ToolchainVariantRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+NoAsserts?>
+  <?define VariantSuffix = _noasserts?>
+  <?define VariantUpgradeCode = $(IdeNoAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.IdeNoAsserts_ProductName)?>
+  <?define VariantCabName = ide.noasserts.cab?>
+
+  <?include ../ide.wxi ?>
+</Wix>
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index bb319fb1..3eba3e83 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -9,6 +9,7 @@
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
   <String Id="DbgNoAsserts_ProductName" Value="Swift Debugging Tools" />
   <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
+  <String Id="IdeNoAsserts_ProductName" Value="Swift IDE Integration Tools" />
   <String Id="Rtl_ProductName" Value="Swift Windows Runtime" />
   <String Id="VCRuntime_ProductName_arm64" Value="Visual C++ Runtime (ARM64)" />
   <String Id="VCRuntime_ProductName_amd64" Value="Visual C++ Runtime (AMD64)" />

From cf8f5f1773850ba0a6c17738b0f2067d5733a89c Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 14:03:21 -0700
Subject: [PATCH 09/27] Install ide.noasserts files to the noassert toolchain
 folder

---
 platforms/Windows/ide/ide.wxi | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/platforms/Windows/ide/ide.wxi b/platforms/Windows/ide/ide.wxi
index f64783cf..5eabda8e 100644
--- a/platforms/Windows/ide/ide.wxi
+++ b/platforms/Windows/ide/ide.wxi
@@ -14,45 +14,45 @@
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
-    <DirectoryRef Id="_usr_include">
-      <Directory Id="_usr_include_SourceKit" Name="SourceKit" />
+    <DirectoryRef Id="_usr_include$(VariantSuffix)">
+      <Directory Id="_usr_include_SourceKit$(VariantSuffix)" Name="SourceKit" />
     </DirectoryRef>
 
-    <ComponentGroup Id="clangd" Directory="_usr_bin">
+    <ComponentGroup Id="clangd" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\clangd.exe" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="lldb" Directory="_usr_bin">
+    <ComponentGroup Id="lldb" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\lldb-dap.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="sourcekitd">
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\sourcekitdInProc.dll" />
       </Component>
 
-      <Component Directory="_usr_lib">
+      <Component Directory="_usr_lib$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\sourcekitdInProc.lib" />
       </Component>
 
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\SwiftSourceKitPlugin.dll" />
       </Component>
 
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\SwiftSourceKitClientPlugin.dll" />
       </Component>
 
-      <Component Directory="_usr_include_SourceKit">
+      <Component Directory="_usr_include_SourceKit$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\include\SourceKit\sourcekitd.h" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="lsp" Directory="_usr_bin">
+    <ComponentGroup Id="lsp" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\sourcekit-lsp.exe" />
       </Component>

From 92426dad39e9a526c825669ecd72ef602037a089 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 14:10:12 -0700
Subject: [PATCH 10/27] Pull ide.noasserts.msi files from the noasserts
 toolchain output when avialable

---
 platforms/Windows/ide/ide.wxi | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/platforms/Windows/ide/ide.wxi b/platforms/Windows/ide/ide.wxi
index 5eabda8e..89096ee5 100644
--- a/platforms/Windows/ide/ide.wxi
+++ b/platforms/Windows/ide/ide.wxi
@@ -20,23 +20,23 @@
 
     <ComponentGroup Id="clangd" Directory="_usr_bin$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\clangd.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\clangd.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="lldb" Directory="_usr_bin$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\lldb-dap.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\lldb-dap.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="sourcekitd">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\sourcekitdInProc.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\sourcekitdInProc.dll" />
       </Component>
 
       <Component Directory="_usr_lib$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\sourcekitdInProc.lib" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\sourcekitdInProc.lib" />
       </Component>
 
       <Component Directory="_usr_bin$(VariantSuffix)">
@@ -48,7 +48,7 @@
       </Component>
 
       <Component Directory="_usr_include_SourceKit$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\include\SourceKit\sourcekitd.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\SourceKit\sourcekitd.h" />
       </Component>
     </ComponentGroup>
 

From 26bc1ef103f5ee59778a8a4a0f7bc585bd3189b2 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 14:45:45 -0700
Subject: [PATCH 11/27] Split bld.msi into two separate msi's based on variant

---
 .../Windows/SideBySideUpgradeStrategy.props   |  2 ++
 .../bld.asserts.wixproj}                      |  1 +
 platforms/Windows/bld/asserts/bld.asserts.wxs | 10 ++++++
 platforms/Windows/bld/{bld.wxs => bld.wxi}    | 17 +++++----
 .../Windows/bld/noasserts/bld.noasserts..wxs  | 10 ++++++
 .../bld/noasserts/bld.noasserts.wixproj       | 36 +++++++++++++++++++
 platforms/Windows/bundle/installer.wixproj    |  3 +-
 platforms/Windows/bundle/installer.wxs        | 10 +++++-
 platforms/Windows/shared/swift.en-us.wxl      |  2 +-
 9 files changed, 79 insertions(+), 12 deletions(-)
 rename platforms/Windows/bld/{bld.wixproj => asserts/bld.asserts.wixproj} (97%)
 create mode 100644 platforms/Windows/bld/asserts/bld.asserts.wxs
 rename platforms/Windows/bld/{bld.wxs => bld.wxi} (97%)
 create mode 100644 platforms/Windows/bld/noasserts/bld.noasserts..wxs
 create mode 100644 platforms/Windows/bld/noasserts/bld.noasserts.wixproj

diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props
index f82e8a65..dcec1503 100644
--- a/platforms/Windows/SideBySideUpgradeStrategy.props
+++ b/platforms/Windows/SideBySideUpgradeStrategy.props
@@ -18,6 +18,7 @@
 
   <PropertyGroup>
     <BldUpgradeCode>{7E95DC06-7F84-4E8E-A038-8304AF0468FB}</BldUpgradeCode>
+    <BldNoAssertsUpgradeCode>{0F18B0C5-F6EE-46DE-A930-E666BEE6A9C3}</BldNoAssertsUpgradeCode>
     <CliUpgradeCode>{87019842-3F3E-4227-B5C5-23A8EF72AD89}</CliUpgradeCode>
     <CliNoAssertsUpgradeCode>{BBF4E043-FAB3-4E7A-9E6D-714E3F3EBA9C}</CliNoAssertsUpgradeCode>
     <DbgUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgUpgradeCode>
@@ -58,6 +59,7 @@
       $(DefineConstants);
       BundleUpgradeCode=$(BundleUpgradeCode);
       BldUpgradeCode=$(BldUpgradeCode);
+      BldNoAssertsUpgradeCode=$(BldNoAssertsUpgradeCode);
       CliUpgradeCode=$(CliUpgradeCode);
       CliNoAssertsUpgradeCode=$(CliNoAssertsUpgradeCode);
       DbgUpgradeCode=$(DbgUpgradeCode);
diff --git a/platforms/Windows/bld/bld.wixproj b/platforms/Windows/bld/asserts/bld.asserts.wixproj
similarity index 97%
rename from platforms/Windows/bld/bld.wixproj
rename to platforms/Windows/bld/asserts/bld.asserts.wixproj
index 0f3385e8..bd53ebaa 100644
--- a/platforms/Windows/bld/bld.wixproj
+++ b/platforms/Windows/bld/asserts/bld.asserts.wixproj
@@ -5,6 +5,7 @@
       _USR_LIB_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang;
       _USR_LIB_SWIFT_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang;
     </DefineConstants>
+    <OutputName>bld.asserts</OutputName>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/platforms/Windows/bld/asserts/bld.asserts.wxs b/platforms/Windows/bld/asserts/bld.asserts.wxs
new file mode 100644
index 00000000..489ea3dc
--- /dev/null
+++ b/platforms/Windows/bld/asserts/bld.asserts.wxs
@@ -0,0 +1,10 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define ToolchainVariantRoot = $(ToolchainRoot)?>
+  <?define VariantSuffix ?>
+  <?define VariantUpgradeCode = $(BldUpgradeCode)?>
+  <?define VariantProductName = !(loc.Bld_ProductName)?>
+  <?define VariantCabName = bld.asserts.cab?>
+
+  <?include ../bld.wxi ?>
+</Wix>
diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxi
similarity index 97%
rename from platforms/Windows/bld/bld.wxs
rename to platforms/Windows/bld/bld.wxi
index 0af0ebea..c6a92078 100644
--- a/platforms/Windows/bld/bld.wxs
+++ b/platforms/Windows/bld/bld.wxi
@@ -1,18 +1,17 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.Bld_ProductName)"
-      UpgradeCode="$(BldUpgradeCode)"
+      Name="$(VariantProductName)"
+      UpgradeCode="$(VariantUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="bld.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(BldUpgradeCode)" />
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
     <DirectoryRef Id="_usr_include">
@@ -549,7 +548,7 @@
       </Component>
     </ComponentGroup>
 
-    <Feature Id="BuildTools" AllowAbsent="no" Title="!(loc.Bld_ProductName)">
+    <Feature Id="BuildTools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="cmark_gfm" />
 
       <ComponentGroupRef Id="binutils" />
@@ -578,4 +577,4 @@
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
   </Package>
-</Wix>
+</Include>
diff --git a/platforms/Windows/bld/noasserts/bld.noasserts..wxs b/platforms/Windows/bld/noasserts/bld.noasserts..wxs
new file mode 100644
index 00000000..1f612a50
--- /dev/null
+++ b/platforms/Windows/bld/noasserts/bld.noasserts..wxs
@@ -0,0 +1,10 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define ToolchainVariantRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+NoAsserts?>
+  <?define VariantSuffix = _noasserts?>
+  <?define VariantUpgradeCode = $(BldNoAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.BldNoAsserts_ProductName)?>
+  <?define VariantCabName = bld.noasserts.cab?>
+
+  <?include ../bld.wxi ?>
+</Wix>
diff --git a/platforms/Windows/bld/noasserts/bld.noasserts.wixproj b/platforms/Windows/bld/noasserts/bld.noasserts.wixproj
new file mode 100644
index 00000000..1a3fbd07
--- /dev/null
+++ b/platforms/Windows/bld/noasserts/bld.noasserts.wixproj
@@ -0,0 +1,36 @@
+<Project Sdk="WixToolset.Sdk/4.0.5">
+  <PropertyGroup>
+    <DefineConstants>
+      $(DefineConstants);
+      _USR_LIB_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang;
+      _USR_LIB_SWIFT_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang;
+    </DefineConstants>
+    <OutputName>bld.noasserts</OutputName>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang">
+      <ComponentGroupName>ClangResources</ComponentGroupName>
+      <DirectoryRefId>_usr_lib_clang</DirectoryRefId>
+      <PreprocessorVariable>var._USR_LIB_CLANG</PreprocessorVariable>
+      <SuppressCom>true</SuppressCom>
+      <SuppressRegistry>true</SuppressRegistry>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestDirectory>
+  </ItemGroup>
+
+  <ItemGroup>
+    <HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang">
+      <ComponentGroupName>SwiftClangResources</ComponentGroupName>
+      <DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
+      <PreprocessorVariable>var._USR_LIB_SWIFT_CLANG</PreprocessorVariable>
+      <SuppressCom>true</SuppressCom>
+      <SuppressRegistry>true</SuppressRegistry>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
+    </HarvestDirectory>
+  </ItemGroup>
+</Project>
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 1f096365..4dbc4de7 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -16,7 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\bld\bld.wixproj" BindName="bld" />
+    <ProjectReference Include="..\bld\asserts\bld.asserts.wixproj" BindName="bld.asserts" />
+    <ProjectReference Include="..\bld\noasserts\bld.noasserts.wixproj" BindName="bld.noasserts" />
     <ProjectReference Include="..\cli\asserts\cli.asserts.wixproj" BindName="cli.asserts" />
     <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" />
     <ProjectReference Include="..\dbg\asserts\dbg.asserts.wixproj" BindName="dbg.asserts" />
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 131bc3ec..5dddbfac 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -85,7 +85,15 @@
       </MsiPackage>
 
       <MsiPackage
-        SourceFile="!(bindpath.bld)\bld.msi"
+        SourceFile="!(bindpath.bld.asserts)\bld.asserts.msi"
+        InstallCondition="OptionsInstallAssertsToolchain = 1"
+        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+      </MsiPackage>
+
+      <MsiPackage
+        SourceFile="!(bindpath.bld.noasserts)\bld.noasserts.msi"
+        InstallCondition="OptionsInstallNoAssertsToolchain = 1"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index 3eba3e83..0e48734c 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -3,7 +3,7 @@
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
   <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
   <String Id="Bld_ProductName" Value="Swift Build Tools" />
-  <String Id="Bld_NoAsserts_ProductName" Value="Swift Build Tools (Asserts disabled)" />
+  <String Id="BldNoAsserts_ProductName" Value="Swift Build Tools (Asserts disabled)" />
   <String Id="Cli_ProductName" Value="Swift Command Line Tools" />
   <String Id="CliNoAsserts_ProductName" Value="Swift Command Line Tools" />
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />

From 4d78a330fa6a46fcad1d2ca16dcf7563c08d8e39 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 15:14:37 -0700
Subject: [PATCH 12/27] Install bld.noassert.msi files to the noassert
 toolchain folders

---
 platforms/Windows/bld/bld.wxi                 | 96 +++++++++----------
 .../bld/noasserts/bld.noasserts.wixproj       | 18 ++--
 2 files changed, 57 insertions(+), 57 deletions(-)

diff --git a/platforms/Windows/bld/bld.wxi b/platforms/Windows/bld/bld.wxi
index c6a92078..7fe83bfe 100644
--- a/platforms/Windows/bld/bld.wxi
+++ b/platforms/Windows/bld/bld.wxi
@@ -14,28 +14,28 @@
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
-    <DirectoryRef Id="_usr_include">
-      <Directory Id="_usr_include_llvm_c" Name="llvm-c" />
-      <Directory Id="_usr_include_swift" Name="swift" />
+    <DirectoryRef Id="_usr_include$(VariantSuffix)">
+      <Directory Id="_usr_include_llvm_c$(VariantSuffix)" Name="llvm-c" />
+      <Directory Id="_usr_include_swift$(VariantSuffix)" Name="swift" />
     </DirectoryRef>
 
-    <DirectoryRef Id="_usr_lib_swift">
-      <Directory Id="_usr_lib_swift_migrator" Name="migrator" />
-      <Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
+    <DirectoryRef Id="_usr_lib_swift$(VariantSuffix)">
+      <Directory Id="_usr_lib_swift_migrator$(VariantSuffix)" Name="migrator" />
+      <Directory Id="_usr_lib_swift_swiftToCxx$(VariantSuffix)" Name="swiftToCxx" />
     </DirectoryRef>
 
-    <DirectoryRef Id="_usr_share">
-      <Directory Id="_usr_share_clang" Name="clang" />
-      <Directory Id="_usr_share_swift" Name="swift" />
-      <Directory Id="_usr_share_doc" Name="doc">
-        <Directory Id="_usr_share_doc_swift" Name="swift">
-          <Directory Id="_usr_share_doc_swift_diagnostics" Name="diagnostics">
+    <DirectoryRef Id="_usr_share$(VariantSuffix)">
+      <Directory Id="_usr_share_clang$(VariantSuffix)" Name="clang" />
+      <Directory Id="_usr_share_swift$(VariantSuffix)" Name="swift" />
+      <Directory Id="_usr_share_doc$(VariantSuffix)" Name="doc">
+        <Directory Id="_usr_share_doc_swift$(VariantSuffix)" Name="swift">
+          <Directory Id="_usr_share_doc_swift_diagnostics$(VariantSuffix)" Name="diagnostics">
           </Directory>
         </Directory>
       </Directory>
     </DirectoryRef>
 
-    <ComponentGroup Id="cmark_gfm" Directory="_usr_bin">
+    <ComponentGroup Id="cmark_gfm" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin/cmark-gfm.dll" />
       </Component>
@@ -44,7 +44,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="binutils" Directory="_usr_bin">
+    <ComponentGroup Id="binutils" Directory="_usr_bin$(VariantSuffix)">
       <!-- TODO(compnerd) can we use symbolic links to llvm-ar.exe instead? -->
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\llvm-dlltool.exe" />
@@ -143,26 +143,26 @@
     </ComponentGroup>
 
     <ComponentGroup Id="lto">
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\LTO.dll" />
       </Component>
 
-      <Component Directory="_usr_lib">
+      <Component Directory="_usr_lib$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\LTO.lib" />
       </Component>
 
-      <Component Directory="_usr_include_llvm_c">
+      <Component Directory="_usr_include_llvm_c$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\include\llvm-c\lto.h" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="ClangFeatures" Directory="_usr_share_clang">
+    <ComponentGroup Id="ClangFeatures" Directory="_usr_share_clang$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\clang\features.json" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="clang" Directory="_usr_bin">
+    <ComponentGroup Id="clang" Directory="_usr_bin$(VariantSuffix)">
       <ComponentGroupRef Id="ClangFeatures" />
 
       <!-- TODO(compnerd) can we use symbolic links to clang.exe instead? -->
@@ -193,7 +193,7 @@
       -->
     </ComponentGroup>
 
-    <ComponentGroup Id="lld" Directory="_usr_bin">
+    <ComponentGroup Id="lld" Directory="_usr_bin$(VariantSuffix)">
       <!-- TODO(compnerd) can we use symbolic links to lld.exe instead? -->
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\ld.lld.exe" />
@@ -213,11 +213,11 @@
     </ComponentGroup>
 
     <ComponentGroup Id="BlocksRuntime">
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\BlocksRuntime.dll" />
       </Component>
 
-      <Component Directory="_usr_lib">
+      <Component Directory="_usr_lib$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\BlocksRuntime.lib" />
       </Component>
 
@@ -225,18 +225,18 @@
     </ComponentGroup>
 
     <ComponentGroup Id="libdispatch">
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\dispatch.dll" />
       </Component>
 
-      <Component Directory="_usr_lib">
+      <Component Directory="_usr_lib$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\dispatch.lib" />
       </Component>
 
       <!-- TODO(compnerd) should we install the dispatch headers? -->
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftCxx" Directory="_usr_lib_swift_swiftToCxx">
+    <ComponentGroup Id="SwiftCxx" Directory="_usr_lib_swift_swiftToCxx$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
       </Component>
@@ -247,27 +247,27 @@
         <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" />
       </Component>
 
-      <Component Directory="_usr_include_swift">
+      <Component Directory="_usr_include_swift$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\include\swift\bridging.modulemap" />
       </Component>
-      <Component Directory="_usr_include_swift">
+      <Component Directory="_usr_include_swift$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\include\swift\bridging" />
       </Component>
-      <Component Directory="_usr_include_swift">
+      <Component Directory="_usr_include_swift$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\include\module.modulemap" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftDemangle">
-      <Component Directory="_usr_bin">
+      <Component Directory="_usr_bin$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\bin\swiftDemangle.dll" />
       </Component>
-      <Component Directory="_usr_lib">
+      <Component Directory="_usr_lib$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\usr\lib\swiftDemangle.lib" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftEducationalNotes" Directory="_usr_share_doc_swift_diagnostics">
+    <ComponentGroup Id="SwiftEducationalNotes" Directory="_usr_share_doc_swift_diagnostics$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\dynamic-callable-requirements.md" />
       </Component>
@@ -306,13 +306,13 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftFeatures" Directory="_usr_share_swift">
+    <ComponentGroup Id="SwiftFeatures" Directory="_usr_share_swift$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\swift\features.json" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftMigrator" Directory="_usr_lib_swift_migrator">
+    <ComponentGroup Id="SwiftMigrator" Directory="_usr_lib_swift_migrator$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\ios4.json" />
       </Component>
@@ -345,7 +345,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="swift" Directory="_usr_bin">
+    <ComponentGroup Id="swift" Directory="_usr_bin$(VariantSuffix)">
       <ComponentGroupRef Id="SwiftCxx" />
       <ComponentGroupRef Id="SwiftDemangle" />
       <ComponentGroupRef Id="SwiftEducationalNotes" />
@@ -370,7 +370,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftMacros" Directory="_usr_bin">
+    <ComponentGroup Id="SwiftMacros" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\ObservationMacros.dll" />
       </Component>
@@ -379,25 +379,25 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="FoundationMacros" Directory="_usr_bin">
+    <ComponentGroup Id="FoundationMacros" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\FoundationMacros.dll" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="TestingMacros" Directory="_usr_bin">
+    <ComponentGroup Id="TestingMacros" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\TestingMacros.dll" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="argument_parser" Directory="_usr_bin">
+    <ComponentGroup Id="argument_parser" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\ArgumentParser.dll" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="tools_support_core" Directory="_usr_bin">
+    <ComponentGroup Id="tools_support_core" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\TSCBasic.dll" />
       </Component>
@@ -406,7 +406,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="swift_driver" Directory="_usr_bin">
+    <ComponentGroup Id="swift_driver" Directory="_usr_bin$(VariantSuffix)">
       <!-- TODO(compnerd) can we use symbolic links to swift.exe instead? -->
       <Component>
         <File Name="swiftc.exe" Source="$(ToolchainRoot)\usr\bin\swift-driver.exe" />
@@ -430,7 +430,7 @@
       </Component>
     </ComponentGroup>
 
-   <ComponentGroup Id="compiler_swift_syntax" Directory="_usr_bin">
+   <ComponentGroup Id="compiler_swift_syntax" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftBasicFormat.dll" />
       </Component>
@@ -472,7 +472,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="swift_syntax" Directory="_usr_bin">
+    <ComponentGroup Id="swift_syntax" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\SwiftBasicFormat.dll" />
       </Component>
@@ -514,7 +514,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="plugin_server" Directory="_usr_bin">
+    <ComponentGroup Id="plugin_server" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\swift-plugin-server.exe" />
       </Component>
@@ -523,7 +523,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="mimalloc" Directory="_usr_bin">
+    <ComponentGroup Id="mimalloc" Directory="_usr_bin$(VariantSuffix)">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\mimalloc.dll" />
       </Component>
@@ -537,13 +537,13 @@
     </ComponentGroup>
 
     <ComponentGroup Id="Configuration">
-      <Component Directory="ToolchainsVersioned">
+      <Component Directory="ToolchainsVersioned$(VariantSuffix)">
         <File Source="$(ToolchainRoot)\ToolchainInfo.plist" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="EnvironmentVariables">
-      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="_usr_bin" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
+      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="_usr_bin$(VariantSuffix)" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
         <Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[_usr_bin]" />
       </Component>
     </ComponentGroup>
@@ -569,8 +569,8 @@
       <ComponentGroupRef Id="TestingMacros" />
       <ComponentGroupRef Id="mimalloc" />
 
-      <ComponentGroupRef Id="ClangResources" />
-      <ComponentGroupRef Id="SwiftClangResources" />
+      <ComponentGroupRef Id="ClangResources$(VariantSuffix)" />
+      <ComponentGroupRef Id="SwiftClangResources$(VariantSuffix)" />
 
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="EnvironmentVariables" />
diff --git a/platforms/Windows/bld/noasserts/bld.noasserts.wixproj b/platforms/Windows/bld/noasserts/bld.noasserts.wixproj
index 1a3fbd07..6b9d4f5b 100644
--- a/platforms/Windows/bld/noasserts/bld.noasserts.wixproj
+++ b/platforms/Windows/bld/noasserts/bld.noasserts.wixproj
@@ -2,8 +2,8 @@
   <PropertyGroup>
     <DefineConstants>
       $(DefineConstants);
-      _USR_LIB_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang;
-      _USR_LIB_SWIFT_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang;
+      _USR_LIB_CLANG_NOASSERTS=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang;
+      _USR_LIB_SWIFT_CLANG_NOASSERTS=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang;
     </DefineConstants>
     <OutputName>bld.noasserts</OutputName>
   </PropertyGroup>
@@ -14,9 +14,9 @@
 
   <ItemGroup>
     <HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang">
-      <ComponentGroupName>ClangResources</ComponentGroupName>
-      <DirectoryRefId>_usr_lib_clang</DirectoryRefId>
-      <PreprocessorVariable>var._USR_LIB_CLANG</PreprocessorVariable>
+      <ComponentGroupName>ClangResources_noasserts</ComponentGroupName>
+      <DirectoryRefId>_usr_lib_clang_noasserts</DirectoryRefId>
+      <PreprocessorVariable>var._USR_LIB_CLANG_NOASSERTS</PreprocessorVariable>
       <SuppressCom>true</SuppressCom>
       <SuppressRegistry>true</SuppressRegistry>
       <SuppressRootDirectory>true</SuppressRootDirectory>
@@ -24,10 +24,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang">
-      <ComponentGroupName>SwiftClangResources</ComponentGroupName>
-      <DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
-      <PreprocessorVariable>var._USR_LIB_SWIFT_CLANG</PreprocessorVariable>
+    <HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+NoAsserts\usr\lib\swift\clang">
+      <ComponentGroupName>SwiftClangResources_noasserts</ComponentGroupName>
+      <DirectoryRefId>_usr_lib_swift_clang_noasserts</DirectoryRefId>
+      <PreprocessorVariable>var._USR_LIB_SWIFT_CLANG_NOASSERTS</PreprocessorVariable>
       <SuppressCom>true</SuppressCom>
       <SuppressRegistry>true</SuppressRegistry>
       <SuppressRootDirectory>true</SuppressRootDirectory>

From 15d0085e229bcfaec3d7d43ed43f44b4d2171a4e Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 15:32:40 -0700
Subject: [PATCH 13/27] Pull bld.noasserts.msi files from the noasserts output
 folder when available

---
 platforms/Windows/bld/bld.wxi | 222 +++++++++++++++++-----------------
 1 file changed, 111 insertions(+), 111 deletions(-)

diff --git a/platforms/Windows/bld/bld.wxi b/platforms/Windows/bld/bld.wxi
index 7fe83bfe..beeb1743 100644
--- a/platforms/Windows/bld/bld.wxi
+++ b/platforms/Windows/bld/bld.wxi
@@ -47,20 +47,20 @@
     <ComponentGroup Id="binutils" Directory="_usr_bin$(VariantSuffix)">
       <!-- TODO(compnerd) can we use symbolic links to llvm-ar.exe instead? -->
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-dlltool.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-dlltool.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-lib.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-lib.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-ranlib.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-ranlib.exe" />
       </Component>
       <!-- TODO(compnerd) can we use symbolic links to llvm-objdump.exe instead? -->
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-readelf.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-readelf.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-strip.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-strip.exe" />
       </Component>
       <!--
         TODO(compnerd) we should symlink:
@@ -78,87 +78,87 @@
       -->
 
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\dsymutil.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\dsymutil.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-ar.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-ar.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-cov.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-cov.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-cvtres.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-cvtres.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-cxxfilt.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-cxxfilt.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-dwarfdump.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-dwarfdump.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-dwp.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-dwp.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-lipo.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-lipo.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-ml.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-ml.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-mt.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-mt.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-nm.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-nm.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-objcopy.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-objcopy.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-objdump.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-objdump.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-pdbutil.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-pdbutil.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-profdata.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-profdata.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-rc.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-rc.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-readobj.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-readobj.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-size.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-size.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-strings.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-strings.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-symbolizer.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-symbolizer.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\llvm-undname.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\llvm-undname.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="lto">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\LTO.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\LTO.dll" />
       </Component>
 
       <Component Directory="_usr_lib$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\LTO.lib" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\LTO.lib" />
       </Component>
 
       <Component Directory="_usr_include_llvm_c$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\include\llvm-c\lto.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\llvm-c\lto.h" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="ClangFeatures" Directory="_usr_share_clang$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\clang\features.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\clang\features.json" />
       </Component>
     </ComponentGroup>
 
@@ -167,22 +167,22 @@
 
       <!-- TODO(compnerd) can we use symbolic links to clang.exe instead? -->
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\clang-cl.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\clang-cl.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\clang-cpp.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\clang-cpp.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\clang++.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\clang++.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\clang.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\clang.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\clang-scan-deps.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\clang-scan-deps.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\clang-deps-launcher.py" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\clang-deps-launcher.py" />
       </Component>
       <!--
         TODO(compnerd) we should include:
@@ -196,29 +196,29 @@
     <ComponentGroup Id="lld" Directory="_usr_bin$(VariantSuffix)">
       <!-- TODO(compnerd) can we use symbolic links to lld.exe instead? -->
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\ld.lld.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\ld.lld.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\ld64.lld.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\ld64.lld.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\lld-link.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\lld-link.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\wasm-ld.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\wasm-ld.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\lld.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\lld.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="BlocksRuntime">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\BlocksRuntime.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\BlocksRuntime.dll" />
       </Component>
 
       <Component Directory="_usr_lib$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\BlocksRuntime.lib" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\BlocksRuntime.lib" />
       </Component>
 
       <!-- TODO(compnerd) should we install the block headers? -->
@@ -226,11 +226,11 @@
 
     <ComponentGroup Id="libdispatch">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\dispatch.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\dispatch.dll" />
       </Component>
 
       <Component Directory="_usr_lib$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\dispatch.lib" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\dispatch.lib" />
       </Component>
 
       <!-- TODO(compnerd) should we install the dispatch headers? -->
@@ -238,110 +238,110 @@
 
     <ComponentGroup Id="SwiftCxx" Directory="_usr_lib_swift_swiftToCxx$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" />
       </Component>
 
       <Component Directory="_usr_include_swift$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\include\swift\bridging.modulemap" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\swift\bridging.modulemap" />
       </Component>
       <Component Directory="_usr_include_swift$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\include\swift\bridging" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\swift\bridging" />
       </Component>
       <Component Directory="_usr_include_swift$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\include\module.modulemap" />
+        <File Source="$(ToolchainVariantRoot)\usr\include\module.modulemap" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftDemangle">
       <Component Directory="_usr_bin$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\bin\swiftDemangle.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\swiftDemangle.dll" />
       </Component>
       <Component Directory="_usr_lib$(VariantSuffix)">
-        <File Source="$(ToolchainRoot)\usr\lib\swiftDemangle.lib" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swiftDemangle.lib" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftEducationalNotes" Directory="_usr_share_doc_swift_diagnostics$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\dynamic-callable-requirements.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\dynamic-callable-requirements.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\error-in-future-swift-version.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\error-in-future-swift-version.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\existential-member-access-limitations.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\existential-member-access-limitations.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\multiple-inheritance.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\multiple-inheritance.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\nominal-types.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\nominal-types.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\opaque-type-inference.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\opaque-type-inference.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\property-wrapper-requirements.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\property-wrapper-requirements.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\protocol-type-non-conformance.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\protocol-type-non-conformance.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\result-builder-methods.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\result-builder-methods.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\string-interpolation-conformance.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\string-interpolation-conformance.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\temporary-pointers.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\temporary-pointers.md" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\trailing-closure-matching.md" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\doc\swift\diagnostics\trailing-closure-matching.md" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftFeatures" Directory="_usr_share_swift$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\share\swift\features.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\share\swift\features.json" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftMigrator" Directory="_usr_lib_swift_migrator$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\ios4.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\migrator\ios4.json" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\ios42.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\migrator\ios42.json" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\macos4.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\migrator\macos4.json" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\macos42.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\migrator\macos42.json" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\overlay4.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\migrator\overlay4.json" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\overlay42.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\migrator\overlay42.json" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\tvos4.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\migrator\tvos4.json" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\tvos42.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\migrator\tvos42.json" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\watchos4.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\migrator\watchos4.json" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\watchos42.json" />
+        <File Source="$(ToolchainVariantRoot)\usr\lib\swift\migrator\watchos42.json" />
       </Component>
     </ComponentGroup>
 
@@ -354,28 +354,28 @@
 
       <!-- TODO(compnerd) can we use symbolic links to swift-frontend.exe instead? -->
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\swift-api-digester.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\swift-api-digester.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\swift-autolink-extract.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\swift-autolink-extract.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\swift-symbolgraph-extract.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\swift-symbolgraph-extract.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\swift-demangle.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\swift-demangle.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\swift-frontend.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\swift-frontend.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftMacros" Directory="_usr_bin$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\ObservationMacros.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\ObservationMacros.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftMacros.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftMacros.dll" />
       </Component>
     </ComponentGroup>
 
@@ -432,94 +432,94 @@
 
    <ComponentGroup Id="compiler_swift_syntax" Directory="_usr_bin$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftBasicFormat.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftBasicFormat.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftCompilerPluginMessageHandling.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftCompilerPluginMessageHandling.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftDiagnostics.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftDiagnostics.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftIDEUtils.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftIDEUtils.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftIfConfig.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftIfConfig.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftLexicalLookup.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftLexicalLookup.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftOperators.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftOperators.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftParser.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftParser.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftParserDiagnostics.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftParserDiagnostics.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftSyntax.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftSyntax.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftSyntaxBuilder.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftSyntaxBuilder.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftSyntaxMacroExpansion.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftSyntaxMacroExpansion.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftSyntaxMacros.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\_CompilerSwiftSyntaxMacros.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="swift_syntax" Directory="_usr_bin$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftBasicFormat.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftBasicFormat.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftCompilerPluginMessageHandling.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftCompilerPluginMessageHandling.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftDiagnostics.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftDiagnostics.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftIDEUtils.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftIDEUtils.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftLibraryPluginProvider.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftLibraryPluginProvider.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftOperators.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftOperators.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftParser.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftParser.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftParserDiagnostics.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftParserDiagnostics.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftRefactor.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftRefactor.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftSyntax.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftSyntax.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftSyntaxBuilder.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftSyntaxBuilder.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftSyntaxMacroExpansion.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftSyntaxMacroExpansion.dll" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftSyntaxMacros.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftSyntaxMacros.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="plugin_server" Directory="_usr_bin$(VariantSuffix)">
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\swift-plugin-server.exe" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\swift-plugin-server.exe" />
       </Component>
       <Component>
-        <File Source="$(ToolchainRoot)\usr\bin\SwiftInProcPluginServer.dll" />
+        <File Source="$(ToolchainVariantRoot)\usr\bin\SwiftInProcPluginServer.dll" />
       </Component>
     </ComponentGroup>
 

From 4e76e5ae550fbb2059f40a76b7f30b534d04effc Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 15:33:07 -0700
Subject: [PATCH 14/27] Make product names for noasserts msi uniform

---
 platforms/Windows/shared/swift.en-us.wxl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index 0e48734c..9b32431c 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -5,11 +5,11 @@
   <String Id="Bld_ProductName" Value="Swift Build Tools" />
   <String Id="BldNoAsserts_ProductName" Value="Swift Build Tools (Asserts disabled)" />
   <String Id="Cli_ProductName" Value="Swift Command Line Tools" />
-  <String Id="CliNoAsserts_ProductName" Value="Swift Command Line Tools" />
+  <String Id="CliNoAsserts_ProductName" Value="Swift Command Line Tools (Asserts disabled)" />
   <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
-  <String Id="DbgNoAsserts_ProductName" Value="Swift Debugging Tools" />
+  <String Id="DbgNoAsserts_ProductName" Value="Swift Debugging Tools (Asserts disabled)" />
   <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
-  <String Id="IdeNoAsserts_ProductName" Value="Swift IDE Integration Tools" />
+  <String Id="IdeNoAsserts_ProductName" Value="Swift IDE Integration Tools (Asserts disabled)" />
   <String Id="Rtl_ProductName" Value="Swift Windows Runtime" />
   <String Id="VCRuntime_ProductName_arm64" Value="Visual C++ Runtime (ARM64)" />
   <String Id="VCRuntime_ProductName_amd64" Value="Visual C++ Runtime (AMD64)" />

From c8994cb901c0eb38daeb068a115767aff4ea3811 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 17:36:53 -0700
Subject: [PATCH 15/27] Only build the noasserts msi's if the INCLUDE_NOASSERTS
 property is set

---
 platforms/Windows/bundle/installer.wixproj |  9 ++--
 platforms/Windows/bundle/installer.wxs     | 58 ++++++++++++----------
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 4dbc4de7..624c9c5d 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -8,6 +8,7 @@
       $(DefineConstants);
       IncludeAndroid=$(Platforms.Contains("android"));
       IncludeWindows=$(Platforms.Contains("windows"));
+      INCLUDE_NOASSERTS=$(INCLUDE_NOASSERTS);
     </DefineConstants>
   </PropertyGroup>
 
@@ -17,13 +18,13 @@
 
   <ItemGroup>
     <ProjectReference Include="..\bld\asserts\bld.asserts.wixproj" BindName="bld.asserts" />
-    <ProjectReference Include="..\bld\noasserts\bld.noasserts.wixproj" BindName="bld.noasserts" />
+    <ProjectReference Include="..\bld\noasserts\bld.noasserts.wixproj" BindName="bld.noasserts" Condition="$(INCLUDE_NOASSERTS) == True"/>
     <ProjectReference Include="..\cli\asserts\cli.asserts.wixproj" BindName="cli.asserts" />
-    <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" />
+    <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" Condition="$(INCLUDE_NOASSERTS) == True"/>
     <ProjectReference Include="..\dbg\asserts\dbg.asserts.wixproj" BindName="dbg.asserts" />
-    <ProjectReference Include="..\dbg\noasserts\dbg.noasserts.wixproj" BindName="dbg.noasserts" />
+    <ProjectReference Include="..\dbg\noasserts\dbg.noasserts.wixproj" BindName="dbg.noasserts" Condition="$(INCLUDE_NOASSERTS) == True"/>
     <ProjectReference Include="..\ide\asserts\ide.asserts.wixproj" BindName="ide.asserts" />
-    <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" />
+    <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" Condition="$(INCLUDE_NOASSERTS) == True"/>
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
   </ItemGroup>
 
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 5dddbfac..cae38355 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -91,12 +91,14 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <MsiPackage
-        SourceFile="!(bindpath.bld.noasserts)\bld.noasserts.msi"
-        InstallCondition="OptionsInstallNoAssertsToolchain = 1"
-        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-      </MsiPackage>
+      <?if $(INCLUDE_NOASSERTS) == True?>
+        <MsiPackage
+          SourceFile="!(bindpath.bld.noasserts)\bld.noasserts.msi"
+          InstallCondition="OptionsInstallNoAssertsToolchain = 1"
+          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        </MsiPackage>
+      <?endif?>
 
       <MsiPackage
         SourceFile="!(bindpath.cli.asserts)\cli.asserts.msi"
@@ -105,12 +107,14 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <MsiPackage
-        SourceFile="!(bindpath.cli.noasserts)\cli.noasserts.msi"
-        InstallCondition="OptionsInstallCLI = 1 and OptionsInstallNoAssertsToolchain = 1"
-        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-      </MsiPackage>
+      <?if $(INCLUDE_NOASSERTS) == True?>
+        <MsiPackage
+          SourceFile="!(bindpath.cli.noasserts)\cli.noasserts.msi"
+          InstallCondition="OptionsInstallCLI = 1 and OptionsInstallNoAssertsToolchain = 1"
+          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        </MsiPackage>
+      <?endif?>
 
       <MsiPackage
         SourceFile="!(bindpath.dbg.asserts)\dbg.asserts.msi"
@@ -119,26 +123,30 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <MsiPackage
-        SourceFile="!(bindpath.dbg.noasserts)\dbg.noasserts.msi"
-        InstallCondition="OptionsInstallDBG = 1 and OptionsInstallNoAssertsToolchain = 1"
-        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-      </MsiPackage>
+      <?if $(INCLUDE_NOASSERTS) == True?>
+        <MsiPackage
+          SourceFile="!(bindpath.dbg.noasserts)\dbg.noasserts.msi"
+          InstallCondition="OptionsInstallDBG = 1 and OptionsInstallNoAssertsToolchain = 1"
+          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        </MsiPackage>
+      <?endif?>
   
       <MsiPackage
         SourceFile="!(bindpath.ide.asserts)\ide.asserts.msi"
-        InstallCondition="OptionsInstallIDE = 1 OptionsInstallAssertsToolchain = 1"
+        InstallCondition="OptionsInstallIDE = 1 and OptionsInstallAssertsToolchain = 1"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <MsiPackage
-        SourceFile="!(bindpath.ide.noasserts)\ide.noasserts.msi"
-        InstallCondition="OptionsInstallIDE = 1 and OptionsInstallNoAssertsToolchain = 1"
-        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-      </MsiPackage>
+      <?if $(INCLUDE_NOASSERTS) == True?>
+        <MsiPackage
+          SourceFile="!(bindpath.ide.noasserts)\ide.noasserts.msi"
+          InstallCondition="OptionsInstallIDE = 1 and OptionsInstallNoAssertsToolchain = 1"
+          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        </MsiPackage>
+      <?endif?>
 
       <?if $(IncludeAndroid) == True?>
         <MsiPackage

From 979dcc85b932793608801e2249ebdaa7d268f06e Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 19 May 2025 19:15:33 -0700
Subject: [PATCH 16/27] Only allow choosing variants if we are building with
 IncludeNoAsserts

---
 platforms/Windows/bundle/installer.wxs | 10 ++++++++--
 platforms/Windows/bundle/theme.xml     |  5 ++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index cae38355..5f15f657 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -57,7 +57,13 @@
     <Variable Name="OptionsInstallAssertsToolchain" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallNoAssertsToolchain" bal:Overridable="yes" Persisted="yes" Value="0" />
 
-    <!--
+    <?if $(INCLUDE_NOASSERTS) == True?> 
+      <Variable Name="OptionsIncludeNoAsserts" bal:Overridable="yes" Persisted="yes" Value="1" />
+    <?else ?>
+      <Variable Name="OptionsIncludeNoAsserts" bal:Overridable="yes" Persisted="yes" Value="0" />
+    <?endif?>
+
+    <!-- 
     For the online bundle, we need to provide a download URL for each package and its .cabs.
     (The SourceFile attribute is also required, both for the offline bundle and for Burn
     to get the hash of the packages. Note that the packages and .cabs available for
@@ -91,7 +97,7 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <?if $(INCLUDE_NOASSERTS) == True?>
+      <?if $(INCLUDE_NOASSERTS) == True?> 
         <MsiPackage
           SourceFile="!(bindpath.bld.noasserts)\bld.noasserts.msi"
           InstallCondition="OptionsInstallNoAssertsToolchain = 1"
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index e92e9226..d223dc5c 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -73,9 +73,8 @@
             <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="194" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox>
             <Checkbox Name="OptionsInstallAndroidSDKARM" X="194" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox>
             <Checkbox Name="OptionsInstallAndroidSDKX86" X="194" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallAssertsToolchain" X="176" Y="417" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Asserts_Toolchain_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallNoAssertsToolchain" X="176" Y="435" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="1">#(loc.NoAsserts_Toolchain_ProductName)</Checkbox>
-            
+            <Checkbox Name="OptionsInstallAssertsToolchain" X="176" Y="417" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsIncludeNoAsserts and OptionsInstallNoAssertsToolchain">#(loc.Asserts_Toolchain_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallNoAssertsToolchain" X="176" Y="435" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsIncludeNoAsserts and OptionsInstallAssertsToolchain">#(loc.NoAsserts_Toolchain_ProductName)</Checkbox>
             <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.OptionsOkButton)</Text>
                 <ChangePageAction Page="Install" />

From 0ad2570689db4e0a80fc5d3b63b6cb0e3e1584fd Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 20 May 2025 11:56:46 -0700
Subject: [PATCH 17/27] Set PATH env var for no-asserts toolchain if it is the
 only variant installed

---
 platforms/Windows/bld/asserts/bld.asserts.wxs      | 1 +
 platforms/Windows/bld/bld.wxi                      | 4 ++--
 platforms/Windows/bld/noasserts/bld.noasserts..wxs | 1 +
 platforms/Windows/bundle/installer.wxs             | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/platforms/Windows/bld/asserts/bld.asserts.wxs b/platforms/Windows/bld/asserts/bld.asserts.wxs
index 489ea3dc..45c632fb 100644
--- a/platforms/Windows/bld/asserts/bld.asserts.wxs
+++ b/platforms/Windows/bld/asserts/bld.asserts.wxs
@@ -5,6 +5,7 @@
   <?define VariantUpgradeCode = $(BldUpgradeCode)?>
   <?define VariantProductName = !(loc.Bld_ProductName)?>
   <?define VariantCabName = bld.asserts.cab?>
+  <?define VariantEnvironmentComponentGUID = ab52b870-23ee-42e8-9581-3fcbdfb9228c?>
 
   <?include ../bld.wxi ?>
 </Wix>
diff --git a/platforms/Windows/bld/bld.wxi b/platforms/Windows/bld/bld.wxi
index beeb1743..b3660e35 100644
--- a/platforms/Windows/bld/bld.wxi
+++ b/platforms/Windows/bld/bld.wxi
@@ -543,8 +543,8 @@
     </ComponentGroup>
 
     <ComponentGroup Id="EnvironmentVariables">
-      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="_usr_bin$(VariantSuffix)" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
-        <Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[_usr_bin]" />
+      <Component Id="UserPathVariable$(VariantSuffix)" Condition="NOT ALLUSERS=1 AND ADDTOOLCHAINTOPATH=1" Directory="_usr_bin$(VariantSuffix)" Guid="$(VariantEnvironmentComponentGUID)">
+        <Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[_usr_bin$(VariantSuffix)]" />
       </Component>
     </ComponentGroup>
 
diff --git a/platforms/Windows/bld/noasserts/bld.noasserts..wxs b/platforms/Windows/bld/noasserts/bld.noasserts..wxs
index 1f612a50..c0b96802 100644
--- a/platforms/Windows/bld/noasserts/bld.noasserts..wxs
+++ b/platforms/Windows/bld/noasserts/bld.noasserts..wxs
@@ -5,6 +5,7 @@
   <?define VariantUpgradeCode = $(BldNoAssertsUpgradeCode)?>
   <?define VariantProductName = !(loc.BldNoAsserts_ProductName)?>
   <?define VariantCabName = bld.noasserts.cab?>
+  <?define VariantEnvironmentComponentGUID = d612c6f1-d74e-46b4-8efe-a4fd8a1b2be7?>
 
   <?include ../bld.wxi ?>
 </Wix>
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 5f15f657..a481003d 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -95,6 +95,7 @@
         InstallCondition="OptionsInstallAssertsToolchain = 1"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        <MsiProperty Name="ADDTOOLCHAINTOPATH" Value="1"/>
       </MsiPackage>
 
       <?if $(INCLUDE_NOASSERTS) == True?> 
@@ -103,6 +104,7 @@
           InstallCondition="OptionsInstallNoAssertsToolchain = 1"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+          <MsiProperty Name="ADDTOOLCHAINTOPATH" Condition="OptionsInstallAssertsToolchain = 0" Value="1" />
         </MsiPackage>
       <?endif?>
 

From 2dd961bed08a8c4db3a50a3e1db913b6bc7ae34d Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 20 May 2025 17:55:18 -0700
Subject: [PATCH 18/27] Change names of upgradeCodes and localization strings
 to reflect variant

---
 .../Windows/SideBySideUpgradeStrategy.props      | 16 ++++++++--------
 platforms/Windows/bld/asserts/bld.asserts.wxs    |  4 ++--
 platforms/Windows/bundle/theme.xml               |  8 ++++----
 platforms/Windows/cli/asserts/cli.asserts.wxs    |  4 ++--
 platforms/Windows/dbg/asserts/dbg.asserts.wxs    |  4 ++--
 platforms/Windows/ide/asserts/ide.asserts.wxs    |  4 ++--
 platforms/Windows/shared/swift.en-us.wxl         |  8 ++++----
 7 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props
index dcec1503..0d94a23d 100644
--- a/platforms/Windows/SideBySideUpgradeStrategy.props
+++ b/platforms/Windows/SideBySideUpgradeStrategy.props
@@ -17,13 +17,13 @@
   -->
 
   <PropertyGroup>
-    <BldUpgradeCode>{7E95DC06-7F84-4E8E-A038-8304AF0468FB}</BldUpgradeCode>
+    <BldAssertsUpgradeCode>{7E95DC06-7F84-4E8E-A038-8304AF0468FB}</BldAssertsUpgradeCode>
     <BldNoAssertsUpgradeCode>{0F18B0C5-F6EE-46DE-A930-E666BEE6A9C3}</BldNoAssertsUpgradeCode>
-    <CliUpgradeCode>{87019842-3F3E-4227-B5C5-23A8EF72AD89}</CliUpgradeCode>
+    <CliAssertsUpgradeCode>{87019842-3F3E-4227-B5C5-23A8EF72AD89}</CliAssertsUpgradeCode>
     <CliNoAssertsUpgradeCode>{BBF4E043-FAB3-4E7A-9E6D-714E3F3EBA9C}</CliNoAssertsUpgradeCode>
-    <DbgUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgUpgradeCode>
+    <DbgAssertsUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgAssertsUpgradeCode>
     <DbgNoAssertsUpgradeCode>{6F26625B-7662-4631-8E0E-F2244339ED37}</DbgNoAssertsUpgradeCode>
-    <IdeUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeUpgradeCode>
+    <IdeAssertsUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeAssertsUpgradeCode>
     <IdeNoAssertsUpgradeCode>{C5519168-CF7B-4127-98B7-D886D9789B42}</IdeNoAssertsUpgradeCode>
     <RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
     <AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
@@ -58,13 +58,13 @@
     <DefineConstants>
       $(DefineConstants);
       BundleUpgradeCode=$(BundleUpgradeCode);
-      BldUpgradeCode=$(BldUpgradeCode);
+      BldAssertsUpgradeCode=$(BldAssertsUpgradeCode);
       BldNoAssertsUpgradeCode=$(BldNoAssertsUpgradeCode);
-      CliUpgradeCode=$(CliUpgradeCode);
+      CliAssertUpgradeCode=$(CliAssertUpgradeCode);
       CliNoAssertsUpgradeCode=$(CliNoAssertsUpgradeCode);
-      DbgUpgradeCode=$(DbgUpgradeCode);
+      DbgAssertsUpgradeCode=$(DbgAssertsUpgradeCode);
       DbgNoAssertsUpgradeCode=$(DbgNoAssertsUpgradeCode);
-      IdeUpgradeCode=$(IdeUpgradeCode);
+      IdeAssertsUpgradeCode=$(IdeAssertsUpgradeCode);
       IdeNoAssertsUpgradeCode=$(IdeNoAssertsUpgradeCode);
       RtlUpgradeCode=$(RtlUpgradeCode);
       AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
diff --git a/platforms/Windows/bld/asserts/bld.asserts.wxs b/platforms/Windows/bld/asserts/bld.asserts.wxs
index 45c632fb..8d972e11 100644
--- a/platforms/Windows/bld/asserts/bld.asserts.wxs
+++ b/platforms/Windows/bld/asserts/bld.asserts.wxs
@@ -2,8 +2,8 @@
   <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
   <?define ToolchainVariantRoot = $(ToolchainRoot)?>
   <?define VariantSuffix ?>
-  <?define VariantUpgradeCode = $(BldUpgradeCode)?>
-  <?define VariantProductName = !(loc.Bld_ProductName)?>
+  <?define VariantUpgradeCode = $(BldAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.BldAsserts_ProductName)?>
   <?define VariantCabName = bld.asserts.cab?>
   <?define VariantEnvironmentComponentGUID = ab52b870-23ee-42e8-9581-3fcbdfb9228c?>
 
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index d223dc5c..a72ea14a 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -56,10 +56,10 @@
             </Button>
 
             <Label X="176" Y="88" Width="-11" Height="20" FontId="2" DisablePrefix="yes">#(loc.OptionsFeaturesLabel)</Label>
-            <Checkbox Name="OptionsInstallBLD" X="176" Y="111" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallCLI" X="176" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallDBG" X="176" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallIDE" X="176" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallBLD" X="176" Y="111" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.BldAsserts_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallCLI" X="176" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.CliAsserts_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallDBG" X="176" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.DbgAsserts_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallIDE" X="176" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.IdeAsserts_ProductName)</Checkbox>
             <Checkbox Name="OptionsInstallRTL" X="176" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
             <Checkbox Name="OptionsInstallWindowsPlatform" X="176" Y="201" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Windows)</Checkbox>
             <Checkbox Name="OptionsInstallWindowsSDKAMD64" X="194" Y="219" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_amd64)</Checkbox>
diff --git a/platforms/Windows/cli/asserts/cli.asserts.wxs b/platforms/Windows/cli/asserts/cli.asserts.wxs
index 3296182d..ef07cc02 100644
--- a/platforms/Windows/cli/asserts/cli.asserts.wxs
+++ b/platforms/Windows/cli/asserts/cli.asserts.wxs
@@ -2,8 +2,8 @@
   <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
   <?define ToolchainVariantRoot = $(ToolchainRoot)?>
   <?define VariantSuffix ?>
-  <?define VariantUpgradeCode = $(CliUpgradeCode)?>
-  <?define VariantProductName = !(loc.Cli_ProductName)?>
+  <?define VariantUpgradeCode = $(CliAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.CliAsserts_ProductName)?>
   <?define VariantCabName = cli.asserts.cab?>
 
   <?include ../cli.wxi ?>
diff --git a/platforms/Windows/dbg/asserts/dbg.asserts.wxs b/platforms/Windows/dbg/asserts/dbg.asserts.wxs
index b159ca8d..5394c833 100644
--- a/platforms/Windows/dbg/asserts/dbg.asserts.wxs
+++ b/platforms/Windows/dbg/asserts/dbg.asserts.wxs
@@ -2,8 +2,8 @@
   <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
   <?define ToolchainVariantRoot = $(ToolchainRoot)?>
   <?define VariantSuffix ?>
-  <?define VariantUpgradeCode = $(DbgUpgradeCode)?>
-  <?define VariantProductName = !(loc.Dbg_ProductName)?>
+  <?define VariantUpgradeCode = $(DbgAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.DbgAsserts_ProductName)?>
   <?define VariantCabName = dbg.asserts.cab?>
 
   <?include ../dbg.wxi ?>
diff --git a/platforms/Windows/ide/asserts/ide.asserts.wxs b/platforms/Windows/ide/asserts/ide.asserts.wxs
index 7f764a65..ae3c9c9f 100644
--- a/platforms/Windows/ide/asserts/ide.asserts.wxs
+++ b/platforms/Windows/ide/asserts/ide.asserts.wxs
@@ -2,8 +2,8 @@
   <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
   <?define ToolchainVariantRoot = $(ToolchainRoot)?>
   <?define VariantSuffix ?>
-  <?define VariantUpgradeCode = $(IdeUpgradeCode)?>
-  <?define VariantProductName = !(loc.Ide_ProductName)?>
+  <?define VariantUpgradeCode = $(IdeAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.IdeAsserts_ProductName)?>
   <?define VariantCabName = ide.asserts.cab?>
 
   <?include ../ide.wxi ?>
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index 9b32431c..8b2eb5f7 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -2,13 +2,13 @@
 
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
   <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
-  <String Id="Bld_ProductName" Value="Swift Build Tools" />
+  <String Id="BldAsserts_ProductName" Value="Swift Build Tools" />
   <String Id="BldNoAsserts_ProductName" Value="Swift Build Tools (Asserts disabled)" />
-  <String Id="Cli_ProductName" Value="Swift Command Line Tools" />
+  <String Id="CliAsserts_ProductName" Value="Swift Command Line Tools" />
   <String Id="CliNoAsserts_ProductName" Value="Swift Command Line Tools (Asserts disabled)" />
-  <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
+  <String Id="DbgAsserts_ProductName" Value="Swift Debugging Tools" />
   <String Id="DbgNoAsserts_ProductName" Value="Swift Debugging Tools (Asserts disabled)" />
-  <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
+  <String Id="IdeAsserts_ProductName" Value="Swift IDE Integration Tools" />
   <String Id="IdeNoAsserts_ProductName" Value="Swift IDE Integration Tools (Asserts disabled)" />
   <String Id="Rtl_ProductName" Value="Swift Windows Runtime" />
   <String Id="VCRuntime_ProductName_arm64" Value="Visual C++ Runtime (ARM64)" />

From 7daeb98e9bbb955cfcd56addf05ab70b60813226 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 20 May 2025 17:57:37 -0700
Subject: [PATCH 19/27] Add variant in product names

---
 platforms/Windows/shared/swift.en-us.wxl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index 8b2eb5f7..e6df73a9 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -2,14 +2,14 @@
 
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
   <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
-  <String Id="BldAsserts_ProductName" Value="Swift Build Tools" />
-  <String Id="BldNoAsserts_ProductName" Value="Swift Build Tools (Asserts disabled)" />
-  <String Id="CliAsserts_ProductName" Value="Swift Command Line Tools" />
-  <String Id="CliNoAsserts_ProductName" Value="Swift Command Line Tools (Asserts disabled)" />
-  <String Id="DbgAsserts_ProductName" Value="Swift Debugging Tools" />
-  <String Id="DbgNoAsserts_ProductName" Value="Swift Debugging Tools (Asserts disabled)" />
-  <String Id="IdeAsserts_ProductName" Value="Swift IDE Integration Tools" />
-  <String Id="IdeNoAsserts_ProductName" Value="Swift IDE Integration Tools (Asserts disabled)" />
+  <String Id="BldAsserts_ProductName" Value="Swift Build Tools (Asserts)" />
+  <String Id="BldNoAsserts_ProductName" Value="Swift Build Tools (NoAsserts)" />
+  <String Id="CliAsserts_ProductName" Value="Swift Command Line Tools (Asserts)" />
+  <String Id="CliNoAsserts_ProductName" Value="Swift Command Line Tools (NoAsserts)" />
+  <String Id="DbgAsserts_ProductName" Value="Swift Debugging Tools (Asserts)" />
+  <String Id="DbgNoAsserts_ProductName" Value="Swift Debugging Tools (NoAsserts)" />
+  <String Id="IdeAsserts_ProductName" Value="Swift IDE Integration Tools (Asserts)" />
+  <String Id="IdeNoAsserts_ProductName" Value="Swift IDE Integration Tools (NoAsserts)" />
   <String Id="Rtl_ProductName" Value="Swift Windows Runtime" />
   <String Id="VCRuntime_ProductName_arm64" Value="Visual C++ Runtime (ARM64)" />
   <String Id="VCRuntime_ProductName_amd64" Value="Visual C++ Runtime (AMD64)" />

From 5a02a68ad72b3ee7eb35d7764733ffd3a367e2a7 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 20 May 2025 18:03:11 -0700
Subject: [PATCH 20/27] Use variant-free names for UI for feature selection

---
 platforms/Windows/bundle/theme.xml       | 8 ++++----
 platforms/Windows/shared/swift.en-us.wxl | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index a72ea14a..d223dc5c 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -56,10 +56,10 @@
             </Button>
 
             <Label X="176" Y="88" Width="-11" Height="20" FontId="2" DisablePrefix="yes">#(loc.OptionsFeaturesLabel)</Label>
-            <Checkbox Name="OptionsInstallBLD" X="176" Y="111" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.BldAsserts_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallCLI" X="176" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.CliAsserts_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallDBG" X="176" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.DbgAsserts_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallIDE" X="176" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.IdeAsserts_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallBLD" X="176" Y="111" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallCLI" X="176" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallDBG" X="176" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallIDE" X="176" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
             <Checkbox Name="OptionsInstallRTL" X="176" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
             <Checkbox Name="OptionsInstallWindowsPlatform" X="176" Y="201" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Windows)</Checkbox>
             <Checkbox Name="OptionsInstallWindowsSDKAMD64" X="194" Y="219" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_amd64)</Checkbox>
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index e6df73a9..eb6dc5d7 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -2,12 +2,16 @@
 
 <WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl" Culture="en-US">
   <String Id="DowngradeError" Value="A newer version of [ProductName] is already installed." />
+  <String Id="Bld_ProductName" Value="Swift Build Tools" />
   <String Id="BldAsserts_ProductName" Value="Swift Build Tools (Asserts)" />
   <String Id="BldNoAsserts_ProductName" Value="Swift Build Tools (NoAsserts)" />
+  <String Id="Cli_ProductName" Value="Swift Command Line Tools" />
   <String Id="CliAsserts_ProductName" Value="Swift Command Line Tools (Asserts)" />
   <String Id="CliNoAsserts_ProductName" Value="Swift Command Line Tools (NoAsserts)" />
+  <String Id="Dbg_ProductName" Value="Swift Debugging Tools" />
   <String Id="DbgAsserts_ProductName" Value="Swift Debugging Tools (Asserts)" />
   <String Id="DbgNoAsserts_ProductName" Value="Swift Debugging Tools (NoAsserts)" />
+  <String Id="Ide_ProductName" Value="Swift IDE Integration Tools" />
   <String Id="IdeAsserts_ProductName" Value="Swift IDE Integration Tools (Asserts)" />
   <String Id="IdeNoAsserts_ProductName" Value="Swift IDE Integration Tools (NoAsserts)" />
   <String Id="Rtl_ProductName" Value="Swift Windows Runtime" />

From 2ab0301b69eaa89fc2dfdf235007e97815924743 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 20 May 2025 18:04:19 -0700
Subject: [PATCH 21/27] Use Asserts/NoAsserts uniformly in all Product Names

---
 platforms/Windows/shared/swift.en-us.wxl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index eb6dc5d7..0475ed24 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -33,8 +33,8 @@
   <String Id="Utl_ProductName_arm64" Value="Swift Windows Utilities (ARM64)" />
   <String Id="Utl_ProductName_amd64" Value="Swift Windows Utilities (AMD64)" />
   <String Id="Utl_ProductName_x86" Value="Swift Windows Utilities (X86)" />
-  <String Id="Asserts_Toolchain_ProductName" Value="Swift Toolchain (Asserts enabled)" />
-  <String Id="NoAsserts_Toolchain_ProductName" Value="Swift Toolchain (Asserts disabled)" />
+  <String Id="Asserts_Toolchain_ProductName" Value="Swift Toolchain (Asserts)" />
+  <String Id="NoAsserts_Toolchain_ProductName" Value="Swift Toolchain (NoAsserts)" />
   <String Id="BundleName" Value="Swift Developer Toolkit" />
   <String Id="ManufacturerName" Value="swift.org" />
 

From c50c40e1f3744a353107b3a7c384aa618937620d Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 20 May 2025 18:16:43 -0700
Subject: [PATCH 22/27] Pass in an array of ToolchainVariants as input to the
 installer isntead of INCLUDE_NOASSERTS as a flag

---
 platforms/Windows/bundle/installer.wixproj | 10 +++++-----
 platforms/Windows/bundle/installer.wxs     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 624c9c5d..101c66c3 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -8,7 +8,7 @@
       $(DefineConstants);
       IncludeAndroid=$(Platforms.Contains("android"));
       IncludeWindows=$(Platforms.Contains("windows"));
-      INCLUDE_NOASSERTS=$(INCLUDE_NOASSERTS);
+      Include_NoAsserts=$(ToolchainVariants.Contains("noasserts"));
     </DefineConstants>
   </PropertyGroup>
 
@@ -18,13 +18,13 @@
 
   <ItemGroup>
     <ProjectReference Include="..\bld\asserts\bld.asserts.wixproj" BindName="bld.asserts" />
-    <ProjectReference Include="..\bld\noasserts\bld.noasserts.wixproj" BindName="bld.noasserts" Condition="$(INCLUDE_NOASSERTS) == True"/>
+    <ProjectReference Include="..\bld\noasserts\bld.noasserts.wixproj" BindName="bld.noasserts" Condition="$(Include_NoAsserts) == True"/>
     <ProjectReference Include="..\cli\asserts\cli.asserts.wixproj" BindName="cli.asserts" />
-    <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" Condition="$(INCLUDE_NOASSERTS) == True"/>
+    <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" Condition="$(Include_NoAsserts) == True"/>
     <ProjectReference Include="..\dbg\asserts\dbg.asserts.wixproj" BindName="dbg.asserts" />
-    <ProjectReference Include="..\dbg\noasserts\dbg.noasserts.wixproj" BindName="dbg.noasserts" Condition="$(INCLUDE_NOASSERTS) == True"/>
+    <ProjectReference Include="..\dbg\noasserts\dbg.noasserts.wixproj" BindName="dbg.noasserts" Condition="$(Include_NoAsserts) == True"/>
     <ProjectReference Include="..\ide\asserts\ide.asserts.wixproj" BindName="ide.asserts" />
-    <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" Condition="$(INCLUDE_NOASSERTS) == True"/>
+    <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" Condition="$(Include_NoAsserts) == True"/>
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
   </ItemGroup>
 
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index a481003d..584a195d 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -57,7 +57,7 @@
     <Variable Name="OptionsInstallAssertsToolchain" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallNoAssertsToolchain" bal:Overridable="yes" Persisted="yes" Value="0" />
 
-    <?if $(INCLUDE_NOASSERTS) == True?> 
+    <?if $(Include_NoAsserts) == True?>
       <Variable Name="OptionsIncludeNoAsserts" bal:Overridable="yes" Persisted="yes" Value="1" />
     <?else ?>
       <Variable Name="OptionsIncludeNoAsserts" bal:Overridable="yes" Persisted="yes" Value="0" />
@@ -98,7 +98,7 @@
         <MsiProperty Name="ADDTOOLCHAINTOPATH" Value="1"/>
       </MsiPackage>
 
-      <?if $(INCLUDE_NOASSERTS) == True?> 
+      <?if $(Include_NoAsserts) == True?>
         <MsiPackage
           SourceFile="!(bindpath.bld.noasserts)\bld.noasserts.msi"
           InstallCondition="OptionsInstallNoAssertsToolchain = 1"
@@ -115,7 +115,7 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <?if $(INCLUDE_NOASSERTS) == True?>
+      <?if $(Include_NoAsserts) == True?>
         <MsiPackage
           SourceFile="!(bindpath.cli.noasserts)\cli.noasserts.msi"
           InstallCondition="OptionsInstallCLI = 1 and OptionsInstallNoAssertsToolchain = 1"
@@ -131,7 +131,7 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <?if $(INCLUDE_NOASSERTS) == True?>
+      <?if $(Include_NoAsserts) == True?>
         <MsiPackage
           SourceFile="!(bindpath.dbg.noasserts)\dbg.noasserts.msi"
           InstallCondition="OptionsInstallDBG = 1 and OptionsInstallNoAssertsToolchain = 1"
@@ -147,7 +147,7 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <?if $(INCLUDE_NOASSERTS) == True?>
+      <?if $(Include_NoAsserts) == True?>
         <MsiPackage
           SourceFile="!(bindpath.ide.noasserts)\ide.noasserts.msi"
           InstallCondition="OptionsInstallIDE = 1 and OptionsInstallNoAssertsToolchain = 1"

From eae989137ce707dae86711725516133f664d14f7 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 20 May 2025 21:29:34 -0700
Subject: [PATCH 23/27] Switch variable name casing

---
 platforms/Windows/bundle/installer.wixproj | 10 +++++-----
 platforms/Windows/bundle/installer.wxs     | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 101c66c3..959022b3 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -8,7 +8,7 @@
       $(DefineConstants);
       IncludeAndroid=$(Platforms.Contains("android"));
       IncludeWindows=$(Platforms.Contains("windows"));
-      Include_NoAsserts=$(ToolchainVariants.Contains("noasserts"));
+      IncludeNoAsserts=$(ToolchainVariants.Contains("noasserts"));
     </DefineConstants>
   </PropertyGroup>
 
@@ -18,13 +18,13 @@
 
   <ItemGroup>
     <ProjectReference Include="..\bld\asserts\bld.asserts.wixproj" BindName="bld.asserts" />
-    <ProjectReference Include="..\bld\noasserts\bld.noasserts.wixproj" BindName="bld.noasserts" Condition="$(Include_NoAsserts) == True"/>
+    <ProjectReference Include="..\bld\noasserts\bld.noasserts.wixproj" BindName="bld.noasserts" Condition="$(IncludeNoAsserts) == True"/>
     <ProjectReference Include="..\cli\asserts\cli.asserts.wixproj" BindName="cli.asserts" />
-    <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" Condition="$(Include_NoAsserts) == True"/>
+    <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" Condition="$(IncludeNoAsserts) == True"/>
     <ProjectReference Include="..\dbg\asserts\dbg.asserts.wixproj" BindName="dbg.asserts" />
-    <ProjectReference Include="..\dbg\noasserts\dbg.noasserts.wixproj" BindName="dbg.noasserts" Condition="$(Include_NoAsserts) == True"/>
+    <ProjectReference Include="..\dbg\noasserts\dbg.noasserts.wixproj" BindName="dbg.noasserts" Condition="$(IncludeNoAsserts) == True"/>
     <ProjectReference Include="..\ide\asserts\ide.asserts.wixproj" BindName="ide.asserts" />
-    <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" Condition="$(Include_NoAsserts) == True"/>
+    <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" Condition="$(IncludeNoAsserts) == True"/>
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
   </ItemGroup>
 
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 584a195d..ca97553a 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -57,7 +57,7 @@
     <Variable Name="OptionsInstallAssertsToolchain" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallNoAssertsToolchain" bal:Overridable="yes" Persisted="yes" Value="0" />
 
-    <?if $(Include_NoAsserts) == True?>
+    <?if $(IncludeNoAsserts) == True?>
       <Variable Name="OptionsIncludeNoAsserts" bal:Overridable="yes" Persisted="yes" Value="1" />
     <?else ?>
       <Variable Name="OptionsIncludeNoAsserts" bal:Overridable="yes" Persisted="yes" Value="0" />
@@ -98,7 +98,7 @@
         <MsiProperty Name="ADDTOOLCHAINTOPATH" Value="1"/>
       </MsiPackage>
 
-      <?if $(Include_NoAsserts) == True?>
+      <?if $(IncludeNoAsserts) == True?>
         <MsiPackage
           SourceFile="!(bindpath.bld.noasserts)\bld.noasserts.msi"
           InstallCondition="OptionsInstallNoAssertsToolchain = 1"
@@ -115,7 +115,7 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <?if $(Include_NoAsserts) == True?>
+      <?if $(IncludeNoAsserts) == True?>
         <MsiPackage
           SourceFile="!(bindpath.cli.noasserts)\cli.noasserts.msi"
           InstallCondition="OptionsInstallCLI = 1 and OptionsInstallNoAssertsToolchain = 1"
@@ -131,7 +131,7 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <?if $(Include_NoAsserts) == True?>
+      <?if $(IncludeNoAsserts) == True?>
         <MsiPackage
           SourceFile="!(bindpath.dbg.noasserts)\dbg.noasserts.msi"
           InstallCondition="OptionsInstallDBG = 1 and OptionsInstallNoAssertsToolchain = 1"
@@ -147,7 +147,7 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <?if $(Include_NoAsserts) == True?>
+      <?if $(IncludeNoAsserts) == True?>
         <MsiPackage
           SourceFile="!(bindpath.ide.noasserts)\ide.noasserts.msi"
           InstallCondition="OptionsInstallIDE = 1 and OptionsInstallNoAssertsToolchain = 1"

From 4aba9d4abe28a6cc761cc05b926dc22bf22955e2 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 20 May 2025 21:32:01 -0700
Subject: [PATCH 24/27] Fix file names with extra dot

---
 .../bld/noasserts/{bld.noasserts..wxs => bld.noasserts.wxs}       | 0
 .../cli/noasserts/{cli.noasserts..wxs => cli.noasserts.wxs}       | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename platforms/Windows/bld/noasserts/{bld.noasserts..wxs => bld.noasserts.wxs} (100%)
 rename platforms/Windows/cli/noasserts/{cli.noasserts..wxs => cli.noasserts.wxs} (100%)

diff --git a/platforms/Windows/bld/noasserts/bld.noasserts..wxs b/platforms/Windows/bld/noasserts/bld.noasserts.wxs
similarity index 100%
rename from platforms/Windows/bld/noasserts/bld.noasserts..wxs
rename to platforms/Windows/bld/noasserts/bld.noasserts.wxs
diff --git a/platforms/Windows/cli/noasserts/cli.noasserts..wxs b/platforms/Windows/cli/noasserts/cli.noasserts.wxs
similarity index 100%
rename from platforms/Windows/cli/noasserts/cli.noasserts..wxs
rename to platforms/Windows/cli/noasserts/cli.noasserts.wxs

From 384672157aa5a9133908d6eec0d45369a0c99b17 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 20 May 2025 21:34:56 -0700
Subject: [PATCH 25/27] Use Install instead of Include

---
 platforms/Windows/bundle/installer.wxs | 4 ++--
 platforms/Windows/bundle/theme.xml     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index ca97553a..3d951c23 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -58,9 +58,9 @@
     <Variable Name="OptionsInstallNoAssertsToolchain" bal:Overridable="yes" Persisted="yes" Value="0" />
 
     <?if $(IncludeNoAsserts) == True?>
-      <Variable Name="OptionsIncludeNoAsserts" bal:Overridable="yes" Persisted="yes" Value="1" />
+      <Variable Name="OptionsInstallNoAsserts" bal:Overridable="yes" Persisted="yes" Value="1" />
     <?else ?>
-      <Variable Name="OptionsIncludeNoAsserts" bal:Overridable="yes" Persisted="yes" Value="0" />
+      <Variable Name="OptionsInstallNoAsserts" bal:Overridable="yes" Persisted="yes" Value="0" />
     <?endif?>
 
     <!-- 
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index d223dc5c..fb11e080 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -73,8 +73,8 @@
             <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="194" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox>
             <Checkbox Name="OptionsInstallAndroidSDKARM" X="194" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox>
             <Checkbox Name="OptionsInstallAndroidSDKX86" X="194" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallAssertsToolchain" X="176" Y="417" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsIncludeNoAsserts and OptionsInstallNoAssertsToolchain">#(loc.Asserts_Toolchain_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallNoAssertsToolchain" X="176" Y="435" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsIncludeNoAsserts and OptionsInstallAssertsToolchain">#(loc.NoAsserts_Toolchain_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallAssertsToolchain" X="176" Y="417" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallNoAsserts and OptionsInstallNoAssertsToolchain">#(loc.Asserts_Toolchain_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallNoAssertsToolchain" X="176" Y="435" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallNoAsserts and OptionsInstallAssertsToolchain">#(loc.NoAsserts_Toolchain_ProductName)</Checkbox>
             <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.OptionsOkButton)</Text>
                 <ChangePageAction Page="Install" />

From c942d440d927674b831befcb29c0ceedca925d51 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 20 May 2025 22:53:07 -0700
Subject: [PATCH 26/27] Fix typo

---
 platforms/Windows/SideBySideUpgradeStrategy.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props
index 0d94a23d..90ff5345 100644
--- a/platforms/Windows/SideBySideUpgradeStrategy.props
+++ b/platforms/Windows/SideBySideUpgradeStrategy.props
@@ -60,7 +60,7 @@
       BundleUpgradeCode=$(BundleUpgradeCode);
       BldAssertsUpgradeCode=$(BldAssertsUpgradeCode);
       BldNoAssertsUpgradeCode=$(BldNoAssertsUpgradeCode);
-      CliAssertUpgradeCode=$(CliAssertUpgradeCode);
+      CliAssertsUpgradeCode=$(CliAssertsUpgradeCode);
       CliNoAssertsUpgradeCode=$(CliNoAssertsUpgradeCode);
       DbgAssertsUpgradeCode=$(DbgAssertsUpgradeCode);
       DbgNoAssertsUpgradeCode=$(DbgNoAssertsUpgradeCode);

From 2e5dfdbc9d46821c6fc3e05fd34c2f2af1eb9486 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Wed, 21 May 2025 08:07:00 -0700
Subject: [PATCH 27/27] Use condition correctelly in proj file

---
 platforms/Windows/bundle/installer.wixproj | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 959022b3..0f991aa8 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -18,13 +18,19 @@
 
   <ItemGroup>
     <ProjectReference Include="..\bld\asserts\bld.asserts.wixproj" BindName="bld.asserts" />
-    <ProjectReference Include="..\bld\noasserts\bld.noasserts.wixproj" BindName="bld.noasserts" Condition="$(IncludeNoAsserts) == True"/>
     <ProjectReference Include="..\cli\asserts\cli.asserts.wixproj" BindName="cli.asserts" />
-    <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" Condition="$(IncludeNoAsserts) == True"/>
     <ProjectReference Include="..\dbg\asserts\dbg.asserts.wixproj" BindName="dbg.asserts" />
-    <ProjectReference Include="..\dbg\noasserts\dbg.noasserts.wixproj" BindName="dbg.noasserts" Condition="$(IncludeNoAsserts) == True"/>
     <ProjectReference Include="..\ide\asserts\ide.asserts.wixproj" BindName="ide.asserts" />
-    <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" Condition="$(IncludeNoAsserts) == True"/>
+  </ItemGroup>
+ 
+ <ItemGroup Condition=" $(ToolchainVariants.Contains('noasserts')) ">
+    <ProjectReference Include="..\bld\noasserts\bld.noasserts.wixproj" BindName="bld.noasserts" />
+    <ProjectReference Include="..\cli\noasserts\cli.noasserts.wixproj" BindName="cli.noasserts" />
+    <ProjectReference Include="..\dbg\noasserts\dbg.noasserts.wixproj" BindName="dbg.noasserts" />
+    <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" />
+  </ItemGroup>
+ 
+  <ItemGroup>
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
   </ItemGroup>