From 3ddc40db3a572160bce5d459610ade75f636167b Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Thu, 24 Jul 2025 19:22:10 -0700
Subject: [PATCH 1/2] Parametrize authoring for toolchain msi's

---
 platforms/Windows/bld/asserts/bld.asserts.wxs |   8 ++
 platforms/Windows/bld/bld.wxi                 | 112 +++++++++---------
 platforms/Windows/cli/asserts/cli.asserts.wxs |   6 +
 platforms/Windows/cli/cli.wxi                 | 102 ++++++++--------
 platforms/Windows/dbg/asserts/dbg.asserts.wxs |   6 +
 platforms/Windows/dbg/dbg.wxi                 |  78 ++++++------
 platforms/Windows/ide/asserts/ide.asserts.wxs |   6 +
 platforms/Windows/ide/ide.wxi                 |  32 +++--
 platforms/Windows/shared/shared.wxs           |   2 +-
 9 files changed, 185 insertions(+), 167 deletions(-)

diff --git a/platforms/Windows/bld/asserts/bld.asserts.wxs b/platforms/Windows/bld/asserts/bld.asserts.wxs
index dd1084ce..ad005343 100644
--- a/platforms/Windows/bld/asserts/bld.asserts.wxs
+++ b/platforms/Windows/bld/asserts/bld.asserts.wxs
@@ -1,3 +1,11 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define VariantName = asserts ?>
+  <?define VariantUpgradeCode = $(BldAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.BldAsserts_ProductName)?>
+  <?define VariantCabName = bld.asserts.cab?>
+  <?define ToolchainVersionedVariantDirectory= ToolchainVersionedAsserts ?>
+  <?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 514d74f0..ed2c5286 100644
--- a/platforms/Windows/bld/bld.wxi
+++ b/platforms/Windows/bld/bld.wxi
@@ -1,43 +1,41 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
-  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
-
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.BldAsserts_ProductName)"
-      UpgradeCode="$(BldAssertsUpgradeCode)"
+      Name="$(VariantProductName)"
+      UpgradeCode="$(VariantUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="bld.asserts.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(BldAssertsUpgradeCode)" />
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
-    <DirectoryRef Id="toolchain_asserts_usr_include">
-      <Directory Id="toolchain_asserts_usr_include_llvm_c" Name="llvm-c" />
-      <Directory Id="toolchain_asserts_usr_include_swift" Name="swift" />
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_include">
+      <Directory Id="toolchain_$(VariantName)_usr_include_llvm_c" Name="llvm-c" />
+      <Directory Id="toolchain_$(VariantName)_usr_include_swift" Name="swift" />
     </DirectoryRef>
 
-    <DirectoryRef Id="toolchain_asserts_usr_lib_swift">
-      <Directory Id="toolchain_asserts_usr_lib_swift_migrator" Name="migrator" />
-      <Directory Id="toolchain_asserts_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_lib_swift">
+      <Directory Id="toolchain_$(VariantName)_usr_lib_swift_migrator" Name="migrator" />
+      <Directory Id="toolchain_$(VariantName)_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
     </DirectoryRef>
 
-    <DirectoryRef Id="toolchain_asserts_usr_share">
-      <Directory Id="toolchain_asserts_usr_share_clang" Name="clang" />
-      <Directory Id="toolchain_asserts_usr_share_swift" Name="swift" />
-      <Directory Id="toolchain_asserts_usr_share_doc" Name="doc">
-        <Directory Id="toolchain_asserts_usr_share_doc_swift" Name="swift">
-          <Directory Id="toolchain_asserts_usr_share_doc_swift_diagnostics" Name="diagnostics">
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_share">
+      <Directory Id="toolchain_$(VariantName)_usr_share_clang" Name="clang" />
+      <Directory Id="toolchain_$(VariantName)_usr_share_swift" Name="swift" />
+      <Directory Id="toolchain_$(VariantName)_usr_share_doc" Name="doc">
+        <Directory Id="toolchain_$(VariantName)_usr_share_doc_swift" Name="swift">
+          <Directory Id="toolchain_$(VariantName)_usr_share_doc_swift_diagnostics" Name="diagnostics">
           </Directory>
         </Directory>
       </Directory>
     </DirectoryRef>
 
-    <ComponentGroup Id="cmark_gfm" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="cmark_gfm" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin/cmark-gfm.dll" />
       </Component>
@@ -46,7 +44,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="binutils" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="binutils" Directory="toolchain_$(VariantName)_usr_bin">
       <!-- TODO(compnerd) can we use symbolic links to llvm-ar.exe instead? -->
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\llvm-dlltool.exe" />
@@ -145,26 +143,26 @@
     </ComponentGroup>
 
     <ComponentGroup Id="lto">
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\LTO.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib">
+      <Component Directory="toolchain_$(VariantName)_usr_lib">
         <File Source="$(ToolchainRoot)\usr\lib\LTO.lib" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_include_llvm_c">
+      <Component Directory="toolchain_$(VariantName)_usr_include_llvm_c">
         <File Source="$(ToolchainRoot)\usr\include\llvm-c\lto.h" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="ClangFeatures" Directory="toolchain_asserts_usr_share_clang">
