From 21fae8c5bf5dc227f889e7821c426000cce09eff Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Tue, 19 May 2026 11:35:55 -0700
Subject: [PATCH 1/3] WiX: drop legacy SDK, promote experimental packaging

Remove the legacy SDK packaging, promote the experimental SDK to the
canonical SDK. Update the rules to use a bit more whitespace to make it
easier to process the sources non-progamatically.

(cherry picked from commit ff7dd3e1013e83bf22427fac642318129d0b4bbb)
---
 platforms/Windows/Directory.Build.props       |    7 -
 .../Windows/SideBySideUpgradeStrategy.props   |    6 +-
 platforms/Windows/bundle/installer.wixproj    |    4 -
 platforms/Windows/bundle/installer.wxs        |   13 -
 .../Windows/platforms/android/android.wxs     | 2644 ++++++++--
 .../Windows/platforms/windows/windows.wixproj |   18 +-
 .../Windows/platforms/windows/windows.wxs     | 4528 ++++++-----------
 .../Windows/rtl/legacy/lib/rtllib.wixproj     |    7 -
 platforms/Windows/rtl/legacy/lib/rtllib.wxs   |  145 -
 .../Windows/rtl/legacy/msi/rtlmsi.wixproj     |   36 -
 platforms/Windows/rtl/legacy/msi/rtlmsi.wxs   |   51 -
 .../Windows/rtl/legacy/msm/rtlmsm.wixproj     |   18 -
 platforms/Windows/rtl/legacy/msm/rtlmsm.wxs   |   24 -
 .../Windows/rtl/shared/lib/rtl.shared.lib.wxs |   12 +-
 .../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      |    8 +-
 17 files changed, 3612 insertions(+), 3919 deletions(-)
 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 382ce242..06e16b51 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>
@@ -88,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 40004dfe..ce3d4b7a 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>
     <PythonUpgradeCode>{5FC42BA9-ABF5-4CCD-B93B-BDFED936BA37}</PythonUpgradeCode>
@@ -77,8 +76,7 @@
       DbgNoAssertsUpgradeCode=$(DbgNoAssertsUpgradeCode);
       IdeAssertsUpgradeCode=$(IdeAssertsUpgradeCode);
       IdeNoAssertsUpgradeCode=$(IdeNoAssertsUpgradeCode);
-      RtlUpgradeCode=$(RtlUpgradeCode);
-      ExperimentalRTLUpgradeCode=$(ExperimentalRTLUpgradeCode);
+      RTLUpgradeCode=$(RTLUpgradeCode);
       AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
       WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
       PythonUpgradeCode=$(PythonUpgradeCode);
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index e0cdc453..2f183359 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -32,10 +32,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 647ab36b..8ad8e46b 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -165,15 +165,6 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-<?if $(IncludeLegacySDK) == True?>
-      <MsiPackage
-        SourceFile="!(bindpath.rtl)\rtl.msi"
-        DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-        <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-        <MsiProperty Name="INSTALLSUPPORT" Value="[OptionsInstallSupport]" />
-        <MsiProperty Name="INSTALLUTILITIES" Value="[OptionsInstallUtilities]" />
-      </MsiPackage>
-<?else?>
       <MsiPackage
         SourceFile="!(bindpath.rtl.shared)\rtl.$(ProductArchitecture).msi"
         DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
@@ -181,7 +172,6 @@
         <MsiProperty Name="INSTALLSUPPORT" Value="[OptionsInstallSupport]" />
         <MsiProperty Name="INSTALLUTILITIES" Value="[OptionsInstallUtilities]" />
       </MsiPackage>
-<?endif?>
 
       <?if $(IncludeAndroid) == True?>
         <MsiPackage
@@ -205,15 +195,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/android/android.wxs b/platforms/Windows/platforms/android/android.wxs
index f460ddf4..128cd24f 100644
--- a/platforms/Windows/platforms/android/android.wxs
+++ b/platforms/Windows/platforms/android/android.wxs
@@ -96,7 +96,7 @@
                       <?if $(IncludeX86) = True?>
                         <Directory Id="Testing_usr_lib_swift_android_x86" Name="i686" DiskId="5" />
                       <?endif?>
-                      <Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" />
+                      <Directory Id="Testing.swiftcrossimport" Name="Testing.swiftcrossimport" DiskId="1" />
                       <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
                     </Directory>
                   </Directory>
@@ -119,58 +119,98 @@
             <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__foundation_unicode" Name="_foundation_unicode" DiskId="1" />
+                  <Directory Id="AndroidSDK_usr_include__FoundationCShims" Name="_FoundationCShims" DiskId="1" />
+                  <Directory Id="AndroidSDK_usr_include_Block" Name="Block" DiskId="1" />
+                  <Directory Id="AndroidSDK_usr_include_dispatch" Name="dispatch" DiskId="1" />
+                  <Directory Id="AndroidSDK_usr_include_os" Name="os" DiskId="1" />
                   <Directory Name="swift">
-                    <Directory Id="AndroidSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" />
+                    <Directory Id="AndroidSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" DiskId="1" />
                   </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="1" />
+                    <Directory Id="AndroidSDK_usr_lib_swift_shims" Name="shims" DiskId="1" />
                     <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="_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
+                      <Directory Id="_math.swiftmodule" Name="_math.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" />
                       <?if $(IncludeARM64) = True?>
-                        <Directory Id="AndroidSDK_usr_lib_swift_android_arm64" Name="aarch64" />
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_arm64" Name="aarch64" DiskId="2" />
+                      <?endif?>
+                      <?if $(IncludeARM) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_arm" Name="armv7" DiskId="3" />
+                      <?endif?>
+                      <?if $(IncludeX64) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_x64" Name="x86_64" DiskId="4" />
+                      <?endif?>
+                      <?if $(IncludeX86) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_x86" Name="i686" DiskId="5" />
+                      <?endif?>
+                    </Directory>
+                  </Directory>
+                  <Directory Name="swift_static">
+                    <Directory Id="AndroidSDK_usr_lib_swift_static_android" Name="android">
+                      <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_math.swiftmodule" Name="_math.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" />
+                      <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" />
+                      <?if $(IncludeARM64) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_static_android_arm64" Name="aarch64" DiskId="2" />
                       <?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="3" />
                       <?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="4" />
                       <?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="5" />
                       <?endif?>
                     </Directory>
                   </Directory>
                 </Directory>
+                <Directory Id="AndroidSDK_usr_share" Name="share" DiskId="1" />
               </Directory>
             </Directory>
           </Directory>
@@ -188,11 +228,12 @@
           <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">
@@ -202,11 +243,12 @@
           <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">
@@ -216,11 +258,12 @@
           <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">
@@ -230,7 +273,7 @@
           <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,6 +285,7 @@
         <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">
@@ -258,14 +302,15 @@
           <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">
+        <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" DiskId="2">
+        <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>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="Testing.arm">
         <Component Directory="Testing.swiftmodule" DiskId="3">
@@ -282,14 +327,15 @@
           <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">
+        <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" DiskId="3">
+        <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>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="Testing.x64">
         <Component Directory="Testing.swiftmodule" DiskId="4">
@@ -306,14 +352,15 @@
           <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">
+        <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" DiskId="4">
+        <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>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Testing.x86">
         <Component Directory="Testing.swiftmodule" DiskId="5">
@@ -330,10 +377,10 @@
           <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">
+        <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" DiskId="5">
+        <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>
       </ComponentGroup>
@@ -348,6 +395,7 @@
           </Component>
         </ComponentGroup>
       <?endif?>
+
       <?if $(IncludeARM) = True?>
         <ComponentGroup Id="ds2.arm" Directory="_ds2_usr_bin">
           <Component DiskId="3">
@@ -355,6 +403,7 @@
           </Component>
         </ComponentGroup>
       <?endif?>
+
       <?if $(IncludeX64) = True?>
         <ComponentGroup Id="ds2.x64" Directory="_ds2_usr_bin">
           <Component DiskId="4">
@@ -362,6 +411,7 @@
           </Component>
         </ComponentGroup>
       <?endif?>
+
       <?if $(IncludeX86) = True?>
         <ComponentGroup Id="ds2.x86" Directory="_ds2_usr_bin">
           <Component DiskId="5">
@@ -371,50 +421,104 @@
       <?endif?>
     <?endif?>
 
-    <!-- SwiftRemoteMirror -->
-    <ComponentGroup Id="SwiftRemoteMirror" Directory="AndroidSDK_usr_include_swift_SwiftRemoteMirror">
-      <Component>
-        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\Platform.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\module.modulemap" />
-      </Component>
+    <!-- _FoundationUnicode -->
+    <ComponentGroup Id="_FoundationUnicode" Directory="AndroidSDK_usr_include__foundation_unicode">
+      <?define Disk = 1?>
+      <?include ../_FoundationUnicode.wxi?>
+      <?undef Disk?>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftRemoteMirror.so" />
+      <ComponentGroup Id="_FoundationUnicode.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\lib_FoundationICU.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="lib_FoundationUnicode.arm64" Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\lib_FoundationICU.a" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeARM) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.arm" Directory="AndroidSDK_usr_lib_swift_android_arm">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftRemoteMirror.so" />
+      <ComponentGroup Id="_FoundationUnicode.arm" Directory="AndroidSDK_usr_lib_swift_android_arm">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\lib_FoundationICU.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="lib_FoundationUnicode.arm" Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\lib_FoundationICU.a" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.x64" Directory="AndroidSDK_usr_lib_swift_android_x64">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftRemoteMirror.so" />
+      <ComponentGroup Id="_FoundationUnicode.x64" Directory="AndroidSDK_usr_lib_swift_android_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\lib_FoundationICU.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="lib_FoundationUnicode.x64" Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\lib_FoundationICU.a" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="SwiftRemoteMirror.x86" Directory="AndroidSDK_usr_lib_swift_android_x86">
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftRemoteMirror.so" />
+      <ComponentGroup Id="_FoundationUnicode.x86" Directory="AndroidSDK_usr_lib_swift_android_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\lib_FoundationICU.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="lib_FoundationUnicode.x86" Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+        <Component>
+          <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?>
+      <?include ../_FoundationCShims.wxi?>
+      <?undef Disk?>
+    </ComponentGroup>
+
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="lib_FoundationCShims.arm64" Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\lib_FoundationCShims.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="lib_FoundationCShims.arm" Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\lib_FoundationCShims.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="lib_FoundationCShims.x64" Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\lib_FoundationCShims.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="lib_FoundationCShims.x86" Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\lib_FoundationCShims.a" />
         </Component>
       </ComponentGroup>
     <?endif?>
@@ -428,35 +532,62 @@
 
     <?if $(IncludeARM64) = True?>
       <ComponentGroup Id="BlocksRuntime.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
-        <Component DiskId="2">
+        <Component>
           <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libBlocksRuntime.so" />
         </Component>
       </ComponentGroup>
+
+      <ComponentGroup Id="libBlocksRuntime.arm64" Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libBlocksRuntime.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeARM) = True?>
       <ComponentGroup Id="BlocksRuntime.arm" Directory="AndroidSDK_usr_lib_swift_android_arm">
-        <Component DiskId="3">
+        <Component>
           <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libBlocksRuntime.so" />
         </Component>
       </ComponentGroup>
+
+      <ComponentGroup Id="libBlocksRuntime.arm" Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libBlocksRuntime.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="BlocksRuntime.x64" Directory="AndroidSDK_usr_lib_swift_android_x64">
-        <Component DiskId="4">
+        <Component>
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libBlocksRuntime.so" />
         </Component>
       </ComponentGroup>
+
+      <ComponentGroup Id="libBlocksRuntime.x64" Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libBlocksRuntime.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="BlocksRuntime.x86" Directory="AndroidSDK_usr_lib_swift_android_x86">
-        <Component DiskId="5">
+        <Component>
           <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libBlocksRuntime.so" />
         </Component>
       </ComponentGroup>
