From 5744030fe64e929374299fc121e80438346392ed Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Thu, 27 Mar 2025 15:55:41 -0700
Subject: [PATCH] WiX: restructure the Windows installer

This restructures the Windows installer components to the following:
- bld
- cli
- dbg
- ide
- rtl

The SDKs for the various platforms have now been removed and replaced
with the new platforms packages. There are currently two of them:
- android
- windows

Each one of these platform support packages support a set of
architectures relevant to the OS. The platform MSI installs the shared
view of the platform support, and each architecture slice adds the
support for the specified architecture.

The parameters to the installer build have now been replaced with the
single root path to the toolchain image and a set of paths for the
Windows runtime installations to package. This is critical to resolving
the previous issue with the unified installer build: we would clobber
the paths as there was no android and windows platform differentiation.

The changes removed the need for the variants of the shared library as
all the architectures are now included into a single MSI, simply split
up amongst the CABs.
---
 platforms/Windows/Directory.Build.props       |   26 +-
 platforms/Windows/Directory.Build.targets     |    2 +-
 .../Windows/SideBySideUpgradeStrategy.props   |   13 +-
 platforms/Windows/bld/bld.wixproj             |   13 +-
 platforms/Windows/bld/bld.wxs                 |  268 +-
 platforms/Windows/bundle/installer.wixproj    |   37 +-
 platforms/Windows/bundle/installer.wxs        |   70 +-
 platforms/Windows/bundle/theme.xml            |   42 +-
 platforms/Windows/cli/cli.wixproj             |    3 +-
 platforms/Windows/cli/cli.wxs                 |  123 +-
 platforms/Windows/dbg/dbg.wixproj             |    6 -
 platforms/Windows/dbg/dbg.wxs                 |   59 +-
 platforms/Windows/ide/ide.wixproj             |    6 -
 platforms/Windows/ide/ide.wxs                 |   19 +-
 platforms/Windows/platforms/CDispatch.wxi     |   45 +
 .../Windows/platforms/_FoundationCShims.wxi   |   42 +
 .../Windows/platforms/_FoundationUnicode.wxi  |  618 +++++
 .../android/android.wixproj}                  |   10 +-
 .../Windows/platforms/android/android.wxs     | 2283 +++++++++++++++++
 .../Windows/platforms/windows/windows.wixproj |   42 +
 .../Windows/platforms/windows/windows.wxs     | 1812 +++++++++++++
 platforms/Windows/readme.md                   |   47 +-
 platforms/Windows/rtl/lib/rtllib.wxs          |   56 +-
 platforms/Windows/sdk/CDispatch.wxi           |   45 -
 platforms/Windows/sdk/_FoundationCShims.wxi   |   42 -
 platforms/Windows/sdk/_FoundationUnicode.wxi  |  618 -----
 platforms/Windows/sdk/drd/sdk.wxs             |  618 -----
 platforms/Windows/sdk/win/sdk.wixproj         |   49 -
 platforms/Windows/sdk/win/sdk.wxs             |  620 -----
 platforms/Windows/shared/swift.en-us.wxl      |   16 +-
 30 files changed, 5210 insertions(+), 2440 deletions(-)
 create mode 100644 platforms/Windows/platforms/CDispatch.wxi
 create mode 100644 platforms/Windows/platforms/_FoundationCShims.wxi
 create mode 100644 platforms/Windows/platforms/_FoundationUnicode.wxi
 rename platforms/Windows/{sdk/drd/sdk.wixproj => platforms/android/android.wixproj} (66%)
 create mode 100644 platforms/Windows/platforms/android/android.wxs
 create mode 100644 platforms/Windows/platforms/windows/windows.wixproj
 create mode 100644 platforms/Windows/platforms/windows/windows.wxs
 delete mode 100644 platforms/Windows/sdk/CDispatch.wxi
 delete mode 100644 platforms/Windows/sdk/_FoundationCShims.wxi
 delete mode 100644 platforms/Windows/sdk/_FoundationUnicode.wxi
 delete mode 100644 platforms/Windows/sdk/drd/sdk.wxs
 delete mode 100644 platforms/Windows/sdk/win/sdk.wixproj
 delete mode 100644 platforms/Windows/sdk/win/sdk.wxs

diff --git a/platforms/Windows/Directory.Build.props b/platforms/Windows/Directory.Build.props
index e051bb0f..a59bce70 100644
--- a/platforms/Windows/Directory.Build.props
+++ b/platforms/Windows/Directory.Build.props
@@ -67,26 +67,6 @@
 
   <Import Project="$(USERNAME).props" Condition="Exists('$(USERNAME).props')" />
 
-  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
-    <PLATFORM_ROOT>$(PLATFORM_ROOT_X86)</PLATFORM_ROOT>
-    <SDK_ROOT>$(SDK_ROOT_X86)</SDK_ROOT>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
-    <PLATFORM_ROOT>$(PLATFORM_ROOT_AMD64)</PLATFORM_ROOT>
-    <SDK_ROOT>$(SDK_ROOT_AMD64)</SDK_ROOT>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm' ">
-    <PLATFORM_ROOT>$(PLATFORM_ROOT_ARM)</PLATFORM_ROOT>
-    <SDK_ROOT>$(SDK_ROOT_ARM)</SDK_ROOT>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
-    <PLATFORM_ROOT>$(PLATFORM_ROOT_ARM64)</PLATFORM_ROOT>
-    <SDK_ROOT>$(SDK_ROOT_ARM64)</SDK_ROOT>
-  </PropertyGroup>
-
   <PropertyGroup>
     <DefaultCompressionLevel Condition="'$(DefaultCompressionLevel)' == ''">$(PackageCompressionLevel)</DefaultCompressionLevel>
 
@@ -100,8 +80,10 @@
       IsBundleCompressed=$(IsBundleCompressed);
       ArePackageCabsEmbedded=$(ArePackageCabsEmbedded);
       BaseReleaseDownloadUrl=$(BaseReleaseDownloadUrl);
-      SDK_ROOT=$(SDK_ROOT);
-      PLATFORM_ROOT=$(PLATFORM_ROOT);
+      ImageRoot=$(ImageRoot);
+      WindowsRuntimeARM64=$(WindowsRuntimeARM64);
+      WindowsRuntimeX64=$(WindowsRuntimeX64);
+      WindowsRuntimeX86=$(WindowsRuntimeX86);
     </DefineConstants>
   </PropertyGroup>
 
diff --git a/platforms/Windows/Directory.Build.targets b/platforms/Windows/Directory.Build.targets
index 595fb773..3dfeedc8 100644
--- a/platforms/Windows/Directory.Build.targets
+++ b/platforms/Windows/Directory.Build.targets
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-  <ItemGroup Condition="'$(MSBuildProjectName)' != 'shared' AND '$(MSBuildProjectName)' != 'sdk' AND '$(MSBuildProjectName)' != 'rtllib' AND '$(MSBuildProjectName)' != 'rtlmsm'">
+  <ItemGroup Condition="'$(MSBuildProjectName)' != 'shared' AND '$(MSBuildProjectName)' != 'rtllib' AND '$(MSBuildProjectName)' != 'rtlmsm'">
     <ProjectReference Include="$(MSBuildThisFileDirectory)shared\shared.wixproj" />
   </ItemGroup>
 
diff --git a/platforms/Windows/SideBySideUpgradeStrategy.props b/platforms/Windows/SideBySideUpgradeStrategy.props
index 195168ba..ae79f273 100644
--- a/platforms/Windows/SideBySideUpgradeStrategy.props
+++ b/platforms/Windows/SideBySideUpgradeStrategy.props
@@ -22,13 +22,8 @@
     <DbgUpgradeCode>{91D382AF-1E92-44DC-A4AD-AEE91C1B5160}</DbgUpgradeCode>
     <IdeUpgradeCode>{8DD91C86-D13D-490B-B06B-9522A9CF504C}</IdeUpgradeCode>
     <RtlUpgradeCode>{BEA8C6DC-F73E-445B-9486-2333D1CF2886}</RtlUpgradeCode>
-    <WindowsSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'x86' ">{443F4D7F-38F3-47C8-9BEE-37FEB01D13C8}</WindowsSDKUpgradeCode>
-    <WindowsSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'amd64' ">{762D10FE-EBE5-4554-BB78-FB13A4A487E3}</WindowsSDKUpgradeCode>
-    <WindowsSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm64' ">{9749D9E6-E860-4FF6-9E8A-525270F471A3}</WindowsSDKUpgradeCode>
-    <AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm64' ">{485f88f4-9342-48cb-853a-12da885a5818}</AndroidSDKUpgradeCode>
-    <AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'amd64' ">{0838ee60-5d4a-4832-b844-73dad6eb1cc1}</AndroidSDKUpgradeCode>
-    <AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'arm' ">{1269a926-3528-4ab7-b4d6-386d5c3f903a}</AndroidSDKUpgradeCode>
-    <AndroidSDKUpgradeCode Condition=" '$(ProductArchitecture)' == 'x86' ">{d889349b-0000-4600-a04a-93602525d5db}</AndroidSDKUpgradeCode>
+    <AndroidPlatformUpgradeCode>{313B9C1F-D5B5-4FED-B7E0-138F1EE6B26A}</AndroidPlatformUpgradeCode>
+    <WindowsPlatformUpgradeCode>{01AFF1CF-A025-41B6-BCBC-728D794353FD}</WindowsPlatformUpgradeCode>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(MajorMinorProductVersion)' == '0.0'">
@@ -64,8 +59,8 @@
       DbgUpgradeCode=$(DbgUpgradeCode);
       IdeUpgradeCode=$(IdeUpgradeCode);
       RtlUpgradeCode=$(RtlUpgradeCode);
-      WindowsSDKUpgradeCode=$(WindowsSDKUpgradeCode);
-      AndroidSDKUpgradeCode=$(AndroidSDKUpgradeCode);
+      AndroidPlatformUpgradeCode=$(AndroidPlatformUpgradeCode);
+      WindowsPlatformUpgradeCode=$(WindowsPlatformUpgradeCode);
     </DefineConstants>
   </PropertyGroup>
 </Project>
diff --git a/platforms/Windows/bld/bld.wixproj b/platforms/Windows/bld/bld.wixproj
index 35017fbc..77f56c10 100644
--- a/platforms/Windows/bld/bld.wixproj
+++ b/platforms/Windows/bld/bld.wixproj
@@ -2,9 +2,8 @@
   <PropertyGroup>
     <DefineConstants>
       $(DefineConstants);
-      TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
-      TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang;
-      TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\swift\clang;
+      _USR_LIB_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang;
+      _USR_LIB_SWIFT_CLANG=$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang;
       WORKAROUND_MIMALLOC_ISSUE_997=$(WORKAROUND_MIMALLOC_ISSUE_997);
     </DefineConstants>
   </PropertyGroup>
@@ -14,10 +13,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\clang">
+    <HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\clang">
       <ComponentGroupName>ClangResources</ComponentGroupName>
       <DirectoryRefId>_usr_lib_clang</DirectoryRefId>
-      <PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_CLANG</PreprocessorVariable>
+      <PreprocessorVariable>var._USR_LIB_CLANG</PreprocessorVariable>
       <SuppressCom>true</SuppressCom>
       <SuppressRegistry>true</SuppressRegistry>
       <SuppressRootDirectory>true</SuppressRootDirectory>
@@ -25,10 +24,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <HarvestDirectory Include="$(TOOLCHAIN_ROOT)\usr\lib\swift\clang">
+    <HarvestDirectory Include="$(ImageRoot)\Toolchains\$(ProductVersion)+Asserts\usr\lib\swift\clang">
       <ComponentGroupName>SwiftClangResources</ComponentGroupName>
       <DirectoryRefId>_usr_lib_swift_clang</DirectoryRefId>
-      <PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_SWIFT_CLANG</PreprocessorVariable>
+      <PreprocessorVariable>var._USR_LIB_SWIFT_CLANG</PreprocessorVariable>
       <SuppressCom>true</SuppressCom>
       <SuppressRegistry>true</SuppressRegistry>
       <SuppressRootDirectory>true</SuppressRootDirectory>
diff --git a/platforms/Windows/bld/bld.wxs b/platforms/Windows/bld/bld.wxs
index fcc62f5e..8e908085 100644
--- a/platforms/Windows/bld/bld.wxs
+++ b/platforms/Windows/bld/bld.wxs
@@ -1,10 +1,6 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
 
-  <?if $(ProductArchitecture) = "amd64"?>
-    <?define ArchTriple = "x86_64-unknown-windows-msvc"?>
-  <?elseif $(ProductArchitecture) = "arm64"?>
-    <?define ArchTriple = "aarch64-unknown-windows-msvc"?>
-  <?endif?>
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
 
   <Package
       Language="1033"
@@ -42,30 +38,30 @@
 
     <ComponentGroup Id="cmark_gfm" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin/cmark-gfm.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin/cmark-gfm.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin/cmark-gfm-extensions.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin/cmark-gfm-extensions.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="binutils" Directory="_usr_bin">
       <!-- TODO(compnerd) can we use symbolic links to llvm-ar.exe instead? -->
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-dlltool.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-dlltool.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-lib.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-lib.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-ranlib.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-ranlib.exe" />
       </Component>
       <!-- TODO(compnerd) can we use symbolic links to llvm-objdump.exe instead? -->
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-readelf.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-readelf.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-strip.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-strip.exe" />
       </Component>
       <!--
         TODO(compnerd) we should symlink:
@@ -83,87 +79,87 @@
       -->
 
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\dsymutil.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\dsymutil.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-ar.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-ar.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-cov.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-cov.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-cvtres.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-cvtres.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-cxxfilt.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-cxxfilt.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-dwarfdump.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-dwarfdump.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-dwp.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-dwp.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-lipo.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-lipo.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-ml.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-ml.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-mt.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-mt.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-nm.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-nm.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-objcopy.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-objcopy.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-objdump.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-objdump.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-pdbutil.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-pdbutil.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-profdata.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-profdata.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-rc.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-rc.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-readobj.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-readobj.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-size.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-size.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-strings.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-strings.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-symbolizer.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-symbolizer.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llvm-undname.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\llvm-undname.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="lto">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\LTO.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\LTO.dll" />
       </Component>
 
       <Component Directory="_usr_lib">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\LTO.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\LTO.lib" />
       </Component>
 
       <Component Directory="_usr_include_llvm_c">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\llvm-c\lto.h" />
+        <File Source="$(ToolchainRoot)\usr\include\llvm-c\lto.h" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="ClangFeatures" Directory="_usr_share_clang">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\clang\features.json" />
+        <File Source="$(ToolchainRoot)\usr\share\clang\features.json" />
       </Component>
     </ComponentGroup>
 
@@ -172,22 +168,22 @@
 
       <!-- TODO(compnerd) can we use symbolic links to clang.exe instead? -->
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang-cl.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\clang-cl.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang-cpp.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\clang-cpp.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang++.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\clang++.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\clang.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang-scan-deps.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\clang-scan-deps.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang-deps-launcher.py" />
+        <File Source="$(ToolchainRoot)\usr\bin\clang-deps-launcher.py" />
       </Component>
       <!--
         TODO(compnerd) we should include:
@@ -201,29 +197,29 @@
     <ComponentGroup Id="lld" Directory="_usr_bin">
       <!-- TODO(compnerd) can we use symbolic links to lld.exe instead? -->
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\ld.lld.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\ld.lld.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\ld64.lld.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\ld64.lld.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\lld-link.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\lld-link.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\wasm-ld.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\wasm-ld.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\lld.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\lld.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="BlocksRuntime">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\BlocksRuntime.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\BlocksRuntime.dll" />
       </Component>
 
       <Component Directory="_usr_lib">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\BlocksRuntime.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\BlocksRuntime.lib" />
       </Component>
 
       <!-- TODO(compnerd) should we install the block headers? -->
@@ -231,11 +227,11 @@
 
     <ComponentGroup Id="libdispatch">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\dispatch.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\dispatch.dll" />
       </Component>
 
       <Component Directory="_usr_lib">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\dispatch.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\dispatch.lib" />
       </Component>
 
       <!-- TODO(compnerd) should we install the dispatch headers? -->
@@ -243,110 +239,110 @@
 
     <ComponentGroup Id="SwiftCxx" Directory="_usr_lib_swift_swiftToCxx">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" />
       </Component>
 
       <Component Directory="_usr_include_swift">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\swift\bridging.modulemap" />
+        <File Source="$(ToolchainRoot)\usr\include\swift\bridging.modulemap" />
       </Component>
       <Component Directory="_usr_include_swift">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\swift\bridging" />
+        <File Source="$(ToolchainRoot)\usr\include\swift\bridging" />
       </Component>
       <Component Directory="_usr_include_swift">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\module.modulemap" />
+        <File Source="$(ToolchainRoot)\usr\include\module.modulemap" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftDemangle">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swiftDemangle.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\swiftDemangle.dll" />
       </Component>
       <Component Directory="_usr_lib">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swiftDemangle.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\swiftDemangle.lib" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftEducationalNotes" Directory="_usr_share_doc_swift_diagnostics">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\dynamic-callable-requirements.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\dynamic-callable-requirements.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\error-in-future-swift-version.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\error-in-future-swift-version.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\existential-member-access-limitations.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\existential-member-access-limitations.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\multiple-inheritance.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\multiple-inheritance.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\nominal-types.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\nominal-types.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\opaque-type-inference.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\opaque-type-inference.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\property-wrapper-requirements.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\property-wrapper-requirements.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\protocol-type-non-conformance.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\protocol-type-non-conformance.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\result-builder-methods.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\result-builder-methods.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\string-interpolation-conformance.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\string-interpolation-conformance.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\temporary-pointers.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\temporary-pointers.md" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\doc\swift\diagnostics\trailing-closure-matching.md" />
+        <File Source="$(ToolchainRoot)\usr\share\doc\swift\diagnostics\trailing-closure-matching.md" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftFeatures" Directory="_usr_share_swift">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\share\swift\features.json" />
+        <File Source="$(ToolchainRoot)\usr\share\swift\features.json" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftMigrator" Directory="_usr_lib_swift_migrator">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\ios4.json" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios42.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\ios42.json" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\macos4.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\macos4.json" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\macos42.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\macos42.json" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\overlay4.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\overlay4.json" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\overlay42.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\overlay42.json" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\tvos4.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\tvos4.json" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\tvos42.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\tvos42.json" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\watchos4.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\watchos4.json" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\migrator\watchos42.json" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\migrator\watchos42.json" />
       </Component>
     </ComponentGroup>
 
@@ -359,192 +355,192 @@
 
       <!-- TODO(compnerd) can we use symbolic links to swift-frontend.exe instead? -->
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-api-digester.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-api-digester.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-autolink-extract.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-autolink-extract.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-symbolgraph-extract.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-symbolgraph-extract.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-demangle.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-demangle.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-frontend.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-frontend.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftMacros" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\ObservationMacros.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\ObservationMacros.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftMacros.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftMacros.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="FoundationMacros" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\FoundationMacros.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\FoundationMacros.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="TestingMacros" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\TestingMacros.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\TestingMacros.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="argument_parser" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\ArgumentParser.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\ArgumentParser.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="tools_support_core" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCBasic.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\TSCBasic.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\TSCUtility.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\TSCUtility.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="swift_driver" Directory="_usr_bin">
       <!-- TODO(compnerd) can we use symbolic links to swift.exe instead? -->
       <Component>
-        <File Name="swiftc.exe" Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-driver.exe" />
+        <File Name="swiftc.exe" Source="$(ToolchainRoot)\usr\bin\swift-driver.exe" />
       </Component>
 
       <Component>