+    <ComponentGroup Id="ClangFeatures" Directory="toolchain_$(VariantName)_usr_share_clang">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\clang\features.json" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="clang" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="clang" Directory="toolchain_$(VariantName)_usr_bin">
       <ComponentGroupRef Id="ClangFeatures" />
 
       <!-- TODO(compnerd) can we use symbolic links to clang.exe instead? -->
@@ -195,7 +193,7 @@
       -->
     </ComponentGroup>
 
-    <ComponentGroup Id="lld" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="lld" Directory="toolchain_$(VariantName)_usr_bin">
       <!-- TODO(compnerd) can we use symbolic links to lld.exe instead? -->
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\ld.lld.exe" />
@@ -215,11 +213,11 @@
     </ComponentGroup>
 
     <ComponentGroup Id="BlocksRuntime">
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\BlocksRuntime.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib">
+      <Component Directory="toolchain_$(VariantName)_usr_lib">
         <File Source="$(ToolchainRoot)\usr\lib\BlocksRuntime.lib" />
       </Component>
 
@@ -227,18 +225,18 @@
     </ComponentGroup>
 
     <ComponentGroup Id="libdispatch">
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\dispatch.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib">
+      <Component Directory="toolchain_$(VariantName)_usr_lib">
         <File Source="$(ToolchainRoot)\usr\lib\dispatch.lib" />
       </Component>
 
       <!-- TODO(compnerd) should we install the dispatch headers? -->
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftCxx" Directory="toolchain_asserts_usr_lib_swift_swiftToCxx">
+    <ComponentGroup Id="SwiftCxx" Directory="toolchain_$(VariantName)_usr_lib_swift_swiftToCxx">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
       </Component>
@@ -249,27 +247,27 @@
         <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_include_swift">
+      <Component Directory="toolchain_$(VariantName)_usr_include_swift">
         <File Source="$(ToolchainRoot)\usr\include\swift\bridging.modulemap" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_include_swift">
+      <Component Directory="toolchain_$(VariantName)_usr_include_swift">
         <File Source="$(ToolchainRoot)\usr\include\swift\bridging" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_include_swift">
+      <Component Directory="toolchain_$(VariantName)_usr_include_swift">
         <File Source="$(ToolchainRoot)\usr\include\module.modulemap" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftDemangle">
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\swiftDemangle.dll" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib">
+      <Component Directory="toolchain_$(VariantName)_usr_lib">
         <File Source="$(ToolchainRoot)\usr\lib\swiftDemangle.lib" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftEducationalNotes" Directory="toolchain_asserts_usr_share_doc_swift_diagnostics">
+    <ComponentGroup Id="SwiftEducationalNotes" Directory="toolchain_$(VariantName)_usr_share_doc_swift_diagnostics">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\dynamic-callable-requirements.md" />
       </Component>
@@ -308,13 +306,13 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftFeatures" Directory="toolchain_asserts_usr_share_swift">
+    <ComponentGroup Id="SwiftFeatures" Directory="toolchain_$(VariantName)_usr_share_swift">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\swift\features.json" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftMigrator" Directory="toolchain_asserts_usr_lib_swift_migrator">
+    <ComponentGroup Id="SwiftMigrator" Directory="toolchain_$(VariantName)_usr_lib_swift_migrator">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\ios4.json" />
       </Component>
@@ -347,7 +345,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="swift" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="swift" Directory="toolchain_$(VariantName)_usr_bin">
       <ComponentGroupRef Id="SwiftCxx" />
       <ComponentGroupRef Id="SwiftDemangle" />
       <ComponentGroupRef Id="SwiftEducationalNotes" />
@@ -372,7 +370,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftMacros" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="SwiftMacros" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\ObservationMacros.dll" />
       </Component>
@@ -381,25 +379,25 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="FoundationMacros" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="FoundationMacros" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\FoundationMacros.dll" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="TestingMacros" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="TestingMacros" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\TestingMacros.dll" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="argument_parser" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="argument_parser" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\ArgumentParser.dll" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="tools_support_core" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="tools_support_core" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\TSCBasic.dll" />
       </Component>
@@ -408,7 +406,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="swift_driver" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="swift_driver" Directory="toolchain_$(VariantName)_usr_bin">
       <!-- TODO(compnerd) can we use symbolic links to swift.exe instead? -->
       <Component>
         <File Name="swiftc.exe" Source="$(ToolchainRoot)\usr\bin\swift-driver.exe" />
@@ -432,7 +430,7 @@
       </Component>
     </ComponentGroup>
 
-   <ComponentGroup Id="compiler_swift_syntax" Directory="toolchain_asserts_usr_bin">
+   <ComponentGroup Id="compiler_swift_syntax" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftBasicFormat.dll" />
       </Component>
@@ -474,7 +472,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="swift_syntax" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="swift_syntax" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\SwiftBasicFormat.dll" />
       </Component>
@@ -516,7 +514,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="plugin_server" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="plugin_server" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\swift-plugin-server.exe" />
       </Component>