+
+      <ComponentGroup Id="libBlocksRuntime.x86" Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libBlocksRuntime.a" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
 
     <!-- libdispatch -->
-    <ComponentGroup Id="libdispatch" Directory="AndroidSDK_usr_include_dispatch">
+    <ComponentGroup Id="Dispatch" Directory="AndroidSDK_usr_include_dispatch">
       <?define Disk = 1?>
       <?include ../CDispatch.wxi?>
       <?undef Disk?>
@@ -476,115 +607,216 @@
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="libdispatch.arm64">
-        <Component Directory="Dispatch.swiftmodule" DiskId="2">
+      <ComponentGroup Id="dispatch.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftDispatch.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libdispatch.arm64" Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libdispatch.a" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="swiftDispatch.arm64" Directory="Dispatch.swiftmodule">
+        <Component DiskId="2">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Dispatch.swiftmodule" DiskId="2">
+        <Component DiskId="2">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
+      </ComponentGroup>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libdispatch.so" />
+      <ComponentGroup Id="libswiftDispatch.arm64" Directory="libDispatch.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftDispatch.so" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeARM) = True?>
-      <ComponentGroup Id="libdispatch.arm">
-        <Component Directory="Dispatch.swiftmodule" DiskId="3">
+      <ComponentGroup Id="dispatch.arm" Directory="AndroidSDK_usr_lib_swift_android_arm">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libdispatch.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libdispatch.arm" Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libdispatch.a" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="swiftDispatch.arm" Directory="Dispatch.swiftmodule">
+        <Component DiskId="3">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Dispatch.swiftmodule" DiskId="3">
+        <Component DiskId="3">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
+      </ComponentGroup>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libdispatch.so" />
+      <ComponentGroup Id="libswiftDispatch.arm" Directory="libDispatch.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftDispatch.so" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="libdispatch.x64">
-        <Component Directory="Dispatch.swiftmodule" DiskId="4">
+      <ComponentGroup Id="dispatch.x64" Directory="AndroidSDK_usr_lib_swift_android_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libdispatch.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libdispatch.x64" Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libdispatch.a" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="swiftDispatch.x64" Directory="Dispatch.swiftmodule">
+        <Component DiskId="4">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Dispatch.swiftmodule" DiskId="4">
+        <Component DiskId="4">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
+      </ComponentGroup>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libdispatch.so" />
+      <ComponentGroup Id="libswiftDispatch.x64" Directory="libDispatch.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftDispatch.so" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="libdispatch.x86">
-        <Component Directory="Dispatch.swiftmodule" DiskId="5">
+      <ComponentGroup Id="dispatch.x86" Directory="AndroidSDK_usr_lib_swift_android_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libdispatch.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libdispatch.x86" Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libdispatch.a" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="swiftDispatch.x86" Directory="Dispatch.swiftmodule">
+        <Component DiskId="5">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="Dispatch.swiftmodule" DiskId="5">
+        <Component DiskId="5">
           <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
+      </ComponentGroup>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libdispatch.so" />
+      <ComponentGroup Id="libswiftDispatch.x86" Directory="libDispatch.swiftmodule">
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftDispatch.so" />
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Dispatch.swiftmodule\i686-unknown-linux-android.swiftmodule" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- _FoundationUnicode -->
-    <ComponentGroup Id="_FoundationUnicode" Directory="AndroidSDK_usr_include__foundation_unicode">
-      <?define Disk = 1?>
-      <?include ../_FoundationUnicode.wxi?>
-      <?undef Disk?>
+    <!-- SwiftRemoteMirror -->
+    <ComponentGroup Id="SwiftRemoteMirror" Directory="AndroidSDK_usr_include_swift_SwiftRemoteMirror">
+      <Component>
+        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\Platform.h" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\module.modulemap" />
+      </Component>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="_FoundationUnicode.arm64">
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\lib_FoundationICU.so" />
+      <ComponentGroup Id="SwiftRemoteMirror.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftRemoteMirror.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libSwiftRemoteMirror.arm64" Directory="AndroidSDK_usr_lib_swift_static_android_arm64">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libswiftRemoteMirror.a" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeARM) = True?>
-      <ComponentGroup Id="_FoundationUnicode.arm">
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\lib_FoundationICU.so" />
+      <ComponentGroup Id="SwiftRemoteMirror.arm" Directory="AndroidSDK_usr_lib_swift_android_arm">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftRemoteMirror.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libSwiftRemoteMirror.arm" Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libswiftRemoteMirror.a" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="_FoundationUnicode.x64">
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\lib_FoundationICU.so" />
+      <ComponentGroup Id="SwiftRemoteMirror.x64" Directory="AndroidSDK_usr_lib_swift_android_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftRemoteMirror.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libSwiftRemoteMirror.x64" Directory="AndroidSDK_usr_lib_swift_static_android_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libswiftRemoteMirror.a" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="_FoundationUnicode.x86">
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\lib_FoundationICU.so" />
+      <ComponentGroup Id="SwiftRemoteMirror.x86" Directory="AndroidSDK_usr_lib_swift_android_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftRemoteMirror.so" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libSwiftRemoteMirror.x86" Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftRemoteMirror.a" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- _FoundationCShims -->
-    <ComponentGroup Id="_FoundationCShims" Directory="AndroidSDK_usr_include__FoundationCShims">
-      <?define Disk = 1?>
-      <?include ../_FoundationCShims.wxi?>
-      <?undef Disk?>
+    <!-- apinotes -->
+    <ComponentGroup Id="APINotes" Directory="AndroidSDK_usr_lib_swift_apinotes">
+      <Component>
+        <File Source="$(SDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\lib\swift\apinotes\posix_filesystem.apinotes" />
+      </Component>
     </ComponentGroup>
 
     <!-- _Builtin_float -->
@@ -593,68 +825,111 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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">
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Builtin_float.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -663,68 +938,111 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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">
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Concurrency.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -733,68 +1051,321 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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">
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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>
+
+      <ComponentGroup Id="lib_Differentiation.x86" Directory="lib_Differentiation.swiftmodule">
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Differentiation.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_Differentiation.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _FoundationCollections -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_FoundationCollections.arm64" Directory="_FoundationCollections.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_FoundationCollections.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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?>
+
+    <!-- _math -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_math.arm64" Directory="_math.swiftmodule">
+        <Component DiskId="2">
+          <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.swiftmodule" />
+        </Component>
+
+        <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
+          <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.swiftmodule" />
+        </Component>
+
+        <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
+          <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.swiftmodule" />
+        </Component>
+
+        <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
+          <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.swiftmodule" />
+        </Component>
+
+        <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_math.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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?>
 
     <!-- _RegexParser -->
@@ -807,11 +1378,25 @@
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
@@ -821,11 +1406,25 @@
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
@@ -835,11 +1434,25 @@
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
@@ -849,10 +1462,23 @@
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_RegexParser.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -861,68 +1487,111 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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">
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_StringProcessing.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -931,182 +1600,257 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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">
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\_Volatile.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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">
           <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">
           <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>
-    <?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">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\android.modulemap" />
+
+      <ComponentGroup Id="libAndroid.arm64" Directory="libAndroid.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\SwiftAndroidNDK.h" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
         </Component>
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\SwiftBionic.h" />
+
+        <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">
         <Component DiskId="3">
           <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">
           <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">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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_static_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_static_android_x64">
           <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\SwiftBionic.h" />
         </Component>
 
         <Component DiskId="4">
           <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">
           <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">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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">
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Android.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -1119,11 +1863,25 @@
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
@@ -1133,11 +1891,25 @@
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
@@ -1147,22 +1919,49 @@
           <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>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Cxx.x86" Directory="Cxx.swiftmodule">
+
+      <ComponentGroup Id="libCxx.x64" Directory="libCxx.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <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="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
         <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Cxx.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\libswiftCxx.a" />
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftCxx.a" />
         </Component>
       </ComponentGroup>
     <?endif?>
@@ -1177,11 +1976,25 @@
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
@@ -1191,11 +2004,25 @@
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
@@ -1205,11 +2032,25 @@
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
@@ -1219,10 +2060,23 @@
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\CxxStdlib.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -1231,108 +2085,222 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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">
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Distributed.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
+    <!-- Foundation -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="_FoundationCollections.arm64" Directory="_FoundationCollections.swiftmodule">
+      <ComponentGroup Id="Foundation.arm64" Directory="Foundation.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
         </Component>
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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="_FoundationCollections.arm" Directory="_FoundationCollections.swiftmodule">
+      <ComponentGroup Id="Foundation.arm" Directory="Foundation.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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="_FoundationCollections.x64" Directory="_FoundationCollections.swiftmodule">
+      <ComponentGroup Id="Foundation.x64" Directory="Foundation.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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="_FoundationCollections.x86" Directory="_FoundationCollections.swiftmodule">
+      <ComponentGroup Id="Foundation.x86" Directory="Foundation.swiftmodule">
         <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
         <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Foundation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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?>
@@ -1347,11 +2315,25 @@
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
@@ -1361,11 +2343,25 @@
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
@@ -1375,11 +2371,25 @@
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
@@ -1389,10 +2399,23 @@
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationEssentials.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -1405,11 +2428,25 @@
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
@@ -1419,94 +2456,77 @@
           <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>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="FoundationInternationalization.x64" Directory="FoundationInternationalization.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
-        </Component>
-        <Component DiskId="4">
-          <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">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libFoundationInternationalization.so" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="FoundationInternationalization.x86" Directory="FoundationInternationalization.swiftmodule">
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+      <ComponentGroup Id="libFoundationInternationalization.arm" Directory="libFoundationInternationalization.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundationInternationalization.so" />
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_arm">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libFoundationInternationalization.a" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- Foundation -->
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Foundation.arm64" Directory="Foundation.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="FoundationInternationalization.x64" Directory="FoundationInternationalization.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
         </Component>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundation.so" />
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libFoundationInternationalization.so" />
         </Component>
       </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeARM) = True?>
-      <ComponentGroup Id="Foundation.arm" Directory="Foundation.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
-        </Component>
-        <Component DiskId="3">
-          <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">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libFoundation.so" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Foundation.x64" Directory="Foundation.swiftmodule">
+      <ComponentGroup Id="libFoundationInternationalization.x64" Directory="libFoundationInternationalization.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
         </Component>
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.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\libFoundation.so" />
+        <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="Foundation.x86" Directory="Foundation.swiftmodule">
+      <ComponentGroup Id="FoundationInternationalization.x86" Directory="FoundationInternationalization.swiftmodule">
         <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\i686-unknown-linux-android.swiftdoc" />
         </Component>
         <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+          <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">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundation.so" />
+        <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationInternationalization.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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?>
@@ -1521,11 +2541,25 @@
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
@@ -1535,11 +2569,25 @@
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
@@ -1549,11 +2597,25 @@
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
@@ -1563,10 +2625,23 @@
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationNetworking.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -1579,11 +2654,25 @@
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
@@ -1593,11 +2682,25 @@
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
@@ -1607,11 +2710,25 @@
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
@@ -1621,78 +2738,159 @@
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\FoundationXML.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
+    <!-- Foundation Dependencies -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="_math.arm64" Directory="_math.swiftmodule">
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+      <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 DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libbrotlidec.a" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\aarch64\libcurl.a" />
         </Component>
-
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_math.so" />
+        <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="_math.arm" Directory="_math.swiftmodule">
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+      <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 DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libbrotlidec.a" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\armv7\libcurl.a" />
         </Component>
-
-        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_math.so" />
+        <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="_math.x64" Directory="_math.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+      <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 DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libbrotlidec.a" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\x86_64\libcurl.a" />
         </Component>
-
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_math.so" />
+        <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="_math.x86" Directory="_math.swiftmodule">
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+      <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 DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\i686-unknown-linux-android.swiftinterface" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libbrotlidec.a" />
         </Component>
-        <Component DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\_math.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        <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?>
+
+    <!-- CoreFoundation -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="CoreFoundation.arm64" Directory="AndroidSDK_usr_lib_swift_static_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_static_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?>
 
