From a4dbac8475261825cb33e0030978351bf6c62699 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Wed, 10 Sep 2025 13:13:07 -0700
Subject: [PATCH 1/5] WiX: reorganise the legacy RTL

This moves the legacy RTL packaging into a subdirectory as preparation
for resection.
---
 platforms/Windows/platforms/windows/windows.wixproj   | 6 +++---
 platforms/Windows/rtl/{ => legacy}/lib/rtllib.wixproj | 0
 platforms/Windows/rtl/{ => legacy}/lib/rtllib.wxs     | 0
 platforms/Windows/rtl/{ => legacy}/msi/rtlmsi.wixproj | 0
 platforms/Windows/rtl/{ => legacy}/msi/rtlmsi.wxs     | 0
 platforms/Windows/rtl/{ => legacy}/msm/rtlmsm.wixproj | 0
 platforms/Windows/rtl/{ => legacy}/msm/rtlmsm.wxs     | 0
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename platforms/Windows/rtl/{ => legacy}/lib/rtllib.wixproj (100%)
 rename platforms/Windows/rtl/{ => legacy}/lib/rtllib.wxs (100%)
 rename platforms/Windows/rtl/{ => legacy}/msi/rtlmsi.wixproj (100%)
 rename platforms/Windows/rtl/{ => legacy}/msi/rtlmsi.wxs (100%)
 rename platforms/Windows/rtl/{ => legacy}/msm/rtlmsm.wixproj (100%)
 rename platforms/Windows/rtl/{ => legacy}/msm/rtlmsm.wxs (100%)

diff --git a/platforms/Windows/platforms/windows/windows.wixproj b/platforms/Windows/platforms/windows/windows.wixproj
index 9997ca47..602ba5f5 100644
--- a/platforms/Windows/platforms/windows/windows.wixproj
+++ b/platforms/Windows/platforms/windows/windows.wixproj
@@ -18,19 +18,19 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(WindowsArchitectures.Contains('i686')) ">
-    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.x86.msm" />
+    <ProjectReference Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.x86.msm" />
     <ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.shared.x86.msm" />
     <ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.static.x86.msm" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(WindowsArchitectures.Contains('x86_64')) ">
-    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.amd64.msm" />
+    <ProjectReference Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.amd64.msm" />
     <ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.shared.amd64.msm" />
     <ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.static.amd64.msm" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(WindowsArchitectures.Contains('aarch64')) ">
-    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.arm64.msm" />
+    <ProjectReference Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.arm64.msm" />
     <ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.shared.arm64.msm" />
     <ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.static.arm64.msm" />
   </ItemGroup>
diff --git a/platforms/Windows/rtl/lib/rtllib.wixproj b/platforms/Windows/rtl/legacy/lib/rtllib.wixproj
similarity index 100%
rename from platforms/Windows/rtl/lib/rtllib.wixproj
rename to platforms/Windows/rtl/legacy/lib/rtllib.wixproj
diff --git a/platforms/Windows/rtl/lib/rtllib.wxs b/platforms/Windows/rtl/legacy/lib/rtllib.wxs
similarity index 100%
rename from platforms/Windows/rtl/lib/rtllib.wxs
rename to platforms/Windows/rtl/legacy/lib/rtllib.wxs
diff --git a/platforms/Windows/rtl/msi/rtlmsi.wixproj b/platforms/Windows/rtl/legacy/msi/rtlmsi.wixproj
similarity index 100%
rename from platforms/Windows/rtl/msi/rtlmsi.wixproj
rename to platforms/Windows/rtl/legacy/msi/rtlmsi.wixproj
diff --git a/platforms/Windows/rtl/msi/rtlmsi.wxs b/platforms/Windows/rtl/legacy/msi/rtlmsi.wxs
similarity index 100%
rename from platforms/Windows/rtl/msi/rtlmsi.wxs
rename to platforms/Windows/rtl/legacy/msi/rtlmsi.wxs
diff --git a/platforms/Windows/rtl/msm/rtlmsm.wixproj b/platforms/Windows/rtl/legacy/msm/rtlmsm.wixproj
similarity index 100%
rename from platforms/Windows/rtl/msm/rtlmsm.wixproj
rename to platforms/Windows/rtl/legacy/msm/rtlmsm.wixproj
diff --git a/platforms/Windows/rtl/msm/rtlmsm.wxs b/platforms/Windows/rtl/legacy/msm/rtlmsm.wxs
similarity index 100%
rename from platforms/Windows/rtl/msm/rtlmsm.wxs
rename to platforms/Windows/rtl/legacy/msm/rtlmsm.wxs

From b50e2626d81a4e50dde74209c13097a317a612e7 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Thu, 11 Sep 2025 10:30:35 -0700
Subject: [PATCH 2/5] WiX: optionalise the LegacySDK