@@ -525,7 +523,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="mimalloc" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="mimalloc" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\mimalloc.dll" />
       </Component>
@@ -539,18 +537,18 @@
     </ComponentGroup>
 
     <ComponentGroup Id="Configuration">
-      <Component Directory="ToolchainVersionedAsserts">
+      <Component Directory="$(ToolchainVersionedVariantDirectory)">
         <File Source="$(ToolchainRoot)\ToolchainInfo.plist" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="EnvironmentVariables">
-      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="toolchain_asserts_usr_bin" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
-        <Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[toolchain_asserts_usr_bin]" />
+      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="toolchain_$(VariantName)_usr_bin" Guid="$(VariantEnvironmentComponentGUID)">
+        <Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[toolchain_$(VariantName)_usr_bin]" />
       </Component>
     </ComponentGroup>
 
-    <Feature Id="BuildTools" AllowAbsent="no" Title="!(loc.BldAsserts_ProductName)">
+    <Feature Id="BuildTools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="cmark_gfm" />
 
       <ComponentGroupRef Id="binutils" />
@@ -571,9 +569,9 @@
       <ComponentGroupRef Id="TestingMacros" />
       <ComponentGroupRef Id="mimalloc" />
 
-      <ComponentGroupRef Id="ClangResources_asserts" />
-      <ComponentGroupRef Id="SwiftClangResources_asserts" />
-      <ComponentGroupRef Id="SwiftStaticClangResources_asserts" />
+      <ComponentGroupRef Id="ClangResources_$(VariantName)" />
+      <ComponentGroupRef Id="SwiftClangResources_$(VariantName)" />
+      <ComponentGroupRef Id="SwiftStaticClangResources_$(VariantName)" />
 
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="EnvironmentVariables" />
diff --git a/platforms/Windows/cli/asserts/cli.asserts.wxs b/platforms/Windows/cli/asserts/cli.asserts.wxs
index b9b2899c..70fe5364 100644
--- a/platforms/Windows/cli/asserts/cli.asserts.wxs
+++ b/platforms/Windows/cli/asserts/cli.asserts.wxs
@@ -1,3 +1,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define VariantName = asserts ?>
+  <?define VariantUpgradeCode = $(CliAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.CliAsserts_ProductName)?>
+  <?define VariantCabName = cli.asserts.cab?>
+
   <?include ../cli.wxi ?>
 </Wix>
diff --git a/platforms/Windows/cli/cli.wxi b/platforms/Windows/cli/cli.wxi
index e44f5b68..3d70ced7 100644
--- a/platforms/Windows/cli/cli.wxi
+++ b/platforms/Windows/cli/cli.wxi
@@ -1,48 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
-  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
-
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.CliAsserts_ProductName)"
-      UpgradeCode="$(CliAssertsUpgradeCode)"
+      Name="$(VariantProductName)"
+      UpgradeCode="$(VariantUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="cli.asserts.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(CliAssertsUpgradeCode)" />
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
-    <DirectoryRef Id="toolchain_asserts_usr_include">
-      <Directory Id="toolchain_asserts_usr_include__InternalSwiftScan" Name="_InternalSwiftScan" />
-      <Directory Id="toolchain_asserts_usr_include_clang_c" Name="clang-c" />
-      <Directory Id="toolchain_asserts_usr_include_indexstore" Name="indexstore" />
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_include">
+      <Directory Id="toolchain_$(VariantName)_usr_include__InternalSwiftScan" Name="_InternalSwiftScan" />
+      <Directory Id="toolchain_$(VariantName)_usr_include_clang_c" Name="clang-c" />
+      <Directory Id="toolchain_$(VariantName)_usr_include_indexstore" Name="indexstore" />
     </DirectoryRef>
 
-    <DirectoryRef Id="toolchain_asserts_usr_lib_swift">
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_lib_swift">
       <Directory Name="pm">
-        <Directory Id="toolchain_asserts_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI" />
-        <Directory Id="toolchain_asserts_usr_lib_swift_pm_PluginAPI" Name="PluginAPI" />
+        <Directory Id="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI" />
+        <Directory Id="toolchain_$(VariantName)_usr_lib_swift_pm_PluginAPI" Name="PluginAPI" />
       </Directory>
     </DirectoryRef>
 