-        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
-          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_math.so" />
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="CoreFoundation.x64" Directory="AndroidSDK_usr_lib_swift_static_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_static_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?>
@@ -1703,68 +2901,111 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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">
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Observation.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -1773,68 +3014,111 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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">
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\RegexBuilder.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -1843,68 +3127,111 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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" />
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.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\libswiftCore.so" />
+        <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Swift.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -1913,68 +3240,111 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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">
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\SwiftOnoneSupport.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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 -->
@@ -1983,87 +3353,122 @@
         <Component DiskId="2">
           <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">
           <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
           <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">
           <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
           <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">
           <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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
           <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">
           <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>
-    <?endif?>
 
-    <ComponentGroup Id="apinotes" Directory="AndroidSDK_usr_lib_swift_apinotes">
-      <Component>
-        <File Source="$(SDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
-      </Component>
-      <Component>
-        <File Source="$(SDKRoot)\usr\lib\swift\apinotes\posix_filesystem.apinotes" />
-      </Component>
-    </ComponentGroup>
+      <ComponentGroup Id="libSynchronization.x86" Directory="libSynchronization.swiftmodule">
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\Synchronization.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
 
-    <ComponentGroup Id="libcxxshim" Directory="AndroidSDK_usr_lib_swift_android">
-      <Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_static_android_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\android\i686\libswiftSynchronization.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- libcxxshim -->
+    <ComponentGroup Id="CXXShim" Directory="AndroidSDK_usr_lib_swift_android">
+      <Component DiskId="1">
         <File Source="$(SDKRoot)\usr\lib\swift\android\libcxxshim.h" />
       </Component>
-      <Component>
+      <Component DiskId="1">
         <File Source="$(SDKRoot)\usr\lib\swift\android\libcxxshim.modulemap" />
       </Component>
-      <Component>
+      <Component DiskId="1">
         <File Source="$(SDKRoot)\usr\lib\swift\android\libcxxstdlibshim.h" />
       </Component>
     </ComponentGroup>
@@ -2071,78 +3476,123 @@
     <!-- 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?>
 
+    <!-- Configuration -->
     <ComponentGroup Id="Configuration">
-      <Component Directory="AndroidSDK">
+      <Component Directory="AndroidSDK" DiskId="1">
         <File Source="$(SDKRoot)\SDKSettings.json" />
       </Component>
-      <Component Directory="AndroidSDK">
+      <Component Directory="AndroidSDK" DiskId="1">
         <File Source="$(SDKRoot)\SDKSettings.plist" />
       </Component>
-      <Component Directory="AndroidPlatform">
+      <Component Directory="AndroidPlatform" DiskId="1">
         <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" />
-
+    <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)">
+      <Feature Id="arm64.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Android_arm64)">
         <Level Condition="INSTALLARM64SDK = 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="arm.platform" AllowAbsent="yes" Title="!(loc.Plt_ProductName_Android_armv7)">
+        <Level Condition="INSTALLARMSDK = 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="INSTALLAMD64SDK = 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="INSTALLX86SDK = 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="no" 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 +3605,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 +3616,42 @@
         <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 +3659,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 +3673,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 +3684,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 +3726,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 +3740,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 +3751,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 +3793,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 +3807,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 +3818,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/platforms/windows/windows.wixproj b/platforms/Windows/platforms/windows/windows.wixproj
index 2df3ef90..8fb52cb8 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>
@@ -47,15 +42,4 @@
       <SuppressRootDirectory>true</SuppressRootDirectory>
     </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>
 </Project>
diff --git a/platforms/Windows/platforms/windows/windows.wxs b/platforms/Windows/platforms/windows/windows.wxs
index e2dc597b..7949cb38 100644
--- a/platforms/Windows/platforms/windows/windows.wxs
+++ b/platforms/Windows/platforms/windows/windows.wxs
@@ -9,38 +9,25 @@
       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 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?>
+    <?define SDKRoot = "$(PlatformRoot)\Developer\SDKs\Windows.sdk"?>
 
     <Media Id="1" Cabinet="windows.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
-    <Media Id="5" Cabinet="windows.experimental.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)" />
     <?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)" />
     <?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)" />
     <?endif?>
 
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(WindowsPlatformUpgradeCode)" />
@@ -131,84 +118,31 @@
           </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__foundation_unicode" Name="_foundation_unicode" DiskId="1" />
+                  <Directory Id="WindowsSDK_usr_include__FoundationCShims" Name="_FoundationCShims" DiskId="1" />
+                  <Directory Id="WindowsSDK_usr_include_Block" Name="Block" DiskId="1" />
+                  <Directory Id="WindowsSDK_usr_include_dispatch" Name="dispatch" DiskId="1" />
+                  <Directory Id="WindowsSDK_usr_include_os" Name="os" DiskId="1" />
                   <Directory Name="swift">
-                    <Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" />
+                    <Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" DiskId="1" />
                   </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="1" />
+                    <Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims" DiskId="1" />
                     <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="LegacyRuntime.swiftmodule" Name="Runtime.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="_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="CRT.swiftmodule" Name="CRT.swiftmodule" />
                       <Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule" />
                       <Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
@@ -226,26 +160,26 @@
                       <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
                       <Directory Id="Synchronization.swiftmodule" Name="Synchronization.swiftmodule" />
                       <Directory Id="WinSDK.swiftmodule" Name="WinSDK.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="2" />
                       <?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="3" />
                       <?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="4" />
                       <?endif?>
                     </Directory>
                   </Directory>
                   <Directory Name="swift_static">
-                    <Directory Name="windows">
+                    <Directory Id="WindowsSDK_usr_lib_swift_static_winows" Name="windows">
+                      <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" />
                       <Directory Id="libCRT.swiftmodule" Name="CRT.swiftmodule" />
                       <Directory Id="libCxx.swiftmodule" Name="Cxx.swiftmodule" />
                       <Directory Id="libCxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
@@ -263,26 +197,19 @@
                       <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_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="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64" Name="aarch64" DiskId="6" />
+                        <Directory Id="WindowsSDK_usr_lib_swift_static_windows_arm64" Name="aarch64" DiskId="2" />
                       <?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="3" />
                       <?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="4" />
                       <?endif?>
                     </Directory>
                   </Directory>
                 </Directory>
-                <Directory Id="WindowsExperimentalSDK_usr_share" Name="share" DiskId="5" />
+                <Directory Id="WindowsSDK_usr_share" Name="share" DiskId="1" />
               </Directory>
             </Directory>
           </Directory>
@@ -308,6 +235,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
       <ComponentGroup Id="XCTest.x64">
         <Component Directory="XCTest.swiftmodule" DiskId="3">
@@ -325,6 +253,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="XCTest.x86">
         <Component Directory="XCTest.swiftmodule" DiskId="4">
@@ -352,8 +281,30 @@
         <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.swiftmodule" DiskId="2">
+          <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">
+          <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">
+          <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">
+          <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">
+          <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">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\_Testing_WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+
         <Component Directory="Testing_usr_bin64a" DiskId="2">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\Testing.dll" />
         </Component>
@@ -379,29 +330,9 @@
         <Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
           <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\_TestingInterop.lib" />
         </Component>
-
-        <Component Directory="Testing.swiftmodule" DiskId="2">
-          <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">
-          <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">
-          <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">
-          <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">
-          <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">
-          <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">
@@ -452,6 +383,7 @@
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
       <ComponentGroup Id="Testing.x86">
         <Component Directory="Testing_usr_bin32" DiskId="4">
@@ -503,187 +435,137 @@
       </ComponentGroup>
     <?endif?>
 
-    <!-- SwiftRemoteMirror -->
-<?if $(IncludeLegacySDK) = True?>
-    <ComponentGroup Id="LegacySwiftRemoteMirror" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror">
-      <Component>
-        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\Platform.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\module.modulemap" />
-      </Component>
+    <!-- _FoundationUnicode -->
+    <ComponentGroup Id="_FoundationUnicode" Directory="WindowsSDK_usr_include__foundation_unicode">
+      <?define Disk = 1?>
+      <?include ../_FoundationUnicode.wxi?>
+      <?undef Disk?>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacySwiftRemoteMirror.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+      <ComponentGroup Id="_FoundationUnicode.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
         <Component DiskId="2">
-          <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" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\_FoundationICU.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="lib_FoundationUnicode.arm64" Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\_FoundationICU.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="_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>
-      <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="lib_FoundationUnicode.x64" Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\_FoundationICU.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="_FoundationUnicode.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\_FoundationICU.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="lib_FoundationUnicode.x86" Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\_FoundationICU.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- BlocksRuntime -->
-<?if $(IncludeLegacySDK) = True?>
-    <ComponentGroup Id="LegacyBlocksRuntime">
-      <Component Directory="WindowsSDK_usr_include_Block">
-        <File Source="$(SDKRoot)\usr\include\Block\Block.h" />
-      </Component>
+    <!-- _FoundationCShims -->
+    <ComponentGroup Id="_FoundationCShims" Directory="WindowsSDK_usr_include__FoundationCShims">
+      <?define Disk = 1?>
+      <?include ../_FoundationCShims.wxi?>
+      <?undef Disk?>
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyBlocksRuntime.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+      <ComponentGroup Id="lib_FoundationCShims.arm64" Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\BlocksRuntime.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\_FoundationCShims.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyBlocksRuntime.x64" Directory="WindowsSDK_usr_lib_swift_windows_x64">
+      <ComponentGroup Id="lib_FoundationCShims.x64" Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\BlocksRuntime.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\_FoundationCShims.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyBlocksRuntime.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
+      <ComponentGroup Id="lib_FoundationCShims.x86" Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\BlocksRuntime.lib" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\_FoundationCShims.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
-    <ComponentGroup Id="ExperimentalBlocksRuntime" Directory="WindowsExperimentalSDK_usr_include_Block">
-      <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\include\Block\Block.h" />
+    <!-- BlocksRuntime -->
+    <ComponentGroup Id="BlocksRuntime">
+      <Component Directory="WindowsSDK_usr_include_Block">
+        <File Source="$(SDKRoot)\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" />
+      <ComponentGroup Id="BlocksRuntime.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\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" />
+
+      <ComponentGroup Id="libBlocksRuntime.arm64" Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\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" />
+
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="BlocksRuntime.x64" Directory="WindowsSDK_usr_lib_swift_windows_x64">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\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.x64" Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\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" />
+
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="BlocksRuntime.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\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" Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+        <Component DiskId="4">
+          <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">
+    <ComponentGroup Id="Dispatch" Directory="WindowsSDK_usr_include_dispatch">
       <?define Disk = 1?>
       <?include ../CDispatch.wxi?>
       <?undef Disk?>
@@ -703,3370 +585,2241 @@
     </ComponentGroup>
 
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacydispatch.arm64">
-        <Component Directory="LegacyDispatch.swiftmodule" DiskId="2">
+      <ComponentGroup Id="dispatch.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\dispatch.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libdispatch.arm64" Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\dispatch.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="swiftDispatch.arm64" Directory="Dispatch.swiftmodule">
+        <Component DiskId="2">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="LegacyDispatch.swiftmodule" DiskId="2">
+        <Component 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>
+
+      <ComponentGroup Id="libswiftDispatch.arm64" Directory="libDispatch.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftDispatch.lib" />
+        </Component>
+      </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacydispatch.x64">
-        <Component Directory="LegacyDispatch.swiftmodule" DiskId="3">
+      <ComponentGroup Id="dispatch.x64" Directory="WindowsSDK_usr_lib_swift_windows_x64">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\dispatch.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libdispatch.x64" Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\dispatch.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="swiftDispatch.x64" Directory="Dispatch.swiftmodule">
+        <Component DiskId="3">
           <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component Directory="LegacyDispatch.swiftmodule" DiskId="3">