This adjusts the packaging to allow exclusion of the legacy SDK. This is
a preparatory step towards removing the legacy SDK from the build and
the packaging.
---
 platforms/Windows/Directory.Build.props       |  4 +
 platforms/Windows/bundle/installer.wixproj    |  4 +-
 platforms/Windows/bundle/installer.wxs        | 23 +++--
 .../Windows/platforms/windows/windows.wixproj |  8 +-
 .../Windows/platforms/windows/windows.wxs     | 92 ++++++++++++++++++-
 5 files changed, 114 insertions(+), 17 deletions(-)

diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props
index 50bc7b86..72b72d1f 100644
--- a/platforms/Windows/Directory.Build.props
+++ b/platforms/Windows/Directory.Build.props
@@ -25,6 +25,9 @@
   <PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
     <Platform>x86</Platform>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(IncludeLegacySDK)' == '' ">
+    <IncludeLegacySDK>true</IncludeLegacySDK>
+  </PropertyGroup>
 
   <PropertyGroup>
     <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\))</RootBuildFolder>
@@ -87,6 +90,7 @@
       WindowsExperimentalRuntimeARM64=$(WindowsExperimentalRuntimeARM64);
       WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
       WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
+      IncludeLegacySDK=$(IncludeLegacySDK);
     </DefineConstants>
   </PropertyGroup>
 
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 9f197833..9a3d53ae 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -30,8 +30,8 @@
     <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
+  <ItemGroup Condition=" '$(IncludeLegacySDK)' == 'True' ">
+    <ProjectReference Include="..\rtl\legacy\msi\rtlmsi.wixproj" BindName="rtl" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index d07fed0f..4ee8c319 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -84,13 +84,6 @@
     -->
 
     <Chain>
-      <MsiPackage
-        SourceFile="!(bindpath.rtl)\rtl.msi"
-        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-        <MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtilities]" />
-      </MsiPackage>
-
       <MsiPackage
         SourceFile="!(bindpath.bld.asserts)\bld.asserts.msi"
         InstallCondition="OptionsInstallAssertsToolchain = 1"
@@ -157,6 +150,22 @@
         </MsiPackage>
       <?endif?>
 
+<?if $(IncludeLegacySDK) == True?>
+      <MsiPackage
+        SourceFile="!(bindpath.rtl)\rtl.msi"
+        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        <MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtilities]" />
+      </MsiPackage>
+<?else?>
+      <MsiPackage
+        SourceFile="!(bindpath.rtl.shared)\rtl.$(ProductArchitecture).msi"
+        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
+        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+        <MsiProperty Name="InstallUtilities" Value="[OptionsInstallUtilities]" />
+      </MsiPackage>
+<?endif?>
+
       <?if $(IncludeAndroid) == True?>
         <MsiPackage
           SourceFile="!(bindpath.platform.android)\android.msi"
diff --git a/platforms/Windows/platforms/windows/windows.wixproj b/platforms/Windows/platforms/windows/windows.wixproj
index 602ba5f5..933ed0a9 100644
--- a/platforms/Windows/platforms/windows/windows.wixproj
+++ b/platforms/Windows/platforms/windows/windows.wixproj
@@ -18,24 +18,24 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(WindowsArchitectures.Contains('i686')) ">
-    <ProjectReference Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.x86.msm" />
+    <ProjectReference Condition=" '$(IncludeLegacySDK)' == 'True' " Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.x86.msm" />
     <ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.shared.x86.msm" />
     <ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.static.x86.msm" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(WindowsArchitectures.Contains('x86_64')) ">
-    <ProjectReference Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.amd64.msm" />
+    <ProjectReference Condition=" '$(IncludeLegacySDK)' == 'True' " Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.amd64.msm" />
     <ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.shared.amd64.msm" />
     <ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.static.amd64.msm" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(WindowsArchitectures.Contains('aarch64')) ">
-    <ProjectReference Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.arm64.msm" />
+    <ProjectReference Condition=" '$(IncludeLegacySDK)' == 'True' " Include="..\..\rtl\legacy\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.arm64.msm" />
     <ProjectReference Include="..\..\rtl\shared\msm\rtl.shared.msm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.shared.arm64.msm" />
     <ProjectReference Include="..\..\rtl\static\msm\rtl.static.msm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.static.arm64.msm" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" '$(IncludeLegacySDK)' == 'True' ">
     <HarvestDirectory Include="$(SwiftShimsPath)">
       <ComponentGroupName>SwiftShims</ComponentGroupName>
       <DirectoryRefId>WindowsSDK_usr_lib_swift_shims</DirectoryRefId>
diff --git a/platforms/Windows/platforms/windows/windows.wxs b/platforms/Windows/platforms/windows/windows.wxs
index c94b1f02..2b98ba02 100644
--- a/platforms/Windows/platforms/windows/windows.wxs
+++ b/platforms/Windows/platforms/windows/windows.wxs
@@ -9,9 +9,14 @@
       Scope="$(PackageScope)">
 
     <?define PlatformRoot = "$(ImageRoot)\Platforms\Windows.platform"?>