-    <DirectoryRef Id="toolchain_asserts_usr_share">
-      <Directory Id="toolchain_asserts_usr_share_pm" Name="pm">
-        <Directory Id="toolchain_asserts_usr_share_pm_SWBAndroidPlatform" Name="SwiftBuild_SWBAndroidPlatform.resources" />
-        <Directory Id="toolchain_asserts_usr_share_pm_SWBApplePlatform" Name="SwiftBuild_SWBApplePlatform.resources" />
-        <Directory Id="toolchain_asserts_usr_share_pm_SWBCore" Name="SwiftBuild_SWBCore.resources" />
-        <Directory Id="toolchain_asserts_usr_share_pm_SWBGenericUnixPlatform" Name="SwiftBuild_SWBGenericUnixPlatform.resources" />
-        <Directory Id="toolchain_asserts_usr_share_pm_SWBQNXPlatform" Name="SwiftBuild_SWBQNXPlatform.resources" />
-        <Directory Id="toolchain_asserts_usr_share_pm_SWBUniversalPlatform" Name="SwiftBuild_SWBUniversalPlatform.resources" />
-        <Directory Id="toolchain_asserts_usr_share_pm_SWBWebAssemblyPlatform" Name="SwiftBuild_SWBWebAssemblyPlatform.resources" />
-        <Directory Id="toolchain_asserts_usr_share_pm_SWBWindowsPlatform" Name="SwiftBuild_SWBWindowsPlatform.resources" />
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_share">
+      <Directory Id="toolchain_$(VariantName)_usr_share_pm" Name="pm">
+        <Directory Id="toolchain_$(VariantName)_usr_share_pm_SWBAndroidPlatform" Name="SwiftBuild_SWBAndroidPlatform.resources" />
+        <Directory Id="toolchain_$(VariantName)_usr_share_pm_SWBApplePlatform" Name="SwiftBuild_SWBApplePlatform.resources" />
+        <Directory Id="toolchain_$(VariantName)_usr_share_pm_SWBCore" Name="SwiftBuild_SWBCore.resources" />
+        <Directory Id="toolchain_$(VariantName)_usr_share_pm_SWBGenericUnixPlatform" Name="SwiftBuild_SWBGenericUnixPlatform.resources" />
+        <Directory Id="toolchain_$(VariantName)_usr_share_pm_SWBQNXPlatform" Name="SwiftBuild_SWBQNXPlatform.resources" />
+        <Directory Id="toolchain_$(VariantName)_usr_share_pm_SWBUniversalPlatform" Name="SwiftBuild_SWBUniversalPlatform.resources" />
+        <Directory Id="toolchain_$(VariantName)_usr_share_pm_SWBWebAssemblyPlatform" Name="SwiftBuild_SWBWebAssemblyPlatform.resources" />
+        <Directory Id="toolchain_$(VariantName)_usr_share_pm_SWBWindowsPlatform" Name="SwiftBuild_SWBWindowsPlatform.resources" />
       </Directory>
     </DirectoryRef>
 
-    <ComponentGroup Id="clang" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="clang" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\clang-format.exe" />
       </Component>
@@ -56,12 +54,12 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="libclang" Directory="toolchain_asserts_usr_include_clang_c">
-      <Component Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="libclang" Directory="toolchain_$(VariantName)_usr_include_clang_c">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\libclang.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib">
+      <Component Directory="toolchain_$(VariantName)_usr_lib">
         <File Source="$(ToolchainRoot)\usr\lib\libclang.lib" />
       </Component>
 
@@ -94,12 +92,12 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="IndexStore" Directory="toolchain_asserts_usr_include_indexstore">
-      <Component Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="IndexStore" Directory="toolchain_$(VariantName)_usr_include_indexstore">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\libIndexStore.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib">
+      <Component Directory="toolchain_$(VariantName)_usr_lib">
         <File Source="$(ToolchainRoot)\usr\lib\libIndexStore.lib" />
       </Component>
 
@@ -111,12 +109,12 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="_InternalSwiftScan" Directory="toolchain_asserts_usr_include__InternalSwiftScan">
-      <Component Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="_InternalSwiftScan" Directory="toolchain_$(VariantName)_usr_include__InternalSwiftScan">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\_InternalSwiftScan.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib">
+      <Component Directory="toolchain_$(VariantName)_usr_lib">
         <File Source="$(ToolchainRoot)\usr\lib\swift\windows\_InternalSwiftScan.lib" />
       </Component>
 
@@ -131,7 +129,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="collections" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="collections" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\Collections.dll" />
       </Component>
@@ -146,13 +144,13 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="llbuild" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="llbuild" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\llbuildSwift.dll" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="CompilerPluginSupport" Directory="toolchain_asserts_usr_lib_swift_pm_ManifestAPI">
+    <ComponentGroup Id="CompilerPluginSupport" Directory="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
       </Component>
@@ -167,7 +165,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="PackageDescription" Directory="toolchain_asserts_usr_lib_swift_pm_ManifestAPI">
+    <ComponentGroup Id="PackageDescription" Directory="toolchain_$(VariantName)_usr_lib_swift_pm_ManifestAPI">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
       </Component>
@@ -182,7 +180,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="PackagePlugin" Directory="toolchain_asserts_usr_lib_swift_pm_PluginAPI">
+    <ComponentGroup Id="PackagePlugin" Directory="toolchain_$(VariantName)_usr_lib_swift_pm_PluginAPI">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
       </Component>
@@ -197,12 +195,12 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="SWBAndroidPlatformResources" Directory="toolchain_asserts_usr_share_pm_SWBAndroidPlatform">
+    <ComponentGroup Id="SWBAndroidPlatformResources" Directory="toolchain_$(VariantName)_usr_share_pm_SWBAndroidPlatform">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBAndroidPlatform.resources\Android.xcspec" />
       </Component>
     </ComponentGroup>