+        <Component 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" />
+
+      <ComponentGroup Id="libswiftDispatch.x64" Directory="libDispatch.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\x86_64-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 DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\x86_64-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 Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftDispatch.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
-    <ComponentGroup Id="ExperimentalDispatch" Directory="WindowsExperimentalSDK_usr_include_dispatch">
-      <?define Disk = 5?>
-      <?include ../CDispatch.wxi?>
-      <?undef Disk?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="dispatch.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\dispatch.lib" />
+        </Component>
+      </ComponentGroup>
 
-      <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">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\dispatch.lib" />
-        </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="libdispatch.arm64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\dispatch.lib" />
-        </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="libdispatch.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\dispatch.lib" />
-        </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="libdispatch.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\dispatch.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-
-    <?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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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">
-      <?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" />
-        </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" />
-        </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" />
-        </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" />
-        </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" />
-        </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" />
-        </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">
-      <?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" />
-        </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" />
-        </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" />
-        </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">
-          <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">
-          <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">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Builtin_float.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Legacy_Builtin_float.x64" Directory="Legacy_Builtin_float.swiftmodule">
-        <Component DiskId="3">
-          <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">
-          <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">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_Builtin_float.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Legacy_Builtin_float.x86" Directory="Legacy_Builtin_float.swiftmodule">
-        <Component DiskId="4">
-          <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">
-          <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">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Builtin_float.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
-    <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="_Builtin_float.arm64" Directory="_Builtin_float.swiftmodule">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Builtin_float.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" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\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="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Builtin_float.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" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Builtin_float.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="_Builtin_float.x64" Directory="_Builtin_float.swiftmodule">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Builtin_float.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" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\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="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Builtin_float.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" />
-        </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>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="_Builtin_float.x86" Directory="_Builtin_float.swiftmodule">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_Builtin_float.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" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\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="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\_Builtin_float.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" />
-        </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswift_Builtin_float.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-
-    <!-- _Concurrency -->
-<?if $(IncludeLegacySDK) = True?>
-    <?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" />
-        </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.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>
-      </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" />
-        </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.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_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>
-      </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>
-        <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">
-          <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">
-          <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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </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" />
-        </Component>
-
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftCRT.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" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
-        </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\CRT.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>
-      </ComponentGroup>
-    <?endif?>
-<?endif?>
-
-    <?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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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">
+      <ComponentGroup Id="libdispatch.x86" Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\dispatch.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="swiftDispatch.x86" Directory="Dispatch.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <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\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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftDispatch.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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
+      <ComponentGroup Id="libswiftDispatch.x86" Directory="libDispatch.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Dispatch.swiftmodule\i686-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_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftDispatch.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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </ComponentGroup>
-    <?endif?>
+    <!-- SwiftRemoteMirror -->
+    <ComponentGroup Id="SwiftRemoteMirror" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror">
+      <Component>
+        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\Platform.h" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\include\swift\SwiftRemoteMirror\module.modulemap" />
+      </Component>
+    </ComponentGroup>
 
-    <!-- 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>
+      <ComponentGroup Id="SwiftRemoteMirror.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
         <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" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftRemoteMirror.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" />
+      <ComponentGroup Id="libSwiftRemoteMirror.arm64" Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\swiftRemoteMirror.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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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" />
+      <ComponentGroup Id="SwiftRemoteMirror.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?>
-
-    <!-- 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>
+      <ComponentGroup Id="libSwiftRemoteMirror.x64" Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
         <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" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\swiftRemoteMirror.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyDistributed.x86" Directory="LegacyDistributed.swiftmodule">
+      <ComponentGroup Id="SwiftRemoteMirror.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
         <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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftRemoteMirror.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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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" />
+      <ComponentGroup Id="libSwiftRemoteMirror.x86" Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\swiftRemoteMirror.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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </ComponentGroup>
-    <?endif?>
+    <!-- apinotes -->
+    <ComponentGroup Id="APINotes" Directory="WindowsSDK_usr_lib_swift_apinotes">
+      <Component>
+        <File Source="$(SDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
+      </Component>
+    </ComponentGroup>
 
-    <!-- _FoundationCollections -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- _Builtin_float -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Legacy_FoundationCollections.arm64" Directory="Legacy_FoundationCollections.swiftmodule">
+      <ComponentGroup Id="_Builtin_float.arm64" Directory="_Builtin_float.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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\_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" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\aarch64-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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Builtin_float.lib" />
         </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" />
+
+      <ComponentGroup Id="lib_Builtin_float.arm64" Directory="lib_Builtin_float.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.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" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.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">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Builtin_float.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" />
+      <ComponentGroup Id="_Builtin_float.x64" Directory="_Builtin_float.swiftmodule">
+        <Component DiskId="3">
+          <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.swiftmodule" />
         </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_Builtin_float.lib" />
         </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" />
+
+      <ComponentGroup Id="lib_Builtin_float.x64" Directory="lib_Builtin_float.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.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" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.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">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Builtin_float.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" />
+      <ComponentGroup Id="_Builtin_float.x86" Directory="_Builtin_float.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Builtin_float.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Builtin_float.lib" />
         </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" />
+
+      <ComponentGroup Id="lib_Builtin_float.x86" Directory="lib_Builtin_float.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.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" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Builtin_float.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">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_Builtin_float.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- FoundationEssentials -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- _Concurrency -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyFoundationEssentials.arm64" Directory="LegacyFoundationEssentials.swiftmodule">
+      <ComponentGroup Id="_Concurrency.arm64" Directory="_Concurrency.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Concurrency.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 Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Concurrency.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="lib_Concurrency.arm64" Directory="lib_Concurrency.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Concurrency.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyFoundationEssentials.x64" Directory="LegacyFoundationEssentials.swiftmodule">
+      <ComponentGroup Id="_Concurrency.x64" Directory="_Concurrency.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.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="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.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="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_Concurrency.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="lib_Concurrency.x64" Directory="lib_Concurrency.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Concurrency.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyFoundationEssentials.x86" Directory="LegacyFoundationEssentials.swiftmodule">
+      <ComponentGroup Id="_Concurrency.x86" Directory="_Concurrency.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <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\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <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\FoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Concurrency.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="lib_Concurrency.x86" Directory="lib_Concurrency.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_Concurrency.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- _Differentiation -->
     <?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" />
+      <ComponentGroup Id="_Differentiation.arm64" Directory="_Differentiation.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\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\FoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Differentiation.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" />
+
+      <ComponentGroup Id="lib_Differentiation.arm64" Directory="lib_Differentiation.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Differentiation.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" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\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\libFoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Differentiation.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" />
+      <ComponentGroup Id="_Differentiation.x64" Directory="_Differentiation.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_Differentiation.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" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\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\FoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_Differentiation.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" />
+
+      <ComponentGroup Id="lib_Differentiation.x64" Directory="lib_Differentiation.swiftmodule">
+        <Component DiskId="3">
+          <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\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\libFoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Differentiation.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" />
+      <ComponentGroup Id="_Differentiation.x86" Directory="_Differentiation.swiftmodule">
+        <Component DiskId="4">
+          <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\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\FoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Differentiation.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" />
+
+      <ComponentGroup Id="lib_Differentiation.x86" Directory="lib_Differentiation.swiftmodule">
+        <Component DiskId="4">
+          <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\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\libFoundationEssentials.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_Differentiation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- FoundationInternationalization -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- _FoundationCollections -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyFoundationInternationalization.arm64" Directory="LegacyFoundationInternationalization.swiftmodule">
+      <ComponentGroup Id="_FoundationCollections.arm64" Directory="_FoundationCollections.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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\FoundationInternationalization.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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.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 Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\lib_FoundationCollections.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyFoundationInternationalization.x64" Directory="LegacyFoundationInternationalization.swiftmodule">
+      <ComponentGroup Id="_FoundationCollections.x64" Directory="_FoundationCollections.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.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="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" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </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" />
+
+      <ComponentGroup Id="lib_FoundationCollections.x64" Directory="lib_FoundationCollections.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\x86_64-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 Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\lib_FoundationCollections.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" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="_FoundationCollections.x86" Directory="_FoundationCollections.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\FoundationInternationalization.lib" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </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" />
+
+      <ComponentGroup Id="lib_FoundationCollections.x86" Directory="lib_FoundationCollections.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_FoundationCollections.swiftmodule\i686-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_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\lib_FoundationCollections.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" />
+
+    <!-- _RegexParser -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_RegexParser.arm64" Directory="_RegexParser.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-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_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_RegexParser.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" />
+
+      <ComponentGroup Id="lib_RegexParser.arm64" Directory="lib_RegexParser.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\aarch64-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_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_RegexParser.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" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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>
-      </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" />
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="_RegexParser.x64" Directory="_RegexParser.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-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_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_RegexParser.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" />
+      <ComponentGroup Id="lib_RegexParser.x64" Directory="lib_RegexParser.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\x86_64-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 Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_RegexParser.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" />
+
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="_RegexParser.x86" Directory="_RegexParser.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <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_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\Foundation.lib" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_RegexParser.lib" />
         </Component>
       </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyFoundation.x86" Directory="LegacyFoundation.swiftmodule">
+
+      <ComponentGroup Id="lib_RegexParser.x86" Directory="lib_RegexParser.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\Foundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_RegexParser.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- _StringProcessing -->
     <?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" />
+      <ComponentGroup Id="_StringProcessing.arm64" Directory="_StringProcessing.swiftmodule">
+        <Component DiskId="2">
+          <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\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\Foundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_StringProcessing.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" />
+
+      <ComponentGroup Id="lib_StringProcessing.arm64" Directory="lib_StringProcessing.swiftmodule">
+        <Component DiskId="2">
+          <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\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\libFoundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_StringProcessing.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" />
+      <ComponentGroup Id="_StringProcessing.x64" Directory="_StringProcessing.swiftmodule">
+        <Component DiskId="3">
+          <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\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\Foundation.lib" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swift_StringProcessing.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" />
+
+      <ComponentGroup Id="lib_StringProcessing.x64" Directory="lib_StringProcessing.swiftmodule">
+        <Component DiskId="3">
+          <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\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\libFoundation.lib" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_StringProcessing.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" />
+      <ComponentGroup Id="_StringProcessing.x86" Directory="_StringProcessing.swiftmodule">
+        <Component DiskId="4">
+          <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\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\Foundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_StringProcessing.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" />
+
+      <ComponentGroup Id="lib_StringProcessing.x86" Directory="lib_StringProcessing.swiftmodule">
+        <Component DiskId="4">
+          <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\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\libFoundation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_StringProcessing.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- FoundationNetworking -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- _Volatile -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyFoundationNetworking.arm64" Directory="LegacyFoundationNetworking.swiftmodule">
+      <ComponentGroup Id="_Volatile.arm64" Directory="_Volatile.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <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\FoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swift_Volatile.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="lib_Volatile.arm64" Directory="lib_Volatile.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswift_Volatile.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyFoundationNetworking.x64" Directory="LegacyFoundationNetworking.swiftmodule">
+      <ComponentGroup Id="_Volatile.x64" Directory="_Volatile.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.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="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.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="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswift_Volatile.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyFoundationNetworking.x86" Directory="LegacyFoundationNetworking.swiftmodule">
+      <ComponentGroup Id="_Volatile.x86" Directory="_Volatile.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <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\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <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\FoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Volatile.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="lib_Volatile.x86" Directory="lib_Volatile.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\_Volatile.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswift_Volatile.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- CRT -->
     <?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" />