-    <?define SDKRoot = "$(PlatformRoot)\Developer\SDKs\Windows.sdk"?>
 
     <?define ExperimentalSDKRoot = "$(PlatformRoot)\Developer\SDKs\WindowsExperimental.sdk"?>
+    <?if $(IncludeLegacySDK) = True?>
+      <?define SDKRoot = "$(PlatformRoot)\Developer\SDKs\Windows.sdk"?>
+    <?else?>
+      <!-- NOTE(compnerd) this is temporary while we transition to the new SDK -->
+      <?define SDKRoot = "$(ExperimentalSDKRoot)"?>
+    <?endif?>
 
     <Media Id="1" Cabinet="windows.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
     <Media Id="5" Cabinet="windows.experimental.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
@@ -116,6 +121,7 @@
           </Directory>
 
           <Directory Name="SDKs">
+<?if $(IncludeLegacySDK) = True?>
             <!-- Windows.sdk -->
             <Directory Id="WindowsSDK" Name="Windows.sdk">
               <Directory Name="usr">
@@ -172,6 +178,7 @@
                 <Directory Id="WindowsSDK_usr_share" Name="share" />
               </Directory>
             </Directory>
+<?endif?>
 
             <!-- WindowsExperimental.sdk -->
             <Directory Id="WindowsExperimentalSDK" Name="WindowsExperimental.sdk">
@@ -466,6 +473,7 @@
     <?endif?>
 
     <!-- SwiftRemoteMirror -->
+<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="LegacySwiftRemoteMirror" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror">
       <Component>
         <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
@@ -505,6 +513,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <ComponentGroup Id="ExperimentalSwiftRemoteMirror" Directory="WindowsExperimentalSDK_usr_include_swift_SwiftRemoteMirror">
       <Component>
@@ -562,6 +571,7 @@
     <?endif?>
 
     <!-- BlocksRuntime -->
+<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="LegacyBlocksRuntime">
       <Component Directory="WindowsSDK_usr_include_Block">
         <File Source="$(SDKRoot)\usr\include\Block\Block.h" />
@@ -589,6 +599,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <ComponentGroup Id="ExperimentalBlocksRuntime" Directory="WindowsExperimentalSDK_usr_include_Block">
       <Component>
@@ -640,6 +651,7 @@
     <?endif?>
 
     <!-- libdispatch -->
+<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="Legacydispatch" Directory="WindowsSDK_usr_include_dispatch">
       <?define Disk = 1?>
       <?include ../CDispatch.wxi?>
@@ -710,6 +722,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <ComponentGroup Id="ExperimentalDispatch" Directory="WindowsExperimentalSDK_usr_include_dispatch">
       <?define Disk = 5?>
@@ -847,6 +860,7 @@
     <?endif?>
 
     <!-- _FoundationUnicode -->
+<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="Legacy_FoundationUnicode" Directory="WindowsSDK_usr_include__foundation_unicode">
       <?define Disk = 1?>
       <?include ../_FoundationUnicode.wxi?>
@@ -874,6 +888,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <ComponentGroup Id="Experimental_FoundationUnicode" Directory="WindowsExperimentalSDK_usr_include__foundation_unicode">
       <?define Disk = 5?>
@@ -919,11 +934,13 @@
     <?endif?>
 
     <!-- _FoundationCShims -->
+<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="Legacy_FoundationCShims" Directory="WindowsSDK_usr_include__FoundationCShims">
       <?define Disk = 1?>
       <?include ../_FoundationCShims.wxi?>
       <?undef Disk?>
     </ComponentGroup>
+<?endif?>
 
     <ComponentGroup Id="Experimental_FoundationCShims" Directory="WindowsExperimentalSDK_usr_include__FoundationCShims">
       <?define Disk = 5?>
@@ -954,6 +971,7 @@
     <?endif?>
 
     <!-- _Builtin_float -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Legacy_Builtin_float.arm64" Directory="Legacy_Builtin_float.swiftmodule">
         <Component DiskId="2">
@@ -1005,6 +1023,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_Builtin_float.arm64" Directory="_Builtin_float.swiftmodule">
@@ -1086,6 +1105,7 @@
     <?endif?>
 
     <!-- _Concurrency -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Legacy_Concurrency.arm64" Directory="Legacy_Concurrency.swiftmodule">
         <Component DiskId="2">
@@ -1137,6 +1157,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_Concurrency.arm64" Directory="_Concurrency.swiftmodule">
@@ -1218,6 +1239,7 @@
     <?endif?>
 
     <!-- _Differentiation -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Legacy_Differentiation.arm64" Directory="Legacy_Differentiation.swiftmodule">
         <Component DiskId="2">
@@ -1269,6 +1291,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_Differentiation.arm64" Directory="_Differentiation.swiftmodule">
@@ -1350,6 +1373,7 @@
     <?endif?>
 
     <!-- _RegexParser -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Legacy_RegexParser.arm64" Directory="Legacy_RegexParser.swiftmodule">
         <Component DiskId="2">