-    <ComponentGroup Id="SWBApplePlatformResources" Directory="toolchain_asserts_usr_share_pm_SWBApplePlatform">
+    <ComponentGroup Id="SWBApplePlatformResources" Directory="toolchain_$(VariantName)_usr_share_pm_SWBApplePlatform">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBApplePlatform.resources\AppIntentsMetadata.xcspec" />
       </Component>
@@ -414,7 +412,7 @@
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBApplePlatform.resources\xrOSSimulator.xcspec" />
       </Component>
     </ComponentGroup>
-    <ComponentGroup Id="SWBCoreResources" Directory="toolchain_asserts_usr_share_pm_SWBCore">
+    <ComponentGroup Id="SWBCoreResources" Directory="toolchain_$(VariantName)_usr_share_pm_SWBCore">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBCore.resources\CoreBuildSystem.xcspec" />
       </Component>
@@ -425,7 +423,7 @@
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBCore.resources\NativeBuildSystem.xcspec" />
       </Component>
     </ComponentGroup>
-    <ComponentGroup Id="SWBGenericUnixPlatformResources" Directory="toolchain_asserts_usr_share_pm_SWBGenericUnixPlatform">
+    <ComponentGroup Id="SWBGenericUnixPlatformResources" Directory="toolchain_$(VariantName)_usr_share_pm_SWBGenericUnixPlatform">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBGenericUnixPlatform.resources\Unix.xcspec" />
       </Component>
@@ -439,7 +437,7 @@
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBGenericUnixPlatform.resources\UnixLibtool.xcspec" />
       </Component>
     </ComponentGroup>
-    <ComponentGroup Id="SWBQNXPlatformResources" Directory="toolchain_asserts_usr_share_pm_SWBQNXPlatform">
+    <ComponentGroup Id="SWBQNXPlatformResources" Directory="toolchain_$(VariantName)_usr_share_pm_SWBQNXPlatform">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBQNXPlatform.resources\QNX.xcspec" />
       </Component>
@@ -453,7 +451,7 @@
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBQNXPlatform.resources\QNXLibtool.xcspec" />
       </Component>
     </ComponentGroup>
-    <ComponentGroup Id="SWBUniversalPlatformResources" Directory="toolchain_asserts_usr_share_pm_SWBUniversalPlatform">
+    <ComponentGroup Id="SWBUniversalPlatformResources" Directory="toolchain_$(VariantName)_usr_share_pm_SWBUniversalPlatform">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBUniversalPlatform.resources\BuiltInBuildRules.xcbuildrules" />
       </Component>
@@ -545,7 +543,7 @@
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBUniversalPlatform.resources\swift-stdlib-tool.xcspec" />
       </Component>
     </ComponentGroup>
-    <ComponentGroup Id="SWBWebAssemblyPlatformResources" Directory="toolchain_asserts_usr_share_pm_SWBWebAssemblyPlatform">
+    <ComponentGroup Id="SWBWebAssemblyPlatformResources" Directory="toolchain_$(VariantName)_usr_share_pm_SWBWebAssemblyPlatform">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBWebAssemblyPlatform.resources\WasmCompile.xcspec" />
       </Component>
@@ -559,7 +557,7 @@
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBWebAssemblyPlatform.resources\WebAssembly.xcspec" />
       </Component>
     </ComponentGroup>
-    <ComponentGroup Id="SWBWindowsPlatformResources" Directory="toolchain_asserts_usr_share_pm_SWBWindowsPlatform">
+    <ComponentGroup Id="SWBWindowsPlatformResources" Directory="toolchain_$(VariantName)_usr_share_pm_SWBWindowsPlatform">
       <Component>
         <File Source="$(ToolchainRoot)\usr\share\pm\SwiftBuild_SWBWindowsPlatform.resources\Windows.xcspec" />
       </Component>
@@ -574,7 +572,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="SwiftBuild" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="SwiftBuild" Directory="toolchain_$(VariantName)_usr_bin">
       <ComponentGroupRef Id="SWBAndroidPlatformResources" />
       <ComponentGroupRef Id="SWBApplePlatformResources" />
       <ComponentGroupRef Id="SWBCoreResources" />
@@ -655,7 +653,7 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="package_manager" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="package_manager" Directory="toolchain_$(VariantName)_usr_bin">
       <ComponentGroupRef Id="CompilerPluginSupport" />
       <ComponentGroupRef Id="PackageDescription" />
       <ComponentGroupRef Id="PackagePlugin" />
@@ -719,7 +717,7 @@
       <!-- FIXME(compnerd) we should include the SPM import libraries -->
     </ComponentGroup>
 
-    <ComponentGroup Id="DocC" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="DocC" Directory="toolchain_$(VariantName)_usr_bin">
       <?if $(INCLUDE_SWIFT_DOCC) = True?>
         <Component>
           <File Source="$(SWIFT_DOCC_BUILD)\docc.exe" />
@@ -727,7 +725,7 @@
       <?endif?>
     </ComponentGroup>
 
-    <ComponentGroup Id="swift_format" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="swift_format" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\swift-format.exe" />
       </Component>
@@ -736,7 +734,7 @@
       </Component>
     </ComponentGroup>
 