+      <ComponentGroup Id="CRT.arm64" Directory="CRT.swiftmodule">
+        <Component DiskId="2">
+          <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\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\FoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftCRT.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" />
+
+      <ComponentGroup Id="libCRT.arm64" Directory="libCRT.swiftmodule">
+        <Component DiskId="2">
+          <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\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\libFoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCRT.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" />
+      <ComponentGroup Id="CRT.x64" Directory="CRT.swiftmodule">
+        <Component DiskId="3">
+          <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\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\FoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftCRT.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" />
+
+      <ComponentGroup Id="libCRT.x64" Directory="libCRT.swiftmodule">
+        <Component DiskId="3">
+          <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\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\libFoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCRT.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" />
+      <ComponentGroup Id="CRT.x86" Directory="CRT.swiftmodule">
+        <Component DiskId="4">
+          <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\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\FoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftCRT.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" />
+
+      <ComponentGroup Id="libCRT.x86" Directory="libCRT.swiftmodule">
+        <Component DiskId="4">
+          <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\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\libFoundationNetworking.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftCRT.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- FoundationXML -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- Cxx -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyFoundationXML.arm64" Directory="LegacyFoundationXML.swiftmodule">
+      <ComponentGroup Id="Cxx.arm64" Directory="Cxx.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <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\FoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\libswiftCxx.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libCxx.arm64" Directory="libCxx.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCxx.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyFoundationXML.x64" Directory="LegacyFoundationXML.swiftmodule">
+      <ComponentGroup Id="Cxx.x64" Directory="Cxx.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.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="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.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="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\libswiftCxx.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libCxx.x64" Directory="libCxx.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCxx.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyFoundationXML.x86" Directory="LegacyFoundationXML.swiftmodule">
+      <ComponentGroup Id="Cxx.x86" Directory="Cxx.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <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\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <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\FoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\libswiftCxx.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libCxx.x86" Directory="libCxx.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftCxx.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- CxxStdlib -->
     <?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" />
+      <ComponentGroup Id="CxxStdlib.arm64" Directory="CxxStdlib.swiftmodule">
+        <Component DiskId="2">
+          <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\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\FoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\libswiftCxxStdlib.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" />
+
+      <ComponentGroup Id="libCxxStdlib.arm64" Directory="libCxxStdlib.swiftmodule">
+        <Component DiskId="2">
+          <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\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCxxStdlib.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" />
+      <ComponentGroup Id="CxxStdlib.x64" Directory="CxxStdlib.swiftmodule">
+        <Component DiskId="3">
+          <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\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\FoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\libswiftCxxStdlib.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" />
+
+      <ComponentGroup Id="libCxxStdlib.x64" Directory="libCxxStdlib.swiftmodule">
+        <Component DiskId="3">
+          <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\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCxxStdlib.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" />
+      <ComponentGroup Id="CxxStdlib.x86" Directory="CxxStdlib.swiftmodule">
+        <Component DiskId="4">
+          <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\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\FoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\libswiftCxxStdlib.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" />
+
+      <ComponentGroup Id="libCxxStdlib.x86" Directory="libCxxStdlib.swiftmodule">
+        <Component DiskId="4">
+          <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\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libFoundationXML.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftCxxStdlib.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- Foundation Dependencies -->
+    <!-- Distributed -->
     <?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="Distributed.arm64" Directory="Distributed.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\brotlidec.lib" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libcurl.lib" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftDistributed.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libxml2s.lib" />
+      </ComponentGroup>
+
+      <ComponentGroup Id="libDistributed.arm64" Directory="libDistributed.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\zlibstatic.lib" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftDistributed.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="Distributed.x64" Directory="Distributed.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.swiftmodule" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\brotlidec.lib" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftDistributed.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libcurl.lib" />
+      </ComponentGroup>
+
+      <ComponentGroup Id="libDistributed.x64" Directory="libDistributed.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libxml2s.lib" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\zlibstatic.lib" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftDistributed.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="Distributed.x86" Directory="Distributed.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\brotlidec.lib" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libcurl.lib" />
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftDistributed.lib" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libxml2s.lib" />
+      </ComponentGroup>
+
+      <ComponentGroup Id="libDistributed.x86" Directory="libDistributed.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component>
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\zlibstatic.lib" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftDistributed.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- Observation -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- Foundation -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyObservation.arm64" Directory="LegacyObservation.swiftmodule">
+      <ComponentGroup Id="Foundation.arm64" Directory="Foundation.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\Foundation.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libFoundation.arm64" Directory="libFoundation.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyObservation.x64" Directory="LegacyObservation.swiftmodule">
+      <ComponentGroup Id="Foundation.x64" Directory="Foundation.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.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="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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\Foundation.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libFoundation.x64" Directory="libFoundation.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Foundation.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.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyObservation.x86" Directory="LegacyObservation.swiftmodule">
+      <ComponentGroup Id="Foundation.x86" Directory="Foundation.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\Foundation.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libFoundation.x86" Directory="libFoundation.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libFoundation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- FoundationEssentials -->
     <?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" />
+      <ComponentGroup Id="FoundationEssentials.arm64" Directory="FoundationEssentials.swiftmodule">
+        <Component DiskId="2">
+          <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\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\swiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationEssentials.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" />
+
+      <ComponentGroup Id="libFoundationEssentials.arm64" Directory="libFoundationEssentials.swiftmodule">
+        <Component DiskId="2">
+          <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\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\libswiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationEssentials.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" />
+      <ComponentGroup Id="FoundationEssentials.x64" Directory="FoundationEssentials.swiftmodule">
+        <Component DiskId="3">
+          <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\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\swiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationEssentials.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" />
+
+      <ComponentGroup Id="libFoundationEssentials.x64" Directory="libFoundationEssentials.swiftmodule">
+        <Component DiskId="3">
+          <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\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\libswiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationEssentials.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" />
+      <ComponentGroup Id="FoundationEssentials.x86" Directory="FoundationEssentials.swiftmodule">
+        <Component DiskId="4">
+          <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\Observation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\swiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationEssentials.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" />
+
+      <ComponentGroup Id="libFoundationEssentials.x86" Directory="libFoundationEssentials.swiftmodule">
+        <Component DiskId="4">
+          <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\Observation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\libswiftObservation.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libFoundationEssentials.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- RegexBuilder -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- FoundationInternationalization -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyRegexBuilder.arm64" Directory="LegacyRegexBuilder.swiftmodule">
+      <ComponentGroup Id="FoundationInternationalization.arm64" Directory="FoundationInternationalization.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationInternationalization.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libFoundationInternationalization.arm64" Directory="libFoundationInternationalization.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationInternationalization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyRegexBuilder.x64" Directory="LegacyRegexBuilder.swiftmodule">
+      <ComponentGroup Id="FoundationInternationalization.x64" Directory="FoundationInternationalization.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.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="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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationInternationalization.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libFoundationInternationalization.x64" Directory="libFoundationInternationalization.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.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.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationInternationalization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyRegexBuilder.x86" Directory="LegacyRegexBuilder.swiftmodule">
+      <ComponentGroup Id="FoundationInternationalization.x86" Directory="FoundationInternationalization.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationInternationalization.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libFoundationInternationalization.x86" Directory="libFoundationInternationalization.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libFoundationInternationalization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- FoundationNetworking -->
     <?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" />
+      <ComponentGroup Id="FoundationNetworking.arm64" Directory="FoundationNetworking.swiftmodule">
+        <Component DiskId="2">
+          <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\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\swiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationNetworking.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" />
+
+      <ComponentGroup Id="libFoundationNetworking.arm64" Directory="libFoundationNetworking.swiftmodule">
+        <Component DiskId="2">
+          <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\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\libswiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationNetworking.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" />
+      <ComponentGroup Id="FoundationNetworking.x64" Directory="FoundationNetworking.swiftmodule">
+        <Component DiskId="3">
+          <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\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\swiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationNetworking.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" />
+
+      <ComponentGroup Id="libFoundationNetworking.x64" Directory="libFoundationNetworking.swiftmodule">
+        <Component DiskId="3">
+          <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\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\libswiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libFoundationNetworking.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" />
+      <ComponentGroup Id="FoundationNetworking.x86" Directory="FoundationNetworking.swiftmodule">
+        <Component DiskId="4">
+          <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\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\swiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationNetworking.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" />
+
+      <ComponentGroup Id="libFoundationNetworking.x86" Directory="libFoundationNetworking.swiftmodule">
+        <Component DiskId="4">
+          <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\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\libswiftRegexBuilder.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libFoundationNetworking.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- Runtime -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- FoundationXML -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyRuntime.arm64" Directory="LegacyRuntime.swiftmodule">
+      <ComponentGroup Id="FoundationXML.arm64" Directory="FoundationXML.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationXML.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libFoundationXML.arm64" Directory="libFoundationXML.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftRuntime.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libFoundationXML.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyRuntime.x64" Directory="LegacyRuntime.swiftmodule">
+      <ComponentGroup Id="FoundationXML.x64" Directory="FoundationXML.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.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="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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationXML.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libFoundationXML.x64" Directory="libFoundationXML.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.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="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftRuntime.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <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="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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationXML.lib" />
         </Component>
       </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyRuntime.x86" Directory="LegacyRuntime.swiftmodule">
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
+
+      <ComponentGroup Id="libFoundationXML.x86" Directory="libFoundationXML.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\FoundationXML.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftRuntime.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libFoundationXML.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- Foundation Dependencies -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="Runtime.arm64" Directory="Runtime.swiftmodule">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+      <ComponentGroup Id="FoundationDependencies.arm64" Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\brotlicommon.lib" />
         </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\aarch64\swiftRuntime.lib" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\brotlidec.lib" />
         </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="libRuntime.arm64" Directory="libRuntime.swiftmodule">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libcurl.lib" />
         </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libxml2s.lib" />
         </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_arm64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftRuntime.lib" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\zlibstatic.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="Runtime.x64" Directory="Runtime.swiftmodule">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+      <ComponentGroup Id="FoundationDependencies.x64" Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\brotlicommon.lib" />
         </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\x86_64\swiftRuntime.lib" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\brotlidec.lib" />
         </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="libRuntime.x64" Directory="libRuntime.swiftmodule">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Runtime.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libcurl.lib" />
         </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Runtime.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libxml2s.lib" />
         </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x64">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftRuntime.lib" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\zlibstatic.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="Runtime.x86" Directory="Runtime.swiftmodule">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+      <ComponentGroup Id="FoundationDependencies.x86" Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\brotlicommon.lib" />
         </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\i686\swiftRuntime.lib" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\brotlidec.lib" />
         </Component>
-      </ComponentGroup>
-      <ComponentGroup Id="libRuntime.x86" Directory="libRuntime.swiftmodule">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Runtime.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libcurl.lib" />
         </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\Runtime.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libxml2s.lib" />
         </Component>
-
-        <Component Directory="WindowsExperimentalSDK_usr_lib_swift_static_windows_x86">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftRuntime.lib" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\zlibstatic.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- Swift -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- CoreFoundation -->
     <?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" />
+      <ComponentGroup Id="CoreFoundation.arm64" Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\CoreFoundation.lib" />
         </Component>
-        <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\_CFURLSessionInterface.lib" />
         </Component>
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftCore.lib" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\_CFXMLInterface.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" />
+      <ComponentGroup Id="CoreFoundation.x64" Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\CoreFoundation.lib" />
         </Component>
-        <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\_CFURLSessionInterface.lib" />
         </Component>
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftCore.lib" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\_CFXMLInterface.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="CoreFoundation.x86" Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\CoreFoundation.lib" />
         </Component>
-        <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\_CFURLSessionInterface.lib" />
         </Component>
-        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftCore.lib" />
+        <Component>
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\_CFXMLInterface.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- Observation -->
     <?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" />