@@ -1392,6 +1416,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_RegexParser.arm64" Directory="_RegexParser.swiftmodule">
@@ -1473,6 +1498,7 @@
     <?endif?>
 
     <!-- _StringProcessing -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Legacy_StringProcessing.arm64" Directory="Legacy_StringProcessing.swiftmodule">
         <Component DiskId="2">
@@ -1524,6 +1550,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_StringProcessing.arm64" Directory="_StringProcessing.swiftmodule">
@@ -1605,6 +1632,7 @@
     <?endif?>
 
     <!-- _Volatile -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Legacy_Volatile.arm64" Directory="Legacy_Volatile.swiftmodule">
         <Component DiskId="2">
@@ -1656,6 +1684,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_Volatile.arm64" Directory="_Volatile.swiftmodule">
@@ -1737,6 +1766,7 @@
     <?endif?>
 
     <!-- CRT -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyCRT.arm64" Directory="LegacyCRT.swiftmodule">
         <Component DiskId="2">
@@ -1788,6 +1818,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="CRT.arm64" Directory="CRT.swiftmodule">
@@ -1869,6 +1900,7 @@
     <?endif?>
 
     <!-- Cxx -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyCxx.arm64" Directory="LegacyCxx.swiftmodule">
         <Component DiskId="2">
@@ -1920,6 +1952,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Cxx.arm64" Directory="Cxx.swiftmodule">
@@ -2001,6 +2034,7 @@
     <?endif?>
 
     <!-- CxxStdlib -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyCxxStdlib.arm64" Directory="LegacyCxxStdlib.swiftmodule">
         <Component DiskId="2">
@@ -2052,6 +2086,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="CxxStdlib.arm64" Directory="CxxStdlib.swiftmodule">
@@ -2133,6 +2168,7 @@
     <?endif?>
 
     <!-- Distributed -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyDistributed.arm64" Directory="LegacyDistributed.swiftmodule">
         <Component DiskId="2">
@@ -2184,6 +2220,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Distributed.arm64" Directory="Distributed.swiftmodule">
@@ -2265,6 +2302,7 @@
     <?endif?>
 
     <!-- _FoundationCollections -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Legacy_FoundationCollections.arm64" Directory="Legacy_FoundationCollections.swiftmodule">
         <Component DiskId="2">
@@ -2295,6 +2333,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_FoundationCollections.arm64" Directory="_FoundationCollections.swiftmodule">
@@ -2364,6 +2403,7 @@
     <?endif?>
 
     <!-- FoundationEssentials -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyFoundationEssentials.arm64" Directory="LegacyFoundationEssentials.swiftmodule">
         <Component DiskId="2">
@@ -2406,6 +2446,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationEssentials.arm64" Directory="FoundationEssentials.swiftmodule">
@@ -2487,6 +2528,7 @@
     <?endif?>
 
     <!-- FoundationInternationalization -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyFoundationInternationalization.arm64" Directory="LegacyFoundationInternationalization.swiftmodule">
         <Component DiskId="2">
@@ -2529,6 +2571,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationInternationalization.arm64" Directory="FoundationInternationalization.swiftmodule">
@@ -2610,6 +2653,7 @@
     <?endif?>
 
     <!-- Foundation -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyFoundation.arm64" Directory="LegacyFoundation.swiftmodule">
         <Component DiskId="2">
@@ -2651,6 +2695,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Foundation.arm64" Directory="Foundation.swiftmodule">
@@ -2730,6 +2775,7 @@
     <?endif?>
 
     <!-- FoundationNetworking -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyFoundationNetworking.arm64" Directory="LegacyFoundationNetworking.swiftmodule">
         <Component DiskId="2">
@@ -2772,6 +2818,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationNetworking.arm64" Directory="FoundationNetworking.swiftmodule">
@@ -2853,6 +2900,7 @@
     <?endif?>
 
     <!-- FoundationXML -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyFoundationXML.arm64" Directory="LegacyFoundationXML.swiftmodule">
         <Component DiskId="2">
@@ -2895,6 +2943,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationXML.arm64" Directory="FoundationXML.swiftmodule">
@@ -2976,6 +3025,7 @@
     <?endif?>
 
     <!-- Observation -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyObservation.arm64" Directory="LegacyObservation.swiftmodule">
         <Component DiskId="2">
@@ -3027,6 +3077,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Observation.arm64" Directory="Observation.swiftmodule">
@@ -3108,6 +3159,7 @@
     <?endif?>
 
     <!-- RegexBuilder -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyRegexBuilder.arm64" Directory="LegacyRegexBuilder.swiftmodule">
         <Component DiskId="2">
@@ -3159,6 +3211,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="RegexBuilder.arm64" Directory="RegexBuilder.swiftmodule">
@@ -3240,6 +3293,7 @@
     <?endif?>
 
     <!-- Swift -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacySwift.arm64" Directory="LegacySwift.swiftmodule">
         <Component DiskId="2">
