From 5148295c37b286d67eddf8e96bd7f0346b1ab234 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Wed, 8 Oct 2025 14:57:17 -0700
Subject: [PATCH 1/3] WiX: remove support for packaging the legacy runtime

Clean up the legacy SDK packaging and remove support for it. Collapse
all the various sites into the new layout only. Furthermore, rename the
targets to remove the `Experimental` in the identifiers.
---
 platforms/Windows/Directory.Build.props       |   10 +-
 .../Windows/SideBySideUpgradeStrategy.props   |    6 +-
 platforms/Windows/bundle/installer.wixproj    |    4 -
 platforms/Windows/bundle/installer.wxs        |   12 -
 .../Windows/platforms/windows/AddDiskIds.xsl  |   27 +
 .../Windows/platforms/windows/windows.wixproj |   26 +-
 .../Windows/platforms/windows/windows.wxs     | 3341 +++++------------
 .../Windows/rtl/legacy/lib/rtllib.wixproj     |    7 -
 platforms/Windows/rtl/legacy/lib/rtllib.wxs   |  122 -
 .../Windows/rtl/legacy/msi/rtlmsi.wixproj     |   36 -
 platforms/Windows/rtl/legacy/msi/rtlmsi.wxs   |   41 -
 .../Windows/rtl/legacy/msm/rtlmsm.wixproj     |   18 -
 platforms/Windows/rtl/legacy/msm/rtlmsm.wxs   |   20 -
 .../Windows/rtl/shared/lib/rtl.shared.lib.wxs |    6 +-
 .../Windows/rtl/shared/msi/rtl.shared.msi.wxs |    4 +-
 .../Windows/rtl/static/msm/rtl.static.msm.wxs |    6 +-
 platforms/Windows/shared/swift.en-us.wxl      |    4 -
 17 files changed, 909 insertions(+), 2781 deletions(-)
 create mode 100644 platforms/Windows/platforms/windows/AddDiskIds.xsl
 delete mode 100644 platforms/Windows/rtl/legacy/lib/rtllib.wixproj
 delete mode 100644 platforms/Windows/rtl/legacy/lib/rtllib.wxs
 delete mode 100644 platforms/Windows/rtl/legacy/msi/rtlmsi.wixproj
 delete mode 100644 platforms/Windows/rtl/legacy/msi/rtlmsi.wxs
 delete mode 100644 platforms/Windows/rtl/legacy/msm/rtlmsm.wixproj
 delete mode 100644 platforms/Windows/rtl/legacy/msm/rtlmsm.wxs

diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props
index 72b72d1f..0cffdb4b 100644
--- a/platforms/Windows/Directory.Build.props
+++ b/platforms/Windows/Directory.Build.props
@@ -25,9 +25,6 @@
   <PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
     <Platform>x86</Platform>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(IncludeLegacySDK)' == '' ">
-    <IncludeLegacySDK>true</IncludeLegacySDK>
-  </PropertyGroup>
 
   <PropertyGroup>
     <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)build\))</RootBuildFolder>
@@ -45,9 +42,10 @@
     ICE38 is about mixing per-user and per-machine resources (not a thing for us).
     ICE61 is a warning about allowing "same-version" major upgrades, something we want.
     ICE64 is documented as not being an issue when packages are always per-user.
+    ICE71 is an error if the Media table does not contain an entry with DiskId equal to 1.
     ICE91 is about "roaming scenarios," which doesn't apply to our use of LocalAppDataFolder.
     -->
-    <SuppressIces>ICE38;ICE61;ICE64;ICE91</SuppressIces>
+    <SuppressIces>ICE38;ICE61;ICE64;ICE71;ICE91</SuppressIces>
     <PackageScope>perUser</PackageScope>
   </PropertyGroup>
 
@@ -87,10 +85,6 @@
       WindowsRuntimeARM64=$(WindowsRuntimeARM64);
       WindowsRuntimeX64=$(WindowsRuntimeX64);
       WindowsRuntimeX86=$(WindowsRuntimeX86);
-      WindowsExperimentalRuntimeARM64=$(WindowsExperimentalRuntimeARM64);
-      WindowsExperimentalRuntimeX64=$(WindowsExperimentalRuntimeX64);
-      WindowsExperimentalRuntimeX86=$(WindowsExperimentalRuntimeX86);
-      IncludeLegacySDK=$(IncludeLegacySDK);
     </DefineConstants>
   </PropertyGroup>
 
diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props
index 6cf3935e..5c623546 100644
--- a/platforms/Windows/SideBySideUpgradeStrategy.props
+++ b/platforms/Windows/SideBySideUpgradeStrategy.props
@@ -25,8 +25,7 @@
     <DbgNoAssertsUpgradeCode>{6F26625B-7662-4631-8E0E-F2244339ED37}</DbgNoAssertsUpgradeCode>
     <IdeAssertsUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeAssertsUpgradeCode>
     <IdeNoAssertsUpgradeCode>{C5519168-CF7B-4127-98B7-D886D9789B42}</IdeNoAssertsUpgradeCode>
-    <RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
-    <ExperimentalRTLUpgradeCode>{F9BA01C7-0C7C-4898-90BD-9D6BB308F0B3}</ExperimentalRTLUpgradeCode>
+    <RTLUpgradeCode>{F9BA01C7-0C7C-4898-90BD-9D6BB308F0B3}</RTLUpgradeCode>
     <AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
     <WindowsPlatformUpgradeCode>{01AFF1CF-A025-41B6-BCBC-728D794353FD}</WindowsPlatformUpgradeCode>
   </PropertyGroup>
@@ -67,8 +66,7 @@
       DbgNoAssertsUpgradeCode=$(DbgNoAssertsUpgradeCode);
       IdeAssertsUpgradeCode=$(IdeAssertsUpgradeCode);
       IdeNoAssertsUpgradeCode=$(IdeNoAssertsUpgradeCode);
-      RtlUpgradeCode=$(RtlUpgradeCode);
-      ExperimentalRTLUpgradeCode=$(ExperimentalRTLUpgradeCode);
+      RTLUpgradeCode=$(RTLUpgradeCode);
       AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
       WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
     </DefineConstants>
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 9a3d53ae..87c60ac5 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -30,10 +30,6 @@
     <ProjectReference Include="..\ide\noasserts\ide.noasserts.wixproj" BindName="ide.noasserts" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(IncludeLegacySDK)' == 'True' ">
-    <ProjectReference Include="..\rtl\legacy\msi\rtlmsi.wixproj" BindName="rtl" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\rtl\shared\msi\rtl.shared.msi.wixproj" Properties="ProductArchitecture=$(ProductArchitecture)" BindName="rtl.shared" />
   </ItemGroup>
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 194300e8..1f3e1fb0 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -150,21 +150,12 @@
         </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
@@ -188,15 +179,12 @@
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
 
           <MsiProperty Name="INSTALLARM64SDK" Value="[OptionsInstallWindowsSDKARM64]" />
-          <MsiProperty Name="INSTALLARM64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKARM64]" />
           <MsiProperty Name="INSTALLARM64REDIST" Value="[OptionsInstallWindowsRedistARM64]" />
 
           <MsiProperty Name="INSTALLAMD64SDK" Value="[OptionsInstallWindowsSDKAMD64]" />
-          <MsiProperty Name="INSTALLAMD64EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKAMD64]" />
           <MsiProperty Name="INSTALLAMD64REDIST" Value="[OptionsInstallWindowsRedistAMD64]" />
 
           <MsiProperty Name="INSTALLX86SDK" Value="[OptionsInstallWindowsSDKX86]" />
-          <MsiProperty Name="INSTALLX86EXPERIMENTALSDK" Value="[OptionsInstallWindowsSDKX86]" />
           <MsiProperty Name="INSTALLX86REDIST" Value="[OptionsInstallWindowsRedistX86]" />
         </MsiPackage>
       <?endif?>
diff --git a/platforms/Windows/platforms/windows/AddDiskIds.xsl b/platforms/Windows/platforms/windows/AddDiskIds.xsl
new file mode 100644
index 00000000..c1ec6468
--- /dev/null
+++ b/platforms/Windows/platforms/windows/AddDiskIds.xsl
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xsl:stylesheet version="1.0"
+                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                xmlns:wix="http://wixtoolset.org/schemas/v4/wxs">
+  <!-- Explicitly handle the root element -->
+  <xsl:template match="/wix:Wix">
+    <xsl:copy>
+      <xsl:copy-of select="@*" />
+      <xsl:apply-templates select="node()" />
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- Identity template for everything else -->
+  <xsl:template match="@* | node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@* | node()" />
+    </xsl:copy>
+  </xsl:template>
+
+  <!-- Add DiskId to Files under specific DirectoryRef contexts -->
+  <xsl:template match="wix:Component[ancestor::wix:DirectoryRef/@Id='WindowsSDK_usr_lib_swift_shims']">
+    <xsl:copy>
+      <xsl:attribute name="DiskId">5</xsl:attribute>
+      <xsl:apply-templates select="@* | node()" />
+    </xsl:copy>
+  </xsl:template>
+</xsl:stylesheet>
diff --git a/platforms/Windows/platforms/windows/windows.wixproj b/platforms/Windows/platforms/windows/windows.wixproj
index 2df3ef90..0c5ee49c 100644
--- a/platforms/Windows/platforms/windows/windows.wixproj
+++ b/platforms/Windows/platforms/windows/windows.wixproj
@@ -3,12 +3,10 @@
     <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"));
@@ -20,24 +18,21 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(WindowsArchitectures.Contains('i686')) ">
-    <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 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 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 Condition=" '$(IncludeLegacySDK)' == 'True' ">
+  <ItemGroup>
     <HarvestDirectory Include="$(SwiftShimsPath)">
       <ComponentGroupName>SwiftShims</ComponentGroupName>
       <DirectoryRefId>WindowsSDK_usr_lib_swift_shims</DirectoryRefId>
@@ -48,14 +43,13 @@
     </HarvestDirectory>
   </ItemGroup>
 
-  <ItemGroup>
-    <HarvestDirectory Include="$(ExperimentalSwiftShimsPath)">
-      <ComponentGroupName>ExperimentalSwiftShims</ComponentGroupName>
-      <DirectoryRefId>WindowsExperimentalSDK_usr_lib_swift_shims</DirectoryRefId>
-      <PreprocessorVariable>var.ExperimentalSwiftShimsPath</PreprocessorVariable>
-      <SuppressCom>true</SuppressCom>
-      <SuppressRegistry>true</SuppressRegistry>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestDirectory>
-  </ItemGroup>
+  <Target Name="PostProcessHeatFragment" BeforeTargets="CoreCompile">
+    <PropertyGroup>
+      <Fragment>$(IntermediateOutputPath)_SwiftShims_dir.wxs</Fragment>
+      <Temporary>$(IntermediateOutputPath)_SwiftShims_dir.wxs.tmp</Temporary>
+    </PropertyGroup>
+
+    <XslTransformation XslInputPath="AddDiskIds.xsl" XmlInputPaths="$(Fragment)" OutputPaths="$(Temporary)" />
+    <Move SourceFiles="$(Temporary)" DestinationFiles="$(Fragment)" />
+  </Target>
 </Project>
diff --git a/platforms/Windows/platforms/windows/windows.wxs b/platforms/Windows/platforms/windows/windows.wxs
index 7fd778fd..72155e6c 100644
--- a/platforms/Windows/platforms/windows/windows.wxs
+++ b/platforms/Windows/platforms/windows/windows.wxs
@@ -9,38 +9,24 @@
       Scope="$(PackageScope)">
 
     <Property Id="INSTALLARM64SDK" Value="1" />
-    <Property Id="INSTALLARM64EXPERIMENTALSDK" Value="1" />
     <Property Id="INSTALLARM64REDIST" Value="1" />
     <Property Id="INSTALLAMD64SDK" Value="1" />
-    <Property Id="INSTALLAMD64EXPERIMENTALSDK" Value="1" />
     <Property Id="INSTALLAMD64REDIST" Value="1" />
     <Property Id="INSTALLX86SDK" Value="1" />
-    <Property Id="INSTALLX86EXPERIMENTALSDK" Value="1" />
     <Property Id="INSTALLX86REDIST" Value="1" />
 
     <?define PlatformRoot = "$(ImageRoot)\Platforms\Windows.platform"?>
+    <?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)" />
+    <Media Id="5" Cabinet="windows.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
     <?if $(IncludeARM64) = True?>
-      <Media Id="2" Cabinet="sdk.windows.arm64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
-      <Media Id="6" Cabinet="sdk.windows.experimental.arm64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+      <Media Id="6" Cabinet="sdk.windows.arm64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <Media Id="3" Cabinet="sdk.windows.x64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
-      <Media Id="7" Cabinet="sdk.windows.experimental.x64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+      <Media Id="7" Cabinet="sdk.windows.x64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <Media Id="4" Cabinet="sdk.windows.x86.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
-      <Media Id="8" Cabinet="sdk.windows.experimental.x86.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+      <Media Id="8" Cabinet="sdk.windows.x86.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
     <?endif?>
 
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(WindowsPlatformUpgradeCode)" />
@@ -68,25 +54,25 @@
             <Directory Name="XCTest-$(ProductVersion)">
               <Directory Name="usr">
                 <?if $(IncludeARM64) = True?>
-                  <Directory Id="XCTest_usr_bin64a" Name="bin64a" DiskId="2" />
+                  <Directory Id="XCTest_usr_bin64a" Name="bin64a" DiskId="6" />
                 <?endif?>
                 <?if $(IncludeX64) = True?>
-                  <Directory Id="XCTest_usr_bin64" Name="bin64" DiskId="3" />
+                  <Directory Id="XCTest_usr_bin64" Name="bin64" DiskId="7" />
                 <?endif?>
                 <?if $(IncludeX86) = True?>
-                  <Directory Id="XCTest_usr_bin32" Name="bin32" DiskId="4" />
+                  <Directory Id="XCTest_usr_bin32" Name="bin32" DiskId="8" />
                 <?endif?>
                 <Directory Name="lib">
                   <Directory Name="swift">
                     <Directory Name="windows">
                       <?if $(IncludeARM64) = True?>
-                        <Directory Id="XCTest_usr_lib_swift_windows_arm64" Name="aarch64" DiskId="2" />
+                        <Directory Id="XCTest_usr_lib_swift_windows_arm64" Name="aarch64" DiskId="6" />
                       <?endif?>
                       <?if $(IncludeX64) = True?>
-                        <Directory Id="XCTest_usr_lib_swift_windows_x64" Name="x86_64" DiskId="3" />
+                        <Directory Id="XCTest_usr_lib_swift_windows_x64" Name="x86_64" DiskId="7" />
                       <?endif?>
                       <?if $(IncludeX86) = True?>
-                        <Directory Id="XCTest_usr_lib_swift_windows_x86" Name="i686" DiskId="4" />
+                        <Directory Id="XCTest_usr_lib_swift_windows_x86" Name="i686" DiskId="8" />
                       <?endif?>
                       <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule" />
                     </Directory>
@@ -99,13 +85,13 @@
             <Directory Name="Testing-$(ProductVersion)">
               <Directory Name="usr">
                 <?if $(IncludeARM64) = True?>
-                  <Directory DiskId="2" Id="Testing_usr_bin64a" Name="bin64a" />
+                  <Directory Id="Testing_usr_bin64a" Name="bin64a" DiskId="6" />
                 <?endif?>
                 <?if $(IncludeX64) = True?>
-                  <Directory DiskId="3" Id="Testing_usr_bin64" Name="bin64" />
+                  <Directory Id="Testing_usr_bin64" Name="bin64" DiskId="7" />
                 <?endif?>
                 <?if $(IncludeX86) = True?>
-                  <Directory Id="Testing_usr_bin32" Name="bin32" />
+                  <Directory Id="Testing_usr_bin32" Name="bin32" DiskId="8" />
                 <?endif?>
                 <Directory Name="lib">
                   <Directory Name="swift">
@@ -113,15 +99,15 @@
                       <Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
                       <Directory Id="_Testing_WinSDK.swiftmodule" Name="_Testing_WinSDK.swiftmodule" />
                       <?if $(IncludeARM64) = True?>
-                        <Directory DiskId="2" Id="Testing_usr_lib_swift_windows_arm64" Name="aarch64" />
+                        <Directory Id="Testing_usr_lib_swift_windows_arm64" Name="aarch64" DiskId="6" />
                       <?endif?>
                       <?if $(IncludeX64) = True?>
-                        <Directory DiskId="3" Id="Testing_usr_lib_swift_windows_x64" Name="x86_64" />
+                        <Directory Id="Testing_usr_lib_swift_windows_x64" Name="x86_64" DiskId="7" />
                       <?endif?>
                       <?if $(IncludeX86) = True?>
-                        <Directory DiskId="4" Id="Testing_usr_lib_swift_windows_x86" Name="i686" />
+                        <Directory Id="Testing_usr_lib_swift_windows_x86" Name="i686" DiskId="8" />
                       <?endif?>
-                      <Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
+                      <Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" DiskId="5" />
                       <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
                     </Directory>
                   </Directory>
@@ -131,83 +117,24 @@
           </Directory>
 
           <Directory Name="SDKs">
-<?if $(IncludeLegacySDK) = True?>
             <!-- Windows.sdk -->
             <Directory Id="WindowsSDK" Name="Windows.sdk">
               <Directory Name="usr">
                 <Directory Name="include">
-                  <Directory Id="WindowsSDK_usr_include_Block" Name="Block" />
-                  <Directory Id="WindowsSDK_usr_include_dispatch" Name="dispatch" />
-                  <Directory Id="WindowsSDK_usr_include_os" Name="os" />
-                  <Directory Id="WindowsSDK_usr_include__foundation_unicode" Name="_foundation_unicode" />
-                  <Directory Id="WindowsSDK_usr_include__FoundationCShims" Name="_FoundationCShims" />
+                  <Directory Id="WindowsSDK_usr_include_Block" Name="Block" DiskId="5" />
+                  <Directory Id="WindowsSDK_usr_include_dispatch" Name="dispatch" DiskId="5" />
+                  <Directory Id="WindowsSDK_usr_include_os" Name="os" DiskId="5" />
+                  <Directory Id="WindowsSDK_usr_include__foundation_unicode" Name="_foundation_unicode" DiskId="5" />
+                  <Directory Id="WindowsSDK_usr_include__FoundationCShims" Name="_Foundation_CShims" DiskId="5" />
                   <Directory Name="swift">
-                    <Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" />
+                    <Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" DiskId="5" />
                   </Directory>
                 </Directory>
                 <Directory Name="lib">
                   <Directory Name="swift">
-                    <Directory Id="WindowsSDK_usr_lib_swift_apinotes" Name="apinotes" />
-                    <Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims" />
+                    <Directory Id="WindowsSDK_usr_lib_swift_apinotes" Name="apinotes" DiskId="5" />
+                    <Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims" DiskId="5" />
                     <Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
-                      <Directory Id="Legacy_Builtin_float.swiftmodule" Name="_Builtin_float.swiftmodule" />
-                      <Directory Id="Legacy_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
-                      <Directory Id="Legacy_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
-                      <Directory Id="Legacy_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
-                      <Directory Id="Legacy_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
-                      <Directory Id="Legacy_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
-                      <Directory Id="LegacyCRT.swiftmodule" Name="CRT.swiftmodule" />
-                      <Directory Id="LegacyCxx.swiftmodule" Name="Cxx.swiftmodule" />
-                      <Directory Id="LegacyCxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
-                      <Directory Id="LegacyDistributed.swiftmodule" Name="Distributed.swiftmodule" />
-                      <Directory Id="LegacyDispatch.swiftmodule" Name="Dispatch.swiftmodule" />
-                      <Directory Id="Legacy_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
-                      <Directory Id="LegacyFoundationEssentials.swiftmodule" Name="FoundationEssentials.swiftmodule" />
-                      <Directory Id="LegacyFoundationInternationalization.swiftmodule" Name="FoundationInternationalization.swiftmodule" />
-                      <Directory Id="LegacyFoundation.swiftmodule" Name="Foundation.swiftmodule" />
-                      <Directory Id="LegacyFoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule" />
-                      <Directory Id="LegacyFoundationXML.swiftmodule" Name="FoundationXML.swiftmodule" />
-                      <Directory Id="LegacyObservation.swiftmodule" Name="Observation.swiftmodule" />
-                      <Directory Id="LegacyRegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule" />
-                      <Directory Id="LegacySwift.swiftmodule" Name="Swift.swiftmodule" />
-                      <Directory Id="LegacySwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
-                      <Directory Id="LegacySynchronization.swiftmodule" Name="Synchronization.swiftmodule" />
-                      <Directory Id="LegacyWinSDK.swiftmodule" Name="WinSDK.swiftmodule" />
-                      <?if $(IncludeARM64) = True?>
-                        <Directory DiskId="2" Id="WindowsSDK_usr_lib_swift_windows_arm64" Name="aarch64" />
-                      <?endif?>
-                      <?if $(IncludeX64) = True?>
-                        <Directory DiskId="3" Id="WindowsSDK_usr_lib_swift_windows_x64" Name="x86_64" />
-                      <?endif?>
-                      <?if $(IncludeX86) = True?>
-                        <Directory DiskId="4" Id="WindowsSDK_usr_lib_swift_windows_x86" Name="i686" />
-                      <?endif?>
-                    </Directory>
-                  </Directory>
-                </Directory>
-                <Directory Id="WindowsSDK_usr_share" Name="share" />
-              </Directory>
-            </Directory>
-<?endif?>
-
-            <!-- WindowsExperimental.sdk -->
-            <Directory Id="WindowsExperimentalSDK" Name="WindowsExperimental.sdk">
-              <Directory Name="usr">
-                <Directory Name="include">
-                  <Directory Id="WindowsExperimentalSDK_usr_include_Block" Name="Block" DiskId="5" />
-                  <Directory Id="WindowsExperimentalSDK_usr_include_dispatch" Name="dispatch" DiskId="5" />
-                  <Directory Id="WindowsExperimentalSDK_usr_include_os" Name="os" DiskId="5" />
-                  <Directory Id="WindowsExperimentalSDK_usr_include__foundation_unicode" Name="_foundation_unicode" DiskId="5" />
-                  <Directory Id="WindowsExperimentalSDK_usr_include__FoundationCShims" Name="_Foundation_CShims" DiskId="5" />
-                  <Directory Name="swift">
-                    <Directory Id="WindowsExperimentalSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" DiskId="5" />
-                  </Directory>
-                </Directory>
-                <Directory Name="lib">
-                  <Directory Name="swift">
-                    <Directory Id="WindowsExperimentalSDK_usr_lib_swift_apinotes" Name="apinotes" DiskId="5" />
-                    <Directory Id="WindowsExperimentalSDK_usr_lib_swift_shims" Name="shims" DiskId="5" />
-                    <Directory Id="WindowsExperimentalSDK_usr_lib_swift_windows" Name="windows">
                       <Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule" />
                       <Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule" />
                       <Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