+      <ComponentGroup Id="Observation.arm64" Directory="Observation.swiftmodule">
+        <Component DiskId="2">
+          <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\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\swiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftObservation.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" />
+
+      <ComponentGroup Id="libObservation.arm64" Directory="libObservation.swiftmodule">
+        <Component DiskId="2">
+          <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\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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\libswiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftObservation.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" />
+      <ComponentGroup Id="Observation.x64" Directory="Observation.swiftmodule">
+        <Component DiskId="3">
+          <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\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\swiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftObservation.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" />
+
+      <ComponentGroup Id="libObservation.x64" Directory="libObservation.swiftmodule">
+        <Component DiskId="3">
+          <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\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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\libswiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftObservation.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" />
+      <ComponentGroup Id="Observation.x86" Directory="Observation.swiftmodule">
+        <Component DiskId="4">
+          <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\Swift.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\swiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftObservation.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" />
+
+      <ComponentGroup Id="libObservation.x86" Directory="libObservation.swiftmodule">
+        <Component DiskId="4">
+          <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\Swift.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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\libswiftCore.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftObservation.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- SwiftOnoneSupport -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- RegexBuilder -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacySwiftOnoneSupport.arm64" Directory="LegacySwiftOnoneSupport.swiftmodule">
+      <ComponentGroup Id="RegexBuilder.arm64" Directory="RegexBuilder.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftRegexBuilder.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libRegexBuilder.arm64" Directory="libRegexBuilder.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftSwiftOnoneSupport.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftRegexBuilder.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacySwiftOnoneSupport.x64" Directory="LegacySwiftOnoneSupport.swiftmodule">
+      <ComponentGroup Id="RegexBuilder.x64" Directory="RegexBuilder.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.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="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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftRegexBuilder.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libRegexBuilder.x64" Directory="libRegexBuilder.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\RegexBuilder.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.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftSwiftOnoneSupport.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftRegexBuilder.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacySwiftOnoneSupport.x86" Directory="LegacySwiftOnoneSupport.swiftmodule">
+      <ComponentGroup Id="RegexBuilder.x86" Directory="RegexBuilder.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <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.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftRegexBuilder.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libRegexBuilder.x86" Directory="libRegexBuilder.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+          <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\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <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\swiftSwiftOnoneSupport.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftRegexBuilder.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- Runtime -->
     <?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" />
+      <ComponentGroup Id="Runtime.arm64" Directory="Runtime.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftRuntime.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" />
+
+      <ComponentGroup Id="libRuntime.arm64" Directory="libRuntime.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Runtime.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" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Runtime.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">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftRuntime.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" />
+      <ComponentGroup Id="Runtime.x64" Directory="Runtime.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.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" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftRuntime.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" />
+
+      <ComponentGroup Id="libRuntime.x64" Directory="libRuntime.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Runtime.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" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Runtime.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">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftRuntime.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" />
+      <ComponentGroup Id="Runtime.x86" Directory="Runtime.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Runtime.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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftRuntime.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" />
+
+      <ComponentGroup Id="libRuntime.x86" Directory="libRuntime.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Runtime.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" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Runtime.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">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftRuntime.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- Synchronization -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- Swift -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacySynchronization.arm64" Directory="LegacySynchronization.swiftmodule">
+      <ComponentGroup Id="Swift.arm64" Directory="Swift.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
         </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftCore.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libSwift.arm64" Directory="libSwift.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftSynchronization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftCore.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacySynchronization.x64" Directory="LegacySynchronization.swiftmodule">
+      <ComponentGroup Id="Swift.x64" Directory="Swift.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.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="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
         </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftCore.lib" />
+        </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libSwift.x64" Directory="libSwift.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.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 Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftCore.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacySynchronization.x86" Directory="LegacySynchronization.swiftmodule">
+      <ComponentGroup Id="Swift.x86" Directory="Swift.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <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.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftCore.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libSwift.x86" Directory="libSwift.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Swift.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 Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftCore.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- SwiftOnoneSupport -->
     <?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" />
+      <ComponentGroup Id="SwiftOnoneSupport.arm64" Directory="SwiftOnoneSupport.swiftmodule">
+        <Component DiskId="2">
+          <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\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftSwiftOnoneSupport.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" />
+
+      <ComponentGroup Id="libSwiftOnoneSupport.arm64" Directory="libSwiftOnoneSupport.swiftmodule">
+        <Component DiskId="2">
+          <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\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="2">
+          <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" DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftSynchronization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftSwiftOnoneSupport.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" />
+      <ComponentGroup Id="SwiftOnoneSupport.x64" Directory="SwiftOnoneSupport.swiftmodule">
+        <Component DiskId="3">
+          <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\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftSwiftOnoneSupport.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" />
+
+      <ComponentGroup Id="libSwiftOnoneSupport.x64" Directory="libSwiftOnoneSupport.swiftmodule">
+        <Component DiskId="3">
+          <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\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="3">
+          <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" DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftSynchronization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftSwiftOnoneSupport.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" />
+      <ComponentGroup Id="SwiftOnoneSupport.x86" Directory="SwiftOnoneSupport.swiftmodule">
+        <Component DiskId="4">
+          <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\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftSwiftOnoneSupport.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" />
+
+      <ComponentGroup Id="libSwiftOnoneSupport.x86" Directory="libSwiftOnoneSupport.swiftmodule">
+        <Component DiskId="4">
+          <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\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        <Component DiskId="4">
+          <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" DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\libswiftSynchronization.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftSwiftOnoneSupport.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
 
-    <!-- WinSDK -->
-<?if $(IncludeLegacySDK) = True?>
+    <!-- Synchronization -->
     <?if $(IncludeARM64) = True?>
-      <ComponentGroup Id="LegacyWinSDK.arm64" Directory="LegacyWinSDK.swiftmodule">
+      <ComponentGroup Id="Synchronization.arm64" Directory="Synchronization.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          <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.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftSynchronization.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libSynchronization.arm64" Directory="libSynchronization.swiftmodule">
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftWinSDK.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_arm64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\aarch64\libswiftSynchronization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="LegacyWinSDK.x64" Directory="LegacyWinSDK.swiftmodule">
+      <ComponentGroup Id="Synchronization.x64" Directory="Synchronization.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.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="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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftSynchronization.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libSynchronization.x64" Directory="libSynchronization.swiftmodule">
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Synchronization.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.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftWinSDK.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x64">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\x86_64\libswiftSynchronization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
+
     <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="LegacyWinSDK.x86" Directory="LegacyWinSDK.swiftmodule">
+      <ComponentGroup Id="Synchronization.x86" Directory="Synchronization.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          <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.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftSynchronization.lib" />
         </Component>
+      </ComponentGroup>
+
+      <ComponentGroup Id="libSynchronization.x86" Directory="libSynchronization.swiftmodule">
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
         </Component>
         <Component DiskId="4">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          <File Source="$(SDKRoot)\usr\lib\swift_static\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\swiftWinSDK.lib" />
+        <Component Directory="WindowsSDK_usr_lib_swift_static_windows_x86">
+          <File Source="$(SDKRoot)\usr\lib\swift_static\windows\i686\libswiftSynchronization.lib" />
         </Component>
       </ComponentGroup>
     <?endif?>
-<?endif?>
 
+    <!-- WinSDK -->
     <?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" />
+        <Component DiskId="2">
+          <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" />
+        <Component DiskId="2">
+          <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">
+          <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" />
+        <Component DiskId="2">
+          <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" />
+        <Component DiskId="2">
+          <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">
+          <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" />
+        <Component DiskId="3">
+          <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" />
+        <Component DiskId="3">
+          <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">
+          <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" />
+        <Component DiskId="3">
+          <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" />
+        <Component DiskId="3">
+          <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">
+          <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" />
+        <Component DiskId="4">
+          <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" />
+        <Component DiskId="4">
+          <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">
+          <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" />
+        <Component DiskId="4">
+          <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" />
+        <Component DiskId="4">
+          <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">
+          <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">
-        <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">
+    <ComponentGroup Id="CXXShim" Directory="WindowsSDK_usr_lib_swift_windows">
       <Component DiskId="1">
         <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxshim.h" />
       </Component>
@@ -4077,135 +2830,64 @@
         <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxstdlibshim.h" />
       </Component>
     </ComponentGroup>
-<?endif?>
-
-    <ComponentGroup Id="ExperimentalCXXShim" Directory="WindowsExperimentalSDK_usr_lib_swift_windows">
-      <Component DiskId="5">
-        <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxshim.h" />
-      </Component>
-      <Component DiskId="5">
-        <File Source="$(ExperimentalSDKRoot)\usr\lib\swift\windows\libcxxshim.modulemap" />
-      </Component>
-      <Component DiskId="5">
-        <File Source="$(ExperimentalSDKRoot)\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>
-        <!--
+        <!-- FIXME(swiftlang/swift-driver#1902) - this should be in the static resource directory -->
         <Component DiskId="2">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftrtd.obj" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftrtT.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>
-        <!--
+        <!-- FIXME(swiftlang/swift-driver#1902) - this should be in the static resource directory -->
         <Component DiskId="3">
-          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftrtd.obj" />
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftrtT.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" />
-        </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" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX64) = True?>
-      <ComponentGroup Id="ExperimentalRegistrar.x64" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x64">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-    <?if $(IncludeX86) = True?>
-      <ComponentGroup Id="ExperimentalRegistrar.x86" Directory="WindowsExperimentalSDK_usr_lib_swift_windows_x86">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\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" />
+        <Component DiskId="4">
+          <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">
-        <File Source="$(SDKRoot)\usr\share\ucrt.modulemap" />
-      </Component>
-      <Component DiskId="1">
-        <File Source="$(SDKRoot)\usr\share\winsdk_um.modulemap" />
-      </Component>
-      <Component DiskId="1">
-        <File Source="$(SDKRoot)\usr\share\winsdk_shared.modulemap" />
-      </Component>
-      <Component DiskId="1">
-        <File Source="$(SDKRoot)\usr\share\vcruntime.apinotes" />
-      </Component>
-      <Component DiskId="1">
-        <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" />
+        <File Source="$(SDKRoot)\usr\share\ucrt.modulemap" />
       </Component>
       <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\share\winsdk_um.modulemap" />
+        <File Source="$(SDKRoot)\usr\share\winsdk_um.modulemap" />
       </Component>
       <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\share\winsdk_shared.modulemap" />
+        <File Source="$(SDKRoot)\usr\share\winsdk_shared.modulemap" />
       </Component>
       <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\share\vcruntime.apinotes" />
+        <File Source="$(SDKRoot)\usr\share\vcruntime.apinotes" />
       </Component>
       <Component>
-        <File Source="$(ExperimentalSDKRoot)\usr\share\vcruntime.modulemap" />
+        <File Source="$(SDKRoot)\usr\share\vcruntime.modulemap" />
       </Component>
     </ComponentGroup>
 
     <!-- Configuration -->
-<?if $(IncludeLegacySDK) = True?>
     <ComponentGroup Id="Configuration">
       <Component Directory="WindowsSDK" DiskId="1">
         <File Source="$(SDKRoot)\SDKSettings.json" />
@@ -4217,116 +2899,44 @@
         <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">
+      <Component Id="rtl.shared.arm64.msm" Directory="RedistVersion" Condition="INSTALLARM64REDIST" DiskId="2">
         <File Source="!(bindpath.rtl.shared.arm64.msm)\rtl.shared.arm64.msm" />
       </Component>
-      <Component Id="rtl.static.arm64.msm" Directory="RedistVersion" Condition="INSTALLARM64REDIST" DiskId="6">
+
+      <Component Id="rtl.static.arm64.msm" Directory="RedistVersion" Condition="INSTALLARM64REDIST" DiskId="2">
         <File Source="!(bindpath.rtl.static.arm64.msm)\rtl.static.arm64.msm" />
       </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">
+      <Component Id="rtl.shared.amd64.msm" Directory="RedistVersion" Condition="INSTALLAMD64REDIST" DiskId="3">
         <File Source="!(bindpath.rtl.shared.amd64.msm)\rtl.shared.amd64.msm" />
       </Component>
-      <Component Id="rtl.static.amd64.msm" Directory="RedistVersion" Condition="INSTALLAMD64REDIST" DiskId="7">
+
+      <Component Id="rtl.static.amd64.msm" Directory="RedistVersion" Condition="INSTALLAMD64REDIST" DiskId="3">
         <File Source="!(bindpath.rtl.static.amd64.msm)\rtl.static.amd64.msm" />
       </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">
+      <Component Id="rtl.shared.x86.msm" Directory="RedistVersion" Condition="INSTALLX86REDIST" DiskId="4">
         <File Source="!(bindpath.rtl.shared.x86.msm)\rtl.shared.x86.msm" />
       </Component>
-      <Component Id="rtl.static.x86.msm" Directory="RedistVersion" Condition="INSTALLX86REDIST" DiskId="8">
+
+      <Component Id="rtl.static.x86.msm" Directory="RedistVersion" Condition="INSTALLX86REDIST" DiskId="4">
         <File Source="!(bindpath.rtl.static.x86.msm)\rtl.static.x86.msm" />
       </Component>
     <?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">
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\CoreFoundation.lib" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\aarch64\_CFURLSessionInterface.lib" />
-        </Component>
-        <Component DiskId="6">
-          <File Source="$(ExperimentalSDKRoot)\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">
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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" />
-        </Component>
-        <Component DiskId="7">
-          <File Source="$(ExperimentalSDKRoot)\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">
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\CoreFoundation.lib" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\_CFURLSessionInterface.lib" />
-        </Component>
-        <Component DiskId="8">
-          <File Source="$(ExperimentalSDKRoot)\usr\lib\swift_static\windows\i686\_CFXMLInterface.lib" />
-        </Component>
-      </ComponentGroup>
-    <?endif?>
-
     <!-- Features -->
     <Feature Display="hidden" Id="PlatformSupport" Title="!(loc.Plt_ProductName_Windows)">
       <ComponentGroupRef Id="Testing" />
@@ -4338,7 +2948,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" />
@@ -4347,7 +2957,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" />
@@ -4356,172 +2966,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" />
-
+      <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)">
         <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="LegacyRuntime.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="LegacyRuntime.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="LegacyRuntime.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" />
@@ -4583,7 +3051,7 @@
         <ComponentGroupRef Id="libdispatch.arm64" />
         <ComponentGroupRef Id="libswiftDispatch.arm64" />
 
-        <ComponentGroupRef Id="ExperimentalRegistrar.arm64" />
+        <ComponentGroupRef Id="Registrar.arm64" />
 
         <!-- Redistributable -->
         <ComponentRef Id="rtl.shared.arm64.msm" />
@@ -4592,8 +3060,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.Sdk_ProductName_Windows_amd64)">
+        <Level Condition="INSTALLAMD64SDK = 0" Value="0" />
 
         <ComponentGroupRef Id="BlocksRuntime.x64" />
         <ComponentGroupRef Id="CRT.x64" />