@@ -3288,6 +3342,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Swift.arm64" Directory="Swift.swiftmodule">
@@ -3369,6 +3424,7 @@
     <?endif?>
 
     <!-- SwiftOnoneSupport -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacySwiftOnoneSupport.arm64" Directory="LegacySwiftOnoneSupport.swiftmodule">
         <Component DiskId="2">
@@ -3420,6 +3476,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="SwiftOnoneSupport.arm64" Directory="SwiftOnoneSupport.swiftmodule">
@@ -3501,6 +3558,7 @@
     <?endif?>
 
     <!-- Synchronization -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacySynchronization.arm64" Directory="LegacySynchronization.swiftmodule">
         <Component DiskId="2">
@@ -3552,6 +3610,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Synchronization.arm64" Directory="Synchronization.swiftmodule">
@@ -3633,6 +3692,7 @@
     <?endif?>
 
     <!-- WinSDK -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="LegacyWinSDK.arm64" Directory="LegacyWinSDK.swiftmodule">
         <Component DiskId="2">
@@ -3684,6 +3744,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="WinSDK.arm64" Directory="WinSDK.swiftmodule">
@@ -3765,11 +3826,13 @@
     <?endif?>
 
     <!-- apinotes -->
+<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="apinotes" Directory="WindowsSDK_usr_lib_swift_apinotes">
       <Component DiskId="1">
         <File Source="$(SDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
       </Component>
     </ComponentGroup>
+<?endif?>
 
     <ComponentGroup Id="ExperimentalAPINotes" Directory="WindowsExperimentalSDK_usr_lib_swift_apinotes">
       <Component>
@@ -3778,6 +3841,7 @@
     </ComponentGroup>
 
     <!-- libcxxshim -->
+<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="libcxxshim" Directory="WindowsSDK_usr_lib_swift_windows">
       <Component DiskId="1">
         <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxshim.h" />
@@ -3789,6 +3853,7 @@
         <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxstdlibshim.h" />
       </Component>
     </ComponentGroup>
+<?endif?>
 
     <ComponentGroup Id="ExperimentalCXXShim" Directory="WindowsExperimentalSDK_usr_lib_swift_windows">
       <Component DiskId="5">
@@ -3803,6 +3868,7 @@
     </ComponentGroup>
 
     <!-- Registrar -->
+<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Registrar.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
         <Component DiskId="2">
@@ -3839,6 +3905,7 @@
         -->
       </ComponentGroup>
     <?endif?>
+<?endif?>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="ExperimentalRegistrar.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
@@ -3875,6 +3942,7 @@
     <?endif?>
 
     <!-- clang modules -->
+<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="AuxiliaryFiles" Directory="WindowsSDK_usr_share">
       <Component DiskId="1">
         <File Source="$(SDKRoot)\usr\share\ucrt.modulemap" />
@@ -3892,6 +3960,7 @@
         <File Source="$(SDKRoot)\usr\share\vcruntime.modulemap" />
       </Component>
     </ComponentGroup>
+<?endif?>
 
     <ComponentGroup Id="ExperimentalAuxiliaryFiles" Directory="WindowsExperimentalSDK_usr_share">
       <Component>
@@ -3912,7 +3981,7 @@
     </ComponentGroup>
 
     <!-- Configuration -->
-    <!-- NOTE(compnerd): do not remove this without preserving the Platform Info.plist -->
+<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="Configuration">
       <Component Directory="WindowsSDK" DiskId="1">
         <File Source="$(SDKRoot)\SDKSettings.json" />
@@ -3924,6 +3993,7 @@
         <File Source="$(PlatformRoot)\Info.plist" />
       </Component>
     </ComponentGroup>
+<?endif?>
 
     <ComponentGroup Id="ExperimentalConfiguration">
       <Component Directory="WindowsExperimentalSDK" DiskId="5">
@@ -3932,18 +4002,20 @@
       <Component Directory="WindowsExperimentalSDK" DiskId="5">
         <File Source="$(ExperimentalSDKRoot)\SDKSettings.plist" />
       </Component>
-      <!--
+<?if $(IncludeLegacySDK) = False?>
       <Component Directory="WindowsPlatform" DiskId="5">
         <File Source="$(PlatformRoot)\Info.plist" />
       </Component>
-      -->
+<?endif?>
     </ComponentGroup>
 
     <!-- Redistributables -->
     <?if $(IncludeARM64) = True?>
+<?if $(IncludeLegacySDK) = True?>
       <Component Id="rtl.arm64.msm" Directory="RedistVersion" Condition="INSTALLARM64REDIST" DiskId="2">
         <File Source="!(bindpath.rtl.arm64.msm)\rtl.arm64.msm" />
       </Component>
+<?endif?>
       <Component Id="rtl.shared.arm64.msm" Directory="RedistVersion" Condition="INSTALLARM64REDIST" DiskId="6">
         <File Source="!(bindpath.rtl.shared.arm64.msm)\rtl.shared.arm64.msm" />
       </Component>