-        <File Name="swift.exe" Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-driver.exe" />
+        <File Name="swift.exe" Source="$(ToolchainRoot)\usr\bin\swift-driver.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-help.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-help.exe" />
       </Component>
 
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftOptions.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftOptions.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDriver.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftDriver.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDriverExecution.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftDriverExecution.dll" />
       </Component>
     </ComponentGroup>
 
    <ComponentGroup Id="compiler_swift_syntax" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftBasicFormat.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftBasicFormat.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftCompilerPluginMessageHandling.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftCompilerPluginMessageHandling.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftDiagnostics.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftDiagnostics.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftIDEUtils.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftIDEUtils.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftIfConfig.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftIfConfig.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftLexicalLookup.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftLexicalLookup.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftOperators.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftOperators.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftParser.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftParser.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftParserDiagnostics.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftParserDiagnostics.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftSyntax.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftSyntax.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftSyntaxBuilder.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftSyntaxBuilder.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftSyntaxMacroExpansion.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftSyntaxMacroExpansion.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_CompilerSwiftSyntaxMacros.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_CompilerSwiftSyntaxMacros.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="swift_syntax" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftBasicFormat.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftBasicFormat.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftCompilerPluginMessageHandling.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftCompilerPluginMessageHandling.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftDiagnostics.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftDiagnostics.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftIDEUtils.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftIDEUtils.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftLibraryPluginProvider.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftLibraryPluginProvider.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftOperators.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftOperators.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftParser.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftParser.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftParserDiagnostics.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftParserDiagnostics.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftRefactor.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftRefactor.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntax.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftSyntax.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxBuilder.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftSyntaxBuilder.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacroExpansion.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftSyntaxMacroExpansion.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftSyntaxMacros.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftSyntaxMacros.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="plugin_server" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-plugin-server.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-plugin-server.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftInProcPluginServer.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftInProcPluginServer.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="mimalloc" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\mimalloc.dll" />
       </Component>
       <Component>
         <?if $(ProductArchitecture) = "amd64" ?>
-          <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect.dll" />
+          <File Source="$(ToolchainRoot)\usr\bin\mimalloc-redirect.dll" />
         <?elseif $(ProductArchitecture) = "arm64" ?>
-          <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect-arm64.dll" />
+          <File Source="$(ToolchainRoot)\usr\bin\mimalloc-redirect-arm64.dll" />
         <?endif?>
       </Component>
-      <?if $(WORKAROUND_MIMALLOC_ISSUE_997) ?>
+      <?if $(WORKAROUND_MIMALLOC_ISSUE_997) = True?>
         <Component>
           <?if $(ProductArchitecture) = "amd64" ?>
-            <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect-arm64.dll" />
+            <File Source="$(ToolchainRoot)\usr\bin\mimalloc-redirect-arm64.dll" />
           <?elseif $(ProductArchitecture) = "arm64" ?>
-            <File Source="$(TOOLCHAIN_ROOT)\usr\bin\mimalloc-redirect.dll" />
+            <File Source="$(ToolchainRoot)\usr\bin\mimalloc-redirect.dll" />
           <?endif?>
         </Component>
       <?endif?>
@@ -552,7 +548,7 @@
 
     <ComponentGroup Id="Configuration">
       <Component Directory="ToolchainsVersioned">
-        <File Source="$(TOOLCHAIN_ROOT)\ToolchainInfo.plist" />
+        <File Source="$(ToolchainRoot)\ToolchainInfo.plist" />
       </Component>
     </ComponentGroup>
 
diff --git a/platforms/Windows/bundle/installer.wixproj b/platforms/Windows/bundle/installer.wixproj
index 70f8d952..b62f1e58 100644
--- a/platforms/Windows/bundle/installer.wixproj
+++ b/platforms/Windows/bundle/installer.wixproj
@@ -6,13 +6,8 @@
     <VCRedistDownloadUrl Condition=" '$(VCRedistDownloadUrl)' == '' AND '$(VSMajorVersion)' != '' ">https://aka.ms/vs/$(VSMajorVersion)/release/vc_redist.$(ProductArchitecture).exe</VCRedistDownloadUrl>
     <DefineConstants>
       $(DefineConstants);
-      INCLUDE_ANDROID_ARM_SDK=$(INCLUDE_ANDROID_ARM_SDK);
-      INCLUDE_ANDROID_ARM64_SDK=$(INCLUDE_ANDROID_ARM64_SDK);
-      INCLUDE_ANDROID_X86_SDK=$(INCLUDE_ANDROID_X86_SDK);
-      INCLUDE_ANDROID_X86_64_SDK=$(INCLUDE_ANDROID_X86_64_SDK);
-      INCLUDE_WINDOWS_AMD64_SDK=$(INCLUDE_WINDOWS_AMD64_SDK);
-      INCLUDE_WINDOWS_ARM64_SDK=$(INCLUDE_WINDOWS_ARM64_SDK);
-      INCLUDE_WINDOWS_X86_SDK=$(INCLUDE_WINDOWS_X86_SDK);
+      IncludeAndroid=$(Platforms.Contains("android"));
+      IncludeWindows=$(Platforms.Contains("windows"));
     </DefineConstants>
   </PropertyGroup>
 
@@ -28,31 +23,11 @@
     <ProjectReference Include="..\rtl\msi\rtlmsi.wixproj" BindName="rtl" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=armv7;Platform=x86" BindName="android_armv7_sdk" />
+  <ItemGroup Condition=" $(Platforms.Contains('android')) ">
+    <ProjectReference Include="..\platforms\android\android.wixproj" Properties="AndroidArchitectures=$(AndroidArchitectures)" BindName="platform.android" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(INCLUDE_ANDROID_ARM64_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=aarch64;Platform=x86" BindName="android_aarch64_sdk" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(INCLUDE_ANDROID_X86_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=i686;Platform=x86" BindName="android_i686_sdk" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(INCLUDE_ANDROID_x86_64_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\drd\sdk.wixproj" Properties="ProductArchitecture=x86_64;Platform=x86" BindName="android_x86_64_sdk" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(INCLUDE_WINDOWS_AMD64_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=amd64;Platform=x86" BindName="windows_amd64_sdk" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(INCLUDE_WINDOWS_ARM64_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" BindName="windows_arm64_sdk" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(INCLUDE_WINDOWS_X86_SDK)' != '' ">
-    <ProjectReference Include="..\sdk\win\sdk.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="windows_x86_sdk" />
+  <ItemGroup Condition=" $(Platforms.Contains('windows')) ">
+    <ProjectReference Include="..\platforms\windows\windows.wixproj" Properties="WindowsArchitectures=$(WindowsArchitectures)" BindName="platform.windows" />
   </ItemGroup>
 </Project>
diff --git a/platforms/Windows/bundle/installer.wxs b/platforms/Windows/bundle/installer.wxs
index d22389ba..aa10c953 100644
--- a/platforms/Windows/bundle/installer.wxs
+++ b/platforms/Windows/bundle/installer.wxs
@@ -36,6 +36,8 @@
 
     <Variable Name="OptionsInstallUtilities" bal:Overridable="yes" Persisted="yes" Value="1" />
 
+    <Variable Name="OptionsInstallWindowsPlatform" bal:Overridable="yes" Persisted="yes" Value="1" />
+
     <Variable Name="OptionsInstallWindowsSDKX86" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallWindowsRedistX86" bal:Overridable="yes" Persisted="yes" Value="1" />
 
@@ -45,6 +47,8 @@
     <Variable Name="OptionsInstallWindowsSDKARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallWindowsRedistARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
 
+    <Variable Name="OptionsInstallAndroidPlatform" bal:Overridable="yes" Persisted="yes" Value="1" />
+
     <Variable Name="OptionsInstallAndroidSDKARM64" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallAndroidSDKAMD64" bal:Overridable="yes" Persisted="yes" Value="1" />
     <Variable Name="OptionsInstallAndroidSDKARM" bal:Overridable="yes" Persisted="yes" Value="0" />
@@ -104,69 +108,35 @@
         <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
       </MsiPackage>
 
-      <?if $(INCLUDE_ANDROID_ARM_SDK) == true ?>
-        <MsiPackage
-          SourceFile="!(bindpath.android_armv7_sdk)\sdk.android.arm.msi"
-          InstallCondition="OptionsInstallAndroidSDKARM = 1"
-          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-        </MsiPackage>
-      <?endif?>
-
-      <?if $(INCLUDE_ANDROID_ARM64_SDK) == true ?>
+      <?if $(IncludeAndroid) == true?>
         <MsiPackage
-          SourceFile="!(bindpath.android_aarch64_sdk)\sdk.android.arm64.msi"
-          InstallCondition="OptionsInstallAndroidSDKARM64 = 1"
+          SourceFile="!(bindpath.platform.android)\android.msi"
+          InstallCondition="OptionsInstallAndroidPlatform = 1"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-        </MsiPackage>
-      <?endif?>
 
-      <?if $(INCLUDE_ANDROID_X86_SDK) == true ?>
-        <MsiPackage
-          SourceFile="!(bindpath.android_i686_sdk)\sdk.android.x86.msi"
-          InstallCondition="OptionsInstallAndroidSDKX86 = 1"
-          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
+          <MsiProperty Name="InstallARM64SDK" Value="[OptionsInstallAndroidSDKARM64]" />
+          <MsiProperty Name="InstallAMD64SDK" Value="[OptionsInstallAndroidSDKAMD64]" />
+          <MsiProperty Name="InstallARMSDK" Value="[OptionsInstallAndroidSDKARM]" />
+          <MsiProperty Name="InstallX86SDK" Value="[OptionsInstallAndroidSDKX86]" />
         </MsiPackage>
       <?endif?>
 
-      <?if $(INCLUDE_ANDROID_X86_64_SDK) == true ?>
+      <?if $(IncludeWindows) == true?>
         <MsiPackage
-          SourceFile="!(bindpath.android_x86_64_sdk)\sdk.android.amd64.msi"
-          InstallCondition="OptionsInstallAndroidSDKAMD64 = 1"
+          SourceFile="!(bindpath.platform.windows)\windows.msi"
+          InstallCondition="OptionsInstallWindowsPlatform = 1"
           DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
           <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-        </MsiPackage>
-      <?endif?>
 
-      <?if $(INCLUDE_WINDOWS_AMD64_SDK) == true ?>
-        <MsiPackage
-          SourceFile="!(bindpath.windows_amd64_sdk)\sdk.windows.amd64.msi"
-          InstallCondition="OptionsInstallWindowsSDKAMD64 = 1"
-          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-          <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistAMD64]" />
-        </MsiPackage>
-      <?endif?>
+          <MsiProperty Name="InstallARM64SDK" Value="[OptionsInstallWindowsSDKARM64]" />
+          <MsiProperty Name="InstallARM64REDIST" Value="[OptionsInstallWindowsRedistARM64]" />
 
-      <?if $(INCLUDE_WINDOWS_ARM64_SDK) == true ?>
-        <MsiPackage
-          SourceFile="!(bindpath.windows_arm64_sdk)\sdk.windows.arm64.msi"
-          InstallCondition="OptionsInstallWindowsSDKARM64 = 1"
-          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-          <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistARM64]" />
-        </MsiPackage>
-      <?endif?>
+          <MsiProperty Name="InstallAMD64SDK" Value="[OptionsInstallWindowsSDKAMD64]" />
+          <MsiProperty Name="InstallAMD64REDIST" Value="[OptionsInstallWindowsRedistAMD64]" />
 
-      <?if $(INCLUDE_WINDOWS_X86_SDK) == true?>
-        <MsiPackage
-          SourceFile="!(bindpath.windows_x86_sdk)\sdk.windows.x86.msi"
-          InstallCondition="OptionsInstallWindowsSDKX86 = 1"
-          DownloadUrl="$(BaseReleaseDownloadUrl)/{2}">
-          <MsiProperty Name="INSTALLROOT" Value="[InstallRoot]" />
-          <MsiProperty Name="INSTALLREDIST" Value="[OptionsInstallWindowsRedistX86]" />
+          <MsiProperty Name="InstallX86SDK" Value="[OptionsInstallWindowsSDKX86]" />
+          <MsiProperty Name="InstallX86REDIST" Value="[OptionsInstallWindowsRedistX86]" />
         </MsiPackage>
       <?endif?>
      </Chain>
diff --git a/platforms/Windows/bundle/theme.xml b/platforms/Windows/bundle/theme.xml
index 1144b068..22100e47 100644
--- a/platforms/Windows/bundle/theme.xml
+++ b/platforms/Windows/bundle/theme.xml
@@ -6,7 +6,7 @@
 <Theme xmlns="http://wixtoolset.org/schemas/v4/thmutil">
     <Font Id="0" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
     <Font Id="1" Height="-24" Weight="500" Foreground="windowtext">Segoe UI</Font>
-    <Font Id="2" Height="-22" Weight="500" Foreground="graytext">Segoe UI</Font>
+    <Font Id="2" Height="-18" Weight="500" Foreground="graytext">Segoe UI</Font>
     <Font Id="3" Height="-12" Weight="500" Foreground="windowtext" Background="window">Segoe UI</Font>
 
     <Window Width="614" Height="456" HexStyle="100a0000" FontId="0" Caption="#(loc.Caption)">
@@ -48,29 +48,31 @@
         </Page>
 
         <Page Name="Options">
-            <Label X="176" Y="46" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Label>
-            <Editbox Name="InstallRoot" X="176" Y="80" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
-            <Button Name="BrowseButton" X="-11" Y="79" Width="75" Height="23" TabStop="yes" FontId="3">
+            <Label X="176" Y="46" Width="-11" Height="20" FontId="2" DisablePrefix="yes">#(loc.OptionsLocationLabel)</Label>
+            <Editbox Name="InstallRoot" X="176" Y="70" Width="-91" Height="21" TabStop="yes" FontId="3" FileSystemAutoComplete="yes" />
+            <Button Name="BrowseButton" X="-11" Y="69" Width="75" Height="23" TabStop="yes" FontId="3">
                 <Text>#(loc.OptionsBrowseButton)</Text>
                 <BrowseDirectoryAction VariableName="InstallRoot" />
             </Button>
 
-            <Label X="176" Y="111" Width="-11" Height="30" FontId="2" DisablePrefix="yes">#(loc.OptionsFeaturesLabel)</Label>
-            <Checkbox Name="OptionsInstallBLD" X="176" Y="141" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallCLI" X="176" Y="159" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallDBG" X="176" Y="177" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallIDE" X="176" Y="195" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallRTL" X="176" Y="213" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
-            <Checkbox Name="OptionsInstallSDKAMD64" X="176" Y="231" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallRedistAMD64" X="194" Y="249" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSDKAMD64">#(loc.Redist_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallSDKARM64" X="176" Y="267" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallRedistARM64" X="194" Y="285" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSDKArm64">#(loc.Redist_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallSDKX86" X="176" Y="303" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Sdk_ProductName_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallRedistX86" X="194" Y="321" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallSDKX86">#(loc.Redist_x86)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKARM4" X="176" Y="339" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_arm64)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="176" Y="357" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_amd64)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKARM" X="176" Y="375" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_arm)</Checkbox>
-            <Checkbox Name="OptionsInstallAndroidSDKX86" X="176" Y="393" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Android_Sdk_x86)</Checkbox>
+            <Label X="176" Y="88" Width="-11" Height="20" FontId="2" DisablePrefix="yes">#(loc.OptionsFeaturesLabel)</Label>
+            <Checkbox Name="OptionsInstallBLD" X="176" Y="111" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Bld_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallCLI" X="176" Y="129" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Cli_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallDBG" X="176" Y="147" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Dbg_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallIDE" X="176" Y="165" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Ide_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallRTL" X="176" Y="183" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="0">#(loc.Rtl_ProductName)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsPlatform" X="176" Y="201" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Windows)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsSDKAMD64" X="194" Y="219" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsRedistAMD64" X="212" Y="237" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKAMD64">#(loc.Redist_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsSDKARM64" X="194" Y="255" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsRedistARM64" X="212" Y="273" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKARM64">#(loc.Redist_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsSDKX86" X="194" Y="291" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform">#(loc.Sdk_ProductName_Windows_x86)</Checkbox>
+            <Checkbox Name="OptionsInstallWindowsRedistX86" X="212" Y="309" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallWindowsPlatform AND OptionsInstallWindowsSDKX86">#(loc.Redist_x86)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidPlatform" X="176" Y="327" Width="-11" Height="17" TabStop="yes" FontId="3">#(loc.Plt_ProductName_Android)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKARM64" X="194" Y="345" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_arm64)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKAMD64" X="194" Y="363" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_amd64)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKARM" X="194" Y="381" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_armv7)</Checkbox>
+            <Checkbox Name="OptionsInstallAndroidSDKX86" X="194" Y="399" Width="-11" Height="17" TabStop="yes" FontId="3" EnableCondition="OptionsInstallAndroidPlatform">#(loc.Sdk_ProductName_Android_x86)</Checkbox>
 
             <Button Name="OptionsOkButton" X="-91" Y="-11" Width="75" Height="23" TabStop="yes" FontId="0">
                 <Text>#(loc.OptionsOkButton)</Text>
diff --git a/platforms/Windows/cli/cli.wixproj b/platforms/Windows/cli/cli.wixproj
index 88f83903..5dda6e00 100644
--- a/platforms/Windows/cli/cli.wixproj
+++ b/platforms/Windows/cli/cli.wixproj
@@ -2,7 +2,6 @@
   <PropertyGroup>
     <DefineConstants>
       $(DefineConstants);
-      TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
       SWIFT_DOCC_BUILD=$(SWIFT_DOCC_BUILD);
       INCLUDE_SWIFT_DOCC=$(INCLUDE_SWIFT_DOCC);
       SWIFT_FORMAT_BUILD=$(SWIFT_FORMAT_BUILD);
@@ -14,7 +13,7 @@
     <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(INCLUDE_SWIFT_DOCC)' == 'true'">
+  <ItemGroup Condition=" '$(INCLUDE_SWIFT_DOCC)' == 'True' ">
     <HarvestDirectory Include="$(SWIFT_DOCC_RENDER_ARTIFACT_ROOT)\dist">
       <ComponentGroupName>DocCRender</ComponentGroupName>
       <DirectoryRefId>_usr_share_docc_render</DirectoryRefId>