@@ -4656,7 +3124,7 @@
         <ComponentGroupRef Id="libdispatch.x64" />
         <ComponentGroupRef Id="libswiftDispatch.x64" />
 
-        <ComponentGroupRef Id="ExperimentalRegistrar.x64" />
+        <ComponentGroupRef Id="Registrar.x64" />
 
         <!-- Redistributable -->
         <ComponentRef Id="rtl.shared.amd64.msm" />
@@ -4665,8 +3133,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.Sdk_ProductName_Windows_x86)">
+        <Level Condition="INSTALLX86SDK = 0" Value="0" />
 
         <ComponentGroupRef Id="BlocksRuntime.x86" />
         <ComponentGroupRef Id="CRT.x86" />
@@ -4729,7 +3197,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 ec42103b..00000000
--- a/platforms/Windows/rtl/legacy/lib/rtllib.wxs
+++ /dev/null
@@ -1,145 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Fragment>
-    <?if $(sys.BUILDARCH) == x86 ?>
-      <?define RuntimeDirectoryComponentGuidGenerationSeed = "79856274-E0F9-4602-A56A-A8DE16C05C41" ?>
-      <?define LibexecDirectoryComponentGuidGenerationSeed = "1D2D9D05-6EB4-45A1-A23E-980FCC78CA90" ?>
-    <?elseif $(sys.BUILDARCH) == x64 ?>
-      <?define RuntimeDirectoryComponentGuidGenerationSeed = "89EC12D8-2E04-41C5-9685-C38DA162A2DA" ?>
-      <?define LibexecDirectoryComponentGuidGenerationSeed = "303ABB32-9479-4F81-92D5-5599C6BD3A54" ?>
-    <?elseif $(sys.BUILDARCH) == arm64 ?>
-      <?define RuntimeDirectoryComponentGuidGenerationSeed = "E9BC660F-2E0E-48E4-8DE0-18567335AF6B" ?>
-      <?define LibexecDirectoryComponentGuidGenerationSeed = "F713CE0B-3385-4F79-A690-25384497B172" ?>
-    <?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)" />
-    <Directory Id="LIBEXECDIR_$(ProductArchitecture)" ComponentGuidGenerationSeed="$(LibexecDirectoryComponentGuidGenerationSeed)" />
-
-    <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>
-      <Component>
-        <File Source="$(RuntimeRoot)\usr\bin\swiftRuntime.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>
-
-    <!-- TODO(https://github.com/swiftlang/swift/issues/87499 ) enable this when we build this for x86 -->
-    <?if $(ProductArchitecture) != x86?>
-    <ComponentGroup Id="swift_backtrace_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
-      <Component Directory="LIBEXECDIR_$(ProductArchitecture)">
-        <File Source="$(RuntimeRoot)\usr\libexec\swift\windows\swift-backtrace.exe" />
-      </Component>
-    </ComponentGroup>
-    <?endif?>
-
-    <ComponentGroup Id="swift_runtime_$(ProductArchitecture)">
-      <ComponentGroupRef Id="stdlib_$(ProductArchitecture)" />
-      <ComponentGroupRef Id="BlocksRuntime_$(ProductArchitecture)" />
-      <ComponentGroupRef Id="libdispatch_$(ProductArchitecture)" />
-      <ComponentGroupRef Id="Foundation_$(ProductArchitecture)" />
-    </ComponentGroup>
-
-    <!-- TODO(https://github.com/swiftlang/swift/issues/87499 ) enable this when we build this for x86 -->
-    <?if $(ProductArchitecture) != x86?>
-    <ComponentGroup Id="swift_runtime_support_$(ProductArchitecture)">
-      <ComponentGroupRef Id="swift_backtrace_$(ProductArchitecture)" />
-    </ComponentGroup>
-    <?endif?>
-
-    <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 159ed148..00000000
--- a/platforms/Windows/rtl/legacy/msi/rtlmsi.wxs
+++ /dev/null
@@ -1,51 +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" />
-    <DirectoryRef Id="runtimes_usr_libexec_swift" />
-    <SetDirectory Id="RUNTIMEDIR_$(ProductArchitecture)" Value="[runtimes_usr_bin]" Sequence="first" />
-    <SetDirectory Id="LIBEXECDIR_$(ProductArchitecture)" Value="[runtimes_usr_libexec_swift]" 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>
-
-    <!-- TODO(https://github.com/swiftlang/swift/issues/87499 ) enable this when we build this for x86 -->
-    <?if $(ProductArchitecture) != x86?>
-    <Feature Id="SwiftRuntimeSupport" AllowAbsent="yes" Title="!(loc.Sup_ProductName_$(ProductArchitecture))">
-      <Level Condition="INSTALLSUPPORT = 0" Value="0" />
-      <ComponentGroupRef Id="swift_runtime_support_$(ProductArchitecture)" />
-    </Feature>
-    <?endif?>
-
-    <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 795046ee..00000000
--- a/platforms/Windows/rtl/legacy/msm/rtlmsm.wxs
+++ /dev/null
@@ -1,24 +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)" />
-    <!-- TODO(https://github.com/swiftlang/swift/issues/87499 ) enable this when we build this for x86 -->
-    <?if $(ProductArchitecture) != x86?>
-    <ComponentGroupRef Id="swift_runtime_support_$(ProductArchitecture)" />
-    <?endif?>
-    <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 4590f22a..9ac8596a 100644
--- a/platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs
+++ b/platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs
@@ -3,17 +3,17 @@
     <?if $(sys.BUILDARCH) == x64 ?>
       <?define RuntimeDirectoryComponentGuidGenerationSeed = "E33B165B-8460-467D-ABCD-27EA8197A3CF" ?>
       <?define LibexecDirectoryComponentGuidGenerationSeed = "FFC6429D-AF95-413E-B338-75642F8F7F34" ?>
-      <?define RuntimeRoot = $(WindowsExperimentalRuntimeX64)?>
+      <?define RuntimeRoot = $(WindowsRuntimeX64)?>
     <?elseif $(sys.BUILDARCH) == arm64 ?>
       <?define RuntimeDirectoryComponentGuidGenerationSeed = "BFFDD8F7-CC47-40CB-AF0E-095273FF10FC" ?>
       <?define LibexecDirectoryComponentGuidGenerationSeed = "AD26608D-63D8-45AC-AA57-D4CEEF2DF021" ?>
-      <?define RuntimeRoot = $(WindowsExperimentalRuntimeARM64)?>
+      <?define RuntimeRoot = $(WindowsRuntimeARM64)?>
     <?elseif $(sys.BUILDARCH) == x86 ?>
       <?define RuntimeDirectoryComponentGuidGenerationSeed = "72064820-3795-4331-8CBD-FF1ABA7DAE7B" ?>
       <?define LibexecDirectoryComponentGuidGenerationSeed = "FCAC627D-44EC-4745-B81B-E12CE8F80951" ?>
-      <?define RuntimeRoot = $(WindowsExperimentalRuntimeX86)?>
+      <?define RuntimeRoot = $(WindowsRuntimeX86)?>
     <?endif?>
-    <?define SDKRoot = "$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\WindowsExperimental.sdk"?>
+    <?define SDKRoot = "$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\Windows.sdk"?>
 
     <Directory Id="RUNTIMEDIR_$(ProductArchitecture)" ComponentGuidGenerationSeed="$(RuntimeDirectoryComponentGuidGenerationSeed)" />
     <Directory Id="LIBEXECDIR_$(ProductArchitecture)" ComponentGuidGenerationSeed="$(LibexecDirectoryComponentGuidGenerationSeed)" />
@@ -117,7 +117,7 @@
       </Component>
     </ComponentGroup>
 
-    <!-- TODO(https://github.com/swiftlang/swift/issues/87499 ) enable this when we build this for x86 -->
+    <!-- TODO(https://github.com/swiftlang/swift/issues/87499) enable this when we build this for x86 -->
     <?if $(ProductArchitecture) != x86?>
     <ComponentGroup Id="swift_backtrace_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
       <Component Directory="LIBEXECDIR_$(ProductArchitecture)">
@@ -133,7 +133,7 @@
       <ComponentGroupRef Id="Foundation_$(ProductArchitecture)" />
     </ComponentGroup>
 
-    <!-- TODO(https://github.com/swiftlang/swift/issues/87499 ) enable this when we build this for x86 -->
+    <!-- TODO(https://github.com/swiftlang/swift/issues/87499) enable this when we build this for x86 -->
     <?if $(ProductArchitecture) != x86?>
     <ComponentGroup Id="swift_runtime_support_$(ProductArchitecture)">
       <ComponentGroupRef Id="swift_backtrace_$(ProductArchitecture)" />
diff --git a/platforms/Windows/rtl/shared/msi/rtl.shared.msi.wxs b/platforms/Windows/rtl/shared/msi/rtl.shared.msi.wxs
index 30fa62cd..abdd78f4 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 7469cc79..26348c9f 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -21,7 +21,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="Res_ProductName" Value="Swift Developer Toolkit Resources" />
   <String Id="Rtl_ProductName_arm64" Value="Swift Windows Runtime (ARM64)" />
   <String Id="Rtl_ProductName_amd64" Value="Swift Windows Runtime (AMD64)" />
@@ -30,15 +29,16 @@
   <String Id="Sdk_ProductName_Android_armv7" Value="Swift Android SDK (ARMv7)" />
   <String Id="Sdk_ProductName_Android_amd64" Value="Swift Android SDK (AMD64)" />
   <String Id="Sdk_ProductName_Android_x86" Value="Swift Android 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="Sdk_ProductName_Windows_arm64" Value="Swift Windows SDK (ARM64)" />
   <String Id="Sdk_ProductName_Windows_amd64" Value="Swift Windows SDK (AMD64)" />
   <String Id="Sdk_ProductName_Windows_x86" Value="Swift Windows SDK (X86)" />
   <String Id="Plt_ProductName_Windows_arm64" Value="Swift Windows Platform Support (ARM64)" />
   <String Id="Plt_ProductName_Windows_amd64" Value="Swift Windows Platform Support (AMD64)" />
   <String Id="Plt_ProductName_Windows_x86" Value="Swift Windows Platform Support (X86)" />
-  <String Id="Plt_ProductName_Windows_Experimental_arm64" Value="Swift Windows Platform Support (ARM64) [Experimental]" />
-  <String Id="Plt_ProductName_Windows_Experimental_amd64" Value="Swift Windows Platform Support (AMD64) [Experimental]" />
-  <String Id="Plt_ProductName_Windows_Experimental_x86" Value="Swift Windows Platform Support (X86) [Experimental]" />
   <String Id="Sup_ProductName_arm64" Value="Swift Runtime Support (ARM64)" />
   <String Id="Sup_ProductName_amd64" Value="Swift Runtime Support (AMD64)" />
   <String Id="Sup_ProductName_x86" Value="Swift Runtime Support (X86)" />

From cfbdd2ec7c82b8ce377a6ccee609f7a990774f84 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Tue, 19 May 2026 23:28:28 -0700
Subject: [PATCH 2/3] WiX: package SxS runtime for toolchain

This adds the SxS runtime DLLs to the toolchain. This final piece will
enable SxS toolchain installations as the toolchain now packages and
distributes the runtime alongwith the toolchain. There is no runtime
needed in the path, and we bind to this version avoiding ABI skew.

(cherry picked from commit 16df22ef97c351ca02487104c87f1f7c50a48796)
---
 platforms/Windows/bld/bld.wxi | 51 ++++++++++++++++++++++++++++++++---
 platforms/Windows/cli/cli.wxi | 19 +++++++++++++
 platforms/Windows/dbg/dbg.wxi | 11 ++++++++
 platforms/Windows/ide/ide.wxi | 15 +++++++++++
 4 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/platforms/Windows/bld/bld.wxi b/platforms/Windows/bld/bld.wxi
index 3c4ecbf2..652d392f 100644
--- a/platforms/Windows/bld/bld.wxi
+++ b/platforms/Windows/bld/bld.wxi
@@ -14,6 +14,19 @@
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
+      <Directory Id="toolchain_$(VariantName)_usr_bin_dispatch" Name="dispatch" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_FoundationEssentials" Name="FoundationEssentials" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_swift_Concurrency" Name="swift_Concurrency" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_swift_StringProcessing" Name="swift_StringProcessing" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_swiftCore" Name="swiftCore" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_swiftCRT" Name="swiftCRT" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_swiftDispatch" Name="swiftDispatch" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_swiftObservation" Name="swiftObservation" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_swiftSynchronization" Name="swiftSynchronization" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_swiftWinSDK" Name="swiftWinSDK" />
+    </DirectoryRef>
+
     <DirectoryRef Id="toolchain_$(VariantName)_usr_include">
       <Directory Id="toolchain_$(VariantName)_usr_include_llvm_c" Name="llvm-c" />
       <Directory Id="toolchain_$(VariantName)_usr_include_swift" Name="swift" />
@@ -225,10 +238,6 @@
     </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>
@@ -542,6 +551,39 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="SxSSwiftRuntime">
+      <Component Directory="toolchain_$(VariantName)_usr_bin_dispatch">
+        <File Source="$(ToolchainRoot)\usr\bin\dispatch\dispatch.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_FoundationEssentials">
+        <File Source="$(ToolchainRoot)\usr\bin\FoundationEssentials\FoundationEssentials.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_swift_Concurrency">
+        <File Source="$(ToolchainRoot)\usr\bin\swift_Concurrency\swift_Concurrency.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_swift_StringProcessing">
+        <File Source="$(ToolchainRoot)\usr\bin\swift_StringProcessing\swift_StringProcessing.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_swiftCore">
+        <File Source="$(ToolchainRoot)\usr\bin\swiftCore\swiftCore.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_swiftCRT">
+        <File Source="$(ToolchainRoot)\usr\bin\swiftCRT\swiftCRT.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_swiftDispatch">
+        <File Source="$(ToolchainRoot)\usr\bin\swiftDispatch\swiftDispatch.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_swiftObservation">
+        <File Source="$(ToolchainRoot)\usr\bin\swiftObservation\swiftObservation.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_swiftSynchronization">
+        <File Source="$(ToolchainRoot)\usr\bin\swiftSynchronization\swiftSynchronization.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_swiftWinSDK">
+        <File Source="$(ToolchainRoot)\usr\bin\swiftWinSDK\swiftWinSDK.dll" />
+      </Component>
+    </ComponentGroup>
+
     <ComponentGroup Id="Configuration">
       <Component Directory="$(ToolchainVersionedVariantDirectory)">
         <File Source="$(ToolchainRoot)\ToolchainInfo.plist" />
@@ -574,6 +616,7 @@
       <ComponentGroupRef Id="FoundationMacros" />
       <ComponentGroupRef Id="TestingMacros" />
       <ComponentGroupRef Id="mimalloc" />
+      <ComponentGroupRef Id="SxSSwiftRuntime" />
 
       <ComponentGroupRef Id="ClangResources_$(VariantName)" />
       <ComponentGroupRef Id="SwiftClangResources_$(VariantName)" />
diff --git a/platforms/Windows/cli/cli.wxi b/platforms/Windows/cli/cli.wxi
index 6f930ca1..f822cc25 100644
--- a/platforms/Windows/cli/cli.wxi
+++ b/platforms/Windows/cli/cli.wxi
@@ -21,6 +21,12 @@
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
+      <Directory Id="toolchain_$(VariantName)_usr_bin_Foundation" Name="Foundation" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_FoundationInternationalization" Name="FoundationInternationalization" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin__FoundationICU" Name="_FoundationICU" />
+    </DirectoryRef>
+
     <DirectoryRef Id="toolchain_$(VariantName)_usr_include">
       <Directory Id="toolchain_$(VariantName)_usr_include__InternalSwiftScan" Name="_InternalSwiftScan" />
       <Directory Id="toolchain_$(VariantName)_usr_include_clang_c" Name="clang-c" />
@@ -810,6 +816,18 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="SxSSwiftRuntime">
+      <Component Directory="toolchain_$(VariantName)_usr_bin_Foundation">
+        <File Source="$(ToolchainRoot)\usr\bin\Foundation\Foundation.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_FoundationInternationalization">
+        <File Source="$(ToolchainRoot)\usr\bin\FoundationInternationalization\FoundationInternationalization.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin__FoundationICU">
+        <File Source="$(ToolchainRoot)\usr\bin\_FoundationICU\_FoundationICU.dll" />
+      </Component>
+    </ComponentGroup>
+
     <Feature Id="CLITools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="clang" />
       <ComponentGroupRef Id="libclang" />
@@ -833,6 +851,7 @@
       <ComponentGroupRef Id="DocCRender" />
 
       <ComponentGroupRef Id="swift_format" />
+      <ComponentGroupRef Id="SxSSwiftRuntime" />
 
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
diff --git a/platforms/Windows/dbg/dbg.wxi b/platforms/Windows/dbg/dbg.wxi
index 545a9471..55a71d06 100644
--- a/platforms/Windows/dbg/dbg.wxi
+++ b/platforms/Windows/dbg/dbg.wxi
@@ -14,6 +14,10 @@
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
+      <Directory Id="toolchain_$(VariantName)_usr_bin_swiftRemoteMirror" Name="swiftRemoteMirror" />
+    </DirectoryRef>
+
     <DirectoryRef Id="toolchain_$(VariantName)_usr_include">
       <Directory Id="toolchain_$(VariantName)_usr_include__InternalSwiftStaticMirror" Name="_InternalSwiftStaticMirror" />
     </DirectoryRef>
@@ -139,6 +143,12 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="SxSSwiftRuntime">
+      <Component Directory="toolchain_$(VariantName)_usr_bin_swiftRemoteMirror">
+        <File Source="$(ToolchainRoot)\usr\bin\swiftRemoteMirror\swiftRemoteMirror.dll" />
+      </Component>
+    </ComponentGroup>
+
     <Feature Id="DebuggingTools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="LLDB" />
       <ComponentGroupRef Id="LLDBServer" />
@@ -148,6 +158,7 @@
       <ComponentGroupRef Id="SwiftSynthesizeInterface" />
 
       <ComponentGroupRef Id="_InternalSwiftStaticMirror" />
+      <ComponentGroupRef Id="SxSSwiftRuntime" />
 
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>
diff --git a/platforms/Windows/ide/ide.wxi b/platforms/Windows/ide/ide.wxi
index 9cc207dd..e858f18d 100644
--- a/platforms/Windows/ide/ide.wxi
+++ b/platforms/Windows/ide/ide.wxi
@@ -14,6 +14,11 @@
     <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(VariantUpgradeCode)" />
     <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
 
+    <DirectoryRef Id="toolchain_$(VariantName)_usr_bin">
+      <Directory Id="toolchain_$(VariantName)_usr_bin_FoundationXML" Name="FoundationXML" />
+      <Directory Id="toolchain_$(VariantName)_usr_bin_swiftRegexBuilder" Name="swiftRegexBuilder" />
+    </DirectoryRef>
+
     <DirectoryRef Id="toolchain_$(VariantName)_usr_include">
       <Directory Id="toolchain_$(VariantName)_usr_include_SourceKit" Name="SourceKit" />
     </DirectoryRef>
@@ -65,11 +70,21 @@
       </Component>
     </ComponentGroup>
 
+    <ComponentGroup Id="SxSSwiftRuntime">
+      <Component Directory="toolchain_$(VariantName)_usr_bin_FoundationXML">
+        <File Source="$(ToolchainRoot)\usr\bin\FoundationXML\FoundationXML.dll" />
+      </Component>
+      <Component Directory="toolchain_$(VariantName)_usr_bin_swiftRegexBuilder">
+        <File Source="$(ToolchainRoot)\usr\bin\swiftRegexBuilder\swiftRegexBuilder.dll" />
+      </Component>
+    </ComponentGroup>
+
     <Feature Id="IDETools" AllowAbsent="no" Title="$(VariantProductName)">
       <ComponentGroupRef Id="clangd" />
       <ComponentGroupRef Id="lldb" />
       <ComponentGroupRef Id="sourcekitd" />
       <ComponentGroupRef Id="lsp" />
+      <ComponentGroupRef Id="SxSSwiftRuntime" />
 
       <ComponentGroupRef Id="VersionedDirectoryCleanup" />
     </Feature>

From 51b9b5a9eeb288ea0e2968b0c47573319df67d11 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Tue, 19 May 2026 23:59:43 -0700
Subject: [PATCH 3/3] WiX: update locations for bootstrapped toolchain

The bootstrapping changes introduced a small change to the layout of the
staged toolchain. Update the references to accommodate that.

(cherry picked from commit db08c5940d3dd72df737413969b5505772f8d7b6)
---
 platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs b/platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs
index 9ac8596a..536dff72 100644
--- a/platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs
+++ b/platforms/Windows/rtl/shared/lib/rtl.shared.lib.wxs
@@ -121,7 +121,7 @@
     <?if $(ProductArchitecture) != x86?>
     <ComponentGroup Id="swift_backtrace_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
       <Component Directory="LIBEXECDIR_$(ProductArchitecture)">
-        <File Source="$(SDKRoot)\usr\libexec\swift\swift-backtrace.exe" />
+        <File Source="$(RuntimeRoot)\usr\libexec\swift\swift-backtrace.exe" />
       </Component>
     </ComponentGroup>
     <?endif?>