@@ -3952,9 +4024,11 @@
       </Component>
     <?endif?>
     <?if $(IncludeX64) = True?>
+<?if $(IncludeLegacySDK) = True?>
       <Component Id="rtl.amd64.msm" Directory="RedistVersion" Condition="INSTALLAMD64REDIST" DiskId="3">
         <File Source="!(bindpath.rtl.amd64.msm)\rtl.amd64.msm" />
       </Component>
+<?endif?>
       <Component Id="rtl.shared.amd64.msm" Directory="RedistVersion" Condition="INSTALLAMD64REDIST" DiskId="7">
         <File Source="!(bindpath.rtl.shared.amd64.msm)\rtl.shared.amd64.msm" />
       </Component>
@@ -3963,9 +4037,11 @@
       </Component>
     <?endif?>
     <?if $(IncludeX86) = True?>
+<?if $(IncludeLegacySDK) = True?>
       <Component Id="rtl.x86.msm" Directory="RedistVersion" Condition="INSTALLX86REDIST" DiskId="4">
         <File Source="!(bindpath.rtl.x86.msm)\rtl.x86.msm" />
       </Component>
+<?endif?>
       <Component Id="rtl.shared.x86.msm" Directory="RedistVersion" Condition="INSTALLX86REDIST" DiskId="8">
         <File Source="!(bindpath.rtl.shared.x86.msm)\rtl.shared.x86.msm" />
       </Component>
@@ -3975,9 +4051,15 @@
     <?endif?>
 
     <ComponentGroup Id="EnvironmentVariables">
+<?if $(IncludeLegacySDK) = True?>
       <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="WindowsSDK" Guid="580f1edd-8744-4be8-8dd8-e519f70a91e4">
         <Environment Action="set" Name="SDKROOT" Part="all" Permanent="no" System="no" Value="[WindowsSDK]" />
       </Component>
+<?else?>
+      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="WindowsExperimentalSDK" Guid="9344f841-d071-4080-b1d6-afc0261326e9">
+        <Environment Action="set" Name="SDKROOT" Part="all" Permanent="no" System="no" Value="[WindowsExperimentalSDK]" />
+      </Component>
+<?endif?>
     </ComponentGroup>
 
     <!-- CoreFoundation -->
@@ -4022,6 +4104,7 @@
     <?endif?>
 
     <!-- Features -->
+<?if $(IncludeLegacySDK) = True?>
     <Feature Id="SDK" AllowAbsent="no" Title="!(loc.Plt_ProductName_Windows)">
       <ComponentGroupRef Id="LegacySwiftRemoteMirror" />
       <ComponentGroupRef Id="LegacyBlocksRuntime" />
@@ -4173,6 +4256,7 @@
         <ComponentRef Id="rtl.x86.msm" />
       </Feature>
     <?endif?>
+<?endif?>
 
     <Feature Id="ExperimentalSDK" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental)">
       <ComponentGroupRef Id="ExperimentalAPINotes" />

From 3e70dffa4f41d02095dbf006fbed400947c6f7af Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Thu, 11 Sep 2025 22:19:25 -0700
Subject: [PATCH 3/5] WiX: isolate experimental shims from legacy shims

Adjust the package authoring to use separate paths as we prepare to
eject the legacy SDK.
---
 platforms/Windows/platforms/windows/windows.wixproj | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platforms/Windows/platforms/windows/windows.wixproj b/platforms/Windows/platforms/windows/windows.wixproj
index 933ed0a9..2df3ef90 100644
--- a/platforms/Windows/platforms/windows/windows.wixproj
+++ b/platforms/Windows/platforms/windows/windows.wixproj
@@ -3,10 +3,12 @@
     <OutputName>windows</OutputName>
 
     <SwiftShimsPath>$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\Windows.sdk\usr\lib\swift\shims</SwiftShimsPath>
+    <ExperimentalSwiftShimsPath>$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\WindowsExperimental.sdk\usr\lib\swift\shims</ExperimentalSwiftShimsPath>
 
     <DefineConstants>
       $(DefineConstants);
       SwiftShimsPath=$(SwiftShimsPath);
+      ExperimentalSwiftShimsPath=$(ExperimentalSwiftShimsPath);
       IncludeARM64=$(WindowsArchitectures.Contains("aarch64"));
       IncludeX64=$(WindowsArchitectures.Contains("x86_64"));
       IncludeX86=$(WindowsArchitectures.Contains("i686"));
@@ -47,10 +49,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <HarvestDirectory Include="$(SwiftShimsPath)">
+    <HarvestDirectory Include="$(ExperimentalSwiftShimsPath)">
       <ComponentGroupName>ExperimentalSwiftShims</ComponentGroupName>
       <DirectoryRefId>WindowsExperimentalSDK_usr_lib_swift_shims</DirectoryRefId>