diff --git a/platforms/Windows/cli/cli.wxs b/platforms/Windows/cli/cli.wxs
index 16e42f06..52649c0a 100644
--- a/platforms/Windows/cli/cli.wxs
+++ b/platforms/Windows/cli/cli.wxs
@@ -1,4 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
@@ -27,156 +30,156 @@
 
     <ComponentGroup Id="clang" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang-format.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\clang-format.exe" />
       </Component>
 
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\git-clang-format" />
+        <File Source="$(ToolchainRoot)\usr\bin\git-clang-format" />
       </Component>
 
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\clang-tidy.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\clang-tidy.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="libclang" Directory="_usr_include_clang_c">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\libclang.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\libclang.dll" />
       </Component>
 
       <Component Directory="_usr_lib">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\libclang.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\libclang.lib" />
       </Component>
 
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\clang-c\BuildSystem.h" />
+        <File Source="$(ToolchainRoot)\usr\include\clang-c\BuildSystem.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\clang-c\CXCompilationDatabase.h" />
+        <File Source="$(ToolchainRoot)\usr\include\clang-c\CXCompilationDatabase.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\clang-c\CXErrorCode.h" />
+        <File Source="$(ToolchainRoot)\usr\include\clang-c\CXErrorCode.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\clang-c\CXString.h" />
+        <File Source="$(ToolchainRoot)\usr\include\clang-c\CXString.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\clang-c\Documentation.h" />
+        <File Source="$(ToolchainRoot)\usr\include\clang-c\Documentation.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\clang-c\FatalErrorHandler.h" />
+        <File Source="$(ToolchainRoot)\usr\include\clang-c\FatalErrorHandler.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\clang-c\Index.h" />
+        <File Source="$(ToolchainRoot)\usr\include\clang-c\Index.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\clang-c\Platform.h" />
+        <File Source="$(ToolchainRoot)\usr\include\clang-c\Platform.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\clang-c\Refactor.h" />
+        <File Source="$(ToolchainRoot)\usr\include\clang-c\Refactor.h" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="IndexStore" Directory="_usr_include_indexstore">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\libIndexStore.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\libIndexStore.dll" />
       </Component>
 
       <Component Directory="_usr_lib">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\libIndexStore.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\libIndexStore.lib" />
       </Component>
 
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\local\include\indexstore\indexstore.h" />
+        <File Source="$(ToolchainRoot)\usr\local\include\indexstore\indexstore.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\local\include\indexstore\IndexStoreCXX.h" />
+        <File Source="$(ToolchainRoot)\usr\local\include\indexstore\IndexStoreCXX.h" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="_InternalSwiftScan" Directory="_usr_include__InternalSwiftScan">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftScan.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_InternalSwiftScan.dll" />
       </Component>
 
       <Component Directory="_usr_lib">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\windows\_InternalSwiftScan.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\windows\_InternalSwiftScan.lib" />
       </Component>
 
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\DependencyScan.h" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftScan\DependencyScan.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\DependencyScanMacros.h" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftScan\DependencyScanMacros.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\module.modulemap" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftScan\module.modulemap" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="collections" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\Collections.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\Collections.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\DequeModule.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\DequeModule.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\InternalCollectionsUtilities.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\InternalCollectionsUtilities.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\OrderedCollections.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\OrderedCollections.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="llbuild" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\llbuildSwift.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\llbuildSwift.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="CompilerPluginSupport" Directory="_usr_lib_swift_pm_ManifestAPI">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="PackageDescription" Directory="_usr_lib_swift_pm_ManifestAPI">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="PackagePlugin" Directory="_usr_lib_swift_pm_PluginAPI">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" />
       </Component>
     </ComponentGroup>
 
@@ -186,60 +189,60 @@
       <ComponentGroupRef Id="PackagePlugin" />
 
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-build.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-build.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-package.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-package.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-run.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-run.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-test.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-test.exe" />
       </Component>
 
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\Basics.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\Basics.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\Build.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\Build.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\Commands.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\Commands.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\CoreCommands.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\CoreCommands.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\DriverSupport.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\DriverSupport.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageGraph.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\PackageGraph.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageLoading.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\PackageLoading.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageModel.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\PackageModel.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\PackageModelSyntax.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\PackageModelSyntax.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SourceControl.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SourceControl.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SPMBuildCore.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SPMBuildCore.dll" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\Workspace.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\Workspace.dll" />
       </Component>
 
       <!-- FIXME(compnerd) we should include the SPM import libraries -->
     </ComponentGroup>
 
     <ComponentGroup Id="DocC" Directory="_usr_bin">
-      <?if $(INCLUDE_SWIFT_DOCC) == true ?>
+      <?if $(INCLUDE_SWIFT_DOCC) = True?>
         <Component>
           <File Source="$(SWIFT_DOCC_BUILD)\docc.exe" />
         </Component>
@@ -248,10 +251,10 @@
 
     <ComponentGroup Id="swift_format" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-format.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-format.exe" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\SwiftFormat.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\SwiftFormat.dll" />
       </Component>
     </ComponentGroup>
 
@@ -267,7 +270,7 @@
       <ComponentGroupRef Id="package_manager" />
 
       <ComponentGroupRef Id="DocC" />
-      <?if $(INCLUDE_SWIFT_DOCC) == true ?>
+      <?if $(INCLUDE_SWIFT_DOCC) = True?>
         <ComponentGroupRef Id="DocCRender" />
       <?endif?>
 
diff --git a/platforms/Windows/dbg/dbg.wixproj b/platforms/Windows/dbg/dbg.wixproj
index 70298d5b..8a93eeab 100644
--- a/platforms/Windows/dbg/dbg.wixproj
+++ b/platforms/Windows/dbg/dbg.wixproj
@@ -1,8 +1,2 @@
 <Project Sdk="WixToolset.Sdk/4.0.5">
-  <PropertyGroup>
-    <DefineConstants>
-      $(DefineConstants);
-      TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);
-    </DefineConstants>
-  </PropertyGroup>
 </Project>
diff --git a/platforms/Windows/dbg/dbg.wxs b/platforms/Windows/dbg/dbg.wxs
index a57e1b5e..94848bc2 100644
--- a/platforms/Windows/dbg/dbg.wxs
+++ b/platforms/Windows/dbg/dbg.wxs
@@ -1,4 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
@@ -29,111 +32,111 @@
 
     <ComponentGroup Id="LLDB">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\lldb.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\lldb.exe" />
       </Component>
 
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\liblldb.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\liblldb.dll" />
       </Component>
 
       <Component Directory="_usr_lib">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\liblldb.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\liblldb.lib" />
       </Component>
 
       <Component Directory="_usr_lib_site_packages_lldb">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\__init__.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\__init__.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\_lldb.pyd" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\_lldb.pyd" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\embedded_interpreter.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\embedded_interpreter.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\lldb-argdumper.exe" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\lldb-argdumper.exe" />
       </Component>
 
       <Component Directory="_usr_lib_site_packages_lldb_formatters">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\Logger.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\Logger.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\__init__.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\__init__.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\attrib_fromdict.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\attrib_fromdict.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cache.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cache.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\metrics.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\metrics.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\synth.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\synth.py" />
       </Component>
 
       <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cpp\__init__.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\__init__.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cpp\gnu_libstdcpp.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\gnu_libstdcpp.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cpp\libcxx.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\formatters\cpp\libcxx.py" />
       </Component>
 
       <Component Directory="_usr_lib_site_packages_lldb_utils">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\utils\__init__.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\__init__.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_utils">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\utils\in_call_stack.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\in_call_stack.py" />
       </Component>
       <Component Directory="_usr_lib_site_packages_lldb_utils">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\utils\symbolication.py" />
+        <File Source="$(ToolchainRoot)\usr\lib\site-packages\lldb\utils\symbolication.py" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="LLDBServer">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\lldb-server.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\lldb-server.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftREPL">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\repl_swift.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\repl_swift.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftSynthesizeInterface">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-synthesize-interface.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-synthesize-interface.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="SwiftInspect">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\swift-inspect.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\swift-inspect.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="_InternalSwiftStaticMirror" Directory="_usr_include__InternalSwiftStaticMirror">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftStaticMirror.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\_InternalSwiftStaticMirror.dll" />
       </Component>
 
       <Component Directory="_usr_lib">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\windows\_InternalSwiftStaticMirror.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\windows\_InternalSwiftStaticMirror.lib" />
       </Component>
 
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftStaticMirror\BinaryScan.h" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftStaticMirror\BinaryScan.h" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftStaticMirror\module.modulemap" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftStaticMirror\module.modulemap" />
       </Component>
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftStaticMirror\StaticMirrorMacros.h" />
+        <File Source="$(ToolchainRoot)\usr\lib\swift\_InternalSwiftStaticMirror\StaticMirrorMacros.h" />
       </Component>
     </ComponentGroup>
 
diff --git a/platforms/Windows/ide/ide.wixproj b/platforms/Windows/ide/ide.wixproj
index 84df0a38..8a93eeab 100644
--- a/platforms/Windows/ide/ide.wixproj
+++ b/platforms/Windows/ide/ide.wixproj
@@ -1,8 +1,2 @@
 <Project Sdk="WixToolset.Sdk/4.0.5">
-  <PropertyGroup>
-    <DefineConstants>
-      $(DefineConstants);
-      TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT)
-    </DefineConstants>
-  </PropertyGroup>
 </Project>
diff --git a/platforms/Windows/ide/ide.wxs b/platforms/Windows/ide/ide.wxs
index e0851441..97170e15 100644
--- a/platforms/Windows/ide/ide.wxs
+++ b/platforms/Windows/ide/ide.wxs
@@ -1,4 +1,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+
+  <?define ToolchainRoot = $(ImageRoot)\Toolchains\$(ProductVersion)+Asserts?>
+
   <Package
       Language="1033"
       Manufacturer="!(loc.ManufacturerName)"
@@ -18,41 +21,41 @@
 
     <ComponentGroup Id="clangd" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\clangd.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\clangd.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="lldb" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\lldb-dap.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\lldb-dap.exe" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="sourcekitd">
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\sourcekitdInProc.dll" />
+        <File Source="$(ToolchainRoot)\usr\bin\sourcekitdInProc.dll" />
       </Component>
 
       <Component Directory="_usr_lib">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\sourcekitdInProc.lib" />
+        <File Source="$(ToolchainRoot)\usr\lib\sourcekitdInProc.lib" />
       </Component>
 
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\SwiftSourceKitPlugin.dll" />
+        <File Source="$(ToolchainRoot)\usr\lib\SwiftSourceKitPlugin.dll" />
       </Component>
 
       <Component Directory="_usr_bin">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\lib\SwiftSourceKitClientPlugin.dll" />
+        <File Source="$(ToolchainRoot)\usr\lib\SwiftSourceKitClientPlugin.dll" />
       </Component>
 
       <Component Directory="_usr_include_SourceKit">
-        <File Source="$(TOOLCHAIN_ROOT)\usr\include\SourceKit\sourcekitd.h" />
+        <File Source="$(ToolchainRoot)\usr\include\SourceKit\sourcekitd.h" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="lsp" Directory="_usr_bin">
       <Component>
-        <File Source="$(TOOLCHAIN_ROOT)\usr\bin\sourcekit-lsp.exe" />
+        <File Source="$(ToolchainRoot)\usr\bin\sourcekit-lsp.exe" />
       </Component>
     </ComponentGroup>
 
diff --git a/platforms/Windows/platforms/CDispatch.wxi b/platforms/Windows/platforms/CDispatch.wxi
new file mode 100644
index 00000000..e8d24dd5
--- /dev/null
+++ b/platforms/Windows/platforms/CDispatch.wxi
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\base.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\block.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\data.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\dispatch.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\group.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\introspection.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\io.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\module.modulemap" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\object.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\once.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\queue.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\semaphore.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\source.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\dispatch\time.h" />
+  </Component>
+</Include>
diff --git a/platforms/Windows/platforms/_FoundationCShims.wxi b/platforms/Windows/platforms/_FoundationCShims.wxi
new file mode 100644
index 00000000..7eb46e8d
--- /dev/null
+++ b/platforms/Windows/platforms/_FoundationCShims.wxi
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\bplist_shims.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\CFUniCharBitmapData.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\CFUniCharBitmapData.inc.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\filemanager_shims.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\io_shims.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\module.modulemap" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\platform_shims.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\string_shims.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\uuid.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\_CShimsMacros.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\_CShimsTargetConditionals.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\_CStdlib.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_FoundationCShims\_FoundationCShims.h" />
+  </Component>
+</Include>
diff --git a/platforms/Windows/platforms/_FoundationUnicode.wxi b/platforms/Windows/platforms/_FoundationUnicode.wxi
new file mode 100644
index 00000000..5bdd50df
--- /dev/null
+++ b/platforms/Windows/platforms/_FoundationUnicode.wxi
@@ -0,0 +1,618 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\alphaindex.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\appendable.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\basictz.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\brkiter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\bytestream.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\bytestrie.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\bytestriebuilder.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\calendar.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\caniter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\casemap.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\char16ptr.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\chariter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\choicfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\coleitr.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\coll.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\compactdecimalformat.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\curramt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\currpinf.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\currunit.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\datefmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\dbbi.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\dcfmtsym.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\decimfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\displayoptions.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\docmain.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\dtfmtsym.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\dtintrv.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\dtitvfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\dtitvinf.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\dtptngen.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\dtrule.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\edits.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\enumset.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\errorcode.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\fieldpos.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\filteredbrk.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\fmtable.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\format.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\formattedvalue.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\formattednumber.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\fpositer.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\gender.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\gregocal.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\icudataver.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\icuplug.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\idna.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\listformatter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\localebuilder.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\localematcher.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\localpointer.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\locdspnm.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\locid.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\measfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\measunit.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\measure.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\messagepattern.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\module.modulemap" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\msgfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\normalizer2.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\normlzr.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\nounit.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\numberformatter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\numberrangeformatter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\numfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\numsys.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\parseerr.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\parsepos.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\platform.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\plurfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\plurrule.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ptypes.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\putil.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\rbbi.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\rbnf.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\rbtz.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\regex.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\region.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\reldatefmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\rep.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\resbund.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\schriter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\scientificnumberformatter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\search.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\selfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\simpleformatter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\simplenumberformatter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\simpletz.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\smpdtfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\sortkey.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\std_string.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\strenum.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\stringoptions.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\stringpiece.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\stringtriebuilder.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\stsearch.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\symtable.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\tblcoll.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\timezone.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\tmunit.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\tmutamt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\tmutfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\translit.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\tzfmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\tznames.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\tzrule.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\tztrans.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ualoc.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uameasureformat.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uameasureunit.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uatimeunitformat.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ubidi.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ubiditransform.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ubrk.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucal.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucasemap.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucat.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uchar.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucharstrie.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucharstriebuilder.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uchriter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uclean.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucnv.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucnvsel.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucnv_cb.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucnv_err.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucol.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucoleitr.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uconfig.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucpmap.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucptrie.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucsdet.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ucurr.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\udat.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\udata.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\udateintervalformat.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\udatintv.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\udatpg.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\udisplaycontext.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\udisplayoptions.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uenum.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ufieldpositer.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uformattable.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uformattedvalue.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uformattednumber.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ugender.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uidna.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uiter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uldnames.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ulistformatter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uloc.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ulocale.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ulocbuilder.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ulocdata.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\umachine.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\umisc.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\umsg.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\umutablecptrie.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unifilt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unifunct.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unimatch.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unirepl.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uniset.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unistr.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unorm.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unorm2.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unum.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unumberformatter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unumberoptions.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unumberrangeformatter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\unumsys.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uobject.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uplrule.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\upluralrules.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\urbtok.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uregex.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uregion.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ureldatefmt.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\urename.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\urep.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ures.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uscript.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\usearch.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uset.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\usetiter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ushape.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\usimplenumberformatter.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uspoof.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\usprep.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ustdio.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ustream.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ustring.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\ustringtrie.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\utext.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\utf.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\utf16.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\utf32.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\utf8.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\utf_old.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\utmscale.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\utrace.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\utrans.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\utypes.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uvernum.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\uversion.h" />
+  </Component>
+  <Component>
+    <File Source="$(SDKRoot)\usr\include\_foundation_unicode\vtzone.h" />
+  </Component>
+</Include>
diff --git a/platforms/Windows/sdk/drd/sdk.wixproj b/platforms/Windows/platforms/android/android.wixproj
similarity index 66%
rename from platforms/Windows/sdk/drd/sdk.wixproj
rename to platforms/Windows/platforms/android/android.wixproj
index 064f0d69..ade8ffbd 100644
--- a/platforms/Windows/sdk/drd/sdk.wixproj
+++ b/platforms/Windows/platforms/android/android.wixproj
@@ -1,19 +1,21 @@
 <Project Sdk="WixToolset.Sdk/4.0.5">
   <PropertyGroup>
-    <OutputName>sdk.android.$(ProductArchitecture)</OutputName>
-    <Platform>x86</Platform>
+    <OutputName>android</OutputName>
 
-    <SwiftShimsPath>$(SDK_ROOT)\usr\lib\swift\shims</SwiftShimsPath>
+    <SwiftShimsPath>$(ImageRoot)\Platforms\Android.platform\Developer\SDKs\Android.sdk\usr\lib\swift\shims</SwiftShimsPath>
 
     <DefineConstants>
       $(DefineConstants);
       ANDROID_INCLUDE_DS2=$(ANDROID_INCLUDE_DS2);
       SwiftShimsPath=$(SwiftShimsPath);
+      IncludeARM64=$(AndroidArchitectures.Contains("aarch64"));
+      IncludeARM=$(AndroidArchitectures.Contains("armv7"));
+      IncludeX64=$(AndroidArchitectures.Contains("x86_64"));
+      IncludeX86=$(AndroidArchitectures.Contains("i686"));
     </DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\shared\shared.wixproj" />
     <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
   </ItemGroup>
 