-    <Feature Id="CLITools" AllowAbsent="no" Title="!(loc.CliAsserts_ProductName)">
+    <Feature Id="CLITools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="clang" />
       <ComponentGroupRef Id="libclang" />
       <ComponentGroupRef Id="IndexStore" />
@@ -750,7 +748,7 @@
 
       <ComponentGroupRef Id="DocC" />
       <?if $(INCLUDE_SWIFT_DOCC) = True?>
-        <ComponentGroupRef Id="DocCRender_asserts" />
+        <ComponentGroupRef Id="DocCRender_$(VariantName)" />
       <?endif?>
 
       <ComponentGroupRef Id="swift_format" />
diff --git a/platforms/Windows/dbg/asserts/dbg.asserts.wxs b/platforms/Windows/dbg/asserts/dbg.asserts.wxs
index 0f050b72..9f39cafb 100644
--- a/platforms/Windows/dbg/asserts/dbg.asserts.wxs
+++ b/platforms/Windows/dbg/asserts/dbg.asserts.wxs
@@ -1,3 +1,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define VariantName = asserts ?>
+  <?define VariantUpgradeCode = $(DbgAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.DbgAsserts_ProductName)?>
+  <?define VariantCabName = dbg.asserts.cab?>
+
   <?include ../dbg.wxi ?>
 </Wix>
diff --git a/platforms/Windows/dbg/dbg.wxi b/platforms/Windows/dbg/dbg.wxi
index 5185d705..d4c46820 100644
--- a/platforms/Windows/dbg/dbg.wxi
+++ b/platforms/Windows/dbg/dbg.wxi
@@ -1,132 +1,130 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
-  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
-
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.DbgAsserts_ProductName)"
-      UpgradeCode="$(DbgAssertsUpgradeCode)"
+      Name="$(VariantProductName)"
+      UpgradeCode="$(VariantUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="dbg.asserts.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(DbgAssertsUpgradeCode)" />
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
-    <DirectoryRef Id="toolchain_asserts_usr_include">
-      <Directory Id="toolchain_asserts_usr_include__InternalSwiftStaticMirror" Name="_InternalSwiftStaticMirror" />
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_include">
+      <Directory Id="toolchain_$(VariantName)_usr_include__InternalSwiftStaticMirror" Name="_InternalSwiftStaticMirror" />
     </DirectoryRef>
 
-    <DirectoryRef Id="toolchain_asserts_usr_lib">
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_lib">
       <Directory Name="site-packages">
-        <Directory Id="toolchain_asserts_usr_lib_site_packages_lldb" Name="lldb">
-          <Directory Id="toolchain_asserts_usr_lib_site_packages_lldb_formatters" Name="formatters">
-            <Directory Id="toolchain_asserts_usr_lib_site_packages_lldb_formatters_cpp" Name="cpp" />
+        <Directory Id="toolchain_$(VariantName)_usr_lib_site_packages_lldb" Name="lldb">
+          <Directory Id="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters" Name="formatters">
+            <Directory Id="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters_cpp" Name="cpp" />
           </Directory>
-          <Directory Id="toolchain_asserts_usr_lib_site_packages_lldb_utils" Name="utils" />
+          <Directory Id="toolchain_$(VariantName)_usr_lib_site_packages_lldb_utils" Name="utils" />
         </Directory>
       </Directory>
     </DirectoryRef>
 
     <ComponentGroup Id="LLDB">
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\lldb.exe" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\liblldb.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib">
+      <Component Directory="toolchain_$(VariantName)_usr_lib">
         <File Source="$(ToolchainRoot)\usr\lib\liblldb.lib" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\__init__.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\_lldb.pyd" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\embedded_interpreter.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\lldb-argdumper.exe" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\Logger.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\__init__.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\attrib_fromdict.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cache.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\metrics.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_formatters">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\synth.py" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_formatters_cpp">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters_cpp">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\__init__.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_formatters_cpp">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters_cpp">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\gnu_libstdcpp.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_formatters_cpp">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_formatters_cpp">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\libcxx.py" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_utils">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_utils">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\__init__.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_utils">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_utils">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\in_call_stack.py" />
       </Component>
-      <Component Directory="toolchain_asserts_usr_lib_site_packages_lldb_utils">
+      <Component Directory="toolchain_$(VariantName)_usr_lib_site_packages_lldb_utils">
         <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\symbolication.py" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="LLDBServer">
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\lldb-server.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftREPL">
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\repl_swift.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftSynthesizeInterface">
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\swift-synthesize-interface.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftInspect">
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\swift-inspect.exe" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="_InternalSwiftStaticMirror" Directory="toolchain_asserts_usr_include__InternalSwiftStaticMirror">
-      <Component Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="_InternalSwiftStaticMirror" Directory="toolchain_$(VariantName)_usr_include__InternalSwiftStaticMirror">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\_InternalSwiftStaticMirror.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib">
+      <Component Directory="toolchain_$(VariantName)_usr_lib">
         <File Source="$(ToolchainRoot)\usr\lib\swift\windows\_InternalSwiftStaticMirror.lib" />
       </Component>
 