-      <PreprocessorVariable>var.SwiftShimsPath</PreprocessorVariable>
+      <PreprocessorVariable>var.ExperimentalSwiftShimsPath</PreprocessorVariable>
       <SuppressCom>true</SuppressCom>
       <SuppressRegistry>true</SuppressRegistry>
       <SuppressRootDirectory>true</SuppressRootDirectory>

From 2ab082b76cc2fd2575429d3feac8bbf0c62ac40f Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Thu, 11 Sep 2025 22:20:48 -0700
Subject: [PATCH 4/5] WiX: adjust features for shared content

Adjust the feature set to extract platform support from the SDK content.
This allows us to have the platform specific libraries (XCTest, Testing)
isolated from the SDK content. It also allows us to temporarily share
the features across the legacy and experimental SDKs.
---
 .../Windows/platforms/windows/windows.wxs     | 53 ++++++++++++-------
 platforms/Windows/shared/swift.en-us.wxl      |  3 ++
 2 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/platforms/Windows/platforms/windows/windows.wxs b/platforms/Windows/platforms/windows/windows.wxs
index 2b98ba02..056eda7a 100644
--- a/platforms/Windows/platforms/windows/windows.wxs
+++ b/platforms/Windows/platforms/windows/windows.wxs
@@ -4104,6 +4104,41 @@
     <?endif?>
 
     <!-- Features -->
+    <Feature Display="hidden" Id="PlatformSupport" Title="!(loc.Plt_ProductName_Windows)">
+      <ComponentGroupRef Id="Testing" />
+
+      <!-- MSI management Components -->
+      <ComponentGroupRef Id="EnvironmentVariables" />
+      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
+    </Feature>
+
+    <?if $(IncludeARM64) = True?>
+      <Feature Display="hidden" Id="arm64.platform" Level="0" Title="!(loc.Plt_ProductName_Windows_arm64)">
+        <Level Condition="InstallARM64Platform = 1 OR InstallARM64ExperimentalSDK = 1" Value="1" />
+
+        <ComponentGroupRef Id="XCTest.arm64" />
+        <ComponentGroupRef Id="Testing.arm64" />
+      </Feature>
+    <?endif?>
+
+    <?if $(IncludeX64) = True?>
+      <Feature Display="hidden" Id="x64.platform" Level="0" Title="!(loc.Plt_ProductName_Windows_amd64)">
+        <Level Condition="InstallAMD64Platform = 1 OR InstallAMD64ExperimentalSDK = 1" Value="1" />
+
+        <ComponentGroupRef Id="XCTest.x64" />
+        <ComponentGroupRef Id="Testing.x64" />
+      </Feature>
+    <?endif?>
+
+    <?if $(IncludeX86) = True?>
+      <Feature Display="hidden" Id="x86.platform" Level="0" Title="!(loc.Plt_ProductName_Windows_x86)">
+        <Level Condition="InstallX86Platform = 1 OR InstallX86ExperimentalSDK = 1" Value="1" />
+
+        <ComponentGroupRef Id="XCTest.x86" />
+        <ComponentGroupRef Id="Testing.x86" />
+      </Feature>
+    <?endif?>
+
 <?if $(IncludeLegacySDK) = True?>
     <Feature Id="SDK" AllowAbsent="no" Title="!(loc.Plt_ProductName_Windows)">
       <ComponentGroupRef Id="LegacySwiftRemoteMirror" />
@@ -4112,26 +4147,17 @@
       <ComponentGroupRef Id="Legacy_FoundationUnicode" />
       <ComponentGroupRef Id="Legacy_FoundationCShims" />
 
-      <ComponentGroupRef Id="Testing" />
-
       <ComponentGroupRef Id="AuxiliaryFiles" />
       <ComponentGroupRef Id="Configuration" />
       <ComponentGroupRef Id="SwiftShims" />
       <ComponentGroupRef Id="apinotes" />
       <ComponentGroupRef Id="libcxxshim" />
-
-      <!-- MSI management Components -->
-      <ComponentGroupRef Id="EnvironmentVariables" />
-      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
 
     <?if $(IncludeARM64) = True?>
       <Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_arm64)">
         <Level Condition="InstallARM64SDK = 0" Value="0" />
 
-        <ComponentGroupRef Id="XCTest.arm64" />
-        <ComponentGroupRef Id="Testing.arm64" />
-
         <ComponentGroupRef Id="LegacySwiftRemoteMirror.arm64" />
 
         <ComponentGroupRef Id="LegacyBlocksRuntime.arm64" />
@@ -4173,9 +4199,6 @@
       <Feature Id="x64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_amd64)">
         <Level Condition="InstallAMD64SDK = 0" Value="0" />
 
-        <ComponentGroupRef Id="XCTest.x64" />
-        <ComponentGroupRef Id="Testing.x64" />
-
         <ComponentGroupRef Id="LegacySwiftRemoteMirror.x64" />
 
         <ComponentGroupRef Id="LegacyBlocksRuntime.x64" />
@@ -4217,9 +4240,6 @@
       <Feature Id="x86" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_x86)">
         <Level Condition="InstallX86SDK = 0" Value="0" />
 
-        <ComponentGroupRef Id="XCTest.x86" />
-        <ComponentGroupRef Id="Testing.x86" />
-
         <ComponentGroupRef Id="LegacySwiftRemoteMirror.x86" />
 
         <ComponentGroupRef Id="LegacyBlocksRuntime.x86" />
@@ -4269,9 +4289,6 @@
       <ComponentGroupRef Id="ExperimentalSwiftShims" />
       <ComponentGroupRef Id="Experimental_FoundationCShims" />
       <ComponentGroupRef Id="Experimental_FoundationUnicode" />
-
-      <!-- MSI management Components -->
-      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
 
     <?if $(IncludeARM64) = True?>
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index f5d92501..fa3960f9 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -31,6 +31,9 @@
   <String Id="Sdk_ProductName_Windows_arm64" Value="Swift Windows SDK (ARM64)" />
   <String Id="Sdk_ProductName_Windows_amd64" Value="Swift Windows SDK (AMD64)" />
   <String Id="Sdk_ProductName_Windows_x86" Value="Swift Windows SDK (X86)" />
+  <String Id="Plt_ProductName_Windows_arm64" Value="Swift Windows Platform Support (ARM64)" />
+  <String Id="Plt_ProductName_Windows_amd64" Value="Swift Windows Platform Support (AMD64)" />
+  <String Id="Plt_ProductName_Windows_x86" Value="Swift Windows Platform Support (X86)" />
   <String Id="Plt_ProductName_Windows_Experimental_arm64" Value="Swift Windows Platform Support (ARM64) [Experimental]" />
   <String Id="Plt_ProductName_Windows_Experimental_amd64" Value="Swift Windows Platform Support (AMD64) [Experimental]" />
   <String Id="Plt_ProductName_Windows_Experimental_x86" Value="Swift Windows Platform Support (X86) [Experimental]" />

From 55b57794529ae31a8628b9b2467a5e2583d3d572 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Sat, 20 Sep 2025 09:34:46 -0700
Subject: [PATCH 5/5] WiX: package up static libraries for static SDK

Package up the static library dependencies that are required for
FoundationNetworking, FoundationXML. These are packaged with the
experimental SDK as they are required only for static linking.
---
 .../Windows/platforms/windows/windows.wxs     | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/platforms/Windows/platforms/windows/windows.wxs b/platforms/Windows/platforms/windows/windows.wxs
index 056eda7a..2dfb4439 100644
--- a/platforms/Windows/platforms/windows/windows.wxs
+++ b/platforms/Windows/platforms/windows/windows.wxs
@@ -3024,6 +3024,47 @@
       </ComponentGroup>
     <?endif?>
 
+    <!-- Foundation Dependencies -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="FoundationDependencies.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
+        <Component>
+          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libcurl.lib" />
+        </Component>
+        <Component>
+          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libxml2s.lib" />
+        </Component>
+        <Component>
+          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\zlibstatic.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="FoundationDependencies.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
+        <Component>
+          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libcurl.lib" />
+        </Component>
+        <Component>
+          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libxml2s.lib" />
+        </Component>
+        <Component>
+          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\zlibstatic.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="FoundationDependencies.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
+        <Component>
+          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libcurl.lib" />
+        </Component>
+        <Component>
+          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libxml2s.lib" />
+        </Component>
+        <Component>
+          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\zlibstatic.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
     <!-- Observation -->
 <?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
@@ -4324,6 +4365,7 @@
         <ComponentGroupRef Id="swiftDispatch.arm64" />
 
         <ComponentGroupRef Id="CoreFoundation.arm64" />
+        <ComponentGroupRef Id="FoundationDependencies.arm64" />
         <ComponentGroupRef Id="libBlocksRuntime.arm64" />
         <ComponentGroupRef Id="libCRT.arm64" />
         <ComponentGroupRef Id="libCxx.arm64" />
@@ -4394,6 +4436,7 @@
         <ComponentGroupRef Id="swiftDispatch.x64" />
 
         <ComponentGroupRef Id="CoreFoundation.x64" />
+        <ComponentGroupRef Id="FoundationDependencies.x64" />
         <ComponentGroupRef Id="libBlocksRuntime.x64" />
         <ComponentGroupRef Id="libCRT.x64" />
         <ComponentGroupRef Id="libCxx.x64" />
@@ -4464,6 +4507,7 @@
         <ComponentGroupRef Id="swiftDispatch.x86" />
 
         <ComponentGroupRef Id="CoreFoundation.x86" />
+        <ComponentGroupRef Id="FoundationDependencies.x86" />
         <ComponentGroupRef Id="libBlocksRuntime.x86" />
         <ComponentGroupRef Id="libCRT.x86" />
         <ComponentGroupRef Id="libCxx.x86" />