@@ -224,21 +151,21 @@
                       <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
                       <Directory Id="Synchronization.swiftmodule" Name="Synchronization.swiftmodule" />
                       <Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule" />
+                      <Directory Id="_Builtin_float.swiftmodule" Name="_Builtin_float.swiftmodule" />
                       <Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
                       <Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
                       <Directory Id="_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
                       <Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
                       <Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
                       <Directory Id="_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
-                      <Directory Id="_Builtin_float.swiftmodule" Name="Builtin_float.swiftmodule" />
                       <?if $(IncludeARM64) = True?>
-                        <Directory Id="WindowsExperimentalSDK_usr_lib_swift_windows_arm64" Name="aarch64" DiskId="6" />
+                        <Directory Id="WindowsSDK_usr_lib_swift_windows_arm64" Name="aarch64" DiskId="6" />
                       <?endif?>
                       <?if $(IncludeX64) = True?>
-                        <Directory Id="WindowsExperimentalSDK_usr_lib_swift_windows_x64" Name="x86_64" DiskId="7" />
+                        <Directory Id="WindowsSDK_usr_lib_swift_windows_x64" Name="x86_64" DiskId="7" />
                       <?endif?>
                       <?if $(IncludeX86) = True?>
-                        <Directory Id="WindowsExperimentalSDK_usr_lib_swift_windows_x86" Name="i686" DiskId="8" />
+                        <Directory Id="WindowsSDK_usr_lib_swift_windows_x86" Name="i686" DiskId="8" />
                       <?endif?>
                     </Directory>
                   </Directory>
@@ -260,7 +187,7 @@
                       <Directory Id="libSwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
                       <Directory Id="libSynchronization.swiftmodule" Name="Synchronization.swiftmodule" />
                       <Directory Id="libWinSDK.swiftmodule" Name="WinSDK.swiftmodule" />
-                      <Directory Id="lib_Builtin_float.swiftmodule" Name="Builtin_float.swiftmodule" />
+                      <Directory Id="lib_Builtin_float.swiftmodule" Name="_Builtin_float.swiftmodule" />
                       <Directory Id="lib_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
                       <Directory Id="lib_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
                       <Directory Id="lib_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
@@ -268,18 +195,18 @@
                       <Directory Id="lib_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
                       <Directory Id="lib_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
                       <?if $(IncludeARM64) = True?>
-                        <Directory Id="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" Name="aarch64" DiskId="6" />
+                        <Directory Id="WindowsSDK_usr_lib_swift_static_windows_arm64" Name="aarch64" DiskId="6" />
                       <?endif?>
                       <?if $(IncludeX64) = True?>
-                        <Directory Id="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64" Name="x86_64" DiskId="7" />
+                        <Directory Id="WindowsSDK_usr_lib_swift_static_windows_x64" Name="x86_64" DiskId="7" />
                       <?endif?>
                       <?if $(IncludeX86) = True?>
-                        <Directory Id="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86" Name="i686" DiskId="8" />
+                        <Directory Id="WindowsSDK_usr_lib_swift_static_windows_x86" Name="i686" DiskId="8" />
                       <?endif?>
                     </Directory>
                   </Directory>
                 </Directory>
-                <Directory Id="WindowsExperimentalSDK_usr_share" Name="share" DiskId="5" />
+                <Directory Id="WindowsSDK_usr_share" Name="share" DiskId="5" />
               </Directory>
             </Directory>
           </Directory>
@@ -290,51 +217,51 @@
     <!-- XCTest -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="XCTest.arm64">
-        <Component Directory="XCTest.swiftmodule" DiskId="2">
+        <Component Directory="XCTest.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="XCTest.swiftmodule" DiskId="2">
+        <Component Directory="XCTest.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="XCTest_usr_bin64a" DiskId="2">
+        <Component Directory="XCTest_usr_bin64a" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\bin64a\XCTest.dll" />
         </Component>
-        <Component Directory="XCTest_usr_lib_swift_windows_arm64" DiskId="2">
+        <Component Directory="XCTest_usr_lib_swift_windows_arm64" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\aarch64\XCTest.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="XCTest.x64">
-        <Component Directory="XCTest.swiftmodule" DiskId="3">
+        <Component Directory="XCTest.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="XCTest.swiftmodule" DiskId="3">
+        <Component Directory="XCTest.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="XCTest_usr_bin64" DiskId="3">
+        <Component Directory="XCTest_usr_bin64" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\bin64\XCTest.dll" />
         </Component>
-        <Component Directory="XCTest_usr_lib_swift_windows_x64" DiskId="3">
+        <Component Directory="XCTest_usr_lib_swift_windows_x64" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\x86_64\XCTest.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="XCTest.x86">
-        <Component Directory="XCTest.swiftmodule" DiskId="4">
+        <Component Directory="XCTest.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="XCTest.swiftmodule" DiskId="4">
+        <Component Directory="XCTest.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="XCTest_usr_bin32" DiskId="4">
+        <Component Directory="XCTest_usr_bin32" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\bin32\XCTest.dll" />
         </Component>
-        <Component Directory="XCTest_usr_lib_swift_windows_x86" DiskId="4">
+        <Component Directory="XCTest_usr_lib_swift_windows_x86" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\i686\XCTest.lib" />
         </Component>
       </ComponentGroup>
@@ -342,450 +269,306 @@
 
     <!-- Testing -->
     <ComponentGroup Id="Testing">
-      <Component Directory="Testing.swiftcrossimport">
+      <Component Directory="Testing.swiftcrossimport" DiskId="5">
         <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\Foundation.swiftoverlay" />
       </Component>
-      <Component Directory="Testing.swiftcrossimport">
+      <Component Directory="Testing.swiftcrossimport" DiskId="5">
         <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftcrossimport\WinSDK.swiftoverlay" />
       </Component>
     </ComponentGroup>
+
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Testing.arm64">
-        <Component Directory="Testing_usr_bin64a" DiskId="2">
+        <Component Directory="Testing_usr_bin64a" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\Testing.dll" />
         </Component>
-        <Component Directory="Testing_usr_bin64a" DiskId="2">
+        <Component Directory="Testing_usr_bin64a" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_Foundation.dll" />
         </Component>
-        <Component Directory="Testing_usr_bin64a" DiskId="2">
+        <Component Directory="Testing_usr_bin64a" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\_Testing_WinSDK.dll" />
         </Component>
 
-        <Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
+        <Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\Testing.lib" />
         </Component>
-        <Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
+        <Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_Foundation.lib" />
         </Component>
-        <Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
+        <Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_Testing_WinSDK.lib" />
         </Component>
 
-        <Component Directory="Testing.swiftmodule" DiskId="2">
+        <Component Directory="Testing.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="Testing.swiftmodule" DiskId="2">
+        <Component Directory="Testing.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
         </Component>
 
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
         </Component>
 
-        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="2">
+        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="2">
+        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Testing.x64">
-        <Component Directory="Testing_usr_bin64" DiskId="3">
+        <Component Directory="Testing_usr_bin64" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\Testing.dll" />
         </Component>
-        <Component Directory="Testing_usr_bin64" DiskId="3">
+        <Component Directory="Testing_usr_bin64" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_Foundation.dll" />
         </Component>
-        <Component Directory="Testing_usr_bin64" DiskId="3">
+        <Component Directory="Testing_usr_bin64" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\_Testing_WinSDK.dll" />
         </Component>
 
-        <Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
+        <Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\Testing.lib" />
         </Component>
-        <Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
+        <Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_Foundation.lib" />
         </Component>
-        <Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
+        <Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\_Testing_WinSDK.lib" />
         </Component>
 
-        <Component Directory="Testing.swiftmodule" DiskId="3">
+        <Component Directory="Testing.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="Testing.swiftmodule" DiskId="3">
+        <Component Directory="Testing.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
         </Component>
 
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
         </Component>
 
-        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="3">
+        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="3">
+        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Testing.x86">
-        <Component Directory="Testing_usr_bin32" DiskId="4">
+        <Component Directory="Testing_usr_bin32" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\Testing.dll" />
         </Component>
-        <Component Directory="Testing_usr_bin32" DiskId="4">
+        <Component Directory="Testing_usr_bin32" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_Foundation.dll" />
         </Component>
-        <Component Directory="Testing_usr_bin32" DiskId="4">
+        <Component Directory="Testing_usr_bin32" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\_Testing_WinSDK.dll" />
         </Component>
 
-        <Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
+        <Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\Testing.lib" />
         </Component>
-        <Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
+        <Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_Foundation.lib" />
         </Component>
-        <Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
+        <Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\_Testing_WinSDK.lib" />
         </Component>
 
-        <Component Directory="Testing.swiftmodule" DiskId="4">
+        <Component Directory="Testing.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="Testing.swiftmodule" DiskId="4">
+        <Component Directory="Testing.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
         </Component>
 
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_Foundation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
         </Component>
 
-        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="4">
+        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="4">
+        <Component Directory="_Testing_WinSDK.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- SwiftRemoteMirror -->
-<?if $(IncludeLegacySDK) = True?>
-    <ComponentGroup Id="LegacySwiftRemoteMirror" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror">
-      <Component>
+    <ComponentGroup Id="SwiftRemoteMirror" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror">
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
       </Component>
-      <Component>
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\Platform.h" />
       </Component>
-      <Component>
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" />
       </Component>
-      <Component>
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" />
       </Component>
-      <Component>
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\module.modulemap" />
       </Component>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacySwiftRemoteMirror.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
-        <Component DiskId="2">
+      <ComponentGroup Id="SwiftRemoteMirror.arm64">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftRemoteMirror.lib" />
         </Component>
       </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacySwiftRemoteMirror.x64" Directory="WindowsSDK_usr_lib_swift_windows_x64">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftRemoteMirror.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacySwiftRemoteMirror.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftRemoteMirror.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
-    <ComponentGroup Id="ExperimentalSwiftRemoteMirror" Directory="WindowsExperimentalSDK_usr_include_swift_SwiftRemoteMirror">
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
-      </Component>
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\Platform.h" />
-      </Component>
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" />
-      </Component>
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" />
-      </Component>
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\include\swift\SwiftRemoteMirror\module.modulemap" />
-      </Component>
-    </ComponentGroup>
-
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftRemoteMirror.lib" />
-        </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="libSwiftRemoteMirror.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\swiftRemoteMirror.lib" />
+      <ComponentGroup Id="libSwiftRemoteMirror.arm64">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\swiftRemoteMirror.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftRemoteMirror.lib" />
+      <ComponentGroup Id="SwiftRemoteMirror.x64">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftRemoteMirror.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="libSwiftRemoteMirror.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\swiftRemoteMirror.lib" />
+      <ComponentGroup Id="libSwiftRemoteMirror.x64">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\swiftRemoteMirror.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftRemoteMirror.lib" />
+      <ComponentGroup Id="SwiftRemoteMirror.x86">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftRemoteMirror.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="libSwiftRemoteMirror.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\swiftRemoteMirror.lib" />
+      <ComponentGroup Id="libSwiftRemoteMirror.x86">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\swiftRemoteMirror.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- BlocksRuntime -->
-<?if $(IncludeLegacySDK) = True?>
-    <ComponentGroup Id="LegacyBlocksRuntime">
-      <Component Directory="WindowsSDK_usr_include_Block">
+    <ComponentGroup Id="BlocksRuntime" Directory="WindowsSDK_usr_include_Block">
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\include\Block\Block.h" />
       </Component>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyBlocksRuntime.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
-        <Component DiskId="2">
+      <ComponentGroup Id="BlocksRuntime.arm64">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\BlocksRuntime.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyBlocksRuntime.x64" Directory="WindowsSDK_usr_lib_swift_windows_x64">
-        <Component DiskId="3">
+      <ComponentGroup Id="BlocksRuntime.x64">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\BlocksRuntime.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyBlocksRuntime.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
-        <Component DiskId="4">
+      <ComponentGroup Id="BlocksRuntime.x86">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\BlocksRuntime.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
-
-    <ComponentGroup Id="ExperimentalBlocksRuntime" Directory="WindowsExperimentalSDK_usr_include_Block">
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\include\Block\Block.h" />
-      </Component>
-    </ComponentGroup>
-
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="BlocksRuntime.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\BlocksRuntime.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="BlocksRuntime.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\BlocksRuntime.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="BlocksRuntime.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\BlocksRuntime.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="libBlocksRuntime.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\BlocksRuntime.lib" />
+      <ComponentGroup Id="libBlocksRuntime.arm64">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\BlocksRuntime.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="libBlocksRuntime.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\BlocksRuntime.lib" />
+      <ComponentGroup Id="libBlocksRuntime.x64">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\BlocksRuntime.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="libBlocksRuntime.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\BlocksRuntime.lib" />
+      <ComponentGroup Id="libBlocksRuntime.x86">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\BlocksRuntime.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- libdispatch -->
-<?if $(IncludeLegacySDK) = True?>
-    <ComponentGroup Id="Legacydispatch" Directory="WindowsSDK_usr_include_dispatch">
-      <?define Disk = 1?>
+    <ComponentGroup Id="Dispatch" Directory="WindowsSDK_usr_include_dispatch">
+      <?define Disk = 5?>
       <?include ../CDispatch.wxi?>
       <?undef Disk?>
 
-      <Component Directory="WindowsSDK_usr_include_os">
+      <Component Directory="WindowsSDK_usr_include_os" DiskId="5">
         <File Source="$(SDKRoot)\usr\include\os\generic_base.h" />
       </Component>
-      <Component Directory="WindowsSDK_usr_include_os">
+      <Component Directory="WindowsSDK_usr_include_os" DiskId="5">
         <File Source="$(SDKRoot)\usr\include\os\generic_unix_base.h" />
       </Component>
-      <Component Directory="WindowsSDK_usr_include_os">
+      <Component Directory="WindowsSDK_usr_include_os" DiskId="5">
         <File Source="$(SDKRoot)\usr\include\os\generic_win_base.h" />
       </Component>
-      <Component Directory="WindowsSDK_usr_include_os">
+      <Component Directory="WindowsSDK_usr_include_os" DiskId="5">
         <File Source="$(SDKRoot)\usr\include\os\object.h" />
       </Component>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacydispatch.arm64">
-        <Component Directory="LegacyDispatch.swiftmodule" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component Directory="LegacyDispatch.swiftmodule" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\dispatch.lib" />
-        </Component>
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftDispatch.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacydispatch.x64">
-        <Component Directory="LegacyDispatch.swiftmodule" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component Directory="LegacyDispatch.swiftmodule" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\dispatch.lib" />
-        </Component>
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftDispatch.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Legacydispatch.x86">
-        <Component Directory="LegacyDispatch.swiftmodule" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component Directory="LegacyDispatch.swiftmodule" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\dispatch.lib" />
-        </Component>
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftDispatch.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
-    <ComponentGroup Id="ExperimentalDispatch" Directory="WindowsExperimentalSDK_usr_include_dispatch">
-      <?define Disk = 5?>
-      <?include ../CDispatch.wxi?>
-      <?undef Disk?>
-
-      <Component Directory="WindowsExperimentalSDK_usr_include_os">
-        <File Source="$(ExperimentalSDKRoot)\usr\include\os\generic_base.h" />
-      </Component>
-      <Component Directory="WindowsExperimentalSDK_usr_include_os">
-        <File Source="$(ExperimentalSDKRoot)\usr\include\os\generic_unix_base.h" />
-      </Component>
-      <Component Directory="WindowsExperimentalSDK_usr_include_os">
-        <File Source="$(ExperimentalSDKRoot)\usr\include\os\generic_win_base.h" />
-      </Component>
-      <Component Directory="WindowsExperimentalSDK_usr_include_os">
-        <File Source="$(ExperimentalSDKRoot)\usr\include\os\object.h" />
-      </Component>
-    </ComponentGroup>
-
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="dispatch.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
+      <ComponentGroup Id="dispatch.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\dispatch.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\dispatch.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="libdispatch.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
+      <ComponentGroup Id="libdispatch.arm64" Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\dispatch.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\dispatch.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="dispatch.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
+      <ComponentGroup Id="dispatch.x64" Directory="WindowsSDK_usr_lib_swift_windows_x64">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\dispatch.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\dispatch.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="libdispatch.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
+      <ComponentGroup Id="libdispatch.x64" Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\dispatch.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\dispatch.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="dispatch.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
+      <ComponentGroup Id="dispatch.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\dispatch.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\dispatch.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="libdispatch.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
+      <ComponentGroup Id="libdispatch.x86" Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\dispatch.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\dispatch.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
@@ -793,3298 +576,2049 @@
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="swiftDispatch.arm64" Directory="Dispatch.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64" DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftDispatch.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftDispatch.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libswiftDispatch.arm64" Directory="libDispatch.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftDispatch.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftDispatch.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="swiftDispatch.x64" Directory="Dispatch.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64" DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftDispatch.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftDispatch.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libswiftDispatch.x64" Directory="libDispatch.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64" DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftDispatch.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftDispatch.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="swiftDispatch.x86" Directory="Dispatch.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86" DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftDispatch.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftDispatch.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libswiftDispatch.x86" Directory="libDispatch.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86" DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftDispatch.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftDispatch.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- _FoundationUnicode -->
-<?if $(IncludeLegacySDK) = True?>
-    <ComponentGroup Id="Legacy_FoundationUnicode" Directory="WindowsSDK_usr_include__foundation_unicode">
-      <?define Disk = 1?>
-      <?include ../_FoundationUnicode.wxi?>
-      <?undef Disk?>
-    </ComponentGroup>
-
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacy_FoundationUnicode.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\_FoundationICU.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacy_FoundationUnicode.x64" Directory="WindowsSDK_usr_lib_swift_windows_x64">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\_FoundationICU.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Legacy_FoundationUnicode.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\_FoundationICU.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
-    <ComponentGroup Id="Experimental_FoundationUnicode" Directory="WindowsExperimentalSDK_usr_include__foundation_unicode">
+    <ComponentGroup Id="_FoundationUnicode" Directory="WindowsSDK_usr_include__foundation_unicode">
       <?define Disk = 5?>
       <?include ../_FoundationUnicode.wxi?>
       <?undef Disk?>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="_FoundationUnicode.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\_FoundationICU.lib" />
+      <ComponentGroup Id="_FoundationUnicode.arm64">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\_FoundationICU.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="lib_FoundationUnicode.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\_FoundationICU.lib" />
+      <ComponentGroup Id="lib_FoundationUnicode.arm64">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\_FoundationICU.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="_FoundationUnicode.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\_FoundationICU.lib" />
+      <ComponentGroup Id="_FoundationUnicode.x64">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\_FoundationICU.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="lib_FoundationUnicode.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\_FoundationICU.lib" />
+      <ComponentGroup Id="lib_FoundationUnicode.x64">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\_FoundationICU.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="_FoundationUnicode.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\_FoundationICU.lib" />
+      <ComponentGroup Id="_FoundationUnicode.x86">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\_FoundationICU.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="lib_FoundationUnicode.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\_FoundationICU.lib" />
+      <ComponentGroup Id="lib_FoundationUnicode.x86">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\_FoundationICU.lib" />
         </Component>
       </ComponentGroup>
     <?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">
+    <ComponentGroup Id="_FoundationCShims" Directory="WindowsSDK_usr_include__FoundationCShims">
       <?define Disk = 5?>
       <?include ../_FoundationCShims.wxi?>
       <?undef Disk?>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="lib_FoundationCShims.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\_FoundationCShims.lib" />