@@ -141,7 +139,7 @@
       </Component>
     </ComponentGroup>
 
-    <Feature Id="DebuggingTools" AllowAbsent="no" Title="!(loc.DbgAsserts_ProductName)">
+    <Feature Id="DebuggingTools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="LLDB" />
       <ComponentGroupRef Id="LLDBServer" />
 
diff --git a/platforms/Windows/ide/asserts/ide.asserts.wxs b/platforms/Windows/ide/asserts/ide.asserts.wxs
index eb8aa1a4..f2484aaf 100644
--- a/platforms/Windows/ide/asserts/ide.asserts.wxs
+++ b/platforms/Windows/ide/asserts/ide.asserts.wxs
@@ -1,3 +1,9 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+  <?define VariantName = asserts ?>
+  <?define VariantUpgradeCode = $(IdeAssertsUpgradeCode)?>
+  <?define VariantProductName = !(loc.IdeAsserts_ProductName)?>
+  <?define VariantCabName = ide.asserts.cab?>
+
   <?include ../ide.wxi ?>
 </Wix>
diff --git a/platforms/Windows/ide/ide.wxi b/platforms/Windows/ide/ide.wxi
index 0c36c0d3..b01ffa77 100644
--- a/platforms/Windows/ide/ide.wxi
+++ b/platforms/Windows/ide/ide.wxi
@@ -1,66 +1,64 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
-  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
-
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.IdeAsserts_ProductName)"
-      UpgradeCode="$(IdeAssertsUpgradeCode)"
+      Name="$(VariantProductName)"
+      UpgradeCode="$(VariantUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="ide.asserts.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(IdeAssertsUpgradeCode)" />
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
-    <DirectoryRef Id="toolchain_asserts_usr_include">
-      <Directory Id="toolchain_asserts_usr_include_SourceKit" Name="SourceKit" />
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_include">
+      <Directory Id="toolchain_$(VariantName)_usr_include_SourceKit" Name="SourceKit" />
     </DirectoryRef>
 
-    <ComponentGroup Id="clangd" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="clangd" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\clangd.exe" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="lldb" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="lldb" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\lldb-dap.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="sourcekitd">
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\bin\sourcekitdInProc.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_lib">
+      <Component Directory="toolchain_$(VariantName)_usr_lib">
         <File Source="$(ToolchainRoot)\usr\lib\sourcekitdInProc.lib" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\lib\SwiftSourceKitPlugin.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_bin">
+      <Component Directory="toolchain_$(VariantName)_usr_bin">
         <File Source="$(ToolchainRoot)\usr\lib\SwiftSourceKitClientPlugin.dll" />
       </Component>
 
-      <Component Directory="toolchain_asserts_usr_include_SourceKit">
+      <Component Directory="toolchain_$(VariantName)_usr_include_SourceKit">
         <File Source="$(ToolchainRoot)\usr\include\SourceKit\sourcekitd.h" />
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="lsp" Directory="toolchain_asserts_usr_bin">
+    <ComponentGroup Id="lsp" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin\sourcekit-lsp.exe" />
       </Component>
     </ComponentGroup>
 
-    <Feature Id="IDETools" AllowAbsent="no" Title="!(loc.IdeAsserts_ProductName)">
+    <Feature Id="IDETools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="clangd" />
       <ComponentGroupRef Id="lldb" />
       <ComponentGroupRef Id="sourcekitd" />
diff --git a/platforms/Windows/shared/shared.wxs b/platforms/Windows/shared/shared.wxs
index 1de7fcca..31f95149 100644
--- a/platforms/Windows/shared/shared.wxs
+++ b/platforms/Windows/shared/shared.wxs
@@ -85,7 +85,7 @@
         <util:RemoveFolderEx Property="RUNTIMESVERSIONED" Condition="RUNTIMESVERSIONED" />
       </Component>
 
-      <Component Id="VersionedDirectoryCleanupToolchains">
+      <Component Id="VersionedDirectoryCleanupToolchains_asserts">
         <RegistryValue Root="HKCU" Key="SOFTWARE\!(loc.ManufacturerName)\Installer\$(ProductVersion)\!(bind.Property.UpgradeCode)" Name="ToolchainVersionedAsserts" Value="[ToolchainVersionedAsserts]" />
         <util:RemoveFolderEx Property="TOOLCHAINVERSIONEDASSERTS" Condition="TOOLCHAINVERSIONEDASSERTS" />
       </Component>

From 0351092157cde705d6512b3291f302b1c964c28c Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Tue, 29 Jul 2025 15:27:11 -0700
Subject: [PATCH 2/2] Use CabinetName in place of CabName

---
 platforms/Windows/bld/asserts/bld.asserts.wxs | 4 ++--
 platforms/Windows/bld/bld.wxi                 | 2 +-
 platforms/Windows/cli/asserts/cli.asserts.wxs | 2 +-
 platforms/Windows/cli/cli.wxi                 | 2 +-
 platforms/Windows/dbg/asserts/dbg.asserts.wxs | 2 +-
 platforms/Windows/dbg/dbg.wxi                 | 2 +-
 platforms/Windows/ide/asserts/ide.asserts.wxs | 2 +-
 platforms/Windows/ide/ide.wxi                 | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/platforms/Windows/bld/asserts/bld.asserts.wxs b/platforms/Windows/bld/asserts/bld.asserts.wxs