diff --git a/platforms/Windows/platforms/android/android.wxs b/platforms/Windows/platforms/android/android.wxs
new file mode 100644
index 00000000..1d9400c7
--- /dev/null
+++ b/platforms/Windows/platforms/android/android.wxs
@@ -0,0 +1,2283 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package
+      Language="1033"
+      Manufacturer="!(loc.ManufacturerName)"
+      Name="!(loc.Plt_ProductName_Android)"
+      UpgradeCode="$(AndroidPlatformUpgradeCode)"
+      Version="$(NonSemVerProductVersion)"
+      Scope="$(PackageScope)">
+
+    <?define PlatformRoot = "$(ImageRoot)\Platforms\Android.platform"?>
+    <?define SDKRoot = "$(PlatformRoot)\Developer\SDKs\Android.sdk"?>
+
+    <Media Id="1" Cabinet="android.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <?if $(IncludeARM64) = True?>
+      <Media Id="2" Cabinet="sdk.android.arm64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <Media Id="3" Cabinet="sdk.android.arm.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <Media Id="4" Cabinet="sdk.android.x64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <Media Id="5" Cabinet="sdk.android.x86.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <?endif?>
+
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(AndroidPlatformUpgradeCode)" />
+
+    <!--
+      └─ Swift
+          └─ Platforms
+              └─ Android.platform
+                  └─ Developer
+                      ├─ Library
+                      │   ├─ ds2
+                      │   │   └─ ...
+                      │   ├─ XCTest-$ProductVersion
+                      │   │   └─ ...
+                      │   └─ Testing-$ProductVersion
+                      │       └─ ...
+                      └─ SDKs
+                          └─ Android.sdk
+                                  └─ ...
+    -->
+    <DirectoryRef Id="PlatformsVersioned">
+      <Directory Id="AndroidPlatform" Name="Android.platform">
+        <Directory Name="Developer">
+          <Directory Name="Library">
+            <!-- XCTest -->
+            <Directory Name="XCTest-$(ProductVersion)">
+              <Directory Name="usr">
+                <Directory Name="lib">
+                  <Directory Name="swift">
+                    <Directory Name="android">
+                      <?if $(IncludeARM64) = True?>
+                        <Directory Id="XCTest_usr_lib_swift_android_arm64" Name="aarch64" DiskId="2" />
+                      <?endif?>
+                      <?if $(IncludeARM) = True?>
+                        <Directory Id="XCTest_usr_lib_swift_android_arm" Name="armv7" DiskId="3" />
+                      <?endif?>
+                      <?if $(IncludeX64) = True?>
+                        <Directory Id="XCTest_usr_lib_swift_android_x64" Name="x86_64" DiskId="4" />
+                      <?endif?>
+                      <?if $(IncludeX86) = True?>
+                        <Directory Id="XCTest_usr_lib_swift_android_x86" Name="i686" DiskId="5" />
+                      <?endif?>
+                      <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule" />
+                    </Directory>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+
+            <!-- Testing -->
+            <Directory Name="Testing-$(ProductVersion)">
+              <Directory Name="usr">
+                <Directory Name="lib">
+                  <Directory Name="swift">
+                    <Directory Name="android">
+                      <?if $(IncludeARM64) = True?>
+                        <Directory Id="Testing_usr_lib_swift_android_arm64" Name="aarch64" DiskId="2" />
+                      <?endif?>
+                      <?if $(IncludeARM) = True?>
+                        <Directory Id="Testing_usr_lib_swift_android_arm" Name="armv7" DiskId="3" />
+                      <?endif?>
+                      <?if $(IncludeX64) = True?>
+                        <Directory Id="Testing_usr_lib_swift_android_x64" Name="x86_64" DiskId="4" />
+                      <?endif?>
+                      <?if $(IncludeX86) = True?>
+                        <Directory Id="Testing_usr_lib_swift_android_x86" Name="i686" DiskId="5" />
+                      <?endif?>
+                      <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
+                    </Directory>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+
+            <!-- ds2 -->
+            <?if $(ANDROID_INCLUDE_DS2) = True?>
+              <Directory Name="ds2">
+                <Directory Name="usr">
+                  <Directory Id="_ds2_usr_bin" Name="bin" />
+                </Directory>
+              </Directory>
+            <?endif?>
+          </Directory>
+
+          <Directory Name="SDKs">
+            <!-- Android.sdk -->
+            <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 Name="swift">
+                    <Directory Id="AndroidSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" />
+                  </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_android" Name="android">
+                      <Directory Id="_Builtin_float.swiftmodule" Name="_Builtin_float.swiftmodule" />
+                      <Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
+                      <Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
+                      <Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
+                      <Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
+                      <Directory Id="_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
+                      <Directory Id="Android.swiftmodule" Name="Android.swiftmodule" />
+                      <Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule" />
+                      <Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
+                      <Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule" />
+                      <Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule" />
+                      <Directory Id="_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
+                      <Directory Id="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" />
+                      <?endif?>
+                      <?if $(IncludeARM) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_arm" Name="armv7" />
+                      <?endif?>
+                      <?if $(IncludeX64) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_x64" Name="x86_64" />
+                      <?endif?>
+                      <?if $(IncludeX86) = True?>
+                        <Directory Id="AndroidSDK_usr_lib_swift_android_x86" Name="i686" />
+                      <?endif?>
+                    </Directory>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+
+    <!-- XCTest -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="XCTest.arm64">
+        <Component Directory="XCTest.swiftmodule" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="XCTest.swiftmodule" DiskId="2">
+          <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">
+          <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">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="XCTest.swiftmodule" DiskId="3">
+          <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">
+          <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">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="XCTest.swiftmodule" DiskId="4">
+          <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">
+          <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">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="XCTest.swiftmodule" DiskId="5">
+          <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">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\i686\libXCTest.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Testing -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Testing.arm64">
+        <Component Directory="Testing.swiftmodule" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="Testing.swiftmodule" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\aarch64-unknown-linux-android.swiftinterface" />
+        </Component>
+
+        <Component Directory="Testing_usr_lib_swift_android_arm64" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\aarch64\libTesting.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="Testing.arm">
+        <Component Directory="Testing.swiftmodule" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="Testing.swiftmodule" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\armv7-unknown-linux-android.swiftinterface" />
+        </Component>
+
+        <Component Directory="Testing_usr_lib_swift_android_arm" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\armv7\libTesting.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="Testing.x64">
+        <Component Directory="Testing.swiftmodule" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="Testing.swiftmodule" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\x86_64-unknown-linux-android.swiftinterface" />
+        </Component>
+
+        <Component Directory="Testing_usr_lib_swift_android_x64" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\x86_64\libTesting.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="Testing.x86">
+        <Component Directory="Testing.swiftmodule" DiskId="5">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="Testing.swiftmodule" DiskId="5">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\i686-unknown-linux-android.swiftinterface" />
+        </Component>
+
+        <Component Directory="Testing.swiftmodule" DiskId="5">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\i686\libTesting.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- ds2 -->
+    <?if $(ANDROID_INCLUDE_DS2) = True?>
+      <?if $(IncludeARM64) = True?>
+        <ComponentGroup Id="ds2.arm64" Directory="_ds2_usr_bin">
+          <Component DiskId="2">
+            <File Source="$(PlatformRoot)\Developer\Library\ds2\usr\bin\aarch64-unknown-linux-android-ds2" />
+          </Component>
+        </ComponentGroup>
+      <?endif?>
+      <?if $(IncludeARM) = True?>
+        <ComponentGroup Id="ds2.arm" Directory="_ds2_usr_bin">
+          <Component DiskId="3">
+            <File Source="$(PlatformRoot)\Developer\Library\ds2\usr\bin\armv7-unknown-linux-android-ds2" />
+          </Component>
+        </ComponentGroup>
+      <?endif?>
+      <?if $(IncludeX64) = True?>
+        <ComponentGroup Id="ds2.x64" Directory="_ds2_usr_bin">
+          <Component DiskId="4">
+            <File Source="$(PlatformRoot)\Developer\Library\ds2\usr\bin\x86_64-unknown-linux-android-ds2" />
+          </Component>
+        </ComponentGroup>
+      <?endif?>
+      <?if $(IncludeX86) = True?>
+        <ComponentGroup Id="ds2.x86" Directory="_ds2_usr_bin">
+          <Component DiskId="5">
+            <File Source="$(PlatformRoot)\Developer\Library\ds2\usr\bin\i686-unknown-linux-android-ds2" />
+          </Component>
+        </ComponentGroup>
+      <?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>
+    </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" />
+        </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" />
+        </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" />
+        </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" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- BlocksRuntime -->
+    <ComponentGroup Id="BlocksRuntime">
+      <Component Directory="AndroidSDK_usr_include_Block">
+        <File Source="$(SDKRoot)\usr\include\Block\Block.h" />
+      </Component>
+    </ComponentGroup>
+
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="BlocksRuntime.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libBlocksRuntime.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="BlocksRuntime.arm" Directory="AndroidSDK_usr_lib_swift_android_arm">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libBlocksRuntime.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="BlocksRuntime.x64" Directory="AndroidSDK_usr_lib_swift_android_x64">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libBlocksRuntime.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="BlocksRuntime.x86" Directory="AndroidSDK_usr_lib_swift_android_x86">
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libBlocksRuntime.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- libdispatch -->
+    <ComponentGroup Id="libdispatch" Directory="AndroidSDK_usr_include_dispatch">
+      <?include ../CDispatch.wxi?>
+
+      <Component Directory="AndroidSDK_usr_include_os">
+        <File Source="$(SDKRoot)\usr\include\os\generic_base.h" />
+      </Component>
+      <Component Directory="AndroidSDK_usr_include_os">
+        <File Source="$(SDKRoot)\usr\include\os\generic_unix_base.h" />
+      </Component>
+      <Component Directory="AndroidSDK_usr_include_os">
+        <File Source="$(SDKRoot)\usr\include\os\generic_win_base.h" />
+      </Component>
+      <Component Directory="AndroidSDK_usr_include_os">
+        <File Source="$(SDKRoot)\usr\include\os\object.h" />
+      </Component>
+    </ComponentGroup>
+
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="libdispatch.arm64">
+        <Component Directory="Dispatch.swiftmodule" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="Dispatch.swiftmodule" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libdispatch.so" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftDispatch.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="libdispatch.arm">
+        <Component Directory="Dispatch.swiftmodule" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="Dispatch.swiftmodule" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libdispatch.so" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftDispatch.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="libdispatch.x64">
+        <Component Directory="Dispatch.swiftmodule" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="Dispatch.swiftmodule" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\x86_64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libdispatch.so" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftDispatch.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="libdispatch.x86">
+        <Component Directory="Dispatch.swiftmodule" DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component Directory="Dispatch.swiftmodule" DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Dispatch.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libdispatch.so" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftDispatch.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _FoundationUnicode -->
+    <ComponentGroup Id="_FoundationUnicode" Directory="AndroidSDK_usr_include__foundation_unicode">
+      <?include ../_FoundationUnicode.wxi?>
+    </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" />
+        </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" />
+        </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" />
+        </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" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _FoundationCShims -->
+    <ComponentGroup Id="_FoundationCShims" Directory="AndroidSDK_usr_include__FoundationCShims">
+      <?include ../_FoundationCShims.wxi?>
+    </ComponentGroup>
+
+    <!-- _Builtin_float -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_Builtin_float.arm64" Directory="_Builtin_float.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_Builtin_float.so" />
+        </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_arm64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_Builtin_float.so" />
+        </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_arm64" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_Builtin_float.so" />
+        </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_arm64" DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_Builtin_float.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _Concurrency -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_Concurrency.arm64" Directory="_Concurrency.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_Concurrency.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_Concurrency.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_Concurrency.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_Concurrency.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _Differentiation -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_Differentiation.arm64" Directory="_Differentiation.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_Differentiation.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_Differentiation.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_Differentiation.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_Differentiation.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _RegexParser -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_RegexParser.arm64" Directory="_RegexParser.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_RegexParser.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="_RegexParser.arm" Directory="_RegexParser.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_RegexParser.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="_RegexParser.x64" Directory="_RegexParser.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_RegexParser.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="_RegexParser.x86" Directory="_RegexParser.swiftmodule">
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\_RegexParser.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_RegexParser.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _StringProcessing -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_StringProcessing.arm64" Directory="_StringProcessing.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_StringProcessing.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_StringProcessing.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_StringProcessing.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_StringProcessing.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _Volatile -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_Volatile.arm64" Directory="_Volatile.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_Volatile.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_Volatile.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_Volatile.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_Volatile.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\android.modulemap" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\SwiftAndroidNDK.h" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+          <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">
+          <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" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\SwiftAndroidNDK.h" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\SwiftBionic.h" />
+        </Component>
+
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftAndroid.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\android.modulemap" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\SwiftAndroidNDK.h" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftAndroid.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\android.modulemap" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\SwiftAndroidNDK.h" />
+        </Component>
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x86" DiskId="5">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftAndroid.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Cxx -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Cxx.arm64" Directory="Cxx.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftCxx.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="Cxx.arm" Directory="Cxx.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftCxx.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="Cxx.x64" Directory="Cxx.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Cxx.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_android_x64" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\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" DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftCxx.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- CxxStdlib -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="CxxStdlib.arm64" Directory="CxxStdlib.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftCxxStdlib.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="CxxStdlib.arm" Directory="CxxStdlib.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftCxxStdlib.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="CxxStdlib.x64" Directory="CxxStdlib.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftCxxStdlib.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="CxxStdlib.x86" Directory="CxxStdlib.swiftmodule">
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\CxxStdlib.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftCxxStdlib.a" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Distributed -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Distributed.arm64" Directory="Distributed.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftDistributed.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftDistributed.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftDistributed.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftDistributed.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _FoundationCollections -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_FoundationCollections.arm64" Directory="_FoundationCollections.swiftmodule">
+        <!-- FIXME(swiftlang/swift-foundation#1230)
+        <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>
+        -->
+        <Component DiskId="2">
+          <File Name="aarch64-unknown-linux-android.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\aarch64.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Name="aarch64-unknown-linux-android.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\aarch64.swiftmodule" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="_FoundationCollections.arm" Directory="_FoundationCollections.swiftmodule">
+        <!-- FIXME(swiftlang/swift-foundation#1230)
+        <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>
+        -->
+        <Component DiskId="3">
+          <File Name="armv7-unknown-linux-android.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\armv7.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Name="armv7-unknown-linux-android.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\armv7.swiftmodule" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="_FoundationCollections.x64" Directory="_FoundationCollections.swiftmodule">
+        <!-- FIXME(swiftlang/swift-foundation#1230)
+        <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>
+        -->
+        <Component DiskId="4">
+          <File Name="x86_64-unknown-linux-android.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\x86_64.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Name="x86_64-unknown-linux-android.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\x86_64.swiftmodule" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="_FoundationCollections.x86" Directory="_FoundationCollections.swiftmodule">
+        <!-- FIXME(swiftlang/swift-foundation#1230)
+        <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>
+        -->
+        <Component DiskId="5">
+          <File Name="i686-unknown-linux-android.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\i686.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <File Name="i686-unknown-linux-android.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\android\_FoundationCollections.swiftmodule\i686.swiftmodule" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- FoundationEssentials -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="FoundationEssentials.arm64" Directory="FoundationEssentials.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundationEssentials.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="FoundationEssentials.arm" Directory="FoundationEssentials.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libFoundationEssentials.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="FoundationEssentials.x64" Directory="FoundationEssentials.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libFoundationEssentials.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="FoundationEssentials.x86" Directory="FoundationEssentials.swiftmodule">
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationEssentials.swiftmodule\i686-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundationEssentials.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- FoundationInternationalization -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="FoundationInternationalization.arm64" Directory="FoundationInternationalization.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundationInternationalization.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="FoundationInternationalization.arm" Directory="FoundationInternationalization.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
+          <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" />
+        </Component>
+        <Component DiskId="5">
+          <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\libFoundationInternationalization.so" />
+        </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" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Foundation.swiftmodule\aarch64-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundation.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">
+        <Component DiskId="4">
+          <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\Foundation.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>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="Foundation.x86" Directory="Foundation.swiftmodule">
+        <Component DiskId="5">
+          <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\Foundation.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>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- FoundationNetworking -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="FoundationNetworking.arm64" Directory="FoundationNetworking.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundationNetworking.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="FoundationNetworking.arm" Directory="FoundationNetworking.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libFoundationNetworking.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="FoundationNetworking.x64" Directory="FoundationNetworking.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libFoundationNetworking.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="FoundationNetworking.x86" Directory="FoundationNetworking.swiftmodule">
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationNetworking.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundationNetworking.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- FoundationXML -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="FoundationXML.arm64" Directory="FoundationXML.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\aarch64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libFoundationXML.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeARM) = True?>
+      <ComponentGroup Id="FoundationXML.arm" Directory="FoundationXML.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\armv7-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libFoundationXML.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="FoundationXML.x64" Directory="FoundationXML.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\x86_64-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libFoundationXML.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="FoundationXML.x86" Directory="FoundationXML.swiftmodule">
+        <Component DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\FoundationXML.swiftmodule\i686-unknown-linux-android.swiftdoc" />
+        </Component>
+        <Component DiskId="5">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libFoundationXML.so" />
+        </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.swiftinterface" />
+        </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" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswift_math.so" />
+        </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.swiftinterface" />
+        </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" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswift_math.so" />
+        </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.swiftinterface" />
+        </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_arm64" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswift_math.so" />
+        </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.swiftinterface" />
+        </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_arm64" DiskId="5">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswift_math.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Observation -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Observation.arm64" Directory="Observation.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftObservation.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftObservation.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftObservation.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftObservation.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- RegexBuilder -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="RegexBuilder.arm64" Directory="RegexBuilder.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftRegexBuilder.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftRegexBuilder.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftRegexBuilder.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftRegexBuilder.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Swift -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Swift.arm64" Directory="Swift.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftCore.so" />
+        </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" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\Swift.swiftmodule\armv7-unknown-linux-android.swiftmodule" />
+        </Component>
+
+        <Component Directory="AndroidSDK_usr_lib_swift_android_arm" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftCore.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftCore.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftCore.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- SwiftOnoneSupport -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="SwiftOnoneSupport.arm64" Directory="SwiftOnoneSupport.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftSwiftOnoneSupport.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftSwiftOnoneSupport.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftSwiftOnoneSupport.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\libswiftSwiftOnoneSupport.so" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Synchronization -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Synchronization.arm64" Directory="Synchronization.swiftmodule">
+        <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\aarch64\libswiftSynchronization.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\armv7\libswiftSynchronization.so" />
+        </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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\x86_64\libswiftSynchronization.so" />
+        </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">
+          <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="libcxxshim" Directory="AndroidSDK_usr_lib_swift_android">
+      <Component>
+        <File Source="$(SDKRoot)\usr\lib\swift\android\libcxxshim.h" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\lib\swift\android\libcxxshim.modulemap" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\lib\swift\android\libcxxstdlibshim.h" />
+      </Component>
+    </ComponentGroup>
+
+    <!-- Registrar -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Registrar.arm64" Directory="AndroidSDK_usr_lib_swift_android_arm64">
+        <Component DiskId="2">
+          <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">
+          <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">
+          <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">
+          <File Source="$(SDKRoot)\usr\lib\swift\android\i686\swiftrt.o" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <ComponentGroup Id="Configuration">
+      <Component Directory="AndroidSDK">
+        <File Source="$(SDKRoot)\SDKSettings.json" />
+      </Component>
+      <Component Directory="AndroidSDK">
+        <File Source="$(SDKRoot)\SDKSettings.plist" />
+      </Component>
+      <Component Directory="AndroidPlatform">
+        <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" />
+
+      <ComponentGroupRef Id="Configuration" />
+      <ComponentGroupRef Id="SwiftShims" />
+      <ComponentGroupRef Id="apinotes" />
+      <ComponentGroupRef Id="libcxxshim" />
+
+      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
+    </Feature>
+
+    <?if $(IncludeARM64) = True?>
+      <Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_arm64)">
+        <Level Condition="InstallARM64SDK = 0" Value="0" />
+
+        <ComponentGroupRef Id="XCTest.arm64" />
+        <ComponentGroupRef Id="Testing.arm64" />
+
+        <ComponentGroupRef Id="SwiftRemoteMirror.arm64" />
+
+        <ComponentGroupRef Id="BlocksRuntime.arm64" />
+        <ComponentGroupRef Id="libdispatch.arm64" />
+
+        <ComponentGroupRef Id="_math.arm64" />
+        <ComponentGroupRef Id="Android.arm64" />
+
+        <ComponentGroupRef Id="Cxx.arm64" />
+        <ComponentGroupRef Id="CxxStdlib.arm64" />
+        <ComponentGroupRef Id="Distributed.arm64" />
+        <ComponentGroupRef Id="Foundation.arm64" />
+        <ComponentGroupRef Id="FoundationEssentials.arm64" />
+        <ComponentGroupRef Id="FoundationInternationalization.arm64" />
+        <ComponentGroupRef Id="FoundationNetworking.arm64" />
+        <ComponentGroupRef Id="FoundationXML.arm64" />
+        <ComponentGroupRef Id="Observation.arm64" />
+        <ComponentGroupRef Id="RegexBuilder.arm64" />
+        <ComponentGroupRef Id="Swift.arm64" />
+        <ComponentGroupRef Id="SwiftOnoneSupport.arm64" />
+        <ComponentGroupRef Id="Synchronization.arm64" />
+        <ComponentGroupRef Id="_Builtin_float.arm64" />
+        <ComponentGroupRef Id="_Concurrency.arm64" />
+        <ComponentGroupRef Id="_Differentiation.arm64" />
+        <ComponentGroupRef Id="_FoundationCollections.arm64" />
+        <ComponentGroupRef Id="_FoundationUnicode.arm64" />
+        <ComponentGroupRef Id="_RegexParser.arm64" />
+        <ComponentGroupRef Id="_StringProcessing.arm64" />
+        <ComponentGroupRef Id="_Volatile.arm64" />
+
+        <ComponentGroupRef Id="Registrar.arm64" />
+
+        <?if $(ANDROID_INCLUDE_DS2) = True?>
+          <ComponentGroupRef Id="ds2.arm64" />
+        <?endif?>
+      </Feature>
+    <?endif?>
+
+    <?if $(IncludeARM) = True?>
+      <Feature Id="arm64" 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="Cxx.arm" />
+        <ComponentGroupRef Id="CxxStdlib.arm" />
+        <ComponentGroupRef Id="Distributed.arm" />
+        <ComponentGroupRef Id="Foundation.arm" />
+        <ComponentGroupRef Id="FoundationEssentials.arm" />
+        <ComponentGroupRef Id="FoundationInternationalization.arm" />
+        <ComponentGroupRef Id="FoundationNetworking.arm" />
+        <ComponentGroupRef Id="FoundationXML.arm" />
+        <ComponentGroupRef Id="Observation.arm" />
+        <ComponentGroupRef Id="RegexBuilder.arm" />
+        <ComponentGroupRef Id="Swift.arm" />
+        <ComponentGroupRef Id="SwiftOnoneSupport.arm" />
+        <ComponentGroupRef Id="Synchronization.arm" />
+        <ComponentGroupRef Id="_Builtin_float.arm" />
+        <ComponentGroupRef Id="_Concurrency.arm" />
+        <ComponentGroupRef Id="_Differentiation.arm" />
+        <ComponentGroupRef Id="_FoundationCollections.arm" />
+        <ComponentGroupRef Id="_FoundationUnicode.arm" />
+        <ComponentGroupRef Id="_RegexParser.arm" />
+        <ComponentGroupRef Id="_StringProcessing.arm" />
+        <ComponentGroupRef Id="_Volatile.arm" />
+
+        <ComponentGroupRef Id="Registrar.arm" />
+
+        <?if $(ANDROID_INCLUDE_DS2) = True?>
+          <ComponentGroupRef Id="ds2.arm" />
+        <?endif?>
+      </Feature>
+    <?endif?>
+
+    <?if $(IncludeX64) = True?>
+      <Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Android_amd64)">
+        <Level Condition="InstallX64SDK = 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="Cxx.x64" />
+        <ComponentGroupRef Id="CxxStdlib.x64" />
+        <ComponentGroupRef Id="Distributed.x64" />
+        <ComponentGroupRef Id="Foundation.x64" />
+        <ComponentGroupRef Id="FoundationEssentials.x64" />
+        <ComponentGroupRef Id="FoundationInternationalization.x64" />
+        <ComponentGroupRef Id="FoundationNetworking.x64" />
+        <ComponentGroupRef Id="FoundationXML.x64" />
+        <ComponentGroupRef Id="Observation.x64" />
+        <ComponentGroupRef Id="RegexBuilder.x64" />
+        <ComponentGroupRef Id="Swift.x64" />
+        <ComponentGroupRef Id="SwiftOnoneSupport.x64" />
+        <ComponentGroupRef Id="Synchronization.x64" />
+        <ComponentGroupRef Id="_Builtin_float.x64" />
+        <ComponentGroupRef Id="_Concurrency.x64" />
+        <ComponentGroupRef Id="_Differentiation.x64" />
+        <ComponentGroupRef Id="_FoundationCollections.x64" />
+        <ComponentGroupRef Id="_FoundationUnicode.x64" />
+        <ComponentGroupRef Id="_RegexParser.x64" />
+        <ComponentGroupRef Id="_StringProcessing.x64" />
+        <ComponentGroupRef Id="_Volatile.x64" />
+
+        <ComponentGroupRef Id="Registrar.x64" />
+
+        <?if $(ANDROID_INCLUDE_DS2) = True?>
+          <ComponentGroupRef Id="ds2.x64" />
+        <?endif?>
+      </Feature>
+    <?endif?>
+
+    <?if $(IncludeX86) = True?>
+      <Feature Id="arm64" 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="Cxx.x86" />
+        <ComponentGroupRef Id="CxxStdlib.x86" />
+        <ComponentGroupRef Id="Distributed.x86" />
+        <ComponentGroupRef Id="Foundation.x86" />
+        <ComponentGroupRef Id="FoundationEssentials.x86" />
+        <ComponentGroupRef Id="FoundationInternationalization.x86" />
+        <ComponentGroupRef Id="FoundationNetworking.x86" />
+        <ComponentGroupRef Id="FoundationXML.x86" />
+        <ComponentGroupRef Id="Observation.x86" />
+        <ComponentGroupRef Id="RegexBuilder.x86" />
+        <ComponentGroupRef Id="Swift.x86" />
+        <ComponentGroupRef Id="SwiftOnoneSupport.x86" />
+        <ComponentGroupRef Id="Synchronization.x86" />
+        <ComponentGroupRef Id="_Builtin_float.x86" />
+        <ComponentGroupRef Id="_Concurrency.x86" />
+        <ComponentGroupRef Id="_Differentiation.x86" />
+        <ComponentGroupRef Id="_FoundationCollections.x86" />
+        <ComponentGroupRef Id="_FoundationUnicode.x86" />
+        <ComponentGroupRef Id="_RegexParser.x86" />
+        <ComponentGroupRef Id="_StringProcessing.x86" />
+        <ComponentGroupRef Id="_Volatile.x86" />
+
+        <ComponentGroupRef Id="Registrar.x86" />
+
+          <?if $(ANDROID_INCLUDE_DS2) = True?>
+          <ComponentGroupRef Id="ds2.x86" />
+        <?endif?>
+      </Feature>
+    <?endif?>
+  </Package>
+</Wix>
diff --git a/platforms/Windows/platforms/windows/windows.wixproj b/platforms/Windows/platforms/windows/windows.wixproj
new file mode 100644
index 00000000..c41a3cbd
--- /dev/null
+++ b/platforms/Windows/platforms/windows/windows.wixproj
@@ -0,0 +1,42 @@
+<Project Sdk="WixToolset.Sdk/4.0.5">
+  <PropertyGroup>
+    <OutputName>windows</OutputName>
+
+    <SwiftShimsPath>$(ImageRoot)\Platforms\Windows.platform\Developer\SDKs\Windows.sdk\usr\lib\swift\shims</SwiftShimsPath>
+
+    <DefineConstants>
+      $(DefineConstants);
+      SwiftShimsPath=$(SwiftShimsPath);
+      IncludeARM64=$(WindowsArchitectures.Contains("aarch64"));
+      IncludeX64=$(WindowsArchitectures.Contains("x86_64"));
+      IncludeX86=$(WindowsArchitectures.Contains("i686"));
+    </DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" $(WindowsArchitectures.Contains('i686')) ">
+    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=x86" BindName="rtl.x86.msm" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" $(WindowsArchitectures.Contains('x86_64')) ">
+    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=amd64" BindName="rtl.amd64.msm" />
+  </ItemGroup>
+
+  <ItemGroup Condition=" $(WindowsArchitectures.Contains('aarch64')) ">
+    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="Platform=x86;ProductArchitecture=arm64" BindName="rtl.arm64.msm" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <HarvestDirectory Include="$(SwiftShimsPath)">
+      <ComponentGroupName>SwiftShims</ComponentGroupName>
+      <DirectoryRefId>WindowsSDK_usr_lib_swift_shims</DirectoryRefId>
+      <PreprocessorVariable>var.SwiftShimsPath</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
new file mode 100644
index 00000000..2cc4f38e
--- /dev/null
+++ b/platforms/Windows/platforms/windows/windows.wxs
@@ -0,0 +1,1812 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Package
+      Language="1033"
+      Manufacturer="!(loc.ManufacturerName)"
+      Name="!(loc.Plt_ProductName_Windows)"
+      UpgradeCode="$(WindowsPlatformUpgradeCode)"
+      Version="$(NonSemVerProductVersion)"
+      Scope="$(PackageScope)">
+
+    <?define PlatformRoot = "$(ImageRoot)\Platforms\Windows.platform"?>
+    <?define SDKRoot = "$(PlatformRoot)\Developer\SDKs\Windows.sdk"?>
+
+    <Media Id="1" Cabinet="windows.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <?if $(IncludeARM64) = True?>
+      <Media Id="2" Cabinet="sdk.windows.arm64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <Media Id="3" Cabinet="sdk.windows.x64.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <Media Id="4" Cabinet="sdk.windows.x86.cab" EmbedCab="$(ArePackageCabsEmbedded)" />
+    <?endif?>
+
+    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(WindowsPlatformUpgradeCode)" />
+    <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
+
+    <!--
+      └─ Swift
+          └─ Platforms
+              └─ Windows.platform
+                  └─ Developer
+                      ├─ Library
+                      │   ├─ XCTest-$ProductVersion
+                      │   │   └─ ...
+                      │   └─ Testing-$ProductVersion
+                      │       └─ ...
+                      └─ SDKs
+                          └─ Windows.sdk
+                                  └─ ...
+    -->
+    <DirectoryRef Id="PlatformsVersioned">
+      <Directory Id="WindowsPlatform" Name="Windows.platform">
+        <Directory Name="Developer">
+          <Directory Name="Library">
+            <!-- XCTest -->
+            <Directory Name="XCTest-$(ProductVersion)">
+              <Directory Name="usr">
+                <?if $(IncludeARM64) = True?>
+                  <Directory Id="XCTest_usr_bin64a" Name="bin64a" DiskId="2" />
+                <?endif?>
+                <?if $(IncludeX64) = True?>
+                  <Directory Id="XCTest_usr_bin64" Name="bin64" DiskId="3" />
+                <?endif?>
+                <?if $(IncludeX86) = True?>
+                  <Directory Id="XCTest_usr_bin32" Name="bin32" DiskId="4" />
+                <?endif?>
+                <Directory Name="lib">
+                  <Directory Name="swift">
+                    <Directory Name="windows">
+                      <?if $(IncludeARM64) = True?>
+                        <Directory Id="XCTest_usr_lib_swift_windows_arm64" Name="aarch64" DiskId="2" />
+                      <?endif?>
+                      <?if $(IncludeX64) = True?>
+                        <Directory Id="XCTest_usr_lib_swift_windows_x64" Name="x86_64" DiskId="3" />
+                      <?endif?>
+                      <?if $(IncludeX86) = True?>
+                        <Directory Id="XCTest_usr_lib_swift_windows_x86" Name="i686" DiskId="4" />
+                      <?endif?>
+                      <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule" />
+                    </Directory>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+
+            <!-- Testing -->
+            <Directory Name="Testing-$(ProductVersion)">
+              <Directory Name="usr">
+                <?if $(IncludeARM64) = True?>
+                  <Directory DiskId="2" Id="Testing_usr_bin64a" Name="bin64a" />
+                <?endif?>
+                <?if $(IncludeX64) = True?>
+                  <Directory DiskId="3" Id="Testing_usr_bin64" Name="bin64" />
+                <?endif?>
+                <?if $(IncludeX86) = True?>
+                  <Directory Id="Testing_usr_bin32" Name="bin32" />
+                <?endif?>
+                <Directory Name="lib">
+                  <Directory Name="swift">
+                    <Directory Name="windows">
+                      <?if $(IncludeARM64) = True?>
+                        <Directory DiskId="2" Id="Testing_usr_lib_swift_windows_arm64" Name="aarch64" />
+                      <?endif?>
+                      <?if $(IncludeX64) = True?>
+                        <Directory DiskId="3" Id="Testing_usr_lib_swift_windows_x64" Name="x86_64" />
+                      <?endif?>
+                      <?if $(IncludeX86) = True?>
+                        <Directory DiskId="4" Id="Testing_usr_lib_swift_windows_x86" Name="i686" />
+                      <?endif?>
+                      <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
+                    </Directory>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+          </Directory>
+
+          <Directory Name="SDKs">
+            <!-- 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 Name="swift">
+                    <Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" />
+                  </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_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="_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" />
+                      <Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule" />
+                      <Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule" />
+                      <Directory Id="_FoundationCollections.swiftmodule" Name="_FoundationCollections.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="Observation.swiftmodule" Name="Observation.swiftmodule" />
+                      <Directory Id="RegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule" />
+                      <Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule" />
+                      <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
+                      <Directory Id="Synchronization.swiftmodule" Name="Synchronization.swiftmodule" />
+                      <Directory Id="WinSDK.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>
+          </Directory>
+        </Directory>
+      </Directory>
+    </DirectoryRef>
+
+    <!-- XCTest -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="XCTest.arm64">
+        <Component Directory="XCTest.swiftmodule" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="XCTest.swiftmodule" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="XCTest_usr_bin64a" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\bin64a\XCTest.dll" />
+        </Component>
+        <Component Directory="XCTest_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\aarch64\XCTest.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="XCTest.x64">
+        <Component Directory="XCTest.swiftmodule" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="XCTest.swiftmodule" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="XCTest_usr_bin64" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\bin64\XCTest.dll" />
+        </Component>
+        <Component Directory="XCTest_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\x86_64\XCTest.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="XCTest.x86">
+        <Component Directory="XCTest.swiftmodule" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="XCTest.swiftmodule" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="XCTest_usr_bin32" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\bin32\XCTest.dll" />
+        </Component>
+        <Component Directory="XCTest_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\i686\XCTest.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Testing -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Testing.arm64">
+        <Component Directory="Testing_usr_bin64a" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64a\Testing.dll" />
+        </Component>
+        <Component Directory="Testing_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\aarch64\Testing.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>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="Testing.x64">
+        <Component Directory="Testing_usr_bin64" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin64\Testing.dll" />
+        </Component>
+        <Component Directory="Testing_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\x86_64\Testing.lib" />
+        </Component>
+        <Component Directory="Testing.swiftmodule" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="Testing.swiftmodule" DiskId="3">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="Testing.x86">
+        <Component Directory="Testing_usr_bin32" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\bin32\Testing.dll" />
+        </Component>
+        <Component Directory="Testing_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\i686\Testing.lib" />
+        </Component>
+        <Component Directory="Testing.swiftmodule" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="Testing.swiftmodule" DiskId="4">
+          <File Source="$(PlatformRoot)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        </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>
+
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="SwiftRemoteMirror.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="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?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="SwiftRemoteMirror.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftRemoteMirror.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- 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="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="WindowsSDK_usr_lib_swift_windows_x64">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\BlocksRuntime.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?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?>
+
+    <!-- libdispatch -->
+    <ComponentGroup Id="libdispatch" Directory="WindowsSDK_usr_include_dispatch">
+      <?include ../CDispatch.wxi?>
+
+      <Component Directory="WindowsSDK_usr_include_os">
+        <File Source="$(SDKRoot)\usr\include\os\generic_base.h" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_os">
+        <File Source="$(SDKRoot)\usr\include\os\generic_unix_base.h" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_os">
+        <File Source="$(SDKRoot)\usr\include\os\generic_win_base.h" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_os">
+        <File Source="$(SDKRoot)\usr\include\os\object.h" />
+      </Component>
+    </ComponentGroup>
+
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="libdispatch.arm64">
+        <Component Directory="Dispatch.swiftmodule" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="Dispatch.swiftmodule" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\dispatch.lib" />
+        </Component>
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftDispatch.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="libdispatch.x64">
+        <Component Directory="Dispatch.swiftmodule" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="Dispatch.swiftmodule" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\dispatch.lib" />
+        </Component>
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftDispatch.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="libdispatch.x86">
+        <Component Directory="Dispatch.swiftmodule" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component Directory="Dispatch.swiftmodule" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Dispatch.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\dispatch.lib" />
+        </Component>
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftDispatch.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _FoundationUnicode -->
+    <ComponentGroup Id="_FoundationUnicode" Directory="WindowsSDK_usr_include__foundation_unicode">
+      <?include ../_FoundationUnicode.wxi?>
+    </ComponentGroup>
+
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_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="_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="_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?>
+
+    <!-- _FoundationCShims -->
+    <ComponentGroup Id="_FoundationCShims" Directory="WindowsSDK_usr_include__FoundationCShims">
+      <?include ../_FoundationCShims.wxi?>
+    </ComponentGroup>
+
+    <!-- _Builtin_float -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_Builtin_float.arm64" Directory="_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="_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.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="_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="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?>
+
+    <!-- _Concurrency -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_Concurrency.arm64" Directory="_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="_Concurrency.x64" Directory="_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="_Concurrency.x86" Directory="_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">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swift_Concurrency.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _Differentiation -->
+    <?if $(IncludeARM64) = True?>
+      <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="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="_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="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="_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="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?>
+
+    <!-- _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="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="_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="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="_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="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?>
+
+    <!-- _StringProcessing -->
+    <?if $(IncludeARM64) = True?>
+      <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="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="_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="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="_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="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?>
+
+    <!-- _Volatile -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_Volatile.arm64" Directory="_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="_Volatile.x64" Directory="_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="_Volatile.x86" Directory="_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?>
+
+    <!-- CRT -->
+    <?if $(IncludeARM64) = True?>
+      <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="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="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="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="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="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?>
+
+    <!-- Cxx -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Cxx.arm64" Directory="Cxx.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="Cxx.x64" Directory="Cxx.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="Cxx.x86" Directory="Cxx.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\libswiftCxx.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- CxxStdlib -->
+    <?if $(IncludeARM64) = True?>
+      <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\libswiftCxxStdlib.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\libswiftCxxStdlib.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\CxxStdlib.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\libswiftCxxStdlib.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Distributed -->
+    <?if $(IncludeARM64) = True?>
+      <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 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="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.swiftinterface" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftDistributed.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="Distributed.x86" Directory="Distributed.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftDistributed.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- _FoundationCollections -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="_FoundationCollections.arm64" Directory="_FoundationCollections.swiftmodule">
+        <Component DiskId="2">
+          <!-- FIXME(swiftlang/swift-foundation#1230)
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+          -->
+          <File Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <!-- FIXME(swiftlang/swift-foundation#1230)
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+          -->
+          <File Name="aarch64-unknown-windows-msvc.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\aarch64.swiftmodule" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="_FoundationCollections.x64" Directory="_FoundationCollections.swiftmodule">
+        <Component DiskId="3">
+          <!-- FIXME(swiftlang/swift-foundation#1230)
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+          -->
+          <File Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <!-- FIXME(swiftlang/swift-foundation#1230)
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+          -->
+          <File Name="x86_64-unknown-windows-msvc.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\x86_64.swiftmodule" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="_FoundationCollections.x86" Directory="_FoundationCollections.swiftmodule">
+        <Component DiskId="4">
+          <!-- FIXME(swiftlang/swift-foundation#1230)
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+          -->
+          <File Name="i686-unknown-windows-msvc.swiftdoc" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <!-- FIXME(swiftlang/swift-foundation#1230)
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+          -->
+          <File Name="i686-unknown-windows-msvc.swiftmodule" Source="$(SDKRoot)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\i686.swiftmodule" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- FoundationEssentials -->
+    <?if $(IncludeARM64) = True?>
+      <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationEssentials.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationEssentials.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationEssentials.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- FoundationInternationalization -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="FoundationInternationalization.arm64" Directory="FoundationInternationalization.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationInternationalization.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="FoundationInternationalization.x64" Directory="FoundationInternationalization.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationInternationalization.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="FoundationInternationalization.x86" Directory="FoundationInternationalization.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationInternationalization.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Foundation -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Foundation.arm64" Directory="Foundation.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\Foundation.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="Foundation.x64" Directory="Foundation.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\Foundation.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="Foundation.x86" Directory="Foundation.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Foundation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\Foundation.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- FoundationNetworking -->
+    <?if $(IncludeARM64) = True?>
+      <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationNetworking.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationNetworking.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationNetworking.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- FoundationXML -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="FoundationXML.arm64" Directory="FoundationXML.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\FoundationXML.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="FoundationXML.x64" Directory="FoundationXML.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\FoundationXML.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\FoundationXML.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="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" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\FoundationXML.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Observation -->
+    <?if $(IncludeARM64) = True?>
+      <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftObservation.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftObservation.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Observation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftObservation.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- RegexBuilder -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="RegexBuilder.arm64" Directory="RegexBuilder.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftRegexBuilder.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="RegexBuilder.x64" Directory="RegexBuilder.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftRegexBuilder.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="RegexBuilder.x86" Directory="RegexBuilder.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\RegexBuilder.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftRegexBuilder.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Swift -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Swift.arm64" Directory="Swift.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftCore.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="Swift.x64" Directory="Swift.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" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\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\swiftCore.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="Swift.x86" Directory="Swift.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" />
+        </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" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftCore.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- SwiftOnoneSupport -->
+    <?if $(IncludeARM64) = True?>
+      <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="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftSwiftOnoneSupport.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="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="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftSwiftOnoneSupport.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="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="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftSwiftOnoneSupport.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- Synchronization -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Synchronization.arm64" Directory="Synchronization.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftSynchronization.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="Synchronization.x64" Directory="Synchronization.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftSynchronization.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="Synchronization.x86" Directory="Synchronization.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\Synchronization.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftSynchronization.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- WinSDK -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="WinSDK.arm64" Directory="WinSDK.swiftmodule">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_arm64" DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftWinSDK.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="WinSDK.x64" Directory="WinSDK.swiftmodule">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x64" DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftWinSDK.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="WinSDK.x86" Directory="WinSDK.swiftmodule">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftinterface" />
+        </Component>
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftmodule" />
+        </Component>
+
+        <Component Directory="WindowsSDK_usr_lib_swift_windows_x86" DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftWinSDK.lib" />
+        </Component>
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- apinotes -->
+    <ComponentGroup Id="apinotes" Directory="WindowsSDK_usr_lib_swift_apinotes">
+      <Component>
+        <File Source="$(SDKRoot)\usr\lib\swift\apinotes\std.apinotes" />
+      </Component>
+    </ComponentGroup>
+
+    <!-- libcxxshim -->
+    <ComponentGroup Id="libcxxshim" Directory="WindowsSDK_usr_lib_swift_windows">
+      <Component>
+        <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxshim.h" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxshim.modulemap" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\lib\swift\windows\libcxxstdlibshim.h" />
+      </Component>
+    </ComponentGroup>
+
+    <!-- Registrar -->
+    <?if $(IncludeARM64) = True?>
+      <ComponentGroup Id="Registrar.arm64" Directory="WindowsSDK_usr_lib_swift_windows_arm64">
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftrt.obj" />
+        </Component>
+        <!--
+        <Component DiskId="2">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\aarch64\swiftrtd.obj" />
+        </Component>
+        -->
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <ComponentGroup Id="Registrar.x64" Directory="WindowsSDK_usr_lib_swift_windows_x64">
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftrt.obj" />
+        </Component>
+        <!--
+        <Component DiskId="3">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\x86_64\swiftrtd.obj" />
+        </Component>
+        -->
+      </ComponentGroup>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <ComponentGroup Id="Registrar.x86" Directory="WindowsSDK_usr_lib_swift_windows_x86">
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftrt.obj" />
+        </Component>
+        <!--
+        <Component DiskId="4">
+          <File Source="$(SDKRoot)\usr\lib\swift\windows\i686\swiftrtd.obj" />
+        </Component>
+        -->
+      </ComponentGroup>
+    <?endif?>
+
+    <!-- clang modules -->
+    <ComponentGroup Id="AuxiliaryFiles" Directory="WindowsSDK_usr_share">
+      <Component>
+        <File Source="$(SDKRoot)\usr\share\ucrt.modulemap" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\share\winsdk.modulemap" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\share\vcruntime.apinotes" />
+      </Component>
+      <Component>
+        <File Source="$(SDKRoot)\usr\share\vcruntime.modulemap" />
+      </Component>
+    </ComponentGroup>
+
+    <!-- Configuration -->
+    <ComponentGroup Id="Configuration">
+      <Component Directory="WindowsSDK">
+        <File Source="$(SDKRoot)\SDKSettings.json" />
+      </Component>
+      <Component Directory="WindowsSDK">
+        <File Source="$(SDKRoot)\SDKSettings.plist" />
+      </Component>
+      <Component Directory="WindowsPlatform">
+        <File Source="$(PlatformRoot)\Info.plist" />
+      </Component>
+    </ComponentGroup>
+
+    <!-- Redistributables -->
+    <?if $(IncludeARM64) = True?>
+      <Component Id="rtl.arm64.msm" Directory="RedistVersion" Condition="INSTALLARM64REDIST">
+        <File Source="!(bindpath.rtl.arm64.msm)\rtl.arm64.msm" />
+      </Component>
+    <?endif?>
+    <?if $(IncludeX64) = True?>
+      <Component Id="rtl.amd64.msm" Directory="RedistVersion" Condition="INSTALLAMD64REDIST">
+        <File Source="!(bindpath.rtl.amd64.msm)\rtl.amd64.msm" />
+      </Component>
+    <?endif?>
+    <?if $(IncludeX86) = True?>
+      <Component Id="rtl.x86.msm" Directory="RedistVersion" Condition="INSTALLX86REDIST">
+        <File Source="!(bindpath.rtl.x86.msm)\rtl.x86.msm" />
+      </Component>
+    <?endif?>
+
+    <ComponentGroup Id="EnvironmentVariables">
+      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="WindowsSDK" Guid="580f1edd-8744-4be8-8dd8-e519f70a91e4">
+        <Environment Action="set" Name="SDKROOT" Part="all" Permanent="no" System="no" Value="[WindowsSDK]" />
+      </Component>
+    </ComponentGroup>
+
+    <!-- Features -->
+    <Feature Id="SDK" AllowAbsent="no" Title="!(loc.Plt_ProductName_Windows)">
+      <ComponentGroupRef Id="SwiftRemoteMirror" />
+      <ComponentGroupRef Id="BlocksRuntime" />
+      <ComponentGroupRef Id="libdispatch" />
+      <ComponentGroupRef Id="_FoundationUnicode" />
+      <ComponentGroupRef Id="_FoundationCShims" />
+
+      <ComponentGroupRef Id="AuxiliaryFiles" />
+      <ComponentGroupRef Id="Configuration" />
+      <ComponentGroupRef Id="SwiftShims" />
+      <ComponentGroupRef Id="apinotes" />
+      <ComponentGroupRef Id="libcxxshim" />
+
+      <!-- MSI management Components -->
+      <ComponentGroupRef Id="EnvironmentVariables" />
+      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
+    </Feature>
+
+    <?if $(IncludeARM64) = True?>
+      <Feature Id="arm64" AllowAbsent="yes" Title="!(loc.Sdk_ProductName_Windows_arm64)">
+        <Level Condition="InstallARM64SDK = 0" Value="0" />
+
+        <ComponentGroupRef Id="XCTest.arm64" />
+        <ComponentGroupRef Id="Testing.arm64" />
+
+        <ComponentGroupRef Id="SwiftRemoteMirror.arm64" />
+
+        <ComponentGroupRef Id="BlocksRuntime.arm64" />
+        <ComponentGroupRef Id="libdispatch.arm64" />
+
+        <ComponentGroupRef Id="CRT.arm64" />
+        <ComponentGroupRef Id="WinSDK.arm64" />
+
+        <ComponentGroupRef Id="Cxx.arm64" />
+        <ComponentGroupRef Id="CxxStdlib.arm64" />
+        <ComponentGroupRef Id="Distributed.arm64" />
+        <ComponentGroupRef Id="Foundation.arm64" />
+        <ComponentGroupRef Id="FoundationEssentials.arm64" />
+        <ComponentGroupRef Id="FoundationInternationalization.arm64" />
+        <ComponentGroupRef Id="FoundationNetworking.arm64" />
+        <ComponentGroupRef Id="FoundationXML.arm64" />
+        <ComponentGroupRef Id="Observation.arm64" />
+        <ComponentGroupRef Id="RegexBuilder.arm64" />
+        <ComponentGroupRef Id="Swift.arm64" />
+        <ComponentGroupRef Id="SwiftOnoneSupport.arm64" />
+        <ComponentGroupRef Id="Synchronization.arm64" />
+        <ComponentGroupRef Id="_Builtin_float.arm64" />
+        <ComponentGroupRef Id="_Concurrency.arm64" />
+        <ComponentGroupRef Id="_Differentiation.arm64" />
+        <ComponentGroupRef Id="_FoundationCollections.arm64" />
+        <ComponentGroupRef Id="_FoundationUnicode.arm64" />
+        <ComponentGroupRef Id="_RegexParser.arm64" />
+        <ComponentGroupRef Id="_StringProcessing.arm64" />
+        <ComponentGroupRef Id="_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="XCTest.x64" />
+        <ComponentGroupRef Id="Testing.x64" />
+
+        <ComponentGroupRef Id="SwiftRemoteMirror.x64" />
+
+        <ComponentGroupRef Id="BlocksRuntime.x64" />
+        <ComponentGroupRef Id="libdispatch.x64" />
+
+        <ComponentGroupRef Id="CRT.x64" />
+        <ComponentGroupRef Id="WinSDK.x64" />
+
+        <ComponentGroupRef Id="Cxx.x64" />
+        <ComponentGroupRef Id="CxxStdlib.x64" />
+        <ComponentGroupRef Id="Distributed.x64" />
+        <ComponentGroupRef Id="Foundation.x64" />
+        <ComponentGroupRef Id="FoundationEssentials.x64" />
+        <ComponentGroupRef Id="FoundationInternationalization.x64" />
+        <ComponentGroupRef Id="FoundationNetworking.x64" />
+        <ComponentGroupRef Id="FoundationXML.x64" />
+        <ComponentGroupRef Id="Observation.x64" />
+        <ComponentGroupRef Id="RegexBuilder.x64" />
+        <ComponentGroupRef Id="Swift.x64" />
+        <ComponentGroupRef Id="SwiftOnoneSupport.x64" />
+        <ComponentGroupRef Id="Synchronization.x64" />
+        <ComponentGroupRef Id="_Builtin_float.x64" />
+        <ComponentGroupRef Id="_Concurrency.x64" />
+        <ComponentGroupRef Id="_Differentiation.x64" />
+        <ComponentGroupRef Id="_FoundationCollections.x64" />
+        <ComponentGroupRef Id="_FoundationUnicode.x64" />
+        <ComponentGroupRef Id="_RegexParser.x64" />
+        <ComponentGroupRef Id="_StringProcessing.x64" />
+        <ComponentGroupRef Id="_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="XCTest.x86" />
+        <ComponentGroupRef Id="Testing.x86" />
+
+        <ComponentGroupRef Id="SwiftRemoteMirror.x86" />
+
+        <ComponentGroupRef Id="BlocksRuntime.x86" />
+        <ComponentGroupRef Id="libdispatch.x86" />
+
+        <ComponentGroupRef Id="CRT.x86" />
+        <ComponentGroupRef Id="WinSDK.x86" />
+
+        <ComponentGroupRef Id="Cxx.x86" />
+        <ComponentGroupRef Id="CxxStdlib.x86" />
+        <ComponentGroupRef Id="Distributed.x86" />
+        <ComponentGroupRef Id="Foundation.x86" />
+        <ComponentGroupRef Id="FoundationEssentials.x86" />
+        <ComponentGroupRef Id="FoundationInternationalization.x86" />
+        <ComponentGroupRef Id="FoundationNetworking.x86" />
+        <ComponentGroupRef Id="FoundationXML.x86" />
+        <ComponentGroupRef Id="Observation.x86" />
+        <ComponentGroupRef Id="RegexBuilder.x86" />
+        <ComponentGroupRef Id="Swift.x86" />
+        <ComponentGroupRef Id="SwiftOnoneSupport.x86" />
+        <ComponentGroupRef Id="Synchronization.x86" />
+        <ComponentGroupRef Id="_Builtin_float.x86" />
+        <ComponentGroupRef Id="_Concurrency.x86" />
+        <ComponentGroupRef Id="_Differentiation.x86" />
+        <ComponentGroupRef Id="_FoundationCollections.x86" />
+        <ComponentGroupRef Id="_FoundationUnicode.x86" />
+        <ComponentGroupRef Id="_RegexParser.x86" />
+        <ComponentGroupRef Id="_StringProcessing.x86" />
+        <ComponentGroupRef Id="_Volatile.x86" />
+
+        <ComponentGroupRef Id="Registrar.x86" />
+
+        <!-- Redistributable -->
+        <ComponentRef Id="rtl.x86.msm" />
+      </Feature>
+    <?endif?>
+  </Package>
+</Wix>
diff --git a/platforms/Windows/readme.md b/platforms/Windows/readme.md
index ea69a063..80e8bd4f 100644
--- a/platforms/Windows/readme.md
+++ b/platforms/Windows/readme.md
@@ -36,10 +36,12 @@ The bundle authoring (in `installer.wxs`) drives optional install directory and
 | OptionsInstallDBG | Controls whether debugging tools will be installed. |
 | OptionsInstallIDE | Controls whether IDE integration tools will be installed. |
 | OptionsInstallUtilties | Controls whether additional utilities will be installed. |
+| OptionsInstallAndroidPlatform | Controls whether the Android platform will be installed. |
 | OptionsInstallAndroidSDKAMD64 | Controls whether the Android AMD64 SDK will be installed. |
 | OptionsInstallAndroidSDKARM | Controls whether the Android ARM SDK will be installed. |
 | OptionsInstallAndroidSDKARM64 | Controls whether the Android ARM64 SDK will be installed. |
 | OptionsInstallAndroidSDKX86 | Controls whether the Android X86 SDK will be installed. |
+| OptionsInstallWindowsPlatform | Controls whether the Windows platform will be installed. |
 | OptionsInstallWindowsSDKX86 | Controls whether the Windows X86 SDK will be installed. |
 | OptionsInstallWindowsRedistAMD64 | Controls whether the Windows AMD64 Redistributable MSM will be installed. |
 | OptionsInstallWindowsSDKAMD64 | Controls whether the Windows AMD64 SDK will be installed. |
@@ -112,19 +114,10 @@ MSBuild automatically imports Directory.Build.props files in your tree. We use D
 | ArePackageCabsEmbedded | Always set to false to keep the .cab files external to the .msi files. This save user disk space: Burn caches packages so it can always uninstall and repair. MSI also caches packages for uninstall. If the cab is embedded, you have two copies and MSI doesn't always use its cached copy as a source for repair. With an external .cab, MSI caches only the tiny .msi file and not the (relatively huge) .cab. |
 | BundleFlavor, IsBundleCompressed | BundleFlavor defaults to `online` to build an online bundle. Set by the invocation of MSBuild to build an online or offline bundle. Controls IsBundleCompressed. |
 | DefineConstants | Passes a subset of MSBuild properties into the WiX build as preprocessor variables. |
-| INCLUDE_SWIFT_DOCC | swift-docc is currently conditionalized out. Set it to `true` to include it. The property `SWIFT_DOCC_BUILD` defines the directory to find the artifacts. |
-| INCLUDE_ANDROID_ARM_SDK, INCLUDE_ANDROID_ARM64_SDK, INCLUDE_ANDROID_X86_SDK, INCLUDE_ANDROID_x86_64_SDK, INCLUDE_WINDOWS_AMD64_SDK, INCLUDE_WINDOWS_ARM64_SDK, INCLUDE_WINDOWS_X86_SDK | The included SDKs are currently conditionalized out. Set these to `true` to include them in the bundles. |
-
-
-## SDKs
-
-The SDKs contain architecture-specific payloads like libraries and architecture-neutral payloads like headers. However, as Arm64 packages cannot be installed on an x64 Windows host, all SDKs are built as x86 packages. (Windows Installer doesn't have the concept of an architecture-neutral package, so we use x86 as the package architecture that can be installed on all Windows hosts.)
-
-Because we need 32-bit components in an x86 package, we have to force the shared .wixlib project to an x86 `Platform` at the same using the correct `ProductArchitecture` for the SDK being built. That happens by setting those properties in the `ProjectReference`:
-
-```xml
-<ProjectReference Include="..\shared\shared.wixproj" Properties="ProductArchitecture=arm64;Platform=x86" />
-```
+| Platforms | A semi-colon delimited list of platforms which are bundled. Set it to `android;windows` to package both platforms. |
+| AndroidArchitectures | A semi-colon delimited list of architectures which the Android platform supports. Set it to `aarch64;armv7;i686;x86_64` to package all architectures. |
+| WindowsArchitectures | A semi-colon delimited list of architectures which the Windows platform supports. Set it to `aarch64;i686;x86_64` to package all architectures. |
+| INCLUDE_SWIFT_DOCC | swift-docc is currently conditionalized out. Set it to `True` to include it. The property `SWIFT_DOCC_BUILD` defines the directory to find the artifacts. |
 
 
 ## User.props
@@ -155,13 +148,13 @@ To support the three architecture flavors of the SDK and RTL MSI packages, you n
 
 | MSBuild property | Description |
 | ---------------- | ----------- |
-| PLATFORM_ROOT_X86 | PLATFORM_ROOT when building x86 SDK and RTL |
-| PLATFORM_ROOT_AMD64 | PLATFORM_ROOT when building AMD64 SDK and RTL |
-| PLATFORM_ROOT_ARM64 | PLATFORM_ROOT when building ARM64 SDK and RTL |
-| SDK_ROOT_X86 | SDK_ROOT when building x86 SDK and RTL |
-| SDK_ROOT_AMD64 | SDK_ROOT when building AMD64 SDK and RTL |
-| SDK_ROOT_ARM64 | SDK_ROOT when building ARM64 SDK and RTL |
-
+| ImageRoot | Path to the root of the installed Swift image to package |
+| Platforms | Semicolon delimited list of platforms to package (android;windows) |
+| AndroidArchitectures | Semicolon delimited list of architectures the Android platform supports (aarch54;armv7;i686;x86_64) |
+| WindowsArchitectures | Semicolon delimited list of architectures the Windows platform supports (aarch64;i686;x86_64) |
+| WindowsRuntimeARM64 | Path to the staged Windows ARM64 runtime |
+| WindowsRuntimeX64 | Path to the staged Windows AMD64 runtime |
+| WindowsRuntimeX86 | Path to the staged Windows x86 runtime |
 
 ```sh
 msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.wixproj ^
@@ -171,13 +164,13 @@ msbuild %SourceRoot%\swift-installer-scripts\platforms\Windows\bundle\installer.
   -p:BaseReleaseDownloadUrl=todo://base/release/download/url ^
   -p:Configuration=Release ^
   -p:BaseOutputPath=%PackageRoot%\online\ ^
-  -p:TOOLCHAIN_ROOT=%BuildRoot%\Library\Developer\Toolchains\unknown-Asserts-development.xctoolchain ^
-  -p:PLATFORM_ROOT_X86=path\to\x86\platform ^
-  -p:PLATFORM_ROOT_AMD64=path\to\amd64\platform ^
-  -p:PLATFORM_ROOT_ARM64=path\to\arm64\platform ^
-  -p:SDK_ROOT_X86=path\to\x86\sdk ^
-  -p:SDK_ROOT_AMD64=path\to\amd64\sdk ^
-  -p:SDK_ROOT_ARM64=path\to\arm64\sdk
+  -p:ImageRoot=%ImageRoot%\Program Files\Swift ^
+  -p:Platforms="android;windows" ^
+  -p:AndroidArchitectures="aarch64;armv7;i686;x86_64" ^
+  -p:WindowsArchitectures="aarch64;i686;x86_64" ^
+  -p:WindowsRuntimeARM64=%ImageRoot%\Prograam Files (Arm64)\Swift\Runtimes\0.0.0 ^
+  -p:WindowsRuntimeX64=%ImageRoot%\Program Files\Swift\Runtimes\0.0.0 ^
+  -p:WindowsRuntimeX86=%ImageRoot%\Program Files (x86)\Swift\Runtimes\0.0.0
 ```
 
 
diff --git a/platforms/Windows/rtl/lib/rtllib.wxs b/platforms/Windows/rtl/lib/rtllib.wxs
index 9ce66319..88847eb6 100644
--- a/platforms/Windows/rtl/lib/rtllib.wxs
+++ b/platforms/Windows/rtl/lib/rtllib.wxs
@@ -8,95 +8,103 @@
       <?define RuntimeDirectoryComponentGuidGenerationSeed = "E9BC660F-2E0E-48E4-8DE0-18567335AF6B" ?>
     <?endif?>
 
+    <?if $(ProductArchitecture) == amd64?>
+      <?define RuntimeRoot = $(WindowsRuntimeX64)?>
+    <?elseif $(ProductArchitecture) == arm64?>
+      <?define RuntimeRoot = $(WindowsRuntimeARM64)?>
+    <?elseif $(ProductArchitecture) == x86?>
+      <?define RuntimeRoot = $(WindowsRuntimeX86)?>
+    <?endif?>
+
     <Directory Id="RUNTIMEDIR_$(ProductArchitecture)" ComponentGuidGenerationSeed="$(RuntimeDirectoryComponentGuidGenerationSeed)" />
 
     <ComponentGroup Id="stdlib_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swiftSynchronization.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swiftSynchronization.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swift_Concurrency.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swift_Concurrency.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swift_Differentiation.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swift_Differentiation.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swiftDistributed.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swiftDistributed.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swiftRegexBuilder.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swiftRegexBuilder.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swift_RegexParser.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swift_RegexParser.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swift_StringProcessing.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swift_StringProcessing.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swiftCore.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swiftCore.dll" />
       </Component>
 
       <!-- TODO(compnerd) should we distribute the undecoration library in the runtime?
       <Component Directory="_usr_bin" Id="swiftDemangle.dll">
-        <File Id="swiftDemangle.dll" Source="$(SDK_ROOT)\bin\swiftDemangle.dll" />
+        <File Id="swiftDemangle.dll" Source="$(RuntimeRoot)\bin\swiftDemangle.dll" />
       </Component>
       -->
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swiftCRT.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swiftCRT.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swiftObservation.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swiftObservation.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swiftRemoteMirror.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swiftRemoteMirror.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swiftSwiftOnoneSupport.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swiftSwiftOnoneSupport.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swiftWinSDK.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swiftWinSDK.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="BlocksRuntime_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\BlocksRuntime.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\BlocksRuntime.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="libdispatch_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\dispatch.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\dispatch.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\swiftDispatch.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\swiftDispatch.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="Foundation_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\_FoundationICU.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\_FoundationICU.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\FoundationEssentials.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\FoundationEssentials.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\FoundationInternationalization.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\FoundationInternationalization.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\Foundation.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\Foundation.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\FoundationNetworking.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\FoundationNetworking.dll" />
       </Component>
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\FoundationXML.dll" />
+        <File Source="$(RuntimeRoot)\usr\bin\FoundationXML.dll" />
       </Component>
     </ComponentGroup>
 
     <ComponentGroup Id="plutil_$(ProductArchitecture)" Directory="RUNTIMEDIR_$(ProductArchitecture)">
       <Component>
-        <File Source="$(SDK_ROOT)\usr\bin\plutil.exe" />
+        <File Source="$(RuntimeRoot)\usr\bin\plutil.exe" />
       </Component>
     </ComponentGroup>
 
diff --git a/platforms/Windows/sdk/CDispatch.wxi b/platforms/Windows/sdk/CDispatch.wxi
deleted file mode 100644
index 4063113f..00000000
--- a/platforms/Windows/sdk/CDispatch.wxi
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\base.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\block.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\data.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\dispatch.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\group.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\introspection.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\io.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\module.modulemap" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\object.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\once.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\queue.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\semaphore.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\source.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\dispatch\time.h" />
-  </Component>
-</Include>
diff --git a/platforms/Windows/sdk/_FoundationCShims.wxi b/platforms/Windows/sdk/_FoundationCShims.wxi
deleted file mode 100644
index 7127e0fc..00000000
--- a/platforms/Windows/sdk/_FoundationCShims.wxi
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\bplist_shims.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\CFUniCharBitmapData.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\CFUniCharBitmapData.inc.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\filemanager_shims.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\io_shims.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\module.modulemap" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\platform_shims.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\string_shims.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\uuid.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\_CShimsMacros.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\_CShimsTargetConditionals.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\_CStdlib.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_FoundationCShims\_FoundationCShims.h" />
-  </Component>
-</Include>
diff --git a/platforms/Windows/sdk/_FoundationUnicode.wxi b/platforms/Windows/sdk/_FoundationUnicode.wxi
deleted file mode 100644
index 009f2fee..00000000
--- a/platforms/Windows/sdk/_FoundationUnicode.wxi
+++ /dev/null
@@ -1,618 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\alphaindex.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\appendable.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\basictz.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\brkiter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\bytestream.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\bytestrie.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\bytestriebuilder.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\calendar.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\caniter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\casemap.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\char16ptr.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\chariter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\choicfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\coleitr.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\coll.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\compactdecimalformat.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\curramt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\currpinf.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\currunit.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\datefmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\dbbi.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\dcfmtsym.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\decimfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\displayoptions.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\docmain.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\dtfmtsym.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\dtintrv.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\dtitvfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\dtitvinf.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\dtptngen.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\dtrule.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\edits.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\enumset.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\errorcode.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\fieldpos.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\filteredbrk.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\fmtable.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\format.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\formattedvalue.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\formattednumber.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\fpositer.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\gender.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\gregocal.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\icudataver.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\icuplug.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\idna.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\listformatter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\localebuilder.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\localematcher.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\localpointer.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\locdspnm.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\locid.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\measfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\measunit.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\measure.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\messagepattern.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\module.modulemap" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\msgfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\normalizer2.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\normlzr.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\nounit.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\numberformatter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\numberrangeformatter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\numfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\numsys.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\parseerr.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\parsepos.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\platform.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\plurfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\plurrule.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ptypes.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\putil.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\rbbi.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\rbnf.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\rbtz.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\regex.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\region.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\reldatefmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\rep.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\resbund.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\schriter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\scientificnumberformatter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\search.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\selfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\simpleformatter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\simplenumberformatter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\simpletz.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\smpdtfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\sortkey.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\std_string.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\strenum.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\stringoptions.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\stringpiece.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\stringtriebuilder.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\stsearch.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\symtable.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\tblcoll.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\timezone.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\tmunit.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\tmutamt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\tmutfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\translit.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\tzfmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\tznames.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\tzrule.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\tztrans.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ualoc.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uameasureformat.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uameasureunit.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uatimeunitformat.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ubidi.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ubiditransform.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ubrk.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucal.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucasemap.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucat.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uchar.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucharstrie.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucharstriebuilder.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uchriter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uclean.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucnv.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucnvsel.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucnv_cb.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucnv_err.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucol.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucoleitr.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uconfig.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucpmap.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucptrie.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucsdet.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ucurr.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\udat.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\udata.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\udateintervalformat.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\udatintv.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\udatpg.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\udisplaycontext.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\udisplayoptions.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uenum.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ufieldpositer.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uformattable.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uformattedvalue.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uformattednumber.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ugender.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uidna.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uiter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uldnames.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ulistformatter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uloc.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ulocale.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ulocbuilder.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ulocdata.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\umachine.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\umisc.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\umsg.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\umutablecptrie.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unifilt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unifunct.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unimatch.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unirepl.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uniset.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unistr.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unorm.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unorm2.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unum.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unumberformatter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unumberoptions.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unumberrangeformatter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\unumsys.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uobject.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uplrule.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\upluralrules.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\urbtok.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uregex.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uregion.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ureldatefmt.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\urename.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\urep.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ures.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uscript.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\usearch.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uset.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\usetiter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ushape.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\usimplenumberformatter.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uspoof.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\usprep.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ustdio.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ustream.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ustring.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\ustringtrie.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\utext.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\utf.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\utf16.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\utf32.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\utf8.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\utf_old.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\utmscale.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\utrace.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\utrans.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\utypes.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uvernum.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\uversion.h" />
-  </Component>
-  <Component>
-    <File Source="$(SDK_ROOT)\usr\include\_foundation_unicode\vtzone.h" />
-  </Component>
-</Include>
diff --git a/platforms/Windows/sdk/drd/sdk.wxs b/platforms/Windows/sdk/drd/sdk.wxs
deleted file mode 100644
index 51a14380..00000000
--- a/platforms/Windows/sdk/drd/sdk.wxs
+++ /dev/null
@@ -1,618 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?if $(ProductArchitecture) = "arm64"?>
-    <?define Architecture = "aarch64"?>
-    <?define Triple = "aarch64-unknown-linux-android"?>
-  <?elseif $(ProductArchitecture) = "amd64"?>
-    <?define Architecture = "x86_64"?>
-    <?define Triple = "x86_64-unknown-linux-android"?>
-  <?elseif $(ProductArchitecture) = "arm"?>
-    <?define Architecture = "armv7"?>
-    <!--
-      The Swift compiler outputs Android armv7 .swiftdoc, .swiftmodule, and
-      .swiftinterface files with the name armv7-unknown-linux-android. Since the
-      correct triple is armv7-unknown-linux-androideabi, define two constants to
-      deal with the inconsistency.
-
-      TODO: consider updating Swift compiler to output file names matching the
-      correct triple.
-    -->
-    <?define Triple = "armv7-unknown-linux-android"?>
-  <?elseif $(ProductArchitecture) = "x86"?>
-    <?define Architecture = "i686"?>
-    <?define Triple = "i686-unknown-linux-android"?>
-  <?endif?>
-
-  <Package
-      Language="1033"
-      Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.Android_Sdk_$(ProductArchitecture))"
-      UpgradeCode="$(AndroidSDKUpgradeCode)"
-      Version="$(NonSemVerProductVersion)"
-      Scope="$(PackageScope)">
-
-    <Media Id="1" Cabinet="sdk.android.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
-
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(AndroidSDKUpgradeCode)" />
-
-    <!--
-      └─ Swift
-          └─ Platforms
-              └─ Android.platform
-                  └─ Developer
-                      ├─ Library
-                      │   ├─ ds2
-                      │   │   └─ ...
-                      │   ├─ XCTest-$ProductVersion
-                      │   │   └─ ...
-                      │   └─ Testing-$ProductVersion
-                      │       └─ ...
-                      └─ SDKs
-                          └─ Android.sdk
-                                  └─ ...
-    -->
-    <DirectoryRef Id="PlatformsVersioned">
-      <Directory Id="AndroidPlatform" Name="Android.platform">
-        <Directory Name="Developer">
-          <Directory Name="Library">
-            <!-- XCTest -->
-            <Directory Name="XCTest-$(ProductVersion)">
-              <Directory Name="usr">
-                <Directory Name="lib">
-                  <Directory Name="swift">
-                    <Directory Name="android">
-                      <Directory Id="XCTest_usr_lib_swift_android_ARCH" Name="$(Architecture)" />
-                      <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule" />
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-            <!-- Testing -->
-            <Directory Name="Testing-$(ProductVersion)">
-              <Directory Name="usr">
-                <Directory Name="lib">
-                  <Directory Name="swift">
-                    <Directory Name="android">
-                      <Directory Id="Testing_usr_lib_swift_android_ARCH" Name="$(Architecture)" />
-                      <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-            <!-- ds2 -->
-            <Directory Name="ds2">
-              <Directory Name="usr">
-                <Directory Id="_ds2_usr_bin" Name="bin" />
-              </Directory>
-            </Directory>
-          </Directory>
-          <Directory Name="SDKs">
-            <!-- Android.sdk -->
-            <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 Name="swift">
-                    <Directory Id="AndroidSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" />
-                  </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_android" Name="android">
-                      <Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
-                      <Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
-                      <Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
-                      <Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
-                      <Directory Id="_Volatile.swiftmodule" Name="_Volatile.swiftmodule" />
-                      <Directory Id="Android.swiftmodule" Name="Android.swiftmodule" />
-                      <Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule" />
-                      <Directory Id="CxxStdlib.swiftmodule" Name="CxxStdlib.swiftmodule" />
-                      <Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule" />
-                      <Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule" />
-                      <Directory Id="_FoundationCollections.swiftmodule" Name="_FoundationCollections.swiftmodule" />
-                      <Directory Id="FoundationEssentials.swiftmodule" Name="FoundationEssentials.swiftmodule" />
-                      <Directory Id="FoundationInternationalization.swiftmodule" Name="FoundationInternationalization.swiftmodule" />
-                      <Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule" />
-                      <Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule" />
-                      <Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule" />
-                      <Directory Id="_math.swiftmodule" Name="_math.swiftmodule" />
-                      <Directory Id="Observation.swiftmodule" Name="Observation.swiftmodule" />
-                      <Directory Id="RegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule" />
-                      <Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule" />
-                      <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
-                      <Directory Id="Synchronization.swiftmodule" Name="Synchronization.swiftmodule" />
-                      <Directory Id="AndroidSDK_usr_lib_swift_android_ARCH" Name="$(Architecture)" />
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </DirectoryRef>
-
-    <ComponentGroup Id="XCTest">
-      <Component Directory="XCTest_usr_lib_swift_android_ARCH">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\$(Architecture)\libXCTest.so" />
-      </Component>
-      <Component Directory="XCTest.swiftmodule">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component Directory="XCTest.swiftmodule">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\android\XCTest.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Testing">
-      <Component Directory="Testing_usr_lib_swift_android_ARCH">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\$(Architecture)\libTesting.so" />
-      </Component>
-      <Component Directory="Testing.swiftmodule">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component Directory="Testing.swiftmodule">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\android\Testing.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="DS2">
-      <?if $(ANDROID_INCLUDE_DS2) == true ?>
-        <Component Directory="_ds2_usr_bin">
-          <File Source="$(PLATFORM_ROOT)\Developer\Library\ds2\usr\bin\$(Triple)-ds2" />
-        </Component>
-      <?endif?>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftRemoteMirror" Directory="AndroidSDK_usr_include_swift_SwiftRemoteMirror">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\Platform.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\module.modulemap" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftRemoteMirror.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="BlocksRuntime">
-      <Component Directory="AndroidSDK_usr_include_Block">
-        <File Source="$(SDK_ROOT)\usr\include\Block\Block.h" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libBlocksRuntime.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="libdispatch" Directory="AndroidSDK_usr_include_dispatch">
-      <?include ../CDispatch.wxi?>
-      <Component Directory="AndroidSDK_usr_include_os">
-        <File Source="$(SDK_ROOT)\usr\include\os\generic_base.h" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_include_os">
-        <File Source="$(SDK_ROOT)\usr\include\os\generic_unix_base.h" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_include_os">
-        <File Source="$(SDK_ROOT)\usr\include\os\generic_win_base.h" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_include_os">
-        <File Source="$(SDK_ROOT)\usr\include\os\object.h" />
-      </Component>
-      <Component Directory="Dispatch.swiftmodule">
-        <File Name="$(Triple).swiftdoc" Source="$(SDK_ROOT)\usr\lib\swift\android\$(Architecture)\Dispatch.swiftdoc" />
-      </Component>
-      <Component Directory="Dispatch.swiftmodule">
-        <File Name="$(Triple).swiftmodule" Source="$(SDK_ROOT)\usr\lib\swift\android\$(Architecture)\Dispatch.swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libdispatch.so" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftDispatch.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_foundation_unicode" Directory="AndroidSDK_usr_include__foundation_unicode">
-      <?include ../_FoundationUnicode.wxi?>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\lib_FoundationICU.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_FoundationCShims" Directory="AndroidSDK_usr_include__FoundationCShims">
-      <?include ../_FoundationCShims.wxi?>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Concurrency" Directory="_Concurrency.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_Concurrency.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_Concurrency.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_Concurrency.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswift_Concurrency.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Differentiation" Directory="_Differentiation.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_Differentiation.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_Differentiation.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_Differentiation.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswift_Differentiation.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_RegexParser" Directory="_RegexParser.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_RegexParser.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_RegexParser.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswift_RegexParser.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_StringProcessing" Directory="_StringProcessing.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_StringProcessing.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_StringProcessing.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_StringProcessing.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswift_StringProcessing.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Volatile" Directory="_Volatile.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_Volatile.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_Volatile.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_Volatile.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswift_Volatile.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Android" Directory="Android.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Android.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Android.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Android.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftAndroid.so" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\$(Architecture)\android.modulemap" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\$(Architecture)\SwiftAndroidNDK.h" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\$(Architecture)\SwiftBionic.h" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Cxx" Directory="Cxx.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Cxx.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Cxx.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftCxx.a" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CxxStdlib" Directory="CxxStdlib.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\CxxStdlib.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\CxxStdlib.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftCxxStdlib.a" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Distributed" Directory="Distributed.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Distributed.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Distributed.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Distributed.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftDistributed.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_FoundationCollections" Directory="_FoundationCollections.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_FoundationCollections.swiftmodule\$(Architecture).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_FoundationCollections.swiftmodule\$(Architecture).swiftmodule" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationEssentials" Directory="FoundationEssentials.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\FoundationEssentials.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\FoundationEssentials.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libFoundationEssentials.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationInternationalization" Directory="FoundationInternationalization.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\FoundationInternationalization.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libFoundationInternationalization.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Foundation" Directory="Foundation.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Foundation.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Foundation.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libFoundation.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationNetworking" Directory="FoundationNetworking.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\FoundationNetworking.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\FoundationNetworking.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libFoundationNetworking.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationXML" Directory="FoundationXML.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\FoundationXML.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\FoundationXML.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libFoundationXML.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Math" Directory="_math.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_math.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_math.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\_math.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswift_math.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Observation" Directory="Observation.swiftmodule">
-      <Component>
-        <File Name="$(Triple).swiftdoc" Source="$(SDK_ROOT)\usr\lib\swift\android\Observation.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Name="$(Triple).swiftinterface" Source="$(SDK_ROOT)\usr\lib\swift\android\Observation.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Name="$(Triple).swiftmodule" Source="$(SDK_ROOT)\usr\lib\swift\android\Observation.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftObservation.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="RegexBuilder" Directory="RegexBuilder.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\RegexBuilder.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\RegexBuilder.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\RegexBuilder.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftRegexBuilder.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Swift" Directory="Swift.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Swift.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Swift.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Swift.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftCore.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftOnoneSupport" Directory="SwiftOnoneSupport.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\SwiftOnoneSupport.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftSwiftOnoneSupport.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Synchronization" Directory="Synchronization.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Synchronization.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Synchronization.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\Synchronization.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libswiftSynchronization.so" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="apinotes" Directory="AndroidSDK_usr_lib_swift_apinotes">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\apinotes\std.apinotes" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\apinotes\posix_filesystem.apinotes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="libcxxshim" Directory="AndroidSDK_usr_lib_swift_android">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libcxxshim.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libcxxshim.modulemap" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\libcxxstdlibshim.h" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Registrar" Directory="AndroidSDK_usr_lib_swift_android_ARCH">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\android\$(Architecture)\swiftrt.o" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Configuration">
-      <Component Directory="AndroidSDK">
-        <File Source="$(SDK_ROOT)\SDKSettings.json" />
-      </Component>
-      <Component Directory="AndroidSDK">
-        <File Source="$(SDK_ROOT)\SDKSettings.plist" />
-      </Component>
-      <Component Directory="AndroidPlatform">
-        <File Source="$(PLATFORM_ROOT)\Info.plist" />
-      </Component>
-    </ComponentGroup>
-
-    <!-- Features -->
-    <Feature Id="AndroidSDK" AllowAbsent="no" Title="!(loc.Android_Sdk_$(ProductArchitecture))">
-      <ComponentGroupRef Id="XCTest" />
-      <ComponentGroupRef Id="Testing" />
-      <ComponentGroupRef Id="SwiftRemoteMirror" />
-      <ComponentGroupRef Id="BlocksRuntime" />
-      <ComponentGroupRef Id="libdispatch" />
-      <ComponentGroupRef Id="_foundation_unicode" />
-      <ComponentGroupRef Id="_FoundationCShims" />
-      <ComponentGroupRef Id="_Concurrency" />
-      <ComponentGroupRef Id="_Differentiation" />
-      <ComponentGroupRef Id="_RegexParser" />
-      <ComponentGroupRef Id="_StringProcessing" />
-      <ComponentGroupRef Id="_Volatile" />
-      <ComponentGroupRef Id="Android" />
-      <ComponentGroupRef Id="Cxx" />
-      <ComponentGroupRef Id="CxxStdlib" />
-      <ComponentGroupRef Id="Distributed" />
-      <ComponentGroupRef Id="_FoundationCollections" />
-      <ComponentGroupRef Id="FoundationEssentials" />
-      <ComponentGroupRef Id="FoundationInternationalization" />
-      <ComponentGroupRef Id="Foundation" />
-      <ComponentGroupRef Id="FoundationXML" />
-      <ComponentGroupRef Id="FoundationNetworking" />
-      <ComponentGroupRef Id="Math" />
-      <ComponentGroupRef Id="Observation" />
-      <ComponentGroupRef Id="RegexBuilder" />
-      <ComponentGroupRef Id="Swift" />
-      <ComponentGroupRef Id="SwiftOnoneSupport" />
-      <ComponentGroupRef Id="Synchronization" />
-      <ComponentGroupRef Id="apinotes" />
-      <ComponentGroupRef Id="libcxxshim" />
-      <ComponentGroupRef Id="Registrar" />
-      <ComponentGroupRef Id="Configuration" />
-      <ComponentGroupRef Id="SwiftShims" />
-      <ComponentGroupRef Id="DS2" />
-
-      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
-    </Feature>
-  </Package>
-</Wix>
diff --git a/platforms/Windows/sdk/win/sdk.wixproj b/platforms/Windows/sdk/win/sdk.wixproj
deleted file mode 100644
index cd84a9ed..00000000
--- a/platforms/Windows/sdk/win/sdk.wixproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project Sdk="WixToolset.Sdk/4.0.5">
-  <PropertyGroup>
-    <OutputName>sdk.windows.$(ProductArchitecture)</OutputName>
-    <Platform>x86</Platform>
-
-    <SwiftShimsPath>$(SDK_ROOT)\usr\lib\swift\shims</SwiftShimsPath>
-
-    <DefineConstants>
-      $(DefineConstants);
-      SwiftShimsPath=$(SwiftShimsPath);
-    </DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="WixToolset.Heat" Version="4.0.5" />
-  </ItemGroup>
-
-  <!--
-  The SDKs are x86 packages but package architecture-specific bits. We pass in
-  the appropriate ProductArchitecture and force `Platform=x86`. So the Shared
-  .wixlib matches, we force the output paths here to one distinct from the
-  Shared .wixlibs used by other, "normal" packages.
-  -->
-  <ItemGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
-    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=x86;Platform=x86" BindName="rtlmsm" />
-    <ProjectReference Include="..\..\shared\shared.wixproj" Properties="ProductArchitecture=x86;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
-    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=amd64;Platform=x64" BindName="rtlmsm" />
-    <ProjectReference Include="..\..\shared\shared.wixproj" Properties="ProductArchitecture=amd64;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
-    <ProjectReference Include="..\..\rtl\msm\rtlmsm.wixproj" Properties="ProductArchitecture=arm64;Platform=arm64" BindName="rtlmsm" />
-    <ProjectReference Include="..\..\shared\shared.wixproj" Properties="ProductArchitecture=arm64;Platform=x86;IntermediateOutputPath=$(BaseIntermediateOutputPath)x86_$(ProductArchitecture)\$(Configuration)\;OutputPath=$(BaseOutputPath)$(Configuration)\x86_$(ProductArchitecture)\" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <HarvestDirectory Include="$(SwiftShimsPath)">
-      <ComponentGroupName>SwiftShims</ComponentGroupName>
-      <DirectoryRefId>WindowsSDK_usr_lib_swift_shims</DirectoryRefId>
-      <PreprocessorVariable>var.SwiftShimsPath</PreprocessorVariable>
-      <SuppressCom>true</SuppressCom>
-      <SuppressRegistry>true</SuppressRegistry>
-      <SuppressRootDirectory>true</SuppressRootDirectory>
-    </HarvestDirectory>
-  </ItemGroup>
-</Project>
diff --git a/platforms/Windows/sdk/win/sdk.wxs b/platforms/Windows/sdk/win/sdk.wxs
deleted file mode 100644
index e3c2506e..00000000
--- a/platforms/Windows/sdk/win/sdk.wxs
+++ /dev/null
@@ -1,620 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
-
-  <?if $(ProductArchitecture) = "amd64"?>
-    <?define ArchitectureBinaryDir = "bin64"?>
-    <?define Architecture = "x86_64"?>
-    <?define Triple = "x86_64-unknown-windows-msvc"?>
-  <?elseif $(ProductArchitecture) = "arm64"?>
-    <?define ArchitectureBinaryDir = "bin64a"?>
-    <?define Architecture = "aarch64"?>
-    <?define Triple = "aarch64-unknown-windows-msvc"?>
-  <?elseif $(ProductArchitecture) = "x86"?>
-    <?define ArchitectureBinaryDir = "bin32"?>
-    <?define Architecture = "i686"?>
-    <?define Triple = "i686-unknown-windows-msvc"?>
-  <?endif?>
-
-  <Package
-      Language="1033"
-      Manufacturer="!(loc.ManufacturerName)"
-      Name="!(loc.Sdk_ProductName_$(ProductArchitecture))"
-      UpgradeCode="$(WindowsSDKUpgradeCode)"
-      Version="$(NonSemVerProductVersion)"
-      Scope="$(PackageScope)">
-
-    <Media Id="1" Cabinet="sdk.windows.$(ProductArchitecture).cab" EmbedCab="$(ArePackageCabsEmbedded)" />
-
-    <WixVariable Id="SideBySidePackageUpgradeCode" Value="$(WindowsSDKUpgradeCode)" />
-    <FeatureGroupRef Id="SideBySideUpgradeStrategy" />
-
-    <!--
-      └─ Swift
-          └─ Platforms
-              └─ Windows.platform
-                  └─ Developer
-                      ├─ Library
-                      │   ├─ XCTest-$ProductVersion
-                      │   │   └─ ...
-                      │   └─ Testing-$ProductVersion
-                      │       └─ ...
-                      └─ SDKs
-                          └─ Windows.sdk
-                                  └─ ...
-    -->
-    <DirectoryRef Id="PlatformsVersioned">
-      <Directory Id="WindowsPlatform" Name="Windows.platform">
-        <Directory Name="Developer">
-          <Directory Name="Library">
-            <!-- XCTest -->
-            <Directory Name="XCTest-$(ProductVersion)">
-              <Directory Name="usr">
-                <Directory Id="XCTest_usr_bin" Name="$(ArchitectureBinaryDir)" />
-                <Directory Name="lib">
-                  <Directory Name="swift">
-                    <Directory Name="windows">
-                      <Directory Id="XCTest_usr_lib_swift_windows_ARCH" Name="$(Architecture)" />
-                      <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule" />
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-            <!-- Testing -->
-            <Directory Name="Testing-$(ProductVersion)">
-              <Directory Name="usr">
-                <Directory Id="Testing_usr_bin" Name="$(ArchitectureBinaryDir)" />
-                <Directory Name="lib">
-                  <Directory Name="swift">
-                    <Directory Name="windows">
-                      <Directory Id="Testing_usr_lib_swift_windows_ARCH" Name="$(Architecture)" />
-                      <Directory Id="Testing.swiftmodule" Name="Testing.swiftmodule" />
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-          </Directory>
-          <Directory Name="SDKs">
-            <!-- 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 Name="swift">
-                    <Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" />
-                  </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_windows" Name="windows">
-                      <Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule" />
-                      <Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule" />
-                      <Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule" />
-                      <Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule" />
-                      <Directory Id="CRT.swiftmodule" Name="CRT.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="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="Observation.swiftmodule" Name="Observation.swiftmodule" />
-                      <Directory Id="RegexBuilder.swiftmodule" Name="RegexBuilder.swiftmodule" />
-                      <Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule" />
-                      <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
-                      <Directory Id="Synchronization.swiftmodule" Name="Synchronization.swiftmodule" />
-                      <Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule" />
-                      <Directory Id="WindowsSDK_usr_lib_swift_windows_ARCH" Name="$(Architecture)" />
-                    </Directory>
-                  </Directory>
-                </Directory>
-                <Directory Id="WindowsSDK_usr_share" Name="share" />
-              </Directory>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </DirectoryRef>
-
-    <ComponentGroup Id="XCTest">
-      <Component Directory="XCTest_usr_bin">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\$(ArchitectureBinaryDir)\XCTest.dll" />
-      </Component>
-      <Component Directory="XCTest_usr_lib_swift_windows_ARCH">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\$(Architecture)\XCTest.lib" />
-      </Component>
-      <Component Directory="XCTest.swiftmodule">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component Directory="XCTest.swiftmodule">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\XCTest-$(ProductVersion)\usr\lib\swift\windows\XCTest.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Testing">
-      <Component Directory="Testing_usr_bin">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\$(ArchitectureBinaryDir)\Testing.dll" />
-      </Component>
-      <Component Directory="Testing_usr_lib_swift_windows_ARCH">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\$(Architecture)\Testing.lib" />
-      </Component>
-      <Component Directory="Testing.swiftmodule">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component Directory="Testing.swiftmodule">
-        <File Source="$(PLATFORM_ROOT)\Developer\Library\Testing-$(ProductVersion)\usr\lib\swift\windows\Testing.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftRemoteMirror" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\Platform.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\module.modulemap" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftRemoteMirror.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="BlocksRuntime">
-      <Component Directory="WindowsSDK_usr_include_Block">
-        <File Source="$(SDK_ROOT)\usr\include\Block\Block.h" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\BlocksRuntime.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="libdispatch" Directory="WindowsSDK_usr_include_dispatch">
-      <?include ../CDispatch.wxi?>
-      <Component Directory="WindowsSDK_usr_include_os">
-        <File Source="$(SDK_ROOT)\usr\include\os\generic_base.h" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_include_os">
-        <File Source="$(SDK_ROOT)\usr\include\os\generic_unix_base.h" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_include_os">
-        <File Source="$(SDK_ROOT)\usr\include\os\generic_win_base.h" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_include_os">
-        <File Source="$(SDK_ROOT)\usr\include\os\object.h" />
-      </Component>
-      <Component Directory="Dispatch.swiftmodule">
-        <File Name="$(Triple).swiftdoc" Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\Dispatch.swiftdoc" />
-      </Component>
-      <Component Directory="Dispatch.swiftmodule">
-        <File Name="$(Triple).swiftmodule" Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\Dispatch.swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\dispatch.lib" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftDispatch.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_foundation_unicode" Directory="WindowsSDK_usr_include__foundation_unicode">
-      <?include ../_FoundationUnicode.wxi?>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\_FoundationICU.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_FoundationCShims" Directory="WindowsSDK_usr_include__FoundationCShims">
-      <?include ../_FoundationCShims.wxi?>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Concurrency" Directory="_Concurrency.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swift_Concurrency.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Differentiation" Directory="_Differentiation.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swift_Differentiation.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_RegexParser" Directory="_RegexParser.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swift_RegexParser.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_StringProcessing" Directory="_StringProcessing.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swift_StringProcessing.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CRT" Directory="CRT.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftCRT.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Cxx" Directory="Cxx.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\libswiftCxx.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CxxStdlib" Directory="CxxStdlib.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\CxxStdlib.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\libswiftCxxStdlib.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Distributed" Directory="Distributed.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftDistributed.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_FoundationCollections" Directory="_FoundationCollections.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\$(Architecture).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\_FoundationCollections.swiftmodule\$(Architecture).swiftmodule" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationEssentials" Directory="FoundationEssentials.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\FoundationEssentials.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\FoundationEssentials.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationInternationalization" Directory="FoundationInternationalization.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\FoundationInternationalization.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\FoundationInternationalization.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Foundation" Directory="Foundation.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Foundation.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Foundation.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\Foundation.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationNetworking" Directory="FoundationNetworking.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\FoundationNetworking.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\FoundationNetworking.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationXML" Directory="FoundationXML.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\FoundationXML.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\FoundationXML.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\FoundationXML.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Observation" Directory="Observation.swiftmodule">
-      <Component>
-        <File Name="$(Triple).swiftdoc" Source="$(SDK_ROOT)\usr\lib\swift\windows\Observation.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Name="$(Triple).swiftinterface" Source="$(SDK_ROOT)\usr\lib\swift\windows\Observation.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Name="$(Triple).swiftmodule" Source="$(SDK_ROOT)\usr\lib\swift\windows\Observation.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftObservation.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="RegexBuilder" Directory="RegexBuilder.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\RegexBuilder.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftRegexBuilder.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Swift" Directory="Swift.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftCore.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftOnoneSupport" Directory="SwiftOnoneSupport.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftSwiftOnoneSupport.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Synchronization" Directory="Synchronization.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Synchronization.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Synchronization.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\Synchronization.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftSynchronization.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="WinSDK" Directory="WinSDK.swiftmodule">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\$(Triple).swiftdoc" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\$(Triple).swiftinterface" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\$(Triple).swiftmodule" />
-      </Component>
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftWinSDK.lib" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="apinotes" Directory="WindowsSDK_usr_lib_swift_apinotes">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\apinotes\std.apinotes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="libcxxshim" Directory="WindowsSDK_usr_lib_swift_windows">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\libcxxshim.h" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\libcxxshim.modulemap" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\libcxxstdlibshim.h" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_ARCH">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftrt.obj" />
-      </Component>
-      <!--
-      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftrtd.obj">
-        <File Id="swiftrtd.obj" Source="$(SDK_ROOT)\usr\lib\swift\windows\$(Architecture)\swiftrtd.obj" />
-      </Component>
-      -->
-    </ComponentGroup>
-
-    <ComponentGroup Id="AuxiliaryFiles" Directory="WindowsSDK_usr_share">
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\share\ucrt.modulemap" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\share\winsdk.modulemap" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\share\vcruntime.apinotes" />
-      </Component>
-      <Component>
-        <File Source="$(SDK_ROOT)\usr\share\vcruntime.modulemap" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Configuration">
-      <Component Directory="WindowsSDK">
-        <File Source="$(SDK_ROOT)\SDKSettings.json" />
-      </Component>
-      <Component Directory="WindowsSDK">
-        <File Source="$(SDK_ROOT)\SDKSettings.plist" />
-      </Component>
-      <Component Directory="WindowsPlatform">
-        <File Source="$(PLATFORM_ROOT)\Info.plist" />
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="rtl.msm" Directory="RedistVersion" Condition="INSTALLREDIST">
-      <File Source="!(bindpath.rtlmsm)\rtl.$(ProductArchitecture).msm" />
-    </Component>
-
-    <ComponentGroup Id="EnvironmentVariables">
-      <Component Id="UserPathVariable" Condition="NOT ALLUSERS=1" Directory="WindowsSDK" Guid="580f1edd-8744-4be8-8dd8-e519f70a91e4">
-        <Environment Action="set" Name="SDKROOT" Part="all" Permanent="no" System="no" Value="[WindowsSDK]" />
-      </Component>
-    </ComponentGroup>
-
-    <!-- Features -->
-    <Feature Id="SDK" AllowAbsent="no" Title="!(loc.Sdk_ProductName_$(ProductArchitecture))">
-      <!-- Developer Components -->
-      <ComponentGroupRef Id="XCTest" />
-      <ComponentGroupRef Id="Testing" />
-
-      <!-- SDK Content for dynamic linking -->
-      <ComponentGroupRef Id="SwiftRemoteMirror" />
-      <ComponentGroupRef Id="BlocksRuntime" />
-      <ComponentGroupRef Id="libdispatch" />
-      <ComponentGroupRef Id="_foundation_unicode" />
-      <ComponentGroupRef Id="_FoundationCShims" />
-      <ComponentGroupRef Id="_Concurrency" />
-      <ComponentGroupRef Id="_Differentiation" />
-      <ComponentGroupRef Id="_RegexParser" />
-      <ComponentGroupRef Id="_StringProcessing" />
-      <ComponentGroupRef Id="CRT" />
-      <ComponentGroupRef Id="Cxx" />
-      <ComponentGroupRef Id="CxxStdlib" />
-      <ComponentGroupRef Id="Distributed" />
-      <ComponentGroupRef Id="_FoundationCollections" />
-      <ComponentGroupRef Id="FoundationEssentials" />
-      <ComponentGroupRef Id="FoundationInternationalization" />
-      <ComponentGroupRef Id="Foundation" />
-      <ComponentGroupRef Id="FoundationXML" />
-      <ComponentGroupRef Id="FoundationNetworking" />
-      <ComponentGroupRef Id="Observation" />
-      <ComponentGroupRef Id="RegexBuilder" />
-      <ComponentGroupRef Id="Swift" />
-      <ComponentGroupRef Id="SwiftOnoneSupport" />
-      <ComponentGroupRef Id="Synchronization" />
-      <ComponentGroupRef Id="WinSDK" />
-
-      <!-- Common SDK Content -->
-      <ComponentGroupRef Id="libcxxshim" />
-      <ComponentGroupRef Id="apinotes" />
-      <ComponentGroupRef Id="Registrar" />
-      <ComponentGroupRef Id="AuxiliaryFiles" />
-      <ComponentGroupRef Id="Configuration" />
-      <ComponentGroupRef Id="SwiftShims" />
-
-      <!-- Redistributable -->
-      <ComponentRef Id="rtl.msm" />
-
-      <!-- MSI management Components -->
-      <ComponentGroupRef Id="EnvironmentVariables" />
-      <ComponentGroupRef Id="VersionedDirectoryCleanup" />
-    </Feature>
-  </Package>
-</Wix>
diff --git a/platforms/Windows/shared/swift.en-us.wxl b/platforms/Windows/shared/swift.en-us.wxl
index 89881e3c..7b6517ea 100644
--- a/platforms/Windows/shared/swift.en-us.wxl
+++ b/platforms/Windows/shared/swift.en-us.wxl
@@ -10,19 +10,21 @@
   <String Id="VCRuntime_ProductName_arm64" Value="Visual C++ Runtime (ARM64)" />
   <String Id="VCRuntime_ProductName_amd64" Value="Visual C++ Runtime (AMD64)" />
   <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="Rtl_ProductName_arm64" Value="Swift Windows Runtime (ARM64)" />
   <String Id="Rtl_ProductName_amd64" Value="Swift Windows Runtime (AMD64)" />
   <String Id="Rtl_ProductName_x86" Value="Swift Windows Runtime (X86)" />
-  <String Id="Sdk_ProductName_arm64" Value="Swift Windows SDK (ARM64)" />
-  <String Id="Sdk_ProductName_amd64" Value="Swift Windows SDK (AMD64)" />
-  <String Id="Sdk_ProductName_x86" Value="Swift Windows SDK (X86)" />
+  <String Id="Sdk_ProductName_Android_arm64" Value="Swift Android SDK (ARM64)" />
+  <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="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="Utl_ProductName_arm64" Value="Swift Windows Utilities (ARM64)" />
   <String Id="Utl_ProductName_amd64" Value="Swift Windows Utilities (AMD64)" />
   <String Id="Utl_ProductName_x86" Value="Swift Windows Utilities (X86)" />
-  <String Id="Android_Sdk_arm64" Value="Swift Android SDK (ARM64)" />
-  <String Id="Android_Sdk_amd64" Value="Swift Android SDK (AMD64)" />
-  <String Id="Android_Sdk_arm" Value="Swift Android SDK (ARM)" />
-  <String Id="Android_Sdk_x86" Value="Swift Android SDK (X86)" />
   <String Id="BundleName" Value="Swift Developer Toolkit" />
   <String Id="ManufacturerName" Value="swift.org" />