+      <ComponentGroup Id="lib_FoundationCShims.arm64">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\_FoundationCShims.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="lib_FoundationCShims.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\_FoundationCShims.lib" />
+      <ComponentGroup Id="lib_FoundationCShims.x64">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\_FoundationCShims.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="lib_FoundationCShims.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\_FoundationCShims.lib" />
+      <ComponentGroup Id="lib_FoundationCShims.x86">
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\_FoundationCShims.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- _Builtin_float -->
-<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacy_Builtin_float.arm64" Directory="Legacy_Builtin_float.swiftmodule">
-        <Component DiskId="2">
+      <ComponentGroup Id="_Builtin_float.arm64" Directory="_Builtin_float.swiftmodule">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Builtin_float.lib" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Builtin_float.arm64" Directory="lib_Builtin_float.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Builtin_float.lib" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacy_Builtin_float.x64" Directory="Legacy_Builtin_float.swiftmodule">
-        <Component DiskId="3">
+      <ComponentGroup Id="_Builtin_float.x64" Directory="_Builtin_float.swiftmodule">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_Builtin_float.lib" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Builtin_float.x64" Directory="lib_Builtin_float.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Builtin_float.lib" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Legacy_Builtin_float.x86" Directory="Legacy_Builtin_float.swiftmodule">
-        <Component DiskId="4">
+      <ComponentGroup Id="_Builtin_float.x86" Directory="_Builtin_float.swiftmodule">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Builtin_float.lib" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Builtin_float.x86" Directory="lib_Builtin_float.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_Builtin_float.lib" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- _Concurrency -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="_Builtin_float.arm64" Directory="_Builtin_float.swiftmodule">
+      <ComponentGroup Id="_Concurrency.arm64" Directory="_Concurrency.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swift_Builtin_float.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Concurrency.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="lib_Builtin_float.arm64" Directory="lib_Builtin_float.swiftmodule">
+      <ComponentGroup Id="lib_Concurrency.arm64" Directory="lib_Concurrency.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Builtin_float.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Concurrency.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="_Builtin_float.x64" Directory="_Builtin_float.swiftmodule">
+      <ComponentGroup Id="_Concurrency.x64" Directory="_Concurrency.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swift_Builtin_float.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_Concurrency.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="lib_Builtin_float.x64" Directory="lib_Builtin_float.swiftmodule">
+      <ComponentGroup Id="lib_Concurrency.x64" Directory="lib_Concurrency.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Builtin_float.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Concurrency.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="_Builtin_float.x86" Directory="_Builtin_float.swiftmodule">
+      <ComponentGroup Id="_Concurrency.x86" Directory="_Concurrency.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swift_Builtin_float.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Concurrency.lib" />
         </Component>
       </ComponentGroup>
-      <ComponentGroup Id="lib_Builtin_float.x86" Directory="lib_Builtin_float.swiftmodule">
+      <ComponentGroup Id="lib_Concurrency.x86" Directory="lib_Concurrency.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswift_Builtin_float.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_Concurrency.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- _Concurrency -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- _Differentiation -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacy_Concurrency.arm64" Directory="Legacy_Concurrency.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+      <ComponentGroup Id="_Differentiation.arm64" Directory="_Differentiation.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Concurrency.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Differentiation.lib" />
         </Component>
       </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacy_Concurrency.x64" Directory="Legacy_Concurrency.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+      <ComponentGroup Id="lib_Differentiation.arm64" Directory="lib_Differentiation.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_Concurrency.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Legacy_Concurrency.x86" Directory="Legacy_Concurrency.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Concurrency.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="_Concurrency.arm64" Directory="_Concurrency.swiftmodule">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swift_Concurrency.lib" />
-        </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="lib_Concurrency.arm64" Directory="lib_Concurrency.swiftmodule">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Concurrency.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Differentiation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="_Concurrency.x64" Directory="_Concurrency.swiftmodule">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swift_Concurrency.lib" />
-        </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="lib_Concurrency.x64" Directory="lib_Concurrency.swiftmodule">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
+      <ComponentGroup Id="_Differentiation.x64" Directory="_Differentiation.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Concurrency.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="_Concurrency.x86" Directory="_Concurrency.swiftmodule">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swift_Concurrency.lib" />
-        </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="lib_Concurrency.x86" Directory="lib_Concurrency.swiftmodule">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswift_Concurrency.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-
-    <!-- _Differentiation -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacy_Differentiation.arm64" Directory="Legacy_Differentiation.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Differentiation.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacy_Differentiation.x64" Directory="Legacy_Differentiation.swiftmodule">
-        <Component DiskId="3">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_Differentiation.lib" />
         </Component>
       </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Legacy_Differentiation.x86" Directory="Legacy_Differentiation.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Differentiation.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="_Differentiation.arm64" Directory="_Differentiation.swiftmodule">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swift_Differentiation.lib" />
-        </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="lib_Differentiation.arm64" Directory="lib_Differentiation.swiftmodule">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Differentiation.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="_Differentiation.x64" Directory="_Differentiation.swiftmodule">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swift_Differentiation.lib" />
-        </Component>
-      </ComponentGroup>
       <ComponentGroup Id="lib_Differentiation.x64" Directory="lib_Differentiation.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Differentiation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Differentiation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_Differentiation.x86" Directory="_Differentiation.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swift_Differentiation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Differentiation.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_Differentiation.x86" Directory="lib_Differentiation.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswift_Differentiation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_Differentiation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- _RegexParser -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacy_RegexParser.arm64" Directory="Legacy_RegexParser.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_RegexParser.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacy_RegexParser.x64" Directory="Legacy_RegexParser.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_RegexParser.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Legacy_RegexParser.x86" Directory="Legacy_RegexParser.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_RegexParser.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_RegexParser.arm64" Directory="_RegexParser.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swift_RegexParser.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_RegexParser.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_RegexParser.arm64" Directory="lib_RegexParser.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_RegexParser.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_RegexParser.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_RegexParser.x64" Directory="_RegexParser.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swift_RegexParser.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_RegexParser.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_RegexParser.x64" Directory="lib_RegexParser.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_RegexParser.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_RegexParser.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_RegexParser.x86" Directory="_RegexParser.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swift_RegexParser.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_RegexParser.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_RegexParser.x86" Directory="lib_RegexParser.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswift_RegexParser.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_RegexParser.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- _StringProcessing -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacy_StringProcessing.arm64" Directory="Legacy_StringProcessing.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_StringProcessing.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacy_StringProcessing.x64" Directory="Legacy_StringProcessing.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_StringProcessing.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Legacy_StringProcessing.x86" Directory="Legacy_StringProcessing.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_StringProcessing.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_StringProcessing.arm64" Directory="_StringProcessing.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swift_StringProcessing.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_StringProcessing.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_StringProcessing.arm64" Directory="lib_StringProcessing.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_StringProcessing.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_StringProcessing.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_StringProcessing.x64" Directory="_StringProcessing.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swift_StringProcessing.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_StringProcessing.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_StringProcessing.x64" Directory="lib_StringProcessing.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_StringProcessing.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_StringProcessing.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_StringProcessing.x86" Directory="_StringProcessing.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swift_StringProcessing.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_StringProcessing.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_StringProcessing.x86" Directory="lib_StringProcessing.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswift_StringProcessing.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_StringProcessing.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- _Volatile -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacy_Volatile.arm64" Directory="Legacy_Volatile.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Volatile.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacy_Volatile.x64" Directory="Legacy_Volatile.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_Volatile.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Legacy_Volatile.x86" Directory="Legacy_Volatile.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Volatile.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_Volatile.arm64" Directory="_Volatile.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swift_Volatile.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Volatile.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_Volatile.arm64" Directory="lib_Volatile.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Volatile.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Volatile.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_Volatile.x64" Directory="_Volatile.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swift_Volatile.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_Volatile.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_Volatile.x64" Directory="lib_Volatile.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Volatile.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="_Volatile.x86" Directory="_Volatile.swiftmodule">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swift_Volatile.lib" />
-        </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="lib_Volatile.x86" Directory="lib_Volatile.swiftmodule">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswift_Volatile.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-
-    <!-- CRT -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyCRT.arm64" Directory="LegacyCRT.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftCRT.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyCRT.x64" Directory="LegacyCRT.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftCRT.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Volatile.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyCRT.x86" Directory="LegacyCRT.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+      <ComponentGroup Id="_Volatile.x86" Directory="_Volatile.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Volatile.lib" />
+        </Component>
+      </ComponentGroup>
+      <ComponentGroup Id="lib_Volatile.x86" Directory="lib_Volatile.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftCRT.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_Volatile.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- CRT -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="CRT.arm64" Directory="CRT.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftCRT.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftCRT.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libCRT.arm64" Directory="libCRT.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCRT.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCRT.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="CRT.x64" Directory="CRT.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftCRT.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftCRT.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libCRT.x64" Directory="libCRT.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCRT.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCRT.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="CRT.x86" Directory="CRT.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftCRT.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftCRT.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libCRT.x86" Directory="libCRT.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftCRT.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftCRT.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- Cxx -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyCxx.arm64" Directory="LegacyCxx.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\libswiftCxx.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyCxx.x64" Directory="LegacyCxx.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\libswiftCxx.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyCxx.x86" Directory="LegacyCxx.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\libswiftCxx.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Cxx.arm64" Directory="Cxx.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\libswiftCxx.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\libswiftCxx.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libCxx.arm64" Directory="libCxx.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCxx.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCxx.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Cxx.x64" Directory="Cxx.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\libswiftCxx.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\libswiftCxx.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libCxx.x64" Directory="libCxx.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64" DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCxx.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCxx.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Cxx.x86" Directory="Cxx.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\libswiftCxx.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\libswiftCxx.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libCxx.x86" Directory="libCxx.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86" DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftCxx.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftCxx.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- CxxStdlib -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyCxxStdlib.arm64" Directory="LegacyCxxStdlib.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\libswiftCxxStdlib.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyCxxStdlib.x64" Directory="LegacyCxxStdlib.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\libswiftCxxStdlib.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyCxxStdlib.x86" Directory="LegacyCxxStdlib.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\libswiftCxxStdlib.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="CxxStdlib.arm64" Directory="CxxStdlib.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\libswiftCxxStdlib.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\libswiftCxxStdlib.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libCxxStdlib.arm64" Directory="libCxxStdlib.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCxxStdlib.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCxxStdlib.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="CxxStdlib.x64" Directory="CxxStdlib.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\libswiftCxxStdlib.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\libswiftCxxStdlib.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libCxxStdlib.x64" Directory="libCxxStdlib.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64" DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCxxStdlib.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCxxStdlib.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="CxxStdlib.x86" Directory="CxxStdlib.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\libswiftCxxStdlib.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\libswiftCxxStdlib.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libCxxStdlib.x86" Directory="libCxxStdlib.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86" DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftCxxStdlib.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftCxxStdlib.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- Distributed -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyDistributed.arm64" Directory="LegacyDistributed.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftDistributed.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyDistributed.x64" Directory="LegacyDistributed.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftDistributed.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyDistributed.x86" Directory="LegacyDistributed.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftDistributed.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Distributed.arm64" Directory="Distributed.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftDistributed.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftDistributed.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libDistributed.arm64" Directory="libDistributed.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftDistributed.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftDistributed.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Distributed.x64" Directory="Distributed.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftDistributed.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftDistributed.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libDistributed.x64" Directory="libDistributed.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftDistributed.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftDistributed.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Distributed.x86" Directory="Distributed.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftDistributed.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftDistributed.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libDistributed.x86" Directory="libDistributed.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftDistributed.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftDistributed.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- _FoundationCollections -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacy_FoundationCollections.arm64" Directory="Legacy_FoundationCollections.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacy_FoundationCollections.x64" Directory="Legacy_FoundationCollections.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Legacy_FoundationCollections.x86" Directory="Legacy_FoundationCollections.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_FoundationCollections.arm64" Directory="_FoundationCollections.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_FoundationCollections.arm64" Directory="lib_FoundationCollections.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\lib_FoundationCollections.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\lib_FoundationCollections.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_FoundationCollections.x64" Directory="_FoundationCollections.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_FoundationCollections.x64" Directory="lib_FoundationCollections.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\lib_FoundationCollections.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\lib_FoundationCollections.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_FoundationCollections.x86" Directory="_FoundationCollections.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="lib_FoundationCollections.x86" Directory="lib_FoundationCollections.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\lib_FoundationCollections.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\lib_FoundationCollections.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- FoundationEssentials -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyFoundationEssentials.arm64" Directory="LegacyFoundationEssentials.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationEssentials.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyFoundationEssentials.x64" Directory="LegacyFoundationEssentials.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationEssentials.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyFoundationEssentials.x86" Directory="LegacyFoundationEssentials.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationEssentials.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationEssentials.arm64" Directory="FoundationEssentials.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\FoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationEssentials.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationEssentials.arm64" Directory="libFoundationEssentials.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationEssentials.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="FoundationEssentials.x64" Directory="FoundationEssentials.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\FoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationEssentials.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationEssentials.x64" Directory="libFoundationEssentials.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationEssentials.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="FoundationEssentials.x86" Directory="FoundationEssentials.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\FoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationEssentials.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationEssentials.x86" Directory="libFoundationEssentials.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libFoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libFoundationEssentials.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- FoundationInternationalization -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyFoundationInternationalization.arm64" Directory="LegacyFoundationInternationalization.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationInternationalization.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyFoundationInternationalization.x64" Directory="LegacyFoundationInternationalization.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationInternationalization.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyFoundationInternationalization.x86" Directory="LegacyFoundationInternationalization.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationInternationalization.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationInternationalization.arm64" Directory="FoundationInternationalization.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\FoundationInternationalization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationInternationalization.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationInternationalization.arm64" Directory="libFoundationInternationalization.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationInternationalization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationInternationalization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="FoundationInternationalization.x64" Directory="FoundationInternationalization.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\FoundationInternationalization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationInternationalization.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationInternationalization.x64" Directory="libFoundationInternationalization.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationInternationalization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationInternationalization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="FoundationInternationalization.x86" Directory="FoundationInternationalization.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\FoundationInternationalization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationInternationalization.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationInternationalization.x86" Directory="libFoundationInternationalization.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libFoundationInternationalization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libFoundationInternationalization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- Foundation -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyFoundation.arm64" Directory="LegacyFoundation.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\Foundation.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyFoundation.x64" Directory="LegacyFoundation.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\Foundation.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyFoundation.x86" Directory="LegacyFoundation.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\Foundation.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Foundation.arm64" Directory="Foundation.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\Foundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\Foundation.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundation.arm64" Directory="libFoundation.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Foundation.x64" Directory="Foundation.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\Foundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\Foundation.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundation.x64" Directory="libFoundation.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Foundation.x86" Directory="Foundation.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\Foundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\Foundation.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundation.x86" Directory="libFoundation.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libFoundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libFoundation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- FoundationNetworking -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyFoundationNetworking.arm64" Directory="LegacyFoundationNetworking.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationNetworking.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyFoundationNetworking.x64" Directory="LegacyFoundationNetworking.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationNetworking.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyFoundationNetworking.x86" Directory="LegacyFoundationNetworking.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationNetworking.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationNetworking.arm64" Directory="FoundationNetworking.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\FoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationNetworking.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationNetworking.arm64" Directory="libFoundationNetworking.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationNetworking.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="FoundationNetworking.x64" Directory="FoundationNetworking.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\FoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationNetworking.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationNetworking.x64" Directory="libFoundationNetworking.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationNetworking.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="FoundationNetworking.x86" Directory="FoundationNetworking.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\FoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationNetworking.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationNetworking.x86" Directory="libFoundationNetworking.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libFoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libFoundationNetworking.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- FoundationXML -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyFoundationXML.arm64" Directory="LegacyFoundationXML.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationXML.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyFoundationXML.x64" Directory="LegacyFoundationXML.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationXML.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyFoundationXML.x86" Directory="LegacyFoundationXML.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationXML.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationXML.arm64" Directory="FoundationXML.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\FoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationXML.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationXML.arm64" Directory="libFoundationXML.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationXML.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="FoundationXML.x64" Directory="FoundationXML.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\FoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationXML.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationXML.x64" Directory="libFoundationXML.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationXML.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="FoundationXML.x86" Directory="FoundationXML.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\FoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationXML.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libFoundationXML.x86" Directory="libFoundationXML.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libFoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libFoundationXML.lib" />
         </Component>
       </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\brotlicommon.lib" />
+      <ComponentGroup Id="FoundationDependencies.arm64" Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\brotlicommon.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\brotlidec.lib" />
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\brotlidec.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libcurl.lib" />
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libcurl.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libxml2s.lib" />
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libxml2s.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\zlibstatic.lib" />
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\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\brotlicommon.lib" />
+      <ComponentGroup Id="FoundationDependencies.x64" Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\brotlicommon.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\brotlidec.lib" />
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\brotlidec.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libcurl.lib" />
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libcurl.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libxml2s.lib" />
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libxml2s.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\zlibstatic.lib" />
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\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\brotlicommon.lib" />
+      <ComponentGroup Id="FoundationDependencies.x86" Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\brotlicommon.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\brotlidec.lib" />
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\brotlidec.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libcurl.lib" />
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libcurl.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libxml2s.lib" />
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libxml2s.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\zlibstatic.lib" />
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\zlibstatic.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- Observation -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyObservation.arm64" Directory="LegacyObservation.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftObservation.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyObservation.x64" Directory="LegacyObservation.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftObservation.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyObservation.x86" Directory="LegacyObservation.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftObservation.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Observation.arm64" Directory="Observation.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftObservation.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libObservation.arm64" Directory="libObservation.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftObservation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Observation.x64" Directory="Observation.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftObservation.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libObservation.x64" Directory="libObservation.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftObservation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Observation.x86" Directory="Observation.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftObservation.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libObservation.x86" Directory="libObservation.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftObservation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- RegexBuilder -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyRegexBuilder.arm64" Directory="LegacyRegexBuilder.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftRegexBuilder.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyRegexBuilder.x64" Directory="LegacyRegexBuilder.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftRegexBuilder.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyRegexBuilder.x86" Directory="LegacyRegexBuilder.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftRegexBuilder.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="RegexBuilder.arm64" Directory="RegexBuilder.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftRegexBuilder.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libRegexBuilder.arm64" Directory="libRegexBuilder.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftRegexBuilder.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="RegexBuilder.x64" Directory="RegexBuilder.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftRegexBuilder.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libRegexBuilder.x64" Directory="libRegexBuilder.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftRegexBuilder.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="RegexBuilder.x86" Directory="RegexBuilder.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftRegexBuilder.lib" />
-        </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="libRegexBuilder.x86" Directory="libRegexBuilder.swiftmodule">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftRegexBuilder.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-
-    <!-- Swift -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacySwift.arm64" Directory="LegacySwift.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftCore.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacySwift.x64" Directory="LegacySwift.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftCore.lib" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftRegexBuilder.lib" />
         </Component>
       </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacySwift.x86" Directory="LegacySwift.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+      <ComponentGroup Id="libRegexBuilder.x86" Directory="libRegexBuilder.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftCore.lib" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftRegexBuilder.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- Swift -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Swift.arm64" Directory="Swift.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftCore.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libSwift.arm64" Directory="libSwift.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCore.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Swift.x64" Directory="Swift.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftCore.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libSwift.x64" Directory="libSwift.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCore.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Swift.x86" Directory="Swift.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftCore.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libSwift.x86" Directory="libSwift.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftCore.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- SwiftOnoneSupport -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacySwiftOnoneSupport.arm64" Directory="LegacySwiftOnoneSupport.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftSwiftOnoneSupport.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacySwiftOnoneSupport.x64" Directory="LegacySwiftOnoneSupport.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftSwiftOnoneSupport.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacySwiftOnoneSupport.x86" Directory="LegacySwiftOnoneSupport.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftSwiftOnoneSupport.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="SwiftOnoneSupport.arm64" Directory="SwiftOnoneSupport.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftSwiftOnoneSupport.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftSwiftOnoneSupport.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libSwiftOnoneSupport.arm64" Directory="libSwiftOnoneSupport.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftSwiftOnoneSupport.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftSwiftOnoneSupport.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="SwiftOnoneSupport.x64" Directory="SwiftOnoneSupport.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftSwiftOnoneSupport.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftSwiftOnoneSupport.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libSwiftOnoneSupport.x64" Directory="libSwiftOnoneSupport.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftSwiftOnoneSupport.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftSwiftOnoneSupport.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="SwiftOnoneSupport.x86" Directory="SwiftOnoneSupport.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftSwiftOnoneSupport.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftSwiftOnoneSupport.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libSwiftOnoneSupport.x86" Directory="libSwiftOnoneSupport.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftSwiftOnoneSupport.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftSwiftOnoneSupport.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- Synchronization -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacySynchronization.arm64" Directory="LegacySynchronization.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftSynchronization.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacySynchronization.x64" Directory="LegacySynchronization.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftSynchronization.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacySynchronization.x86" Directory="LegacySynchronization.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftSynchronization.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Synchronization.arm64" Directory="Synchronization.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64" DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftSynchronization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftSynchronization.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libSynchronization.arm64" Directory="libSynchronization.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftSynchronization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftSynchronization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Synchronization.x64" Directory="Synchronization.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64" DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftSynchronization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftSynchronization.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libSynchronization.x64" Directory="libSynchronization.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64" DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftSynchronization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftSynchronization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Synchronization.x86" Directory="Synchronization.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86" DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftSynchronization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftSynchronization.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libSynchronization.x86" Directory="libSynchronization.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86" DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftSynchronization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftSynchronization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- WinSDK -->
-<?if $(IncludeLegacySDK) = True?>
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyWinSDK.arm64" Directory="LegacyWinSDK.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftWinSDK.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyWinSDK.x64" Directory="LegacyWinSDK.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftWinSDK.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyWinSDK.x86" Directory="LegacyWinSDK.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftWinSDK.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="WinSDK.arm64" Directory="WinSDK.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftWinSDK.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftWinSDK.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libWinSDK.arm64" Directory="libWinSDK.swiftmodule">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftWinSDK.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftWinSDK.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="WinSDK.x64" Directory="WinSDK.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftWinSDK.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftWinSDK.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libWinSDK.x64" Directory="libWinSDK.swiftmodule">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftWinSDK.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftWinSDK.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="WinSDK.x86" Directory="WinSDK.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftWinSDK.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftWinSDK.lib" />
         </Component>
       </ComponentGroup>
       <ComponentGroup Id="libWinSDK.x86" Directory="libWinSDK.swiftmodule">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
 
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftWinSDK.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftWinSDK.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- apinotes -->
-<?if $(IncludeLegacySDK) = True?>
-    <ComponentGroup Id="apinotes" Directory="WindowsSDK_usr_lib_swift_apinotes">
-      <Component DiskId="1">
+    <ComponentGroup Id="APINotes" Directory="WindowsSDK_usr_lib_swift_apinotes">
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
       </Component>
     </ComponentGroup>
-<?endif?>
-
-    <ComponentGroup Id="ExperimentalAPINotes" Directory="WindowsExperimentalSDK_usr_lib_swift_apinotes">
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
-      </Component>
-    </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" />
-      </Component>
-      <Component DiskId="1">
-        <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxshim.modulemap" />
-      </Component>
-      <Component DiskId="1">
-        <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxstdlibshim.h" />
-      </Component>
-    </ComponentGroup>
-<?endif?>
-
-    <ComponentGroup Id="ExperimentalCXXShim" Directory="WindowsExperimentalSDK_usr_lib_swift_windows">
+    <ComponentGroup Id="CXXShim" Directory="WindowsSDK_usr_lib_swift_windows">
       <Component DiskId="5">
-        <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxshim.h" />
+        <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxshim.h" />
       </Component>
       <Component DiskId="5">
-        <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxshim.modulemap" />
+        <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxshim.modulemap" />
       </Component>
       <Component DiskId="5">
-        <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxstdlibshim.h" />
+        <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxstdlibshim.h" />
       </Component>
     </ComponentGroup>
 
     <!-- Registrar -->
-<?if $(IncludeLegacySDK) = True?>
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Registrar.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftrt.obj" />
-        </Component>
-        <!--
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftrtd.obj" />
-        </Component>
-        -->
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Registrar.x64" Directory="WindowsSDK_usr_lib_swift_windows_x64">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftrt.obj" />
-        </Component>
-        <!--
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftrtd.obj" />
-        </Component>
-        -->
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Registrar.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftrt.obj" />
-        </Component>
-        <!--
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftrtd.obj" />
-        </Component>
-        -->
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="ExperimentalRegistrar.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftrt.obj" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftrt.obj" />
         </Component>
         <!-- FIXME(swiftlang/swift-driver#1902) - this should be in the static resource directory -->
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftrtT.obj" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftrtT.obj" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="ExperimentalRegistrar.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
+      <ComponentGroup Id="Registrar.x64" Directory="WindowsSDK_usr_lib_swift_windows_x64">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftrt.obj" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftrt.obj" />
         </Component>
         <!-- FIXME(swiftlang/swift-driver#1902) - this should be in the static resource directory -->
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftrtT.obj" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftrtT.obj" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="ExperimentalRegistrar.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
+      <ComponentGroup Id="Registrar.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftrt.obj" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftrt.obj" />
         </Component>
         <!-- FIXME(swiftlang/swift-driver#1902) - this should be in the static resource directory -->
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftrtT.obj" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftrtT.obj" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- clang modules -->
-<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="AuxiliaryFiles" Directory="WindowsSDK_usr_share">
-      <Component DiskId="1">
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\share\ucrt.modulemap" />
       </Component>
-      <Component DiskId="1">
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\share\winsdk_um.modulemap" />
       </Component>
-      <Component DiskId="1">
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\share\winsdk_shared.modulemap" />
       </Component>
-      <Component DiskId="1">
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\share\vcruntime.apinotes" />
       </Component>
-      <Component DiskId="1">
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\share\vcruntime.modulemap" />
       </Component>
     </ComponentGroup>
-<?endif?>
-
-    <ComponentGroup Id="ExperimentalAuxiliaryFiles" Directory="WindowsExperimentalSDK_usr_share">
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\share\ucrt.modulemap" />
-      </Component>
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\share\winsdk_um.modulemap" />
-      </Component>
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\share\winsdk_shared.modulemap" />
-      </Component>
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\share\vcruntime.apinotes" />
-      </Component>
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\share\vcruntime.modulemap" />
-      </Component>
-    </ComponentGroup>
 
     <!-- Configuration -->
-<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="Configuration">
-      <Component Directory="WindowsSDK" DiskId="1">
+      <Component Directory="WindowsSDK" DiskId="5">
         <File Source="$(SDKRoot)\SDKSettings.json" />
       </Component>
-      <Component Directory="WindowsSDK" DiskId="1">
+      <Component Directory="WindowsSDK" DiskId="5">
         <File Source="$(SDKRoot)\SDKSettings.plist" />
       </Component>
-      <Component Directory="WindowsPlatform" DiskId="1">
-        <File Source="$(PlatformRoot)\Info.plist" />
-      </Component>
-    </ComponentGroup>
-<?endif?>
-
-    <ComponentGroup Id="ExperimentalConfiguration">
-      <Component Directory="WindowsExperimentalSDK" DiskId="5">
-        <File Source="$(ExperimentalSDKRoot)\SDKSettings.json" />
-      </Component>
-      <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>
@@ -4093,11 +2627,6 @@
       </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>
@@ -4106,11 +2635,6 @@
       </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>
@@ -4120,54 +2644,48 @@
     <?endif?>
 
     <ComponentGroup Id="EnvironmentVariables">
-<?if $(IncludeLegacySDK) = True?>
-      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="WindowsSDK" Guid="580f1edd-8744-4be8-8dd8-e519f70a91e4">
+      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="WindowsSDK" Guid="9344f841-d071-4080-b1d6-afc0261326e9">
         <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 -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="CoreFoundation.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
+      <ComponentGroup Id="CoreFoundation.arm64" Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\CoreFoundation.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\CoreFoundation.lib" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\_CFURLSessionInterface.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\_CFURLSessionInterface.lib" />
         </Component>
         <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\_CFXMLInterface.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\_CFXMLInterface.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="CoreFoundation.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
+      <ComponentGroup Id="CoreFoundation.x64" Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\CoreFoundation.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\CoreFoundation.lib" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\_CFURLSessionInterface.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\_CFURLSessionInterface.lib" />
         </Component>
         <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\_CFXMLInterface.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\_CFXMLInterface.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="CoreFoundation.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
+      <ComponentGroup Id="CoreFoundation.x86" Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\CoreFoundation.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\CoreFoundation.lib" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\_CFURLSessionInterface.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\_CFURLSessionInterface.lib" />
         </Component>
         <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\_CFXMLInterface.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\_CFXMLInterface.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
@@ -4183,7 +2701,7 @@
 
     <?if $(IncludeARM64) = True?>
       <Feature Id="arm64.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_arm64)">
-        <Level Condition="INSTALLARM64SDK = 0 AND INSTALLARM64EXPERIMENTALSDK = 0" Value="0" />
+        <Level Condition="INSTALLARM64SDK = 0" Value="0" />
 
         <ComponentGroupRef Id="XCTest.arm64" />
         <ComponentGroupRef Id="Testing.arm64" />
@@ -4192,7 +2710,7 @@
 
     <?if $(IncludeX64) = True?>
       <Feature Id="x64.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_amd64)">
-        <Level Condition="INSTALLAMD64SDK = 0 AND INSTALLAMD64EXPERIMENTALSDK = 0" Value="0" />
+        <Level Condition="INSTALLAMD64SDK = 0" Value="0" />
 
         <ComponentGroupRef Id="XCTest.x64" />
         <ComponentGroupRef Id="Testing.x64" />
@@ -4201,169 +2719,30 @@
 
     <?if $(IncludeX86) = True?>
       <Feature Id="x86.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_x86)">
-        <Level Condition="INSTALLX86SDK = 0 AND INSTALLX86EXPERIMENTALSDK = 0" Value="0" />
+        <Level Condition="INSTALLX86SDK = 0" Value="0" />
 
         <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" />
-      <ComponentGroupRef Id="LegacyBlocksRuntime" />
-      <ComponentGroupRef Id="Legacydispatch" />
-      <ComponentGroupRef Id="Legacy_FoundationUnicode" />
-      <ComponentGroupRef Id="Legacy_FoundationCShims" />
-
+    <Feature Id="SDK" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows)">
+      <ComponentGroupRef Id="APINotes" />
       <ComponentGroupRef Id="AuxiliaryFiles" />
+      <ComponentGroupRef Id="BlocksRuntime" />
+      <ComponentGroupRef Id="CXXShim" />
       <ComponentGroupRef Id="Configuration" />
+      <ComponentGroupRef Id="Dispatch" />
+      <ComponentGroupRef Id="SwiftRemoteMirror" />
       <ComponentGroupRef Id="SwiftShims" />
-      <ComponentGroupRef Id="apinotes" />
-      <ComponentGroupRef Id="libcxxshim" />
+      <ComponentGroupRef Id="_FoundationCShims" />
+      <ComponentGroupRef Id="_FoundationUnicode" />
     </Feature>
 
     <?if $(IncludeARM64) = True?>
-      <Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_arm64)">
+      <Feature Id="ARM64" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_arm64)">
         <Level Condition="INSTALLARM64SDK = 0" Value="0" />
 
-        <ComponentGroupRef Id="LegacySwiftRemoteMirror.arm64" />
-
-        <ComponentGroupRef Id="LegacyBlocksRuntime.arm64" />
-        <ComponentGroupRef Id="Legacydispatch.arm64" />
-
-        <ComponentGroupRef Id="LegacyCRT.arm64" />
-        <ComponentGroupRef Id="LegacyWinSDK.arm64" />
-
-        <ComponentGroupRef Id="LegacyCxx.arm64" />
-        <ComponentGroupRef Id="LegacyCxxStdlib.arm64" />
-        <ComponentGroupRef Id="LegacyDistributed.arm64" />
-        <ComponentGroupRef Id="LegacyFoundation.arm64" />
-        <ComponentGroupRef Id="LegacyFoundationEssentials.arm64" />
-        <ComponentGroupRef Id="LegacyFoundationInternationalization.arm64" />
-        <ComponentGroupRef Id="LegacyFoundationNetworking.arm64" />
-        <ComponentGroupRef Id="LegacyFoundationXML.arm64" />
-        <ComponentGroupRef Id="LegacyObservation.arm64" />
-        <ComponentGroupRef Id="LegacyRegexBuilder.arm64" />
-        <ComponentGroupRef Id="LegacySwift.arm64" />
-        <ComponentGroupRef Id="LegacySwiftOnoneSupport.arm64" />
-        <ComponentGroupRef Id="LegacySynchronization.arm64" />
-        <ComponentGroupRef Id="Legacy_Builtin_float.arm64" />
-        <ComponentGroupRef Id="Legacy_Concurrency.arm64" />
-        <ComponentGroupRef Id="Legacy_Differentiation.arm64" />
-        <ComponentGroupRef Id="Legacy_FoundationCollections.arm64" />
-        <ComponentGroupRef Id="Legacy_FoundationUnicode.arm64" />
-        <ComponentGroupRef Id="Legacy_RegexParser.arm64" />
-        <ComponentGroupRef Id="Legacy_StringProcessing.arm64" />
-        <ComponentGroupRef Id="Legacy_Volatile.arm64" />
-
-        <ComponentGroupRef Id="Registrar.arm64" />
-
-        <!-- Redistributable -->
-        <ComponentRef Id="rtl.arm64.msm" />
-      </Feature>
-    <?endif?>
-
-    <?if $(IncludeX64) = True?>
-      <Feature Id="x64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_amd64)">
-        <Level Condition="INSTALLAMD64SDK = 0" Value="0" />
-
-        <ComponentGroupRef Id="LegacySwiftRemoteMirror.x64" />
-
-        <ComponentGroupRef Id="LegacyBlocksRuntime.x64" />
-        <ComponentGroupRef Id="Legacydispatch.x64" />
-
-        <ComponentGroupRef Id="LegacyCRT.x64" />
-        <ComponentGroupRef Id="LegacyWinSDK.x64" />
-
-        <ComponentGroupRef Id="LegacyCxx.x64" />
-        <ComponentGroupRef Id="LegacyCxxStdlib.x64" />
-        <ComponentGroupRef Id="LegacyDistributed.x64" />
-        <ComponentGroupRef Id="LegacyFoundation.x64" />
-        <ComponentGroupRef Id="LegacyFoundationEssentials.x64" />
-        <ComponentGroupRef Id="LegacyFoundationInternationalization.x64" />
-        <ComponentGroupRef Id="LegacyFoundationNetworking.x64" />
-        <ComponentGroupRef Id="LegacyFoundationXML.x64" />
-        <ComponentGroupRef Id="LegacyObservation.x64" />
-        <ComponentGroupRef Id="LegacyRegexBuilder.x64" />
-        <ComponentGroupRef Id="LegacySwift.x64" />
-        <ComponentGroupRef Id="LegacySwiftOnoneSupport.x64" />
-        <ComponentGroupRef Id="LegacySynchronization.x64" />
-        <ComponentGroupRef Id="Legacy_Builtin_float.x64" />
-        <ComponentGroupRef Id="Legacy_Concurrency.x64" />
-        <ComponentGroupRef Id="Legacy_Differentiation.x64" />
-        <ComponentGroupRef Id="Legacy_FoundationCollections.x64" />
-        <ComponentGroupRef Id="Legacy_FoundationUnicode.x64" />
-        <ComponentGroupRef Id="Legacy_RegexParser.x64" />
-        <ComponentGroupRef Id="Legacy_StringProcessing.x64" />
-        <ComponentGroupRef Id="Legacy_Volatile.x64" />
-
-        <ComponentGroupRef Id="Registrar.x64" />
-
-        <!-- Redistributable -->
-        <ComponentRef Id="rtl.amd64.msm" />
-      </Feature>
-    <?endif?>
-
-    <?if $(IncludeX86) = True?>
-      <Feature Id="x86" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_x86)">
-        <Level Condition="INSTALLX86SDK = 0" Value="0" />
-
-        <ComponentGroupRef Id="LegacySwiftRemoteMirror.x86" />
-
-        <ComponentGroupRef Id="LegacyBlocksRuntime.x86" />
-        <ComponentGroupRef Id="Legacydispatch.x86" />
-
-        <ComponentGroupRef Id="LegacyCRT.x86" />
-        <ComponentGroupRef Id="LegacyWinSDK.x86" />
-
-        <ComponentGroupRef Id="LegacyCxx.x86" />
-        <ComponentGroupRef Id="LegacyCxxStdlib.x86" />
-        <ComponentGroupRef Id="LegacyDistributed.x86" />
-        <ComponentGroupRef Id="LegacyFoundation.x86" />
-        <ComponentGroupRef Id="LegacyFoundationEssentials.x86" />
-        <ComponentGroupRef Id="LegacyFoundationInternationalization.x86" />
-        <ComponentGroupRef Id="LegacyFoundationNetworking.x86" />
-        <ComponentGroupRef Id="LegacyFoundationXML.x86" />
-        <ComponentGroupRef Id="LegacyObservation.x86" />
-        <ComponentGroupRef Id="LegacyRegexBuilder.x86" />
-        <ComponentGroupRef Id="LegacySwift.x86" />
-        <ComponentGroupRef Id="LegacySwiftOnoneSupport.x86" />
-        <ComponentGroupRef Id="LegacySynchronization.x86" />
-        <ComponentGroupRef Id="Legacy_Builtin_float.x86" />
-        <ComponentGroupRef Id="Legacy_Concurrency.x86" />
-        <ComponentGroupRef Id="Legacy_Differentiation.x86" />
-        <ComponentGroupRef Id="Legacy_FoundationCollections.x86" />
-        <ComponentGroupRef Id="Legacy_FoundationUnicode.x86" />
-        <ComponentGroupRef Id="Legacy_RegexParser.x86" />
-        <ComponentGroupRef Id="Legacy_StringProcessing.x86" />
-        <ComponentGroupRef Id="Legacy_Volatile.x86" />
-
-        <ComponentGroupRef Id="Registrar.x86" />
-
-        <!-- Redistributable -->
-        <ComponentRef Id="rtl.x86.msm" />
-      </Feature>
-    <?endif?>
-<?endif?>
-
-    <Feature Id="ExperimentalSDK" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental)">
-      <ComponentGroupRef Id="ExperimentalAPINotes" />
-      <ComponentGroupRef Id="ExperimentalAuxiliaryFiles" />
-      <ComponentGroupRef Id="ExperimentalBlocksRuntime" />
-      <ComponentGroupRef Id="ExperimentalCXXShim" />
-      <ComponentGroupRef Id="ExperimentalConfiguration" />
-      <ComponentGroupRef Id="ExperimentalDispatch" />
-      <ComponentGroupRef Id="ExperimentalSwiftRemoteMirror" />
-      <ComponentGroupRef Id="ExperimentalSwiftShims" />
-      <ComponentGroupRef Id="Experimental_FoundationCShims" />
-      <ComponentGroupRef Id="Experimental_FoundationUnicode" />
-    </Feature>
-
-    <?if $(IncludeARM64) = True?>
-      <Feature Id="ExperimentalARM64" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental_arm64)">
-        <Level Condition="INSTALLARM64EXPERIMENTALSDK = 0" Value="0" />
-
         <ComponentGroupRef Id="BlocksRuntime.arm64" />
         <ComponentGroupRef Id="CRT.arm64" />
         <ComponentGroupRef Id="Cxx.arm64" />
@@ -4423,7 +2802,7 @@
         <ComponentGroupRef Id="libdispatch.arm64" />
         <ComponentGroupRef Id="libswiftDispatch.arm64" />
 
-        <ComponentGroupRef Id="ExperimentalRegistrar.arm64" />
+        <ComponentGroupRef Id="Registrar.arm64" />
 
         <!-- Redistributable -->
         <ComponentRef Id="rtl.shared.arm64.msm" />
@@ -4432,8 +2811,8 @@
     <?endif?>
 
     <?if $(IncludeX64) = True?>
-      <Feature Id="ExperimentalX64" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental_amd64)">
-        <Level Condition="INSTALLAMD64EXPERIMENTALSDK = 0" Value="0" />
+      <Feature Id="X64" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_amd64)">
+        <Level Condition="INSTALLAMD64SDK = 0" Value="0" />
 
         <ComponentGroupRef Id="BlocksRuntime.x64" />
         <ComponentGroupRef Id="CRT.x64" />
@@ -4494,7 +2873,7 @@
         <ComponentGroupRef Id="libdispatch.x64" />
         <ComponentGroupRef Id="libswiftDispatch.x64" />
 
-        <ComponentGroupRef Id="ExperimentalRegistrar.x64" />
+        <ComponentGroupRef Id="Registrar.x64" />
 
         <!-- Redistributable -->
         <ComponentRef Id="rtl.shared.amd64.msm" />
@@ -4503,8 +2882,8 @@
     <?endif?>
 
     <?if $(IncludeX86) = True?>
-      <Feature Id="ExperimentalX86" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_Experimental_x86)">
-        <Level Condition="INSTALLX86EXPERIMENTALSDK = 0" Value="0" />
+      <Feature Id="X86" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Windows_x86)">
+        <Level Condition="INSTALLX86SDK = 0" Value="0" />
 
         <ComponentGroupRef Id="BlocksRuntime.x86" />
         <ComponentGroupRef Id="CRT.x86" />
@@ -4565,7 +2944,7 @@
         <ComponentGroupRef Id="libdispatch.x86" />
         <ComponentGroupRef Id="libswiftDispatch.x86" />
 
-        <ComponentGroupRef Id="ExperimentalRegistrar.x86" />
+        <ComponentGroupRef Id="Registrar.x86" />
 
         <!-- Redistributable -->
         <ComponentRef Id="rtl.shared.x86.msm" />
diff --git a/platforms/Windows/rtl/legacy/lib/rtllib.wixproj b/platforms/Windows/rtl/legacy/lib/rtllib.wixproj
deleted file mode 100644
index c6ddada5..00000000
--- a/platforms/Windows/rtl/legacy/lib/rtllib.wixproj
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project Sdk="WixToolset.Sdk/4.0.5">
-  <PropertyGroup>
-    <OutputName>rtl</OutputName>
-    <OutputType>Library</OutputType>
-    <BindFiles>true</BindFiles>
-  </PropertyGroup>
-</Project>
diff --git a/platforms/Windows/rtl/legacy/lib/rtllib.wxs b/platforms/Windows/rtl/legacy/lib/rtllib.wxs
deleted file mode 100644
index 88847eb6..00000000
--- a/platforms/Windows/rtl/legacy/lib/rtllib.wxs
+++ /dev/null
@@ -1,122 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <?if $(sys.BUILDARCH) == x86 ?>
-      <?define RuntimeDirectoryComponentGuidGenerationSeed = "79856274-E0F9-4602-A56A-A8DE16C05C41" ?>
-    <?elseif $(sys.BUILDARCH) == x64 ?>
-      <?define RuntimeDirectoryComponentGuidGenerationSeed = "89EC12D8-2E04-41C5-9685-C38DA162A2DA" ?>
-    <?elseif $(sys.BUILDARCH) == arm64 ?>
-      <?define RuntimeDirectoryComponentGuidGenerationSeed = "E9BC660F-2E0E-48E4-8DE0-18567335AF6B" ?>
-    <?endif?>
-
-    <?if $(ProductArchitecture) == amd64?>
-      <?define RuntimeRoot = $(WindowsRuntimeX64)?>
-    <?elseif $(ProductArchitecture) == arm64?>
-      <?define RuntimeRoot = $(WindowsRuntimeARM64)?>
-    <?elseif $(ProductArchitecture) == x86?>
-      <?define RuntimeRoot = $(WindowsRuntimeX86)?>
-    <?endif?>
-
-    <Directory Id="RUNTIMEDIR_$(ProductArchitecture)" ComponentGuidGenerationSeed="$(RuntimeDirectoryComponentGuidGenerationSeed)" />
-
-    <ComponentGroup Id="stdlib_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftSynchronization.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swift_Concurrency.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swift_Differentiation.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftDistributed.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftRegexBuilder.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swift_RegexParser.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swift_StringProcessing.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftCore.dll" />
-      </Component>
-
-      <!-- TODO(compnerd) should we distribute the undecoration library in the runtime?
-      <Component Directory="_usr_bin" Id="swiftDemangle.dll">
-        <File Id="swiftDemangle.dll" Source="$(RuntimeRoot)\bin\swiftDemangle.dll" />
-      </Component>
-      -->
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftCRT.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftObservation.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftRemoteMirror.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftSwiftOnoneSupport.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftWinSDK.dll" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="BlocksRuntime_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\BlocksRuntime.dll" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="libdispatch_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\dispatch.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftDispatch.dll" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Foundation_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\_FoundationICU.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\FoundationEssentials.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\FoundationInternationalization.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\Foundation.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\FoundationNetworking.dll" />
-      </Component>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\FoundationXML.dll" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="plutil_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\plutil.exe" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="swift_runtime_$(ProductArchitecture)">
-      <ComponentGroupRef Id="stdlib_$(ProductArchitecture)" />
-      <ComponentGroupRef Id="BlocksRuntime_$(ProductArchitecture)" />
-      <ComponentGroupRef Id="libdispatch_$(ProductArchitecture)" />
-      <ComponentGroupRef Id="Foundation_$(ProductArchitecture)" />
-    </ComponentGroup>
-
-    <ComponentGroup Id="swift_runtime_utilities_$(ProductArchitecture)">
-      <ComponentGroupRef Id="plutil_$(ProductArchitecture)" />
-    </ComponentGroup>
-  </Fragment>
-</Wix>
diff --git a/platforms/Windows/rtl/legacy/msi/rtlmsi.wixproj b/platforms/Windows/rtl/legacy/msi/rtlmsi.wixproj
deleted file mode 100644
index 5fda9067..00000000
--- a/platforms/Windows/rtl/legacy/msi/rtlmsi.wixproj
+++ /dev/null
@@ -1,36 +0,0 @@
-<Project Sdk="WixToolset.Sdk/4.0.5">
-  <PropertyGroup>
-    <OutputName>rtl</OutputName>
-    <DefineConstants>
-      $(DefineConstants);
-      VCRedistDir=$(VCRedistDir);
-    </DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
-    <ProjectReference Include="..\lib\rtllib.wixproj" Properties="ProductArchitecture=x86;Platform=x86" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
-    <ProjectReference Include="..\lib\rtllib.wixproj" Properties="ProductArchitecture=amd64;Platform=x64" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
-    <ProjectReference Include="..\lib\rtllib.wixproj" Properties="ProductArchitecture=arm64;Platform=arm64" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <HarvestDirectory Include="$(VCRedistDir)">
-      <ComponentGroupName>VCRuntime_$(ProductArchitecture)</ComponentGroupName>
-      <DirectoryRefId>RUNTIMEDIR_$(ProductArchitecture)</DirectoryRefId>
-      <PreprocessorVariable>var.VCRedistDir</PreprocessorVariable>
-      <SuppressCom>true</SuppressCom>
-      <SuppressRegistry>true</SuppressRegistry>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestDirectory>
-  </ItemGroup>
-</Project>
diff --git a/platforms/Windows/rtl/legacy/msi/rtlmsi.wxs b/platforms/Windows/rtl/legacy/msi/rtlmsi.wxs
deleted file mode 100644
index e68b2dda..00000000
--- a/platforms/Windows/rtl/legacy/msi/rtlmsi.wxs
+++ /dev/null
@@ -1,41 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Package
-      Language="1033"
-      Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.Rtl_ProductName_$(ProductArchitecture))"
-      UpgradeCode="$(RtlUpgradeCode)"
-      Version="$(NonSemVerProductVersion)"
-      Scope="$(PackageScope)">
-
-    <Property Id="INSTALLUTILITIES" Value="0" />
-    <Media Id="1" Cabinet="rtl.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
-
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(RtlUpgradeCode)" />
-    <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
-
-    <!-- Point the RTL component group to the right directory. -->
-    <DirectoryRef Id="runtimes_usr_bin" />
-    <SetDirectory Id="RUNTIMEDIR_$(ProductArchitecture)" Value="[runtimes_usr_bin]" Sequence="first" />
-
-    <ComponentGroup Id="EnvironmentVariables" Directory="RUNTIMEDIR_$(ProductArchitecture)">
-      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Guid="b83f6521-8708-4e2d-afef-076d8cdd7528">
-        <Environment Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[runtimes_usr_bin]" />
-      </Component>
-    </ComponentGroup>
-
-    <Feature Id="VCRuntime" AllowAbsent="no" Title="!(loc.VCRuntime_ProductName_$(ProductArchitecture))">
-      <ComponentGroupRef Id="VCRuntime_$(ProductArchitecture)" />
-    </Feature>
-
-    <Feature Id="SwiftRuntime" AllowAbsent="no" Title="!(loc.Rtl_ProductName_$(ProductArchitecture))">
-      <ComponentGroupRef Id="swift_runtime_$(ProductArchitecture)" />
-      <ComponentGroupRef Id="EnvironmentVariables" />
-      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
-    </Feature>
-
-    <Feature Id="SwiftRuntimeUtilities" AllowAbsent="yes" Title="!(loc.Utl_ProductName_$(ProductArchitecture))">
-      <Level Condition="INSTALLUTILITIES = 0" Value="0" />
-      <ComponentGroupRef Id="swift_runtime_utilities_$(ProductArchitecture)" />
-    </Feature>
-  </Package>
-</Wix>
diff --git a/platforms/Windows/rtl/legacy/msm/rtlmsm.wixproj b/platforms/Windows/rtl/legacy/msm/rtlmsm.wixproj
deleted file mode 100644
index f36e8339..00000000
--- a/platforms/Windows/rtl/legacy/msm/rtlmsm.wixproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="WixToolset.Sdk/4.0.5">
-  <PropertyGroup>
-    <OutputType>Module</OutputType>
-    <OutputName>rtl.$(ProductArchitecture)</OutputName>
-  </PropertyGroup>
-
-  <ItemGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
-    <ProjectReference Include="..\lib\rtllib.wixproj" Properties="ProductArchitecture=x86;Platform=x86" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
-    <ProjectReference Include="..\lib\rtllib.wixproj" Properties="ProductArchitecture=amd64;Platform=x64" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
-    <ProjectReference Include="..\lib\rtllib.wixproj" Properties="ProductArchitecture=arm64;Platform=arm64" />
-  </ItemGroup>
-</Project>
diff --git a/platforms/Windows/rtl/legacy/msm/rtlmsm.wxs b/platforms/Windows/rtl/legacy/msm/rtlmsm.wxs
deleted file mode 100644
index becee0be..00000000
--- a/platforms/Windows/rtl/legacy/msm/rtlmsm.wxs
+++ /dev/null
@@ -1,20 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?if $(sys.BUILDARCH) == x86 ?>
-    <?define ModuleId = "7CE7029A-912E-4BC3-BAEC-D17D6F44A879" ?>
-  <?elseif $(sys.BUILDARCH) == x64 ?>
-    <?define ModuleId = "DB845E25-FB6D-4DD3-A068-C6B17D561505" ?>
-  <?elseif $(sys.BUILDARCH) == arm64 ?>
-    <?define ModuleId = "8C012B90-1F1B-4CB2-858A-DD0BCE4A7B22" ?>
-  <?endif?>
-
-  <Module
-    Guid="$(ModuleId)"
-    Id="swift_runtime"
-    Language="0"
-    Version="$(NonSemVerProductVersion)">
-
-    <ComponentGroupRef Id="swift_runtime_$(ProductArchitecture)" />
-    <ComponentGroupRef Id="swift_runtime_utilities_$(ProductArchitecture)" />
-  </Module>
-</Wix>
diff --git a/platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs b/platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs
index a8b8e059..51b28fac 100644
--- a/platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs
+++ b/platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs
@@ -2,13 +2,13 @@
   <Fragment>
     <?if $(sys.BUILDARCH) == x64 ?>
       <?define RuntimeDirectoryComponentGuidGenerationSeed = "E33B165B-8460-467D-ABCD-27EA8197A3CF" ?>
-      <?define RuntimeRoot = $(WindowsExperimentalRuntimeX64)?>
+      <?define RuntimeRoot = $(WindowsRuntimeX64)?>
     <?elseif $(sys.BUILDARCH) == arm64 ?>
       <?define RuntimeDirectoryComponentGuidGenerationSeed = "BFFDD8F7-CC47-40CB-AF0E-095273FF10FC" ?>
-      <?define RuntimeRoot = $(WindowsExperimentalRuntimeARM64)?>
+      <?define RuntimeRoot = $(WindowsRuntimeARM64)?>
     <?elseif $(sys.BUILDARCH) == x86 ?>
       <?define RuntimeDirectoryComponentGuidGenerationSeed = "72064820-3795-4331-8CBD-FF1ABA7DAE7B" ?>
-      <?define RuntimeRoot = $(WindowsExperimentalRuntimeX86)?>
+      <?define RuntimeRoot = $(WindowsRuntimeX86)?>
     <?endif?>
 
     <Directory Id="RUNTIMEDIR_$(ProductArchitecture)" ComponentGuidGenerationSeed="$(RuntimeDirectoryComponentGuidGenerationSeed)" />
diff --git a/platforms/Windows/rtl/shared/msi/rtl.shared.msi.wxs b/platforms/Windows/rtl/shared/msi/rtl.shared.msi.wxs
index a4faef3f..33b8cac5 100644
--- a/platforms/Windows/rtl/shared/msi/rtl.shared.msi.wxs
+++ b/platforms/Windows/rtl/shared/msi/rtl.shared.msi.wxs
@@ -3,13 +3,13 @@
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
       Name="!(loc.Rtl_ProductName_$(ProductArchitecture))"
-      UpgradeCode="$(ExperimentalRTLUpgradeCode)"
+      UpgradeCode="$(RTLUpgradeCode)"
       Version="$(NonSemVerProductVersion)"
       Scope="$(PackageScope)">
 
     <Media Id="1" Cabinet="rtl.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
 
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(ExperimentalRTLUpgradeCode)" />
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(RTLUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
     <!-- Point the RTL component group to the right directory. -->
diff --git a/platforms/Windows/rtl/static/msm/rtl.static.msm.wxs b/platforms/Windows/rtl/static/msm/rtl.static.msm.wxs
index 7654d8ff..24bc34e9 100644
--- a/platforms/Windows/rtl/static/msm/rtl.static.msm.wxs
+++ b/platforms/Windows/rtl/static/msm/rtl.static.msm.wxs
@@ -3,15 +3,15 @@
   <?if $(ProductArchitecture) == x86 ?>
     <?define RuntimeDirectoryComponentGuidGenerationSeed = "D3021274-DCA3-4369-82D3-B6CEE436A3FC" ?>
     <?define ModuleID = "53C54287-A59A-4828-A526-4F64E00B340E" ?>
-    <?define RuntimeRoot = $(WindowsExperimentalRuntimeX86)?>
+    <?define RuntimeRoot = $(WindowsRuntimeX86)?>
   <?elseif $(ProductArchitecture) == amd64 ?>
     <?define RuntimeDirectoryComponentGuidGenerationSeed = "639A8564-3505-4424-BA2F-449AAF743A90" ?>
     <?define ModuleID = "F84DDCA4-72B0-42AB-9316-21DBAB241540" ?>
-    <?define RuntimeRoot = $(WindowsExperimentalRuntimeX64)?>
+    <?define RuntimeRoot = $(WindowsRuntimeX64)?>
   <?elseif $(ProductArchitecture) == arm64 ?>
     <?define RuntimeDirectoryComponentGuidGenerationSeed = "F8BF026F-8E3F-42B5-A5E7-E0A4D186EDF3" ?>
     <?define ModuleID = "0439EF46-C6C2-43DF-A5A7-8F4C3F5C64A7" ?>
-    <?define RuntimeRoot = $(WindowsExperimentalRuntimeARM64)?>
+    <?define RuntimeRoot = $(WindowsRuntimeARM64)?>
   <?endif?>
 
   <Module Guid="$(ModuleID)" Id="swift_runtime" Language="0" Version="$(NonSemVerProductVersion)">
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index fa3960f9..97592391 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -20,7 +20,6 @@
   <String Id="VCRuntime_ProductName_x86" Value="Visual C++ Runtime (X86)" />
   <String Id="Plt_ProductName_Android" Value="Swift Android Platform Support" />
   <String Id="Plt_ProductName_Windows" Value="Swift Windows Platform Support" />
-  <String Id="Plt_ProductName_Windows_Experimental" Value="Swift Windows Platform Support [Experimental]" />
   <String Id="Rtl_ProductName_arm64" Value="Swift Windows Runtime (ARM64)" />
   <String Id="Rtl_ProductName_amd64" Value="Swift Windows Runtime (AMD64)" />
   <String Id="Rtl_ProductName_x86" Value="Swift Windows Runtime (X86)" />
@@ -34,9 +33,6 @@
   <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]" />
   <String Id="Utl_ProductName_arm64" Value="Swift Windows Utilities (ARM64)" />
   <String Id="Utl_ProductName_amd64" Value="Swift Windows Utilities (AMD64)" />
   <String Id="Utl_ProductName_x86" Value="Swift Windows Utilities (X86)" />

From 22e3265480b69fef19c54f1f7ba71680ca798af8 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Thu, 16 Oct 2025 16:06:47 -0700
Subject: [PATCH 2/3] WiX: adjust the Android SDK packaging

This updates the android packaging to include the new experimental SDK
as the default SDK. It additionally packages up the static runtime and
brings the packaging layout in line with the Windows SDK packaging. It
is able to sufficiently remove the dependency on the legacy SDK in the
build to be useful.
---
 .../Windows/platforms/android/android.wxs     | 2766 +++++++++++++----
 platforms/Windows/shared/swift.en-us.wxl      |    4 +
 2 files changed, 2110 insertions(+), 660 deletions(-)

diff --git a/platforms/Windows/platforms/android/android.wxs b/platforms/Windows/platforms/android/android.wxs
index f460ddf4..1b123a3d 100644
--- a/platforms/Windows/platforms/android/android.wxs
+++ b/platforms/Windows/platforms/android/android.wxs
@@ -16,18 +16,18 @@
     <?define PlatformRoot = "$(ImageRoot)\Platforms\Android.platform"?>
     <?define SDKRoot = "$(PlatformRoot)\Developer\SDKs\Android.sdk"?>
 
-    <Media Id="1" Cabinet="android.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <Media Id="5" Cabinet="android.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
     <?if $(IncludeARM64) = True?>
-      <Media Id="2" Cabinet="sdk.android.arm64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+      <Media Id="6" Cabinet="sdk.android.arm64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
     <?endif?>
     <?if $(IncludeARM) = True?>
-      <Media Id="3" Cabinet="sdk.android.arm.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+      <Media Id="7" Cabinet="sdk.android.arm.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <Media Id="4" Cabinet="sdk.android.x64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+      <Media Id="8" Cabinet="sdk.android.x64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <Media Id="5" Cabinet="sdk.android.x86.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+      <Media Id="9" Cabinet="sdk.android.x86.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
     <?endif?>
 
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(AndroidPlatformUpgradeCode)" />
@@ -59,16 +59,16 @@
                   <Directory Name="swift">
                     <Directory Name="android">
                       <?if $(IncludeARM64) = True?>
-                        <Directory Id="XCTest_usr_lib_swift_android_arm64" Name="aarch64" DiskId="2" />
+                        <Directory Id="XCTest_usr_lib_swift_android_arm64" Name="aarch64" DiskId="6" />
                       <?endif?>
                       <?if $(IncludeARM) = True?>
-                        <Directory Id="XCTest_usr_lib_swift_android_arm" Name="armv7" DiskId="3" />
+                        <Directory Id="XCTest_usr_lib_swift_android_arm" Name="armv7" DiskId="7" />
                       <?endif?>
                       <?if $(IncludeX64) = True?>
-                        <Directory Id="XCTest_usr_lib_swift_android_x64" Name="x86_64" DiskId="4" />
+                        <Directory Id="XCTest_usr_lib_swift_android_x64" Name="x86_64" DiskId="8" />
                       <?endif?>
                       <?if $(IncludeX86) = True?>
-                        <Directory Id="XCTest_usr_lib_swift_android_x86" Name="i686" DiskId="5" />
+                        <Directory Id="XCTest_usr_lib_swift_android_x86" Name="i686" DiskId="9" />
                       <?endif?>
                       <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule" />
                     </Directory>
@@ -85,18 +85,18 @@
                     <Directory Name="android">
                       <Directory Id="_Testing_Foundation.swiftmodule" Name="_Testing_Foundation.swiftmodule" />
                       <?if $(IncludeARM64) = True?>
-                        <Directory Id="Testing_usr_lib_swift_android_arm64" Name="aarch64" DiskId="2" />
+                        <Directory Id="Testing_usr_lib_swift_android_arm64" Name="aarch64" DiskId="6" />
                       <?endif?>
                       <?if $(IncludeARM) = True?>
-                        <Directory Id="Testing_usr_lib_swift_android_arm" Name="armv7" DiskId="3" />
+                        <Directory Id="Testing_usr_lib_swift_android_arm" Name="armv7" DiskId="7" />
                       <?endif?>
                       <?if $(IncludeX64) = True?>
-                        <Directory Id="Testing_usr_lib_swift_android_x64" Name="x86_64" DiskId="4" />
+                        <Directory Id="Testing_usr_lib_swift_android_x64" Name="x86_64" DiskId="8" />
                       <?endif?>
                       <?if $(IncludeX86) = True?>
-                        <Directory Id="Testing_usr_lib_swift_android_x86" Name="i686" DiskId="5" />
+                        <Directory Id="Testing_usr_lib_swift_android_x86" Name="i686" DiskId="9" />
                       <?endif?>
-                      <Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
+                      <Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" DiskId="5" />
                       <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
                     </Directory>
                   </Directory>
@@ -119,54 +119,93 @@
             <Directory Id="AndroidSDK" Name="Android.sdk">
               <Directory Name="usr">
                 <Directory Name="include">
-                  <Directory Id="AndroidSDK_usr_include_Block" Name="Block" />
-                  <Directory Id="AndroidSDK_usr_include_dispatch" Name="dispatch" />
-                  <Directory Id="AndroidSDK_usr_include_os" Name="os" />
-                  <Directory Id="AndroidSDK_usr_include__foundation_unicode" Name="_foundation_unicode" />
-                  <Directory Id="AndroidSDK_usr_include__FoundationCShims" Name="_FoundationCShims" />
+                  <Directory Id="AndroidSDK_usr_include_Block" Name="Block" DiskId="5" />
+                  <Directory Id="AndroidSDK_usr_include_dispatch" Name="dispatch" DiskId="5" />
+                  <Directory Id="AndroidSDK_usr_include_os" Name="os" DiskId="5" />
+                  <Directory Id="AndroidSDK_usr_include__foundation_unicode" Name="_foundation_unicode" DiskId="5" />
+                  <Directory Id="AndroidSDK_usr_include__FoundationCShims" Name="_FoundationCShims" DiskId="5" />
                   <Directory Name="swift">
-                    <Directory Id="AndroidSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" />
+                    <Directory Id="AndroidSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" DiskId="5" />
                   </Directory>
                 </Directory>
                 <Directory Name="lib">
                   <Directory Name="swift">
-                    <Directory Id="AndroidSDK_usr_lib_swift_apinotes" Name="apinotes" />
-                    <Directory Id="AndroidSDK_usr_lib_swift_shims" Name="shims" />
+                    <Directory Id="AndroidSDK_usr_lib_swift_apinotes" Name="apinotes" DiskId="5" />
+                    <Directory Id="AndroidSDK_usr_lib_swift_shims" Name="shims" DiskId="5" />
                     <Directory Id="AndroidSDK_usr_lib_swift_android" Name="android">
-                      <Directory Id="_Builtin_float.swiftmodule" Name="_Builtin_float.swiftmodule" />
-                      <Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
-                      <Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
-                      <Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
-                      <Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
-                      <Directory Id="_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
                       <Directory Id="Android.swiftmodule" Name="Android.swiftmodule" />
                       <Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule" />
                       <Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
-                      <Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule" />
                       <Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule" />
-                      <Directory Id="_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
+                      <Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule" />
+                      <Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule" />
                       <Directory Id="FoundationEssentials.swiftmodule" Name="FoundationEssentials.swiftmodule" />
                       <Directory Id="FoundationInternationalization.swiftmodule" Name="FoundationInternationalization.swiftmodule" />
-                      <Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule" />
                       <Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule" />
                       <Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule" />
-                      <Directory Id="_math.swiftmodule" Name="_math.swiftmodule" />
                       <Directory Id="Observation.swiftmodule" Name="Observation.swiftmodule" />
                       <Directory Id="RegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule" />
                       <Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule" />
                       <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
                       <Directory Id="Synchronization.swiftmodule" Name="Synchronization.swiftmodule" />
+                      <Directory Id="_math.swiftmodule" Name="_math.swiftmodule" />
+                      <Directory Id="_Builtin_float.swiftmodule" Name="_Builtin_float.swiftmodule" />
+                      <Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
+                      <Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
+                      <Directory Id="_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
+                      <Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
+                      <Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
+                      <Directory Id="_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
+                      <?if $(IncludeARM64) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_arm64" Name="aarch64" DiskId="6" />
+                      <?endif?>
+                      <?if $(IncludeARM) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_arm" Name="armv7" DiskId="7" />
+                      <?endif?>
+                      <?if $(IncludeX64) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_x64" Name="x86_64" DiskId="8" />
+                      <?endif?>
+                      <?if $(IncludeX86) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_x86" Name="i686" DiskId="9" />
+                      <?endif?>
+                    </Directory>
+                  </Directory>
+                  <Directory Name="swift_static">
+                    <Directory Name="android">
+                      <Directory Id="libAndroid.swiftmodule" Name="Android.swiftmodule" />
+                      <Directory Id="libCxx.swiftmodule" Name="Cxx.swiftmodule" />
+                      <Directory Id="libCxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
+                      <Directory Id="libDispatch.swiftmodule" Name="Dispatch.swiftmodule" />
+                      <Directory Id="libDistributed.swiftmodule" Name="Distributed.swiftmodule" />
+                      <Directory Id="libFoundation.swiftmodule" Name="Foundation.swiftmodule" />
+                      <Directory Id="libFoundationEssentials.swiftmodule" Name="FoundationEssentials.swiftmodule" />
+                      <Directory Id="libFoundationInternationalization.swiftmodule" Name="FoundationInternationalization.swiftmodule" />
+                      <Directory Id="libFoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule" />
+                      <Directory Id="libFoundationXML.swiftmodule" Name="FoundationXML.swiftmodule" />
+                      <Directory Id="libObservation.swiftmodule" Name="Observation.swiftmodule" />
+                      <Directory Id="libRegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule" />
+                      <Directory Id="libSwift.swiftmodule" Name="Swift.swiftmodule" />
+                      <Directory Id="libSwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
+                      <Directory Id="libSynchronization.swiftmodule" Name="Synchronization.swiftmodule" />
+                      <Directory Id="lib_math.swiftmodule" Name="_math.swiftmodule" />
+                      <Directory Id="lib_Builtin_float.swiftmodule" Name="_Builtin_float.swiftmodule" />
+                      <Directory Id="lib_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
+                      <Directory Id="lib_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
+                      <Directory Id="lib_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
+                      <Directory Id="lib_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
+                      <Directory Id="lib_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
+                      <Directory Id="lib_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
                       <?if $(IncludeARM64) = True?>
-                        <Directory Id="AndroidSDK_usr_lib_swift_android_arm64" Name="aarch64" />
+                        <Directory Id="AndroidSDK_usr_lib_swift_static_android_arm64" Name="aarch64" DiskId="6" />
                       <?endif?>
                       <?if $(IncludeARM) = True?>
-                        <Directory Id="AndroidSDK_usr_lib_swift_android_arm" Name="armv7" />
+                        <Directory Id="AndroidSDK_usr_lib_swift_static_android_arm" Name="armv7" DiskId="7" />
                       <?endif?>
                       <?if $(IncludeX64) = True?>
-                        <Directory Id="AndroidSDK_usr_lib_swift_android_x64" Name="x86_64" />
+                        <Directory Id="AndroidSDK_usr_lib_swift_static_android_x64" Name="x86_64" DiskId="8" />
                       <?endif?>
                       <?if $(IncludeX86) = True?>
-                        <Directory Id="AndroidSDK_usr_lib_swift_android_x86" Name="i686" />
+                        <Directory Id="AndroidSDK_usr_lib_swift_static_android_x86" Name="i686" DiskId="9" />
                       <?endif?>
                     </Directory>
                   </Directory>
@@ -181,56 +220,56 @@
     <!-- XCTest -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="XCTest.arm64">
-        <Component Directory="XCTest.swiftmodule" DiskId="2">
+        <Component Directory="XCTest.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="XCTest.swiftmodule" DiskId="2">
+        <Component Directory="XCTest.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="XCTest_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="XCTest_usr_lib_swift_android_arm64">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\aarch64\libXCTest.so" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="XCTest.arm">
-        <Component Directory="XCTest.swiftmodule" DiskId="3">
+        <Component Directory="XCTest.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="XCTest.swiftmodule" DiskId="3">
+        <Component Directory="XCTest.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="XCTest.swiftmodule" DiskId="3">
+        <Component Directory="XCTest_usr_lib_swift_android_arm">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\armv7\libXCTest.so" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="XCTest.x64">
-        <Component Directory="XCTest.swiftmodule" DiskId="4">
+        <Component Directory="XCTest.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="XCTest.swiftmodule" DiskId="4">
+        <Component Directory="XCTest.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="XCTest_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="XCTest_usr_lib_swift_android_x64">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\x86_64\libXCTest.so" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="XCTest.x86">
-        <Component Directory="XCTest.swiftmodule" DiskId="5">
+        <Component Directory="XCTest.swiftmodule" DiskId="9">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="XCTest.swiftmodule" DiskId="5">
+        <Component Directory="XCTest.swiftmodule" DiskId="9">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="XCTest_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="XCTest_usr_lib_swift_android_x86">
           <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\i686\libXCTest.so" />
         </Component>
       </ComponentGroup>
@@ -242,129 +281,130 @@
         <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftcrossimport\Foundation.swiftoverlay" />
       </Component>
     </ComponentGroup>
+
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Testing.arm64">
-        <Component Directory="Testing.swiftmodule" DiskId="2">
+        <Component Directory="Testing_usr_lib_swift_android_arm64">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\libTesting.so" />
+        </Component>
+        <Component Directory="Testing_usr_lib_swift_android_arm64">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\lib_Testing_Foundation.so" />
+        </Component>
+
+        <Component Directory="Testing.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Testing.swiftmodule" DiskId="2">
+        <Component Directory="Testing.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
         </Component>
 
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="2">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="6">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
         </Component>
-
-        <Component Directory="Testing_usr_lib_swift_android_arm64" DiskId="2">
-          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\libTesting.so" />
-        </Component>
-        <Component Directory="Testing_usr_lib_swift_android_arm64" DiskId="2">
-          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\lib_Testing_Foundation.so" />
-        </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="Testing.arm">
-        <Component Directory="Testing.swiftmodule" DiskId="3">
+        <Component Directory="Testing_usr_lib_swift_android_arm">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\libTesting.so" />
+        </Component>
+        <Component Directory="Testing_usr_lib_swift_android_arm">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\lib_Testing_Foundation.so" />
+        </Component>
+
+        <Component Directory="Testing.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Testing.swiftmodule" DiskId="3">
+        <Component Directory="Testing.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
         </Component>
 
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="3">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="7">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
         </Component>
-
-        <Component Directory="Testing_usr_lib_swift_android_arm" DiskId="3">
-          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\libTesting.so" />
-        </Component>
-        <Component Directory="Testing_usr_lib_swift_android_arm" DiskId="3">
-          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\lib_Testing_Foundation.so" />
-        </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Testing.x64">
-        <Component Directory="Testing.swiftmodule" DiskId="4">
+        <Component Directory="Testing_usr_lib_swift_android_x64">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\libTesting.so" />
+        </Component>
+        <Component Directory="Testing_usr_lib_swift_android_x64">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\lib_Testing_Foundation.so" />
+        </Component>
+
+        <Component Directory="Testing.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Testing.swiftmodule" DiskId="4">
+        <Component Directory="Testing.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
         </Component>
 
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="4">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="8">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
         </Component>
-
-        <Component Directory="Testing_usr_lib_swift_android_x64" DiskId="4">
-          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\libTesting.so" />
-        </Component>
-        <Component Directory="Testing_usr_lib_swift_android_x64" DiskId="4">
-          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\lib_Testing_Foundation.so" />
-        </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Testing.x86">
-        <Component Directory="Testing.swiftmodule" DiskId="5">
+        <Component Directory="Testing_usr_lib_swift_android_x86">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\libTesting.so" />
+        </Component>
+        <Component Directory="Testing_usr_lib_swift_android_x86">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\lib_Testing_Foundation.so" />
+        </Component>
+
+        <Component Directory="Testing.swiftmodule" DiskId="9">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Testing.swiftmodule" DiskId="5">
+        <Component Directory="Testing.swiftmodule" DiskId="9">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\i686-unknown-linux-android.swiftinterface" />
         </Component>
 
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="5">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="9">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="5">
+        <Component Directory="_Testing_Foundation.swiftmodule" DiskId="9">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\_Testing_Foundation.swiftmodule\i686-unknown-linux-android.swiftinterface" />
         </Component>
-
-        <Component Directory="Testing_usr_lib_swift_android_x86" DiskId="5">
-          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\libTesting.so" />
-        </Component>
-        <Component Directory="Testing_usr_lib_swift_android_x86" DiskId="5">
-          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\lib_Testing_Foundation.so" />
-        </Component>
       </ComponentGroup>
     <?endif?>
 
     <!-- ds2 -->
     <?if $(ANDROID_INCLUDE_DS2) = True?>
       <?if $(IncludeARM64) = True?>
-        <ComponentGroup Id="ds2.arm64" Directory="_ds2_usr_bin">
-          <Component DiskId="2">
+        <ComponentGroup Id="ds2.arm64">
+          <Component Directory="_ds2_usr_bin" DiskId="6">
             <File Source="$(PlatformRoot)\Developer\Library\ds2\usr\bin\aarch64-unknown-linux-android-ds2" />
           </Component>
         </ComponentGroup>
       <?endif?>
       <?if $(IncludeARM) = True?>
-        <ComponentGroup Id="ds2.arm" Directory="_ds2_usr_bin">
-          <Component DiskId="3">
+        <ComponentGroup Id="ds2.arm">
+          <Component Directory="_ds2_usr_bin" DiskId="7">
             <File Source="$(PlatformRoot)\Developer\Library\ds2\usr\bin\armv7-unknown-linux-android-ds2" />
           </Component>
         </ComponentGroup>
       <?endif?>
       <?if $(IncludeX64) = True?>
-        <ComponentGroup Id="ds2.x64" Directory="_ds2_usr_bin">
-          <Component DiskId="4">
+        <ComponentGroup Id="ds2.x64">
+          <Component Directory="_ds2_usr_bin" DiskId="8">
             <File Source="$(PlatformRoot)\Developer\Library\ds2\usr\bin\x86_64-unknown-linux-android-ds2" />
           </Component>
         </ComponentGroup>
       <?endif?>
       <?if $(IncludeX86) = True?>
-        <ComponentGroup Id="ds2.x86" Directory="_ds2_usr_bin">
-          <Component DiskId="5">
+        <ComponentGroup Id="ds2.x86">
+          <Component Directory="_ds2_usr_bin" DiskId="9">
             <File Source="$(PlatformRoot)\Developer\Library\ds2\usr\bin\i686-unknown-linux-android-ds2" />
           </Component>
         </ComponentGroup>
@@ -391,73 +431,121 @@
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
-        <Component DiskId="2">
+      <ComponentGroup Id="SwiftRemoteMirror.arm64">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftRemoteMirror.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwiftRemoteMirror.arm64">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftRemoteMirror.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.arm" Directory="AndroidSDK_usr_lib_swift_android_arm">
-        <Component DiskId="3">
+      <ComponentGroup Id="SwiftRemoteMirror.arm">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftRemoteMirror.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwiftRemoteMirror.arm">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftRemoteMirror.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.x64" Directory="AndroidSDK_usr_lib_swift_android_x64">
-        <Component DiskId="4">
+      <ComponentGroup Id="SwiftRemoteMirror.x64">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftRemoteMirror.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwiftRemoteMirror.x64">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftRemoteMirror.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.x86" Directory="AndroidSDK_usr_lib_swift_android_x86">
-        <Component DiskId="5">
+      <ComponentGroup Id="SwiftRemoteMirror.x86">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftRemoteMirror.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwiftRemoteMirror.x86">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftRemoteMirror.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- BlocksRuntime -->
-    <ComponentGroup Id="BlocksRuntime">
-      <Component Directory="AndroidSDK_usr_include_Block">
+    <ComponentGroup Id="BlocksRuntime" Directory="AndroidSDK_usr_include_Block">
+      <Component>
         <File Source="$(SDKRoot)\usr\include\Block\Block.h" />
       </Component>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="BlocksRuntime.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
-        <Component DiskId="2">
+      <ComponentGroup Id="BlocksRuntime.arm64">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libBlocksRuntime.so" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
-      <ComponentGroup Id="BlocksRuntime.arm" Directory="AndroidSDK_usr_lib_swift_android_arm">
-        <Component DiskId="3">
+      <ComponentGroup Id="BlocksRuntime.arm">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libBlocksRuntime.so" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="BlocksRuntime.x64" Directory="AndroidSDK_usr_lib_swift_android_x64">
-        <Component DiskId="4">
+      <ComponentGroup Id="BlocksRuntime.x64">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libBlocksRuntime.so" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="BlocksRuntime.x86" Directory="AndroidSDK_usr_lib_swift_android_x86">
-        <Component DiskId="5">
+      <ComponentGroup Id="BlocksRuntime.x86">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libBlocksRuntime.so" />
         </Component>
       </ComponentGroup>
     <?endif?>
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="libBlocksRuntime.arm64">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libBlocksRuntime.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="libBlocksRuntime.arm">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libBlocksRuntime.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="libBlocksRuntime.x64">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libBlocksRuntime.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="libBlocksRuntime.x86">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libBlocksRuntime.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
 
     <!-- libdispatch -->
-    <ComponentGroup Id="libdispatch" Directory="AndroidSDK_usr_include_dispatch">
-      <?define Disk = 1?>
+    <ComponentGroup Id="Dispatch" Directory="AndroidSDK_usr_include_dispatch">
+      <?define Disk = 5?>
       <?include ../CDispatch.wxi?>
       <?undef Disk?>
 
@@ -476,1578 +564,2743 @@
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="dispatch.arm64">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libdispatch.so" />
+        </Component>
+      </ComponentGroup>
       <ComponentGroup Id="libdispatch.arm64">
-        <Component Directory="Dispatch.swiftmodule" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libdispatch.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="dispatch.arm">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libdispatch.so" />
+        </Component>
+      </ComponentGroup>
+      <ComponentGroup Id="libdispatch.arm">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libdispatch.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="dispatch.x64">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libdispatch.so" />
+        </Component>
+      </ComponentGroup>
+      <ComponentGroup Id="libdispatch.x64">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libdispatch.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="dispatch.x86">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libdispatch.so" />
+        </Component>
+      </ComponentGroup>
+      <ComponentGroup Id="libdispatch.x86">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libdispatch.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="swiftDispatch.arm64" Directory="Dispatch.swiftmodule">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Dispatch.swiftmodule" DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libdispatch.so" />
-        </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftDispatch.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libswiftDispatch.arm64" Directory="libDispatch.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftDispatch.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
-      <ComponentGroup Id="libdispatch.arm">
-        <Component Directory="Dispatch.swiftmodule" DiskId="3">
+      <ComponentGroup Id="swiftDispatch.arm" Directory="Dispatch.swiftmodule">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Dispatch.swiftmodule" DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libdispatch.so" />
-        </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftDispatch.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libswiftDispatch.arm" Directory="libDispatch.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftDispatch.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="libdispatch.x64">
-        <Component Directory="Dispatch.swiftmodule" DiskId="4">
+      <ComponentGroup Id="swiftDispatch.x64" Directory="Dispatch.swiftmodule">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Dispatch.swiftmodule" DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libdispatch.so" />
-        </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftDispatch.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libswiftDispatch.x64" Directory="libDispatch.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftDispatch.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="libdispatch.x86">
-        <Component Directory="Dispatch.swiftmodule" DiskId="5">
+      <ComponentGroup Id="swiftDispatch.x86" Directory="Dispatch.swiftmodule">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Dispatch.swiftmodule" DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libdispatch.so" />
-        </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftDispatch.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libswiftDispatch.x86" Directory="libDispatch.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftDispatch.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- _FoundationUnicode -->
     <ComponentGroup Id="_FoundationUnicode" Directory="AndroidSDK_usr_include__foundation_unicode">
-      <?define Disk = 1?>
+      <?define Disk = 5?>
       <?include ../_FoundationUnicode.wxi?>
       <?undef Disk?>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_FoundationUnicode.arm64">
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\lib_FoundationICU.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_FoundationUnicode.arm64">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\lib_FoundationICU.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="_FoundationUnicode.arm">
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\lib_FoundationICU.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_FoundationUnicode.arm">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\lib_FoundationICU.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_FoundationUnicode.x64">
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\lib_FoundationICU.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_FoundationUnicode.x64">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\lib_FoundationICU.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_FoundationUnicode.x86">
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\lib_FoundationICU.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_FoundationUnicode.x86">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\lib_FoundationICU.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- _FoundationCShims -->
     <ComponentGroup Id="_FoundationCShims" Directory="AndroidSDK_usr_include__FoundationCShims">
-      <?define Disk = 1?>
+      <?define Disk = 5?>
       <?include ../_FoundationCShims.wxi?>
       <?undef Disk?>
     </ComponentGroup>
 
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="lib_FoundationCShims.arm64">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\lib_FoundationCShims.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="lib_FoundationCShims.arm">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\lib_FoundationCShims.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="lib_FoundationCShims.x64">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\lib_FoundationCShims.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="lib_FoundationCShims.x86">
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\lib_FoundationCShims.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
     <!-- _Builtin_float -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_Builtin_float.arm64" Directory="_Builtin_float.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_Builtin_float.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Builtin_float.arm64" Directory="lib_Builtin_float.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswift_Builtin_float.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="_Builtin_float.arm" Directory="_Builtin_float.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_Builtin_float.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Builtin_float.arm" Directory="lib_Builtin_float.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswift_Builtin_float.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_Builtin_float.x64" Directory="_Builtin_float.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_Builtin_float.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Builtin_float.x64" Directory="lib_Builtin_float.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswift_Builtin_float.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_Builtin_float.x86" Directory="_Builtin_float.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Builtin_float.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_Builtin_float.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Builtin_float.x86" Directory="lib_Builtin_float.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswift_Builtin_float.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- _Concurrency -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_Concurrency.arm64" Directory="_Concurrency.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_Concurrency.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Concurrency.arm64" Directory="lib_Concurrency.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswift_Concurrency.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="_Concurrency.arm" Directory="_Concurrency.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_Concurrency.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Concurrency.arm" Directory="lib_Concurrency.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswift_Concurrency.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_Concurrency.x64" Directory="_Concurrency.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_Concurrency.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Concurrency.x64" Directory="lib_Concurrency.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswift_Concurrency.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_Concurrency.x86" Directory="_Concurrency.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Concurrency.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_Concurrency.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Concurrency.x86" Directory="lib_Concurrency.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswift_Concurrency.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- _Differentiation -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_Differentiation.arm64" Directory="_Differentiation.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_Differentiation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Differentiation.arm64" Directory="lib_Differentiation.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswift_Differentiation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="_Differentiation.arm" Directory="_Differentiation.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_Differentiation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Differentiation.arm" Directory="lib_Differentiation.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswift_Differentiation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_Differentiation.x64" Directory="_Differentiation.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_Differentiation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Differentiation.x64" Directory="lib_Differentiation.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswift_Differentiation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_Differentiation.x86" Directory="_Differentiation.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Differentiation.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_Differentiation.so" />
         </Component>
       </ComponentGroup>
-    <?endif?>
+      <ComponentGroup Id="lib_Differentiation.x86" Directory="lib_Differentiation.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
 
-    <!-- _RegexParser -->
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswift_Differentiation.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _RegexParser -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_RegexParser.arm64" Directory="_RegexParser.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_RegexParser.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_RegexParser.arm64" Directory="lib_RegexParser.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswift_RegexParser.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="_RegexParser.arm" Directory="_RegexParser.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_RegexParser.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_RegexParser.arm" Directory="lib_RegexParser.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswift_RegexParser.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_RegexParser.x64" Directory="_RegexParser.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_RegexParser.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_RegexParser.x64" Directory="lib_RegexParser.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswift_RegexParser.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_RegexParser.x86" Directory="_RegexParser.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_RegexParser.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_RegexParser.x86" Directory="lib_RegexParser.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswift_RegexParser.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- _StringProcessing -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_StringProcessing.arm64" Directory="_StringProcessing.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_StringProcessing.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_StringProcessing.arm64" Directory="lib_StringProcessing.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswift_StringProcessing.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="_StringProcessing.arm" Directory="_StringProcessing.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_StringProcessing.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_StringProcessing.arm" Directory="lib_StringProcessing.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswift_StringProcessing.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_StringProcessing.x64" Directory="_StringProcessing.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_StringProcessing.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_StringProcessing.x64" Directory="lib_StringProcessing.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswift_StringProcessing.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_StringProcessing.x86" Directory="_StringProcessing.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_StringProcessing.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_StringProcessing.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_StringProcessing.x86" Directory="lib_StringProcessing.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswift_StringProcessing.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- _Volatile -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_Volatile.arm64" Directory="_Volatile.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_Volatile.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Volatile.arm64" Directory="lib_Volatile.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswift_Volatile.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="_Volatile.arm" Directory="_Volatile.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_Volatile.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Volatile.arm" Directory="lib_Volatile.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswift_Volatile.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_Volatile.x64" Directory="_Volatile.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_Volatile.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Volatile.x64" Directory="lib_Volatile.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswift_Volatile.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_Volatile.x86" Directory="_Volatile.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_Volatile.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_Volatile.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_Volatile.x86" Directory="lib_Volatile.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswift_Volatile.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- Android -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Android.arm64" Directory="Android.swiftmodule">
         <!-- FIXME(swiftlang/swift#80293) - these should be architecture agnostic -->
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\android.modulemap" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\SwiftAndroidNDK.h" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\SwiftBionic.h" />
         </Component>
 
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftAndroid.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libAndroid.arm64" Directory="libAndroid.swiftmodule">
+        <!-- FIXME(swiftlang/swift#80293) - these should be architecture agnostic -->
+        <!--
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\android.modulemap" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\SwiftAndroidNDK.h" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\SwiftBionic.h" />
+        </Component>
+        -->
+
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftAndroid.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="Android.arm" Directory="Android.swiftmodule">
         <!-- FIXME(swiftlang/swift#80293) - these should be architecture agnostic -->
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\android.modulemap" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\SwiftAndroidNDK.h" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\SwiftBionic.h" />
         </Component>
 
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftAndroid.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libAndroid.arm" Directory="libAndroid.swiftmodule">
+        <!-- FIXME(swiftlang/swift#80293) - these should be architecture agnostic -->
+        <!--
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\android.modulemap" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\SwiftAndroidNDK.h" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\SwiftBionic.h" />
+        </Component>
+        -->
+
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftAndroid.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Android.x64" Directory="Android.swiftmodule">
         <!-- FIXME(swiftlang/swift#80293) - these should be architecture agnostic -->
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\android.modulemap" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\SwiftAndroidNDK.h" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\SwiftBionic.h" />
         </Component>
 
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftAndroid.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libAndroid.x64" Directory="libAndroid.swiftmodule">
+        <!-- FIXME(swiftlang/swift#80293) - these should be architecture agnostic -->
+        <!--
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\android.modulemap" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\SwiftAndroidNDK.h" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\SwiftBionic.h" />
+        </Component>
+        -->
+
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftAndroid.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Android.x86" Directory="Android.swiftmodule">
         <!-- FIXME(swiftlang/swift#80293) - these should be architecture agnostic -->
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\android.modulemap" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\SwiftAndroidNDK.h" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\SwiftBionic.h" />
         </Component>
 
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Android.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftAndroid.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libAndroid.x86" Directory="libAndroid.swiftmodule">
+        <!-- FIXME(swiftlang/swift#80293) - these should be architecture agnostic -->
+        <!--
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\android.modulemap" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\SwiftAndroidNDK.h" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\SwiftBionic.h" />
+        </Component>
+        -->
+
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftAndroid.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- Cxx -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Cxx.arm64" Directory="Cxx.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftCxx.a" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libCxx.arm64" Directory="libCxx.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftCxx.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="Cxx.arm" Directory="Cxx.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftCxx.a" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libCxx.arm" Directory="libCxx.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftCxx.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Cxx.x64" Directory="Cxx.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftCxx.a" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libCxx.x64" Directory="libCxx.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftCxx.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Cxx.x86" Directory="Cxx.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftCxx.a" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libCxx.x86" Directory="libCxx.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftCxx.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- CxxStdlib -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="CxxStdlib.arm64" Directory="CxxStdlib.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftCxxStdlib.a" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libCxxStdlib.arm64" Directory="libCxxStdlib.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftCxxStdlib.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="CxxStdlib.arm" Directory="CxxStdlib.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftCxxStdlib.a" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libCxxStdlib.arm" Directory="libCxxStdlib.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftCxxStdlib.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="CxxStdlib.x64" Directory="CxxStdlib.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftCxxStdlib.a" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libCxxStdlib.x64" Directory="libCxxStdlib.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftCxxStdlib.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="CxxStdlib.x86" Directory="CxxStdlib.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftCxxStdlib.a" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libCxxStdlib.x86" Directory="libCxxStdlib.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftCxxStdlib.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- Distributed -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Distributed.arm64" Directory="Distributed.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftDistributed.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libDistributed.arm64" Directory="libDistributed.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftDistributed.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="Distributed.arm" Directory="Distributed.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftDistributed.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libDistributed.arm" Directory="libDistributed.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftDistributed.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Distributed.x64" Directory="Distributed.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftDistributed.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libDistributed.x64" Directory="libDistributed.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftDistributed.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Distributed.x86" Directory="Distributed.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Distributed.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftDistributed.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libDistributed.x86" Directory="libDistributed.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftDistributed.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- _FoundationCollections -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_FoundationCollections.arm64" Directory="_FoundationCollections.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_FoundationCollections.arm64" Directory="lib_FoundationCollections.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\lib_FoundationCollections.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="_FoundationCollections.arm" Directory="_FoundationCollections.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_FoundationCollections.arm" Directory="lib_FoundationCollections.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\lib_FoundationCollections.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_FoundationCollections.x64" Directory="_FoundationCollections.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_FoundationCollections.x64" Directory="lib_FoundationCollections.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\lib_FoundationCollections.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_FoundationCollections.x86" Directory="_FoundationCollections.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_FoundationCollections.x86" Directory="lib_FoundationCollections.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\lib_FoundationCollections.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- FoundationEssentials -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationEssentials.arm64" Directory="FoundationEssentials.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundationEssentials.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationEssentials.arm64" Directory="libFoundationEssentials.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libFoundationEssentials.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="FoundationEssentials.arm" Directory="FoundationEssentials.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libFoundationEssentials.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationEssentials.arm" Directory="libFoundationEssentials.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libFoundationEssentials.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="FoundationEssentials.x64" Directory="FoundationEssentials.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libFoundationEssentials.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationEssentials.x64" Directory="libFoundationEssentials.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libFoundationEssentials.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="FoundationEssentials.x86" Directory="FoundationEssentials.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundationEssentials.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationEssentials.x86" Directory="libFoundationEssentials.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libFoundationEssentials.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- FoundationInternationalization -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationInternationalization.arm64" Directory="FoundationInternationalization.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundationInternationalization.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationInternationalization.arm64" Directory="libFoundationInternationalization.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libFoundationInternationalization.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="FoundationInternationalization.arm" Directory="FoundationInternationalization.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libFoundationInternationalization.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationInternationalization.arm" Directory="libFoundationInternationalization.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libFoundationInternationalization.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="FoundationInternationalization.x64" Directory="FoundationInternationalization.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libFoundationInternationalization.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationInternationalization.x64" Directory="libFoundationInternationalization.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libFoundationInternationalization.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="FoundationInternationalization.x86" Directory="FoundationInternationalization.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundationInternationalization.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationInternationalization.x86" Directory="libFoundationInternationalization.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libFoundationInternationalization.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- Foundation -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Foundation.arm64" Directory="Foundation.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundation.arm64" Directory="libFoundation.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libFoundation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="Foundation.arm" Directory="Foundation.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libFoundation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundation.arm" Directory="libFoundation.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libFoundation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Foundation.x64" Directory="Foundation.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libFoundation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundation.x64" Directory="libFoundation.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libFoundation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Foundation.x86" Directory="Foundation.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundation.x86" Directory="libFoundation.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libFoundation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- FoundationNetworking -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationNetworking.arm64" Directory="FoundationNetworking.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundationNetworking.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationNetworking.arm64" Directory="libFoundationNetworking.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libFoundationNetworking.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="FoundationNetworking.arm" Directory="FoundationNetworking.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libFoundationNetworking.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationNetworking.arm" Directory="libFoundationNetworking.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libFoundationNetworking.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="FoundationNetworking.x64" Directory="FoundationNetworking.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libFoundationNetworking.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationNetworking.x64" Directory="libFoundationNetworking.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libFoundationNetworking.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="FoundationNetworking.x86" Directory="FoundationNetworking.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundationNetworking.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationNetworking.x86" Directory="libFoundationNetworking.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libFoundationNetworking.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- FoundationXML -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="FoundationXML.arm64" Directory="FoundationXML.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundationXML.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationXML.arm64" Directory="libFoundationXML.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libFoundationXML.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="FoundationXML.arm" Directory="FoundationXML.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libFoundationXML.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationXML.arm" Directory="libFoundationXML.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libFoundationXML.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="FoundationXML.x64" Directory="FoundationXML.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libFoundationXML.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationXML.x64" Directory="libFoundationXML.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libFoundationXML.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="FoundationXML.x86" Directory="FoundationXML.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundationXML.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libFoundationXML.x86" Directory="libFoundationXML.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libFoundationXML.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- _math -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="_math.arm64" Directory="_math.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_math.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_math.arm64" Directory="lib_math.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswift_math.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="_math.arm" Directory="_math.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_math.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_math.arm" Directory="lib_math.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswift_math.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="_math.x64" Directory="_math.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_math.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_math.x64" Directory="lib_math.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswift_math.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="_math.x86" Directory="_math.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_math.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="lib_math.x86" Directory="lib_math.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswift_math.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Foundation Dependencies -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="FoundationDependencies.arm64" Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libbrotlicommon.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libbrotlidec.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libcurl.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libxml2.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libz.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="FoundationDependencies.arm" Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libbrotlicommon.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libbrotlidec.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libcurl.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libxml2.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libz.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="FoundationDependencies.x64" Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libbrotlicommon.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libbrotlidec.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libcurl.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libxml2.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libz.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="FoundationDependencies.x86" Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libbrotlicommon.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libbrotlidec.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libcurl.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libxml2.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libz.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- Observation -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Observation.arm64" Directory="Observation.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftObservation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libObservation.arm64" Directory="libObservation.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftObservation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="Observation.arm" Directory="Observation.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftObservation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libObservation.arm" Directory="libObservation.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftObservation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Observation.x64" Directory="Observation.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftObservation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libObservation.x64" Directory="libObservation.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftObservation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Observation.x86" Directory="Observation.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Observation.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftObservation.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libObservation.x86" Directory="libObservation.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftObservation.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- RegexBuilder -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="RegexBuilder.arm64" Directory="RegexBuilder.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftRegexBuilder.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libRegexBuilder.arm64" Directory="libRegexBuilder.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftRegexBuilder.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="RegexBuilder.arm" Directory="RegexBuilder.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftRegexBuilder.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libRegexBuilder.arm" Directory="libRegexBuilder.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftRegexBuilder.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="RegexBuilder.x64" Directory="RegexBuilder.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftRegexBuilder.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libRegexBuilder.x64" Directory="libRegexBuilder.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftRegexBuilder.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="RegexBuilder.x86" Directory="RegexBuilder.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\RegexBuilder.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftRegexBuilder.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libRegexBuilder.x86" Directory="libRegexBuilder.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftRegexBuilder.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- Swift -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Swift.arm64" Directory="Swift.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftCore.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwift.arm64" Directory="libSwift.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftCore.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="Swift.arm" Directory="Swift.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftCore.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwift.arm" Directory="libSwift.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftCore.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Swift.x64" Directory="Swift.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftCore.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwift.x64" Directory="libSwift.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftCore.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Swift.x86" Directory="Swift.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftCore.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwift.x86" Directory="libSwift.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftCore.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- SwiftOnoneSupport -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="SwiftOnoneSupport.arm64" Directory="SwiftOnoneSupport.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftSwiftOnoneSupport.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwiftOnoneSupport.arm64" Directory="libSwiftOnoneSupport.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftSwiftOnoneSupport.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="SwiftOnoneSupport.arm" Directory="SwiftOnoneSupport.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftSwiftOnoneSupport.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwiftOnoneSupport.arm" Directory="libSwiftOnoneSupport.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftSwiftOnoneSupport.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="SwiftOnoneSupport.x64" Directory="SwiftOnoneSupport.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftSwiftOnoneSupport.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwiftOnoneSupport.x64" Directory="libSwiftOnoneSupport.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftSwiftOnoneSupport.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="SwiftOnoneSupport.x86" Directory="SwiftOnoneSupport.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftSwiftOnoneSupport.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSwiftOnoneSupport.x86" Directory="libSwiftOnoneSupport.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftSwiftOnoneSupport.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- Synchronization -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Synchronization.arm64" Directory="Synchronization.swiftmodule">
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="2">
+        <Component DiskId="6">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftSynchronization.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSynchronization.arm64" Directory="libSynchronization.swiftmodule">
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="6">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftSynchronization.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="Synchronization.arm" Directory="Synchronization.swiftmodule">
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="3">
+        <Component DiskId="7">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm">
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftSynchronization.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSynchronization.arm" Directory="libSynchronization.swiftmodule">
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="7">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftSynchronization.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Synchronization.x64" Directory="Synchronization.swiftmodule">
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
+        <Component DiskId="8">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftSynchronization.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSynchronization.x64" Directory="libSynchronization.swiftmodule">
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="8">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftSynchronization.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Synchronization.x86" Directory="Synchronization.swiftmodule">
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\i686-unknown-linux-android.swiftinterface" />
-        </Component>
-        <Component DiskId="5">
+        <Component DiskId="9">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Synchronization.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="2">
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86">
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftSynchronization.so" />
         </Component>
       </ComponentGroup>
+      <ComponentGroup Id="libSynchronization.x86" Directory="libSynchronization.swiftmodule">
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="9">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftSynchronization.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
-    <ComponentGroup Id="apinotes" Directory="AndroidSDK_usr_lib_swift_apinotes">
+    <!-- apinotes -->
+    <ComponentGroup Id="APINotes" Directory="AndroidSDK_usr_lib_swift_apinotes">
       <Component>
         <File Source="$(SDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
       </Component>
@@ -2056,14 +3309,15 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="libcxxshim" Directory="AndroidSDK_usr_lib_swift_android">
-      <Component>
+    <!-- libcxxshim -->
+    <ComponentGroup Id="CXXShim" Directory="AndroidSDK_usr_lib_swift_android">
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\lib\swift\android\libcxxshim.h" />
       </Component>
-      <Component>
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\lib\swift\android\libcxxshim.modulemap" />
       </Component>
-      <Component>
+      <Component DiskId="5">
         <File Source="$(SDKRoot)\usr\lib\swift\android\libcxxstdlibshim.h" />
       </Component>
     </ComponentGroup>
@@ -2071,78 +3325,173 @@
     <!-- Registrar -->
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="Registrar.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
-        <Component DiskId="2">
+        <Component>
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\swiftrt.o" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="Registrar.arm" Directory="AndroidSDK_usr_lib_swift_android_arm">
-        <Component DiskId="3">
+        <Component>
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\swiftrt.o" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Registrar.x64" Directory="AndroidSDK_usr_lib_swift_android_x64">
-        <Component DiskId="4">
+        <Component>
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\swiftrt.o" />
         </Component>
       </ComponentGroup>
     <?endif?>
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Registrar.x86" Directory="AndroidSDK_usr_lib_swift_android_x86">
-        <Component DiskId="5">
+        <Component>
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\swiftrt.o" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
     <ComponentGroup Id="Configuration">
-      <Component Directory="AndroidSDK">
+      <Component Directory="AndroidSDK" DiskId="5">
         <File Source="$(SDKRoot)\SDKSettings.json" />
       </Component>
-      <Component Directory="AndroidSDK">
+      <Component Directory="AndroidSDK" DiskId="5">
         <File Source="$(SDKRoot)\SDKSettings.plist" />
       </Component>
-      <Component Directory="AndroidPlatform">
+      <Component Directory="AndroidPlatform" DiskId="5">
         <File Source="$(PlatformRoot)\Info.plist" />
       </Component>
     </ComponentGroup>
 
-    <!-- Features -->
-    <Feature Id="SDK" AllowAbsent="no" Title="!(loc.Plt_ProductName_Android)">
-      <ComponentGroupRef Id="SwiftRemoteMirror" />
-      <ComponentGroupRef Id="BlocksRuntime" />
-      <ComponentGroupRef Id="libdispatch" />
-      <ComponentGroupRef Id="_FoundationUnicode" />
-      <ComponentGroupRef Id="_FoundationCShims" />
+    <!-- CoreFoundation -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="CoreFoundation.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libCoreFoundation.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\lib_CFURLSessionInterface.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\lib_CFXMLInterface.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="CoreFoundation.arm" Directory="AndroidSDK_usr_lib_swift_android_arm">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libCoreFoundation.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\lib_CFURLSessionInterface.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\lib_CFXMLInterface.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="CoreFoundation.x64" Directory="AndroidSDK_usr_lib_swift_android_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libCoreFoundation.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\lib_CFURLSessionInterface.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\lib_CFXMLInterface.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="CoreFoundation.x86" Directory="AndroidSDK_usr_lib_swift_android_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libCoreFoundation.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\lib_CFURLSessionInterface.a" />
+        </Component>
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\lib_CFXMLInterface.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
 
+    <!-- Features -->
+    <Feature Display="hidden" Id="PlatformSupport" Title="!(loc.Plt_ProductName_Android)">
       <ComponentGroupRef Id="Testing" />
 
-      <ComponentGroupRef Id="Configuration" />
-      <ComponentGroupRef Id="SwiftShims" />
-      <ComponentGroupRef Id="apinotes" />
-      <ComponentGroupRef Id="libcxxshim" />
-
+      <!-- MSI management Components -->
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
 
     <?if $(IncludeARM64) = True?>
-      <Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_arm64)">
-        <Level Condition="INSTALLARM64SDK = 0" Value="0" />
+      <Feature Id="arm64.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Android_arm64)">
+        <Level Condition="INSTALLARM64PLATFORM = 0" Value="0" />
 
         <ComponentGroupRef Id="XCTest.arm64" />
         <ComponentGroupRef Id="Testing.arm64" />
+        <?if $(ANDROID_INCLUDE_DS2) = True?>
+          <ComponentGroupRef Id="ds2.arm64" />
+        <?endif?>
+      </Feature>
+    <?endif?>
 
-        <ComponentGroupRef Id="SwiftRemoteMirror.arm64" />
+    <?if $(IncludeARM) = True?>
+      <Feature Id="armv7.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Android_armv7)">
+        <Level Condition="INSTALLARMV7PLATFORM = 0" Value="0" />
 
-        <ComponentGroupRef Id="BlocksRuntime.arm64" />
-        <ComponentGroupRef Id="libdispatch.arm64" />
+        <ComponentGroupRef Id="XCTest.arm" />
+        <ComponentGroupRef Id="Testing.arm" />
+        <?if $(ANDROID_INCLUDE_DS2) = True?>
+          <ComponentGroupRef Id="ds2.arm" />
+        <?endif?>
+      </Feature>
+    <?endif?>
 
-        <ComponentGroupRef Id="_math.arm64" />
-        <ComponentGroupRef Id="Android.arm64" />
+    <?if $(IncludeX64) = True?>
+      <Feature Id="x64.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Android_amd64)">
+        <Level Condition="INSTALLX64PLATFORM = 0" Value="0" />
 
+        <ComponentGroupRef Id="XCTest.x64" />
+        <ComponentGroupRef Id="Testing.x64" />
+        <?if $(ANDROID_INCLUDE_DS2) = True?>
+          <ComponentGroupRef Id="ds2.x64" />
+        <?endif?>
+      </Feature>
+    <?endif?>
+
+    <?if $(IncludeX86) = True?>
+      <Feature Id="x86.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Android_x86)">
+        <Level Condition="INSTALLX86PLATFORM = 0" Value="0" />
+
+        <ComponentGroupRef Id="XCTest.x86" />
+        <ComponentGroupRef Id="Testing.x86" />
+        <?if $(ANDROID_INCLUDE_DS2) = True?>
+          <ComponentGroupRef Id="ds2.x86" />
+        <?endif?>
+      </Feature>
+    <?endif?>
+
+    <Feature Id="SDK" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Android)">
+      <ComponentGroupRef Id="APINotes" />
+      <ComponentGroupRef Id="BlocksRuntime" />
+      <ComponentGroupRef Id="CXXShim" />
+      <ComponentGroupRef Id="Configuration" />
+      <ComponentGroupRef Id="Dispatch" />
+      <ComponentGroupRef Id="SwiftRemoteMirror" />
+      <ComponentGroupRef Id="SwiftShims" />
+      <ComponentGroupRef Id="_FoundationCShims" />
+      <ComponentGroupRef Id="_FoundationUnicode" />
+    </Feature>
+
+    <?if $(IncludeARM64) = True?>
+      <Feature Id="ARM64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_arm64)">
+        <Level Condition="INSTALLARM64SDK = 0" Value="0" />
+
+        <ComponentGroupRef Id="Android.arm64" />
+        <ComponentGroupRef Id="BlocksRuntime.arm64" />
         <ComponentGroupRef Id="Cxx.arm64" />
         <ComponentGroupRef Id="CxxStdlib.arm64" />
         <ComponentGroupRef Id="Distributed.arm64" />
@@ -2155,7 +3504,9 @@
         <ComponentGroupRef Id="RegexBuilder.arm64" />
         <ComponentGroupRef Id="Swift.arm64" />
         <ComponentGroupRef Id="SwiftOnoneSupport.arm64" />
+        <ComponentGroupRef Id="SwiftRemoteMirror.arm64" />
         <ComponentGroupRef Id="Synchronization.arm64" />
+        <ComponentGroupRef Id="_math.arm64" />
         <ComponentGroupRef Id="_Builtin_float.arm64" />
         <ComponentGroupRef Id="_Concurrency.arm64" />
         <ComponentGroupRef Id="_Differentiation.arm64" />
@@ -2164,12 +3515,41 @@
         <ComponentGroupRef Id="_RegexParser.arm64" />
         <ComponentGroupRef Id="_StringProcessing.arm64" />
         <ComponentGroupRef Id="_Volatile.arm64" />
+        <ComponentGroupRef Id="dispatch.arm64" />
+        <ComponentGroupRef Id="swiftDispatch.arm64" />
+
+        <ComponentGroupRef Id="CoreFoundation.arm64" />
+        <ComponentGroupRef Id="FoundationDependencies.arm64" />
+        <ComponentGroupRef Id="libAndroid.arm64" />
+        <ComponentGroupRef Id="libBlocksRuntime.arm64" />
+        <ComponentGroupRef Id="libCxx.arm64" />
+        <ComponentGroupRef Id="libCxxStdlib.arm64" />
+        <ComponentGroupRef Id="libDistributed.arm64" />
+        <ComponentGroupRef Id="libFoundation.arm64" />
+        <ComponentGroupRef Id="libFoundationEssentials.arm64" />
+        <ComponentGroupRef Id="libFoundationInternationalization.arm64" />
+        <ComponentGroupRef Id="libFoundationNetworking.arm64" />
+        <ComponentGroupRef Id="libFoundationXML.arm64" />
+        <ComponentGroupRef Id="libObservation.arm64" />
+        <ComponentGroupRef Id="libRegexBuilder.arm64" />
+        <ComponentGroupRef Id="libSwift.arm64" />
+        <ComponentGroupRef Id="libSwiftOnoneSupport.arm64" />
+        <ComponentGroupRef Id="libSwiftRemoteMirror.arm64" />
+        <ComponentGroupRef Id="libSynchronization.arm64" />
+        <ComponentGroupRef Id="lib_math.arm64" />
+        <ComponentGroupRef Id="lib_Builtin_float.arm64" />
+        <ComponentGroupRef Id="lib_Concurrency.arm64" />
+        <ComponentGroupRef Id="lib_Differentiation.arm64" />
+        <ComponentGroupRef Id="lib_FoundationCShims.arm64" />
+        <ComponentGroupRef Id="lib_FoundationCollections.arm64" />
+        <ComponentGroupRef Id="lib_FoundationUnicode.arm64" />
+        <ComponentGroupRef Id="lib_RegexParser.arm64" />
+        <ComponentGroupRef Id="lib_StringProcessing.arm64" />
+        <ComponentGroupRef Id="lib_Volatile.arm64" />
+        <ComponentGroupRef Id="libdispatch.arm64" />
+        <ComponentGroupRef Id="libswiftDispatch.arm64" />
 
         <ComponentGroupRef Id="Registrar.arm64" />
-
-        <?if $(ANDROID_INCLUDE_DS2) = True?>
-          <ComponentGroupRef Id="ds2.arm64" />
-        <?endif?>
       </Feature>
     <?endif?>
 
@@ -2177,17 +3557,8 @@
       <Feature Id="armv7" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_armv7)">
         <Level Condition="INSTALLARMSDK = 0" Value="0" />
 
-        <ComponentGroupRef Id="XCTest.arm" />
-        <ComponentGroupRef Id="Testing.arm" />
-
-        <ComponentGroupRef Id="SwiftRemoteMirror.arm" />
-
-        <ComponentGroupRef Id="BlocksRuntime.arm" />
-        <ComponentGroupRef Id="libdispatch.arm" />
-
-        <ComponentGroupRef Id="_math.arm" />
         <ComponentGroupRef Id="Android.arm" />
-
+        <ComponentGroupRef Id="BlocksRuntime.arm" />
         <ComponentGroupRef Id="Cxx.arm" />
         <ComponentGroupRef Id="CxxStdlib.arm" />
         <ComponentGroupRef Id="Distributed.arm" />
@@ -2200,7 +3571,9 @@
         <ComponentGroupRef Id="RegexBuilder.arm" />
         <ComponentGroupRef Id="Swift.arm" />
         <ComponentGroupRef Id="SwiftOnoneSupport.arm" />
+        <ComponentGroupRef Id="SwiftRemoteMirror.arm" />
         <ComponentGroupRef Id="Synchronization.arm" />
+        <ComponentGroupRef Id="_math.arm" />
         <ComponentGroupRef Id="_Builtin_float.arm" />
         <ComponentGroupRef Id="_Concurrency.arm" />
         <ComponentGroupRef Id="_Differentiation.arm" />
@@ -2209,12 +3582,41 @@
         <ComponentGroupRef Id="_RegexParser.arm" />
         <ComponentGroupRef Id="_StringProcessing.arm" />
         <ComponentGroupRef Id="_Volatile.arm" />
+        <ComponentGroupRef Id="dispatch.arm" />
+        <ComponentGroupRef Id="swiftDispatch.arm" />
+
+        <ComponentGroupRef Id="CoreFoundation.arm" />
+        <ComponentGroupRef Id="FoundationDependencies.arm" />
+        <ComponentGroupRef Id="libAndroid.arm" />
+        <ComponentGroupRef Id="libBlocksRuntime.arm" />
+        <ComponentGroupRef Id="libCxx.arm" />
+        <ComponentGroupRef Id="libCxxStdlib.arm" />
+        <ComponentGroupRef Id="libDistributed.arm" />
+        <ComponentGroupRef Id="libFoundation.arm" />
+        <ComponentGroupRef Id="libFoundationEssentials.arm" />
+        <ComponentGroupRef Id="libFoundationInternationalization.arm" />
+        <ComponentGroupRef Id="libFoundationNetworking.arm" />
+        <ComponentGroupRef Id="libFoundationXML.arm" />
+        <ComponentGroupRef Id="libObservation.arm" />
+        <ComponentGroupRef Id="libRegexBuilder.arm" />
+        <ComponentGroupRef Id="libSwift.arm" />
+        <ComponentGroupRef Id="libSwiftOnoneSupport.arm" />
+        <ComponentGroupRef Id="libSwiftRemoteMirror.arm" />
+        <ComponentGroupRef Id="libSynchronization.arm" />
+        <ComponentGroupRef Id="lib_math.arm" />
+        <ComponentGroupRef Id="lib_Builtin_float.arm" />
+        <ComponentGroupRef Id="lib_Concurrency.arm" />
+        <ComponentGroupRef Id="lib_Differentiation.arm" />
+        <ComponentGroupRef Id="lib_FoundationCShims.arm" />
+        <ComponentGroupRef Id="lib_FoundationCollections.arm" />
+        <ComponentGroupRef Id="lib_FoundationUnicode.arm" />
+        <ComponentGroupRef Id="lib_RegexParser.arm" />
+        <ComponentGroupRef Id="lib_StringProcessing.arm" />
+        <ComponentGroupRef Id="lib_Volatile.arm" />
+        <ComponentGroupRef Id="libdispatch.arm" />
+        <ComponentGroupRef Id="libswiftDispatch.arm" />
 
         <ComponentGroupRef Id="Registrar.arm" />
-
-        <?if $(ANDROID_INCLUDE_DS2) = True?>
-          <ComponentGroupRef Id="ds2.arm" />
-        <?endif?>
       </Feature>
     <?endif?>
 
@@ -2222,17 +3624,8 @@
       <Feature Id="amd64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_amd64)">
         <Level Condition="INSTALLAMD64SDK = 0" Value="0" />
 
-        <ComponentGroupRef Id="XCTest.x64" />
-        <ComponentGroupRef Id="Testing.x64" />
-
-        <ComponentGroupRef Id="SwiftRemoteMirror.x64" />
-
-        <ComponentGroupRef Id="BlocksRuntime.x64" />
-        <ComponentGroupRef Id="libdispatch.x64" />
-
-        <ComponentGroupRef Id="_math.x64" />
         <ComponentGroupRef Id="Android.x64" />
-
+        <ComponentGroupRef Id="BlocksRuntime.x64" />
         <ComponentGroupRef Id="Cxx.x64" />
         <ComponentGroupRef Id="CxxStdlib.x64" />
         <ComponentGroupRef Id="Distributed.x64" />
@@ -2245,7 +3638,9 @@
         <ComponentGroupRef Id="RegexBuilder.x64" />
         <ComponentGroupRef Id="Swift.x64" />
         <ComponentGroupRef Id="SwiftOnoneSupport.x64" />
+        <ComponentGroupRef Id="SwiftRemoteMirror.x64" />
         <ComponentGroupRef Id="Synchronization.x64" />
+        <ComponentGroupRef Id="_math.x64" />
         <ComponentGroupRef Id="_Builtin_float.x64" />
         <ComponentGroupRef Id="_Concurrency.x64" />
         <ComponentGroupRef Id="_Differentiation.x64" />
@@ -2254,12 +3649,41 @@
         <ComponentGroupRef Id="_RegexParser.x64" />
         <ComponentGroupRef Id="_StringProcessing.x64" />
         <ComponentGroupRef Id="_Volatile.x64" />
+        <ComponentGroupRef Id="dispatch.x64" />
+        <ComponentGroupRef Id="swiftDispatch.x64" />
+
+        <ComponentGroupRef Id="CoreFoundation.x64" />
+        <ComponentGroupRef Id="FoundationDependencies.x64" />
+        <ComponentGroupRef Id="libAndroid.x64" />
+        <ComponentGroupRef Id="libBlocksRuntime.x64" />
+        <ComponentGroupRef Id="libCxx.x64" />
+        <ComponentGroupRef Id="libCxxStdlib.x64" />
+        <ComponentGroupRef Id="libDistributed.x64" />
+        <ComponentGroupRef Id="libFoundation.x64" />
+        <ComponentGroupRef Id="libFoundationEssentials.x64" />
+        <ComponentGroupRef Id="libFoundationInternationalization.x64" />
+        <ComponentGroupRef Id="libFoundationNetworking.x64" />
+        <ComponentGroupRef Id="libFoundationXML.x64" />
+        <ComponentGroupRef Id="libObservation.x64" />
+        <ComponentGroupRef Id="libRegexBuilder.x64" />
+        <ComponentGroupRef Id="libSwift.x64" />
+        <ComponentGroupRef Id="libSwiftOnoneSupport.x64" />
+        <ComponentGroupRef Id="libSwiftRemoteMirror.x64" />
+        <ComponentGroupRef Id="libSynchronization.x64" />
+        <ComponentGroupRef Id="lib_math.x64" />
+        <ComponentGroupRef Id="lib_Builtin_float.x64" />
+        <ComponentGroupRef Id="lib_Concurrency.x64" />
+        <ComponentGroupRef Id="lib_Differentiation.x64" />
+        <ComponentGroupRef Id="lib_FoundationCShims.x64" />
+        <ComponentGroupRef Id="lib_FoundationCollections.x64" />
+        <ComponentGroupRef Id="lib_FoundationUnicode.x64" />
+        <ComponentGroupRef Id="lib_RegexParser.x64" />
+        <ComponentGroupRef Id="lib_StringProcessing.x64" />
+        <ComponentGroupRef Id="lib_Volatile.x64" />
+        <ComponentGroupRef Id="libdispatch.x64" />
+        <ComponentGroupRef Id="libswiftDispatch.x64" />
 
         <ComponentGroupRef Id="Registrar.x64" />
-
-        <?if $(ANDROID_INCLUDE_DS2) = True?>
-          <ComponentGroupRef Id="ds2.x64" />
-        <?endif?>
       </Feature>
     <?endif?>
 
@@ -2267,17 +3691,8 @@
       <Feature Id="x86" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_x86)">
         <Level Condition="INSTALLX86SDK = 0" Value="0" />
 
-        <ComponentGroupRef Id="XCTest.x86" />
-        <ComponentGroupRef Id="Testing.x86" />
-
-        <ComponentGroupRef Id="SwiftRemoteMirror.x86" />
-
-        <ComponentGroupRef Id="BlocksRuntime.x86" />
-        <ComponentGroupRef Id="libdispatch.x86" />
-
-        <ComponentGroupRef Id="_math.x86" />
         <ComponentGroupRef Id="Android.x86" />
-
+        <ComponentGroupRef Id="BlocksRuntime.x86" />
         <ComponentGroupRef Id="Cxx.x86" />
         <ComponentGroupRef Id="CxxStdlib.x86" />
         <ComponentGroupRef Id="Distributed.x86" />
@@ -2290,7 +3705,9 @@
         <ComponentGroupRef Id="RegexBuilder.x86" />
         <ComponentGroupRef Id="Swift.x86" />
         <ComponentGroupRef Id="SwiftOnoneSupport.x86" />
+        <ComponentGroupRef Id="SwiftRemoteMirror.x86" />
         <ComponentGroupRef Id="Synchronization.x86" />
+        <ComponentGroupRef Id="_math.x86" />
         <ComponentGroupRef Id="_Builtin_float.x86" />
         <ComponentGroupRef Id="_Concurrency.x86" />
         <ComponentGroupRef Id="_Differentiation.x86" />
@@ -2299,12 +3716,41 @@
         <ComponentGroupRef Id="_RegexParser.x86" />
         <ComponentGroupRef Id="_StringProcessing.x86" />
         <ComponentGroupRef Id="_Volatile.x86" />
+        <ComponentGroupRef Id="dispatch.x86" />
+        <ComponentGroupRef Id="swiftDispatch.x86" />
+
+        <ComponentGroupRef Id="CoreFoundation.x86" />
+        <ComponentGroupRef Id="FoundationDependencies.x86" />
+        <ComponentGroupRef Id="libAndroid.x86" />
+        <ComponentGroupRef Id="libBlocksRuntime.x86" />
+        <ComponentGroupRef Id="libCxx.x86" />
+        <ComponentGroupRef Id="libCxxStdlib.x86" />
+        <ComponentGroupRef Id="libDistributed.x86" />
+        <ComponentGroupRef Id="libFoundation.x86" />
+        <ComponentGroupRef Id="libFoundationEssentials.x86" />
+        <ComponentGroupRef Id="libFoundationInternationalization.x86" />
+        <ComponentGroupRef Id="libFoundationNetworking.x86" />
+        <ComponentGroupRef Id="libFoundationXML.x86" />
+        <ComponentGroupRef Id="libObservation.x86" />
+        <ComponentGroupRef Id="libRegexBuilder.x86" />
+        <ComponentGroupRef Id="libSwift.x86" />
+        <ComponentGroupRef Id="libSwiftOnoneSupport.x86" />
+        <ComponentGroupRef Id="libSwiftRemoteMirror.x86" />
+        <ComponentGroupRef Id="libSynchronization.x86" />
+        <ComponentGroupRef Id="lib_math.x86" />
+        <ComponentGroupRef Id="lib_Builtin_float.x86" />
+        <ComponentGroupRef Id="lib_Concurrency.x86" />
+        <ComponentGroupRef Id="lib_Differentiation.x86" />
+        <ComponentGroupRef Id="lib_FoundationCShims.x86" />
+        <ComponentGroupRef Id="lib_FoundationCollections.x86" />
+        <ComponentGroupRef Id="lib_FoundationUnicode.x86" />
+        <ComponentGroupRef Id="lib_RegexParser.x86" />
+        <ComponentGroupRef Id="lib_StringProcessing.x86" />
+        <ComponentGroupRef Id="lib_Volatile.x86" />
+        <ComponentGroupRef Id="libdispatch.x86" />
+        <ComponentGroupRef Id="libswiftDispatch.x86" />
 
         <ComponentGroupRef Id="Registrar.x86" />
-
-        <?if $(ANDROID_INCLUDE_DS2) = True?>
-          <ComponentGroupRef Id="ds2.x86" />
-        <?endif?>
       </Feature>
     <?endif?>
   </Package>
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index 97592391..18792672 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -30,6 +30,10 @@
   <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_Android_arm64" Value="Swift Android Platform Support (ARM64)" />
+  <String Id="Plt_ProductName_Android_armv7" Value="Swift Android Platform Support (ARMv7)" />
+  <String Id="Plt_ProductName_Android_amd64" Value="Swift Android Platform Support (AMD64)" />
+  <String Id="Plt_ProductName_Android_x86" Value="Swift Android Platform Support (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)" />

From 94c939034f8fc6ee9834251667d518d2f485b200 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Fri, 8 Aug 2025 15:46:08 -0700
Subject: [PATCH 3/3] WiX: ingest the MSI redistributable in the toolchain

With the ability to install the runtime with SxS manifesting, we now
properly build the toolchain against a previous runtime which is
isolated from the SDK associated runtime. In order to support this
model, we must ingest the redistributable and package that into the
toolchain.
---
 platforms/Windows/Directory.Build.props |  1 +
 platforms/Windows/bld/bld.wxi           | 40 +++++++++----------------
 platforms/Windows/bundle/installer.wxs  |  3 +-
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props
index 0cffdb4b..840e7a45 100644
--- a/platforms/Windows/Directory.Build.props
+++ b/platforms/Windows/Directory.Build.props
@@ -85,6 +85,7 @@
       WindowsRuntimeARM64=$(WindowsRuntimeARM64);
       WindowsRuntimeX64=$(WindowsRuntimeX64);
       WindowsRuntimeX86=$(WindowsRuntimeX86);
+      RedistributablesDirectory=$(RedistributablesDirectory);
     </DefineConstants>
   </PropertyGroup>
 
diff --git a/platforms/Windows/bld/bld.wxi b/platforms/Windows/bld/bld.wxi
index 788a543f..8140af99 100644
--- a/platforms/Windows/bld/bld.wxi
+++ b/platforms/Windows/bld/bld.wxi
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
+  <?if $(sys.BUILDARCH) == x64 ?>
+    <?define MergeModuleFileName = "rtl.amd64.msm" ?>
+  <?else?>
+    <?define MergeModuleFileName = "rtl.$(sys.BUILDARCH).msm" ?>
+  <?endif?>
+
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
@@ -35,6 +41,10 @@
       </Directory>
     </DirectoryRef>
 
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
+      <Merge DiskId="1" Id="swift_runtime" Language="0" SourceFile="$(RedistributablesDirectory)\$(MergeModuleFileName)" />
+    </DirectoryRef>
+
     <ComponentGroup Id="cmark_gfm" Directory="toolchain_$(VariantName)_usr_bin">
       <Component>
         <File Source="$(ToolchainRoot)\usr\bin/cmark-gfm.dll" />
@@ -212,30 +222,6 @@
       </Component>
     </ComponentGroup>
 
-    <ComponentGroup Id="BlocksRuntime">
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
-        <File Source="$(ToolchainRoot)\usr\bin\BlocksRuntime.dll" />
-      </Component>
-
-      <Component Directory="toolchain_$(VariantName)_usr_lib">
-        <File Source="$(ToolchainRoot)\usr\lib\BlocksRuntime.lib" />
-      </Component>
-
-      <!-- TODO(compnerd) should we install the block headers? -->
-    </ComponentGroup>
-
-    <ComponentGroup Id="libdispatch">
-      <Component Directory="toolchain_$(VariantName)_usr_bin">
-        <File Source="$(ToolchainRoot)\usr\bin\dispatch.dll" />
-      </Component>
-
-      <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_$(VariantName)_usr_lib_swift_swiftToCxx">
       <Component>
         <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
@@ -551,6 +537,10 @@
       </Component>
     </ComponentGroup>
 
+    <Feature Id="SwiftRuntimeRedistributable" Title="Swift Runtime Redistributable" AllowAdvertise="no" Display="hidden" Level="1">
+      <MergeRef Id="swift_runtime" />
+    </Feature>
+
     <Feature Id="BuildTools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="cmark_gfm" />
 
@@ -558,8 +548,6 @@
       <ComponentGroupRef Id="lto" />
       <ComponentGroupRef Id="clang" />
       <ComponentGroupRef Id="lld" />
-      <ComponentGroupRef Id="BlocksRuntime" />
-      <ComponentGroupRef Id="libdispatch" />
       <ComponentGroupRef Id="swift" />
       <ComponentGroupRef Id="argument_parser" />
       <ComponentGroupRef Id="tools_support_core" />
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index 1f3e1fb0..d17440e8 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -32,7 +32,8 @@
     <Variable Name="OptionsInstallCLI" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallDBG" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallIDE" bal:Overridable="yes" Persisted="yes" Value="1" />
-    <Variable Name="OptionsInstallRTL" Value="1" />
+    <!-- TODO(compnerd) enable installing non-native RTL (e.g. X64 on ARM64) -->
+    <Variable Name="OptionsInstallRTL" bal:Overridable="yes" Persisted="yes" Value="1" />
 
     <Variable Name="OptionsInstallUtilities" bal:Overridable="yes" Persisted="yes" Value="1" />