index ad005343..2de2d850 100644
--- a/platforms/Windows/bld/asserts/bld.asserts.wxs
+++ b/platforms/Windows/bld/asserts/bld.asserts.wxs
@@ -3,8 +3,8 @@
   <?define VariantName = asserts ?>
   <?define VariantUpgradeCode = $(BldAssertsUpgradeCode)?>
   <?define VariantProductName = !(loc.BldAsserts_ProductName)?>
-  <?define VariantCabName = bld.asserts.cab?>
-  <?define ToolchainVersionedVariantDirectory= ToolchainVersionedAsserts ?>
+  <?define VariantCabinetName = bld.asserts.cab?>
+  <?define ToolchainVersionedVariantDirectory = ToolchainVersionedAsserts ?>
   <?define VariantEnvironmentComponentGUID = ab52b870-23ee-42e8-9581-3fcbdfb9228c?>
 
   <?include ../bld.wxi ?>
diff --git a/platforms/Windows/bld/bld.wxi b/platforms/Windows/bld/bld.wxi
index ed2c5286..bfbc8932 100644
--- a/platforms/Windows/bld/bld.wxi
+++ b/platforms/Windows/bld/bld.wxi
@@ -9,7 +9,7 @@
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabinetName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
diff --git a/platforms/Windows/cli/asserts/cli.asserts.wxs b/platforms/Windows/cli/asserts/cli.asserts.wxs
index 70fe5364..afd15023 100644
--- a/platforms/Windows/cli/asserts/cli.asserts.wxs
+++ b/platforms/Windows/cli/asserts/cli.asserts.wxs
@@ -3,7 +3,7 @@
   <?define VariantName = asserts ?>
   <?define VariantUpgradeCode = $(CliAssertsUpgradeCode)?>
   <?define VariantProductName = !(loc.CliAsserts_ProductName)?>
-  <?define VariantCabName = cli.asserts.cab?>
+  <?define VariantCabinetName = cli.asserts.cab?>
 
   <?include ../cli.wxi ?>
 </Wix>
diff --git a/platforms/Windows/cli/cli.wxi b/platforms/Windows/cli/cli.wxi
index 3d70ced7..3211efec 100644
--- a/platforms/Windows/cli/cli.wxi
+++ b/platforms/Windows/cli/cli.wxi
@@ -9,7 +9,7 @@
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabinetName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
diff --git a/platforms/Windows/dbg/asserts/dbg.asserts.wxs b/platforms/Windows/dbg/asserts/dbg.asserts.wxs
index 9f39cafb..4ce0456c 100644
--- a/platforms/Windows/dbg/asserts/dbg.asserts.wxs
+++ b/platforms/Windows/dbg/asserts/dbg.asserts.wxs
@@ -3,7 +3,7 @@
   <?define VariantName = asserts ?>
   <?define VariantUpgradeCode = $(DbgAssertsUpgradeCode)?>
   <?define VariantProductName = !(loc.DbgAsserts_ProductName)?>
-  <?define VariantCabName = dbg.asserts.cab?>
+  <?define VariantCabinetName = dbg.asserts.cab?>
 
   <?include ../dbg.wxi ?>
 </Wix>
diff --git a/platforms/Windows/dbg/dbg.wxi b/platforms/Windows/dbg/dbg.wxi
index d4c46820..545a9471 100644
--- a/platforms/Windows/dbg/dbg.wxi
+++ b/platforms/Windows/dbg/dbg.wxi
@@ -9,7 +9,7 @@
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabinetName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
diff --git a/platforms/Windows/ide/asserts/ide.asserts.wxs b/platforms/Windows/ide/asserts/ide.asserts.wxs
index f2484aaf..c88fab6e 100644
--- a/platforms/Windows/ide/asserts/ide.asserts.wxs
+++ b/platforms/Windows/ide/asserts/ide.asserts.wxs
@@ -3,7 +3,7 @@
   <?define VariantName = asserts ?>
   <?define VariantUpgradeCode = $(IdeAssertsUpgradeCode)?>
   <?define VariantProductName = !(loc.IdeAsserts_ProductName)?>
-  <?define VariantCabName = ide.asserts.cab?>
+  <?define VariantCabinetName = ide.asserts.cab?>
 
   <?include ../ide.wxi ?>
 </Wix>
diff --git a/platforms/Windows/ide/ide.wxi b/platforms/Windows/ide/ide.wxi
index b01ffa77..ef87ba72 100644
--- a/platforms/Windows/ide/ide.wxi
+++ b/platforms/Windows/ide/ide.wxi
@@ -9,7 +9,7 @@
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
-    <Media Id="1" Cabinet="$(VariantCabName)" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="1" Cabinet="$(VariantCabinetName)" EmbedCab="$(ArePackageCabsEmbedded)" />
 
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />