From 8db2538c227aea7ca06ce653a9c9fb9f2ec2c1d9 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Tue, 6 Jun 2023 09:29:21 -0700
Subject: [PATCH 01/10] WiX: adjust the rules for harvesting directories with
 heat

This should generate durable GUIDs at compile time to allow an in-place
upgrade.  Remove the unnecessary properties in the developer tools.
---
 platforms/Windows/devtools.wixproj  |  9 ++-------
 platforms/Windows/sdk.wixproj       | 16 +++++++++-------
 platforms/Windows/toolchain.wixproj | 18 +++++++++++-------
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/platforms/Windows/devtools.wixproj b/platforms/Windows/devtools.wixproj
index 92180e8d..c2debc2b 100644
--- a/platforms/Windows/devtools.wixproj
+++ b/platforms/Windows/devtools.wixproj
@@ -20,13 +20,8 @@
 
   <PropertyGroup>
     <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);</DefineConstants>
-    <HarvestDirectoryAutogenerateGuids>false</HarvestDirectoryAutogenerateGuids>
-    <HarvestDirectoryGenerateGuidsNow>true</HarvestDirectoryGenerateGuidsNow>
-    <HarvestDirectoryNoLogo>true</HarvestDirectoryNoLogo>
-    <HarvestDirectorySuppressCom>true</HarvestDirectorySuppressCom>
-    <HarvestDirectorySuppressFragments>true</HarvestDirectorySuppressFragments>
-    <HarvestDirectorySuppressRegistry>true</HarvestDirectorySuppressRegistry>
-    <HarvestDirectorySuppressRootDirectory>true</HarvestDirectorySuppressRootDirectory>
+    <InstallerPlatform Condition=" '$(ProductArchitecture)' == 'amd64' ">x64</InstallerPlatform>
+    <InstallerPlatform Condition=" '$(ProductArchitecture)' == 'arm64' ">arm64</InstallerPlatform>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/platforms/Windows/sdk.wixproj b/platforms/Windows/sdk.wixproj
index 62fcf2c7..3ff2f0a9 100644
--- a/platforms/Windows/sdk.wixproj
+++ b/platforms/Windows/sdk.wixproj
@@ -20,13 +20,11 @@
 
   <PropertyGroup>
     <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);PLATFORM_ROOT=$(PLATFORM_ROOT);SDK_ROOT=$(SDK_ROOT);SwiftShimsPath=$(SDK_ROOT)\usr\lib\swift\shims;</DefineConstants>
-    <HarvestDirectoryAutogenerateGuids>false</HarvestDirectoryAutogenerateGuids>
-    <HarvestDirectoryGenerateGuidsNow>true</HarvestDirectoryGenerateGuidsNow>
-    <HarvestDirectoryNoLogo>true</HarvestDirectoryNoLogo>
-    <HarvestDirectorySuppressCom>true</HarvestDirectorySuppressCom>
-    <HarvestDirectorySuppressFragments>true</HarvestDirectorySuppressFragments>
-    <HarvestDirectorySuppressRegistry>true</HarvestDirectorySuppressRegistry>
-    <HarvestDirectorySuppressRootDirectory>true</HarvestDirectorySuppressRootDirectory>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <HarvestNoLogo>true</HarvestNoLogo>
+    <HarvestGenerateGuidsNow>true</HarvestGenerateGuidsNow>
   </PropertyGroup>
 
   <ItemGroup>
@@ -39,7 +37,11 @@
       <ComponentGroupName>SwiftShims</ComponentGroupName>
       <DirectoryRefId>WindowsSDK_usr_lib_swift_shims</DirectoryRefId>
       <PreprocessorVariable>var.SwiftShimsPath</PreprocessorVariable>
+      <SuppressCom>true</SuppressCom>
+      <SuppressRegistry>true</SuppressRegistry>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
     </HarvestDirectory>
+
     <Compile Include="sdk.wxs" />
   </ItemGroup>
 </Project>
diff --git a/platforms/Windows/toolchain.wixproj b/platforms/Windows/toolchain.wixproj
index 9bd17c7d..ec8f2722 100644
--- a/platforms/Windows/toolchain.wixproj
+++ b/platforms/Windows/toolchain.wixproj
@@ -20,13 +20,13 @@
 
   <PropertyGroup>
     <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang</DefineConstants>
-    <HarvestDirectoryAutogenerateGuids>false</HarvestDirectoryAutogenerateGuids>
-    <HarvestDirectoryGenerateGuidsNow>true</HarvestDirectoryGenerateGuidsNow>
-    <HarvestDirectoryNoLogo>true</HarvestDirectoryNoLogo>
-    <HarvestDirectorySuppressCom>true</HarvestDirectorySuppressCom>
-    <HarvestDirectorySuppressFragments>true</HarvestDirectorySuppressFragments>
-    <HarvestDirectorySuppressRegistry>true</HarvestDirectorySuppressRegistry>
-    <HarvestDirectorySuppressRootDirectory>true</HarvestDirectorySuppressRootDirectory>
+    <InstallerPlatform Condition=" '$(ProductArchitecture)' == 'amd64' ">x64</InstallerPlatform>
+    <InstallerPlatform Condition=" '$(ProductArchitecture)' == 'arm64' ">arm64</InstallerPlatform>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <HarvestNoLogo>true</HarvestNoLogo>
+    <HarvestGenerateGuidsNow>true</HarvestGenerateGuidsNow>
   </PropertyGroup>
 
   <ItemGroup>
@@ -39,7 +39,11 @@
       <ComponentGroupName>ClangResources</ComponentGroupName>
       <DirectoryRefId>_usr_lib_clang</DirectoryRefId>
       <PreprocessorVariable>var.TOOLCHAIN_ROOT_USR_LIB_CLANG</PreprocessorVariable>
+      <SuppressCom>true</SuppressCom>
+      <SuppressRegistry>true</SuppressRegistry>
+      <SuppressRootDirectory>true</SuppressRootDirectory>
     </HarvestDirectory>
+
     <Compile Include="toolchain.wxs" />
   </ItemGroup>
 </Project>

From 73052f4b4317b57ddab0762f1e4462d3240bf59c Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Thu, 8 Jun 2023 16:58:46 -0700
Subject: [PATCH 02/10] WiX: restructure the toolchain MSI

This restructures the MSIs into a slightly more granular set of MSIs.
It reduces the size of the single MSI making the installer proceed a bit
more uniformly.

bld: Build Tools (binutils, compilers, linker, assembler)
cli: Command Line Tools (clang-format, clang-tidy, swift-api-digester, swift-symbolgraph-extract, swift-package-manager)
dbg: Debugging Tools (lldb, repl)
ide: IDE Integration Tools (clangd, lldb-vscode, sourcekitd, SourceKit-LSP)

In the future, this also provides a logical location for DocC (cli),
swift-inspect (dbg), and swift-format (cli).

Take the opportunity to use the higher compression by default on all the
MSIs.

This also removes `swift-build-tool` and `swift-build-sdk-interfaces`
until we have a need for them.

Simultaneously, we are taking advantage of the WiX 4.0 feature to create
a dual-purpose MSI.  Unfortunately, burn does not support dual-purpose
builds and this implicitly migrates the toolchain to a per-user install
currently.  However, this is desirable as it will likely provide a space
free install path along with removing the need for administrator rights.
---
 .../{toolchain.wixproj => bld.wixproj}        |  19 +-
 platforms/Windows/bld.wxs                     | 389 ++++++++++
 platforms/Windows/cli.wixproj                 |  47 ++
 platforms/Windows/cli.wxs                     | 275 +++++++
 .../Windows/{devtools.wixproj => dbg.wixproj} |  21 +-
 platforms/Windows/dbg.wxs                     | 135 ++++
 platforms/Windows/devtools.wxs                | 205 -----
 platforms/Windows/ide.wixproj                 |  47 ++
 platforms/Windows/ide.wxs                     |  83 ++
 platforms/Windows/installer.wixproj           |   2 +-
 platforms/Windows/toolchain.wxs               | 727 ------------------
 11 files changed, 1010 insertions(+), 940 deletions(-)
 rename platforms/Windows/{toolchain.wixproj => bld.wixproj} (72%)
 create mode 100644 platforms/Windows/bld.wxs
 create mode 100644 platforms/Windows/cli.wixproj
 create mode 100644 platforms/Windows/cli.wxs
 rename platforms/Windows/{devtools.wixproj => dbg.wixproj} (57%)
 create mode 100644 platforms/Windows/dbg.wxs
 delete mode 100644 platforms/Windows/devtools.wxs
 create mode 100644 platforms/Windows/ide.wixproj
 create mode 100644 platforms/Windows/ide.wxs
 delete mode 100644 platforms/Windows/toolchain.wxs

diff --git a/platforms/Windows/toolchain.wixproj b/platforms/Windows/bld.wixproj
similarity index 72%
rename from platforms/Windows/toolchain.wixproj
rename to platforms/Windows/bld.wixproj
index ec8f2722..cd362c02 100644
--- a/platforms/Windows/toolchain.wixproj
+++ b/platforms/Windows/bld.wixproj
@@ -20,8 +20,6 @@
 
   <PropertyGroup>
     <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang</DefineConstants>
-    <InstallerPlatform Condition=" '$(ProductArchitecture)' == 'amd64' ">x64</InstallerPlatform>
-    <InstallerPlatform Condition=" '$(ProductArchitecture)' == 'arm64' ">arm64</InstallerPlatform>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -29,6 +27,21 @@
     <HarvestGenerateGuidsNow>true</HarvestGenerateGuidsNow>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
+    <InstallerPlatform>x64</InstallerPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
+    <InstallerPlatform>arm64</InstallerPlatform>
+    <InstallerVersion>500</InstallerVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm' ">
+    <InstallerPlatform>arm</InstallerPlatform>
+    <InstallerVersion>500</InstallerVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
+    <InstallerPlatform>x86</InstallerPlatform>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0" />
     <PackageReference Include="WixToolset.Heat" Version="4.0.0" />
@@ -44,6 +57,6 @@
       <SuppressRootDirectory>true</SuppressRootDirectory>
     </HarvestDirectory>
 
-    <Compile Include="toolchain.wxs" />
+    <Compile Include="bld.wxs" />
   </ItemGroup>
 </Project>
diff --git a/platforms/Windows/bld.wxs b/platforms/Windows/bld.wxs
new file mode 100644
index 00000000..9889d064
--- /dev/null
+++ b/platforms/Windows/bld.wxs
@@ -0,0 +1,389 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+  <?include version.wxi?>
+  <Package
+      Language="1033"
+      Manufacturer="swift.org"
+      Name="Swift Build Tools"
+      UpgradeCode="7e95dc06-7f84-4e8e-a038-8304af0468fb"
+      Version="$(var.ProductVersion)"
+      Scope="perUserOrMachine">
+    <SummaryInformation Description="Swift Build Tools" />
+
+    <!--
+      NOTE(compnerd) Use high compression as this is an extrodinarily large
+      cabinet.  With upstream being amenable to considering decorations for
+      DLL builds, this might be possible to reduce in the future hopefully.
+      In the mean time, burn the CPU cycles to try to claw back the minimal
+      bit of savings to hedge against the constant complaints that the MSIs
+      are too large.
+    -->
+    <Media Id="1" Cabinet="toolchain.cab" EmbedCab="yes" CompressionLevel="high" />
+
+    <StandardDirectory Id="ProgramFiles64Folder">
+      <Directory Id="INSTALLDIR" Name="Swift">
+        <Directory Id="Toolchains" Name="Toolchains">
+          <Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
+            <Directory Id="_usr" Name="usr">
+              <Directory Id="_usr_bin" Name="bin">
+              </Directory>
+              <Directory Id="_usr_include" Name="include">
+                <Directory Id="_usr_include_llvm_c" Name="llvm-c">
+                </Directory>
+              </Directory>
+              <Directory Id="_usr_lib" Name="lib">
+                <Directory Id="_usr_lib_clang" Name="clang">
+                </Directory>
+                <Directory Id="_usr_lib_swift" Name="swift">
+                  <Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
+                  </Directory>
+                  <Directory Id="_usr_lib_swift_migrator" Name="migrator">
+                  </Directory>
+                  <Directory Id="_usr_lib_swift_shims" Name="shims">
+                  </Directory>
+                </Directory>
+              </Directory>
+              <Directory Id="_usr_share" Name="share">
+                <Directory Id="_usr_share_swift" Name="swift">
+                </Directory>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </StandardDirectory>
+
+    <ComponentGroup Id="binutils">
+      <!-- TODO(compnerd) can we use symbolic links to llvm-ar.exe instead? -->
+      <Component Directory="_usr_bin" Id="llvm_dlltool.exe">
+        <File Id="llvm_dlltool.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-dlltool.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_lib.exe">
+        <File Id="llvm_lib.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-lib.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_ranlib.exe">
+        <File Id="llvm_ranlib.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-ranlib.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <!-- TODO(compnerd) can we use symbolic links to llvm-objdump.exe instead? -->
+      <Component Directory="_usr_bin" Id="llvm_readelf.exe">
+        <File Id="llvm_readelf.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-readelf.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_strip.exe">
+        <File Id="llvm_strip.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-strip.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <!--
+        TODO(compnerd) we should symlink:
+          - addr2line.exe
+          - ar.exe
+          - c++filt.exe
+          - dwp.exe
+          - nm.exe
+          - objcopy.exe
+          - objdump.exe
+          - ranlib.exe
+          - readelf.exe
+          - size.exe
+          - strings.exe
+      -->
+
+      <Component Directory="_usr_bin" Id="dsymutil.exe">
+        <File Id="dsymutil.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\dsymutil.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_ar.exe">
+        <File Id="llvm_ar.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-ar.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_cov.exe">
+        <File Id="llvm_cov.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-cov.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_cvtres.exe">
+        <File Id="llvm_cvtres.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-cvtres.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_cxxfilt.exe">
+        <File Id="llvm_cxxfilt.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-cxxfilt.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_dwarfdump.exe">
+        <File Id="llvm_dwarfdump.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-dwarfdump.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_dwp.exe">
+        <File Id="llvm_dwp.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-dwp.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_lipo.exe">
+        <File Id="llvm_lipo.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-lipo.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_mt.exe">
+        <File Id="llvm_mt.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-mt.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_nm.exe">
+        <File Id="llvm_nm.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-nm.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_objcopy.exe">
+        <File Id="llvm_objcopy.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-objcopy.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_objdump.exe">
+        <File Id="llvm_objdump.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-objdump.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_pdbutil.exe">
+        <File Id="llvm_pdbutil.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-pdbutil.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_profdata.exe">
+        <File Id="llvm_profdata.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-profdata.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_rc.exe">
+        <File Id="llvm_rc.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-rc.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_readobj.exe">
+        <File Id="llvm_readobj.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-readobj.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_size.exe">
+        <File Id="llvm_size.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-size.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_strings.exe">
+        <File Id="llvm_strings.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-strings.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_symbolizer.exe">
+        <File Id="llvm_symbolizer.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-symbolizer.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="llvm_undname.exe">
+        <File Id="llvm_undname.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-undname.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="lto">
+      <Component Directory="_usr_bin" Id="LTO.dll">
+        <File Id="LTO.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\LTO.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib" Id="LTO.lib">
+        <File Id="LTO.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\LTO.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_include_llvm_c" Id="lto.h">
+        <File Id="lto.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\llvm-c\lto.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="clang">
+      <!-- TODO(compnerd) can we use symbolic links to clang.exe instead? -->
+      <Component Directory="_usr_bin" Id="clang_cl.exe">
+        <File Id="clang_cl.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang-cl.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="clang_cpp.exe">
+        <File Id="clang_cpp.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang-cpp.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="clang__.exe">
+        <File Id="clang__.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang++.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_bin" Id="clang.exe">
+        <File Id="clang.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <!--
+        TODO(compnerd) we should include:
+        - clang-offload-bundler
+        - optremarks.dll
+        - scan-build
+        - scan-view
+      -->
+    </ComponentGroup>
+
+    <ComponentGroup Id="lld">
+      <!-- TODO(compnerd) can we use symbolic links to lld.exe instead? -->
+      <Component Directory="_usr_bin" Id="ld.lld.exe">
+        <File Id="ld.lld.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\ld.lld.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="ld64.lld.exe">
+        <File Id="ld64.lld.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\ld64.lld.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="lld_link.exe">
+        <File Id="lld_link.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lld-link.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="wasm_ld.exe">
+        <File Id="wasm_ld.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\wasm-ld.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_bin" Id="lld.exe">
+        <File Id="lld.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lld.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="BlocksRuntime">
+      <Component Directory="_usr_bin" Id="BlocksRuntime.dll">
+        <File Id="BlocksRuntime.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib" Id="BlocksRuntime.lib">
+        <File Id="BlocksRuntime.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\BlocksRuntime.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <!-- TODO(compnerd) should we install the block headers? -->
+    </ComponentGroup>
+
+    <ComponentGroup Id="libdispatch">
+      <Component Directory="_usr_bin" Id="dispatch.dll">
+        <File Id="dispatch.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\dispatch.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib" Id="dispatch.lib">
+        <File Id="dispatch.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\dispatch.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <!-- TODO(compnerd) should we install the dispatch headers? -->
+    </ComponentGroup>
+
+    <ComponentGroup Id="SwiftCxx">
+      <Component Directory="_usr_lib_swift_swiftToCxx" Id="_SwiftCxxInteroperability.h">
+        <File Id="_SwiftCxxInteroperability.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_swiftToCxx" Id="_SwiftStdlibCxxOverlay.h">
+        <File Id="_SwiftStdlibCxxOverlay.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_swiftToCxx" Id="experimental_interoperability_version.json">
+        <File Id="experimental_interoperability_version.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="SwiftDemangle">
+      <Component Directory="_usr_bin" Id="swiftDemangle.dll">
+        <File Id="swiftDemangle.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swiftDemangle.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib" Id="swiftDemangle.lib">
+        <File Id="swiftDemangle.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swiftDemangle.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="SwiftFeatures">
+      <Component Directory="_usr_share_swift" Id="features.json">
+        <File Id="features.json" Source="$(var.TOOLCHAIN_ROOT)\usr\share\swift\features.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="SwiftMigrator">
+      <Component Directory="_usr_lib_swift_migrator" Id="ios4.json">
+        <File Id="ios4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_migrator" Id="ios42.json">
+        <File Id="ios42.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios42.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_migrator" Id="macos4.json">
+        <File Id="macos4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\macos4.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_migrator" Id="macos42.json">
+        <File Id="macos42.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\macos42.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_migrator" Id="overlay4.json">
+        <File Id="overlay4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\overlay4.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_migrator" Id="overlay42.json">
+        <File Id="overlay42.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\overlay42.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_migrator" Id="tvos4.json">
+        <File Id="tvos4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\tvos4.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_migrator" Id="tvos42.json">
+        <File Id="tvos42.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\tvos42.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_migrator" Id="watchos4.json">
+        <File Id="watchos4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\watchos4.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_migrator" Id="watchos42.json">
+        <File Id="watchos42.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\watchos42.json" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="swift">
+      <ComponentGroupRef Id="SwiftCxx" />
+      <ComponentGroupRef Id="SwiftDemangle" />
+      <ComponentGroupRef Id="SwiftFeatures" />
+      <ComponentGroupRef Id="SwiftMigrator" />
+
+      <!-- TODO(compnerd) can we use symbolic links to swift-frontend.exe instead? -->
+      <Component Directory="_usr_bin" Id="swift_api_digester.exe">
+        <File Id="swift_api_digester.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-api-digester.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swift_autolink_extract.exe">
+        <File Id="swift_autolink_extract.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-autolink-extract.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swift_symbolgraph_extract.exe">
+        <File Id="swift_symbolgraph_extract.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-symbolgraph-extract.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_bin" Id="swift_demangle.exe">
+        <File Id="swift_demangle.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-demangle.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swift_frontend.exe">
+        <File Id="swift_frontend.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-frontend.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="argument_parser">
+      <Component Directory="_usr_bin" Id="ArgumentParser.dll">
+        <File Id="ArgumentParser.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="tools_support_core">
+      <Component Directory="_usr_bin" Id="TSCBasic.dll">
+        <File Id="TSCBasic.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="TSCUtility.dll">
+        <File Id="TSCUtility.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="swift_driver">
+      <!-- TODO(compnerd) can we use symbolic links to swift.exe instead? -->
+      <Component Directory="_usr_bin" Id="swiftc.exe">
+        <File Id="swiftc.exe" Name="swiftc.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_bin" Id="swift.exe">
+        <File Id="swift.exe" Name="swift.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swift_help.exe">
+        <File Id="swift_help.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-help.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_bin" Id="swiftOptions.dll">
+        <File Id="SwiftOptions.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftOptions.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swiftDriver.dll">
+        <File Id="SwiftDriver.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftDriver.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swiftDriverExecution.dll">
+        <File Id="SwiftDriverExecution.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftDriverExecution.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="d01ea5b8-0f8a-4388-9b61-1186efddfc39">
+      <Environment Id="DeveloperDir" Action="set" Name="DEVELOPER_DIR" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer" />
+      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Toolchains\$(var.ProductVersion)+Asserts\usr\bin" />
+    </Component>
+
+    <Feature Id="BuildTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Build Tools" Level="1" Title="Swift Build Tools">
+      <ComponentGroupRef Id="binutils" />
+      <ComponentGroupRef Id="lto" />
+      <ComponentGroupRef Id="clang" />
+      <ComponentGroupRef Id="lld" />
+      <ComponentGroupRef Id="BlocksRuntime" />
+      <ComponentGroupRef Id="libdispatch" />
+      <ComponentGroupRef Id="swift" />
+      <ComponentGroupRef Id="argument_parser" />
+      <ComponentGroupRef Id="tools_support_core" />
+      <ComponentGroupRef Id="swift_driver" />
+
+      <ComponentGroupRef Id="ClangResources" />
+
+      <ComponentRef Id="EnvironmentVariables" />
+    </Feature>
+
+    <UI>
+      <ui:WixUI Id="WixUI_InstallDir" />
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
+    </UI>
+
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
+
+    <WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
+    <WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
+  </Package>
+</Wix>
diff --git a/platforms/Windows/cli.wixproj b/platforms/Windows/cli.wixproj
new file mode 100644
index 00000000..7ff8cf3f
--- /dev/null
+++ b/platforms/Windows/cli.wixproj
@@ -0,0 +1,47 @@
+<Project Sdk="WixToolset.Sdk/4.0.0">
+  <PropertyGroup>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ProductArchitecture Condition=" '$(ProductArchitecture)' == '' ">amd64</ProductArchitecture>
+    <ProductArchitecture>$(ProductArchitecture)</ProductArchitecture>
+
+    <ProductVersion Condition=" '$(ProductVersion)' == '' ">0.0.0</ProductVersion>
+    <ProductVersion>$(ProductVersion)</ProductVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputPath>build\</OutputPath>
+    <IntermediateOutputPath>build\obj\</IntermediateOutputPath>
+  </PropertyGroup>
+
+  <Import Project="WiXCodeSigning.targets" />
+
+  <PropertyGroup>
+    <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
+    <InstallerPlatform>x64</InstallerPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
+    <InstallerPlatform>arm64</InstallerPlatform>
+    <InstallerVersion>500</InstallerVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm' ">
+    <InstallerPlatform>arm</InstallerPlatform>
+    <InstallerVersion>500</InstallerVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
+    <InstallerPlatform>x86</InstallerPlatform>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="cli.wxs" />
+  </ItemGroup>
+</Project>
diff --git a/platforms/Windows/cli.wxs b/platforms/Windows/cli.wxs
new file mode 100644
index 00000000..0182d21a
--- /dev/null
+++ b/platforms/Windows/cli.wxs
@@ -0,0 +1,275 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+  <?include version.wxi?>
+  <Package
+      Language="1033"
+      Manufacturer="swift.org"
+      Name="Swift Command Line Tools"
+      UpgradeCode="87019842-3f3e-4227-b5c5-23a8ef72ad89"
+      Version="$(var.ProductVersion)"
+      Scope="perUserOrMachine">
+    <SummaryInformation Description="Swift Command Line Tools" />
+
+    <Media Id="1" Cabinet="cli.cab" EmbedCab="yes" CompressionLevel="high" />
+
+    <StandardDirectory Id="ProgramFiles64Folder">
+      <Directory Id="INSTALLDIR" Name="Swift">
+        <Directory Id="Toolchains" Name="Toolchains">
+          <Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
+            <Directory Id="_usr" Name="usr">
+              <Directory Id="_usr_bin" Name="bin">
+              </Directory>
+              <Directory Id="_usr_include" Name="include">
+                <Directory Id="_usr_include__InternalSwiftScan" Name="_InternalSwiftScan">
+                </Directory>
+                <Directory Id="_usr_include_clang_c" Name="clang-c">
+                </Directory>
+                <Directory Id="_usr_include_indexstore" Name="indexstore">
+                </Directory>
+              </Directory>
+              <Directory Id="_usr_lib" Name="lib">
+                <Directory Id="_usr_lib_swift" Name="swift">
+                  <Directory Id="_usr_lib_swift_pm" Name="pm">
+                    <Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
+                    </Directory>
+                    <Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
+                    </Directory>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </StandardDirectory>
+
+    <ComponentGroup Id="clang">
+      <Component Directory="_usr_bin" Id="clang_format.exe">
+        <File Id="clang_format.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang-format.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_bin" Id="clang_tidy.exe">
+        <File Id="clang_tidy.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang-tidy.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="libclang">
+      <Component Directory="_usr_bin" Id="libclang.dll">
+        <File Id="libclang.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\libclang.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib" Id="libclang.lib">
+        <File Id="libclang.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\libclang.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_include_clang_c" Id="BuildSystem.h">
+        <File Id="BuildSystem.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\BuildSystem.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include_clang_c" Id="CXCompilationDatabase.h">
+        <File Id="CXCompilationDatabase.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\CXCompilationDatabase.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include_clang_c" Id="CXErrorCode.h">
+        <File Id="CXErrorCode.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\CXErrorCode.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include_clang_c" Id="CXString.h">
+        <File Id="CXString.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\CXString.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include_clang_c" Id="Documentation.h">
+        <File Id="Documentation.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\Documentation.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include_clang_c" Id="FatalErrorHandler.h">
+        <File Id="FatalErrorHandler.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\FatalErrorHandler.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include_clang_c" Id="Index.h">
+        <File Id="Index.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\Index.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include_clang_c" Id="Platform.h">
+        <File Id="Platform.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\Platform.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include_clang_c" Id="Refactor.h">
+        <File Id="Refactor.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\Refactor.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="IndexStore">
+      <Component Directory="_usr_bin" Id="libIndexStore.dll">
+        <File Id="libIndexStore.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\libIndexStore.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib" Id="libIndexStore.lib">
+        <File Id="libIndexStore.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\libIndexStore.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_include_indexstore" Id="indexstore.h">
+        <File Id="indexstore.h" Source="$(var.TOOLCHAIN_ROOT)\usr\local\include\indexstore\indexstore.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include_indexstore" Id="IndexStoreCXX.h">
+        <File Id="IndexStoreCXX.h" Source="$(var.TOOLCHAIN_ROOT)\usr\local\include\indexstore\IndexStoreCXX.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="_InternalSwiftScan">
+      <Component Directory="_usr_bin" Id="_InternalSwiftScan.dll">
+        <File Id="_InternalSwiftScan.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftScan.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib" Id="_InternalSwiftScan.lib">
+        <File Id="_InternalSwiftScan.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\windows\_InternalSwiftScan.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_include__InternalSwiftScan" Id="DependencyScan.h">
+        <File Id="DependencyScan.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\DependencyScan.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include__InternalSwiftScan" Id="DependencyScanMacros.h">
+        <File Id="DependencyScanMacros.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\DependencyScanMacros.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_include__InternalSwiftScan" Id="_InternalSwiftScan.modulemap">
+        <File Id="_InternalSwiftScan.modulemap" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\module.modulemap" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="collections">
+      <Component Directory="_usr_bin" Id="Collections.dll">
+        <File Id="Collections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Collections.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="DequeModule.dll">
+        <File Id="DequeModule.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\DequeModule.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="OrderedCollections.dll">
+        <File Id="OrderedCollections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\OrderedCollections.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="llbuild">
+      <Component Directory="_usr_bin" Id="llbuildSwift.dll">
+        <File Id="llbuildSwift.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="system">
+      <Component Directory="_usr_bin" Id="SystemPackage.dll">
+        <File Id="SystemPackage.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SystemPackage.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="CompilerPluginSupport">
+      <Component Directory="_usr_lib_swift_pm_ManifestAPI" Id="CompilerPluginSupport.dll">
+        <File Id="CompilerPluginSupport.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_pm_ManifestAPI" Id="CompilerPluginSupport.lib">
+        <File Id="CompilerPluginSupport.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_pm_ManifestAPI" Id="CompilerPluginSupport.swiftdoc">
+        <File Id="CompilerPluginSupport.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_pm_ManifestAPI" Id="CompilerPluginSupport.swiftmodule">
+        <File Id="CompilerPluginSupport.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="PackageDescription">
+      <Component Directory="_usr_lib_swift_pm_ManifestAPI" Id="PackageDescription.dll">
+        <File Id="PackageDescription.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_pm_ManifestAPI" Id="PackageDescription.lib">
+        <File Id="PackageDescription.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_pm_ManifestAPI" Id="PackageDescription.swiftdoc">
+        <File Id="PackageDescription.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_pm_ManifestAPI" Id="PackageDescription.swiftmodule">
+        <File Id="PackageDescription.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="PackagePlugin">
+      <Component Directory="_usr_lib_swift_pm_PluginAPI" Id="PackagePlugin.dll">
+        <File Id="PackagePlugin.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_pm_PluginAPI" Id="PackagePlugin.lib">
+        <File Id="PackagePlugin.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_pm_PluginAPI" Id="PackagePlugin.swiftdoc">
+        <File Id="PackagePlugin.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_swift_pm_PluginAPI" Id="PackagePlugin.swiftmodule">
+        <File Id="PackagePlugin.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="package_manager">
+      <ComponentGroupRef Id="CompilerPluginSupport" />
+      <ComponentGroupRef Id="PackageDescription" />
+      <ComponentGroupRef Id="PackagePlugin" />
+
+      <Component Directory="_usr_bin" Id="swift_build.exe">
+        <File Id="swift_build.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swift_package.exe">
+        <File Id="swift_package.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-package.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swift_run.exe">
+        <File Id="swift_run.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-run.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swift_test.exe">
+        <File Id="swift_test.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-test.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_bin" Id="Basics.dll">
+        <File Id="Basics.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Basics.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="Build.dll">
+        <File Id="Build.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Build.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="Commands.dll">
+        <File Id="Commands.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Commands.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="CoreCommands.dll">
+        <File Id="CoreCommands.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\CoreCommands.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="DriverSupport.dll">
+        <File Id="DriverSupport.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\DriverSupport.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="PackageGraph.dll">
+        <File Id="PackageGraph.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageGraph.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="PackageLoading.dll">
+        <File Id="PackageLoading.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageLoading.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="PackageModel.dll">
+        <File Id="PackageModel.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageModel.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="SPMBuildCore.dll">
+        <File Id="SPMBuildCore.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SPMBuildCore.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="Workspace.dll">
+        <File Id="Workspace.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Workspace.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <!-- FIXME(compnerd) we should include the SPM import libraries -->
+    </ComponentGroup>
+
+    <Feature Id="CLITools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Command Line Tools" Level="1" Title="Swift Command Line Tools">
+      <ComponentGroupRef Id="clang" />
+      <ComponentGroupRef Id="libclang" />
+      <ComponentGroupRef Id="IndexStore" />
+
+      <ComponentGroupRef Id="_InternalSwiftScan" />
+
+      <ComponentGroupRef Id="collections" />
+      <ComponentGroupRef Id="llbuild" />
+      <ComponentGroupRef Id="system" />
+      <ComponentGroupRef Id="package_manager" />
+    </Feature>
+
+    <UI>
+      <ui:WixUI Id="WixUI_InstallDir" />
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
+    </UI>
+
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
+
+    <WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
+    <WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
+  </Package>
+</Wix>
diff --git a/platforms/Windows/devtools.wixproj b/platforms/Windows/dbg.wixproj
similarity index 57%
rename from platforms/Windows/devtools.wixproj
rename to platforms/Windows/dbg.wixproj
index c2debc2b..a012a5e1 100644
--- a/platforms/Windows/devtools.wixproj
+++ b/platforms/Windows/dbg.wixproj
@@ -19,9 +19,22 @@
   <Import Project="WiXCodeSigning.targets" />
 
   <PropertyGroup>
-    <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);</DefineConstants>
-    <InstallerPlatform Condition=" '$(ProductArchitecture)' == 'amd64' ">x64</InstallerPlatform>
-    <InstallerPlatform Condition=" '$(ProductArchitecture)' == 'arm64' ">arm64</InstallerPlatform>
+    <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT)</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
+    <InstallerPlatform>x64</InstallerPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
+    <InstallerPlatform>arm64</InstallerPlatform>
+    <InstallerVersion>500</InstallerVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm' ">
+    <InstallerPlatform>arm</InstallerPlatform>
+    <InstallerVersion>500</InstallerVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
+    <InstallerPlatform>x86</InstallerPlatform>
   </PropertyGroup>
 
   <ItemGroup>
@@ -29,6 +42,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="devtools.wxs" />
+    <Compile Include="dbg.wxs" />
   </ItemGroup>
 </Project>
diff --git a/platforms/Windows/dbg.wxs b/platforms/Windows/dbg.wxs
new file mode 100644
index 00000000..dfdf81ce
--- /dev/null
+++ b/platforms/Windows/dbg.wxs
@@ -0,0 +1,135 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+  <?include version.wxi?>
+  <Package
+      Language="1033"
+      Manufacturer="swift.org"
+      Name="Swift Debugging Tools"
+      UpgradeCode="91d382af-1e92-44dc-a4ad-aee91c1b5160"
+      Version="$(var.ProductVersion)"
+      Scope="perUserOrMachine">
+    <SummaryInformation Description="Swift Debugging Tools" />
+
+    <Media Id="1" Cabinet="dbg.cab" EmbedCab="yes" CompressionLevel="high" />
+
+    <StandardDirectory Id="ProgramFiles64Folder">
+      <Directory Id="INSTALLDIR" Name="Swift">
+        <Directory Id="Toolchains" Name="Toolchains">
+          <Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
+            <Directory Id="_usr" Name="usr">
+              <Directory Id="_usr_bin" Name="bin">
+              </Directory>
+              <Directory Id="_usr_lib" Name="lib">
+                <Directory Id="_usr_lib_site_packages" Name="site-packages">
+                  <Directory Id="_usr_lib_site_packages_lldb" Name="lldb">
+                    <Directory Id="_usr_lib_site_packages_lldb_formatters" Name="formatters">
+                      <Directory Id="_usr_lib_site_packages_lldb_formatters_cpp" Name="cpp">
+                      </Directory>
+                    </Directory>
+                    <Directory Id="_usr_lib_site_packages_lldb_utils" Name="utils">
+                    </Directory>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </StandardDirectory>
+
+    <ComponentGroup Id="lldb">
+      <Component Directory="_usr_bin" Id="lldb.exe">
+        <File Id="lldb.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lldb.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_bin" Id="liblldb.dll">
+        <File Id="liblldb.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\liblldb.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib" Id="liblldb.lib">
+        <File Id="liblldb.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\liblldb.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib_site_packages_lldb" Id="__init__.py_c31e016e2f8b4fba9eebd73d5009e919">
+        <File Id="___init__.py_c31e016e2f8b4fba9eebd73d5009e919" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\__init__.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb" Id="_lldb.py">
+        <File Id="_lldb.pyd" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\_lldb.pyd" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb" Id="embedded_interpreter.py">
+        <File Id="embedded_interpreter.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\embedded_interpreter.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb" Id="lldb_argdumper.exe">
+        <File Id="lldb_argdumper.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\lldb-argdumper.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib_site_packages_lldb_formatters" Id="logger.py">
+        <File Id="logger.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\Logger.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb_formatters" Id="__init__.py_6124a6ee9e584275b153b0e1ddb4a2b2">
+        <File Id="___init__.py_6124a6ee9e584275b153b0e1ddb4a2b2" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\__init__.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb_formatters" Id="attrib_fromdict.py">
+        <File Id="attrib_fromdict.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\attrib_fromdict.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb_formatters" Id="cache.py">
+        <File Id="cache.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cache.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb_formatters" Id="metrics.py">
+        <File Id="metrics.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\metrics.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb_formatters" Id="synth.py">
+        <File Id="synth.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\synth.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp" Id="__init__.py_1bd1d2dc68b7417b83484f6183339af2">
+        <File Id="___init__.py_1bd1d2dc68b7417b83484f6183339af2" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cpp\__init__.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp" Id="gnu_libstdcpp.py">
+        <File Id="gnu_libstdcpp.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cpp\gnu_libstdcpp.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb_formatters_cpp" Id="libcxx.py">
+        <File Id="libcxx.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cpp\libcxx.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib_site_packages_lldb_utils" Id="__init__.py_52ef75ed702f4acc8272e6b2f8aa5392">
+        <File Id="___init__.py_52ef75ed702f4acc8272e6b2f8aa5392" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\utils\__init__.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb_utils" Id="in_call_stack.py">
+        <File Id="in_call_stack.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\utils\in_call_stack.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_lib_site_packages_lldb_utils" Id="symbolication.py">
+        <File Id="symbolication.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\utils\symbolication.py" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="lldb_server">
+      <Component Directory="_usr_bin" Id="lldb_server.exe">
+        <File Id="lldb_server.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lldb-server.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="swift_repl">
+      <Component Directory="_usr_bin" Id="repl_swift.exe">
+        <File Id="repl_swift.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\repl_swift.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <Feature Id="DebuggingTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Debugging Tools" Level="1" Title="Swift Debugging Tools">
+      <ComponentGroupRef Id="lldb" />
+      <ComponentGroupRef Id="lldb_server" />
+
+      <ComponentGroupRef Id="swift_repl" />
+    </Feature>
+
+    <UI>
+      <ui:WixUI Id="WixUI_InstallDir" />
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
+    </UI>
+
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
+
+    <WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
+    <WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
+  </Package>
+</Wix>
diff --git a/platforms/Windows/devtools.wxs b/platforms/Windows/devtools.wxs
deleted file mode 100644
index cd4707a0..00000000
--- a/platforms/Windows/devtools.wxs
+++ /dev/null
@@ -1,205 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
-  <Package
-      Language="1033"
-      Manufacturer="swift.org"
-      Name="Swift Developer Tools"
-      UpgradeCode="87019842-3f3e-4227-b5c5-23a8ef72ad89"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="Swift Developer Tools" />
-
-    <Media Id="1" Cabinet="devtools.cab" EmbedCab="yes" />
-
-    <!-- WindowsVolume is not a StandardDirectory value, but rather a standard property. See https://github.com/wixtoolset/issues/issues/7314 -->
-    <SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]" />
-
-    <Directory ComponentGuidGenerationSeed="61297eca-77a2-4749-b2f7-3b7ae6304140" Id="WINDOWSVOLUME">
-      <Directory Id="INSTALLDIR">
-        <Directory Id="Library" Name="Library">
-          <Directory Id="Developer" Name="Developer">
-            <Directory Id="Toolchains" Name="Toolchains">
-              <Directory Id="xctoolchain" Name="$(var.ToolchainName)">
-                <Directory Id="_usr" Name="usr">
-                  <Directory Id="_usr_bin" Name="bin">
-                    <!-- swift-collections -->
-                    <Component Id="Collections.dll">
-                      <File Id="Collections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Collections.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="DequeModule.dll">
-                      <File Id="DequeModule.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\DequeModule.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="OrderedCollections.dll">
-                      <File Id="OrderedCollections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\OrderedCollections.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- swift-system -->
-                    <Component Id="SystemPackage.dll">
-                      <File Id="SystemPackage.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SystemPackage.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- swift-package-manager -->
-                    <Component Id="Basics.dll">
-                      <File Id="Basics.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Basics.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="Build.dll">
-                      <File Id="Build.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Build.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="Commands.dll">
-                      <File Id="Commands.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Commands.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="CoreCommands.dll">
-                      <File Id="CoreCommands.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\CoreCommands.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="DriverSupport.dll">
-                      <File Id="DriverSupport.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\DriverSupport.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="PackageGraph.dll">
-                      <File Id="PackageGraph.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageGraph.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="PackageLoading.dll">
-                      <File Id="PackageLoading.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageLoading.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="PackageModel.dll">
-                      <File Id="PackageModel.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageModel.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="SPMBuildCore.dll">
-                      <File Id="SPMBuildCore.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SPMBuildCore.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="Workspace.dll">
-                      <File Id="Workspace.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Workspace.dll" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="swift_build.exe">
-                      <File Id="swift_build.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="swift_package.exe">
-                      <File Id="swift_package.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-package.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="swift_run.exe">
-                      <File Id="swift_run.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-run.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="swift_test.exe">
-                      <File Id="swift_test.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-test.exe" Checksum="yes" />
-                    </Component>
-
-                    <!-- sourcekit-lsp -->
-                    <Component Id="sourcekit_lsp.exe">
-                      <File Id="sourcekit_lsp.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\sourcekit-lsp.exe" Checksum="yes" />
-                    </Component>
-                  </Directory>
-
-                  <Directory Id="_usr_lib" Name="lib">
-                    <!-- FIXME(compnerd) should we include the SPM import libraries? -->
-                    <Directory Id="_usr_lib_swift" Name="swift">
-                      <Directory Id="_usr_lib_swift_pm" Name="pm">
-                        <Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
-                          <Component Id="PackageDescription.dll">
-                            <File Id="PackageDescription.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" Checksum="yes" />
-                          </Component>
-                          <Component Id="PackageDescription.lib">
-                            <File Id="PackageDescription.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" Checksum="yes" />
-                          </Component>
-                          <Component Id="PackageDescription.swiftdoc">
-                            <File Id="PackageDescription.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" Checksum="yes" />
-                          </Component>
-                          <Component Id="PackageDescription.swiftmodule">
-                            <File Id="PackageDescription.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" Checksum="yes" />
-                          </Component>
-
-                          <Component Id="CompilerPluginSupport.dll">
-                            <File Id="CompilerPluginSupport.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" Checksum="yes" />
-                          </Component>
-                          <Component Id="CompilerPluginSupport.lib">
-                            <File Id="CompilerPluginSupport.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" Checksum="yes" />
-                          </Component>
-                          <Component Id="CompilerPluginSupport.swiftdoc">
-                            <File Id="CompilerPluginSupport.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" Checksum="yes" />
-                          </Component>
-                          <Component Id="CompilerPluginSupport.swiftmodule">
-                            <File Id="CompilerPluginSupport.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" Checksum="yes" />
-                          </Component>
-                        </Directory>
-
-                        <Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
-                          <Component Id="PackagePlugin.dll">
-                            <File Id="PackagePlugin.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" Checksum="yes" />
-                          </Component>
-                          <Component Id="PackagePlugin.lib">
-                            <File Id="PackagePlugin.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" Checksum="yes" />
-                          </Component>
-                          <Component Id="PackagePlugin.swiftdoc">
-                            <File Id="PackagePlugin.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" Checksum="yes" />
-                          </Component>
-                          <Component Id="PackagePlugin.swiftmodule">
-                            <File Id="PackagePlugin.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" Checksum="yes" />
-                          </Component>
-                        </Directory>
-                      </Directory>
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools" Level="1" Title="Swift Developer Tools">
-      <!-- swift-collections -->
-      <ComponentRef Id="Collections.dll" />
-      <ComponentRef Id="DequeModule.dll" />
-      <ComponentRef Id="OrderedCollections.dll" />
-
-      <!-- swift-system -->
-      <ComponentRef Id="SystemPackage.dll" />
-
-      <!-- swift-system -->
-      <ComponentRef Id="Basics.dll" />
-      <ComponentRef Id="Build.dll" />
-      <ComponentRef Id="Commands.dll" />
-      <ComponentRef Id="CoreCommands.dll" />
-      <ComponentRef Id="DriverSupport.dll" />
-      <ComponentRef Id="PackageGraph.dll" />
-      <ComponentRef Id="PackageLoading.dll" />
-      <ComponentRef Id="PackageModel.dll" />
-      <ComponentRef Id="SPMBuildCore.dll" />
-      <ComponentRef Id="Workspace.dll" />
-
-      <ComponentRef Id="swift_build.exe" />
-      <ComponentRef Id="swift_package.exe" />
-      <ComponentRef Id="swift_run.exe" />
-      <ComponentRef Id="swift_test.exe" />
-
-      <ComponentRef Id="PackageDescription.dll" />
-      <ComponentRef Id="PackageDescription.lib" />
-      <ComponentRef Id="PackageDescription.swiftdoc" />
-      <ComponentRef Id="PackageDescription.swiftmodule" />
-
-      <ComponentRef Id="CompilerPluginSupport.dll" />
-      <ComponentRef Id="CompilerPluginSupport.lib" />
-      <ComponentRef Id="CompilerPluginSupport.swiftdoc" />
-      <ComponentRef Id="CompilerPluginSupport.swiftmodule" />
-
-      <ComponentRef Id="PackagePlugin.dll" />
-      <ComponentRef Id="PackagePlugin.lib" />
-      <ComponentRef Id="PackagePlugin.swiftdoc" />
-      <ComponentRef Id="PackagePlugin.swiftmodule" />
-
-      <!-- sourcekit-lsp -->
-      <ComponentRef Id="sourcekit_lsp.exe" />
-    </Feature>
-
-    <UI>
-      <ui:WixUI Id="WixUI_InstallDir" />
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
-    </UI>
-
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
-
-    <WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
-    <WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
-  </Package>
-</Wix>
diff --git a/platforms/Windows/ide.wixproj b/platforms/Windows/ide.wixproj
new file mode 100644
index 00000000..f90bbb40
--- /dev/null
+++ b/platforms/Windows/ide.wixproj
@@ -0,0 +1,47 @@
+<Project Sdk="WixToolset.Sdk/4.0.0">
+  <PropertyGroup>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <ProductArchitecture Condition=" '$(ProductArchitecture)' == '' ">amd64</ProductArchitecture>
+    <ProductArchitecture>$(ProductArchitecture)</ProductArchitecture>
+
+    <ProductVersion Condition=" '$(ProductVersion)' == '' ">0.0.0</ProductVersion>
+    <ProductVersion>$(ProductVersion)</ProductVersion>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <OutputPath>build\</OutputPath>
+    <IntermediateOutputPath>build\obj\</IntermediateOutputPath>
+  </PropertyGroup>
+
+  <Import Project="WiXCodeSigning.targets" />
+
+  <PropertyGroup>
+    <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT)</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
+    <InstallerPlatform>x64</InstallerPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
+    <InstallerPlatform>arm64</InstallerPlatform>
+    <InstallerVersion>500</InstallerVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm' ">
+    <InstallerPlatform>arm</InstallerPlatform>
+    <InstallerVersion>500</InstallerVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
+    <InstallerPlatform>x86</InstallerPlatform>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Compile Include="ide.wxs" />
+  </ItemGroup>
+</Project>
diff --git a/platforms/Windows/ide.wxs b/platforms/Windows/ide.wxs
new file mode 100644
index 00000000..7d318cb3
--- /dev/null
+++ b/platforms/Windows/ide.wxs
@@ -0,0 +1,83 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+  <?include version.wxi?>
+  <Package
+      Language="1033"
+      Manufacturer="swift.org"
+      Name="Swift IDE Integration Tools"
+      UpgradeCode="8dd91c86-d13d-490b-b06b-9522a9cf504c"
+      Version="$(var.ProductVersion)"
+      Scope="perUserOrMachine">
+    <SummaryInformation Description="Swift IDE Integration Tools" />
+
+    <Media Id="1" Cabinet="ide.cab" EmbedCab="yes" CompressionLevel="high" />
+
+    <StandardDirectory Id="ProgramFiles64Folder">
+      <Directory Id="INSTALLDIR" Name="Swift">
+        <Directory Id="Toolchains" Name="Toolchains">
+          <Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
+            <Directory Id="_usr" Name="usr">
+              <Directory Id="_usr_bin" Name="bin">
+              </Directory>
+              <Directory Id="_usr_include" Name="include">
+                <Directory Id="_usr_include_SourceKit" Name="SourceKit">
+                </Directory>
+              </Directory>
+              <Directory Id="_usr_lib" Name="lib">
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </StandardDirectory>
+
+    <ComponentGroup Id="clangd">
+      <Component Directory="_usr_bin" Id="clangd.exe">
+        <File Id="clangd.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clangd.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="lldb">
+      <Component Directory="_usr_bin" Id="lldb_vscode.exe">
+        <File Id="lldb_vscode.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lldb-vscode.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="sourcekitd">
+      <Component Directory="_usr_bin" Id="sourcekitdInProc.dll">
+        <File Id="sourcekitdInProc.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\sourcekitdInProc.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_lib" Id="sourcekitdInProc.lib">
+        <File Id="sourcekitdInProc.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\sourcekitdInProc.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="_usr_include_SourceKit" Id="sourcekitd.h">
+        <File Id="sourcekitd.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\SourceKit\sourcekitd.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="lsp">
+      <Component Directory="_usr_bin" Id="sourcekit_lsp.exe">
+        <File Id="sourcekit_lsp.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\sourcekit-lsp.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <Feature Id="IDETools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift IDE Integration Tools" Level="1" Title="Swift IDE Integration Tools">
+      <ComponentGroupRef Id="clangd" />
+      <ComponentGroupRef Id="lldb" />
+      <ComponentGroupRef Id="sourcekitd" />
+      <ComponentGroupRef Id="lsp" />
+    </Feature>
+
+    <UI>
+      <ui:WixUI Id="WixUI_InstallDir" />
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
+    </UI>
+
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
+
+    <WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
+    <WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
+  </Package>
+</Wix>
diff --git a/platforms/Windows/installer.wixproj b/platforms/Windows/installer.wixproj
index e539c42f..3681304d 100644
--- a/platforms/Windows/installer.wixproj
+++ b/platforms/Windows/installer.wixproj
@@ -12,7 +12,7 @@
     <ProductVersion>$(ProductVersion)</ProductVersion>
 
     <!-- The list must be %3B (;) separated so that it is passed along properly as `;` normally delimit options -->
-    <RequiredChain Condition=" '$(RequiredChain)' == '' ">runtime.msi%3Btoolchain.msi%3Bdevtools.msi%3Bsdk.msi</RequiredChain>
+    <RequiredChain Condition=" '$(RequiredChain)' == '' ">runtime.msi%3Bbld.msi%3Bcli.msi%3Bdbg.msi%3Bide.msi%3Bsdk.msi</RequiredChain>
     <RequiredChain>$(RequiredChain)</RequiredChain>
 
     <OptionalChain>$(OptionalChain)</OptionalChain>
diff --git a/platforms/Windows/toolchain.wxs b/platforms/Windows/toolchain.wxs
deleted file mode 100644
index 2a254b51..00000000
--- a/platforms/Windows/toolchain.wxs
+++ /dev/null
@@ -1,727 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
-  <Package
-      Language="1033"
-      Manufacturer="swift.org"
-      Name="Swift Compiler Tools"
-      UpgradeCode="7e95dc06-7f84-4e8e-a038-8304af0468fb"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="Swift Compiler Tools" />
-
-    <!--
-      NOTE(compnerd) Use high compression as this is an extrodinarily large
-      cabinet.  With upstream being amenable to considering decorations for
-      DLL builds, this might be possible to reduce in the future hopefully.
-      In the mean time, burn the CPU cycles to try to claw back the minimal
-      bit of savings to hedge against the constant complaints that the MSIs
-      are too large.
-    -->
-    <Media Id="1" Cabinet="toolchain.cab" EmbedCab="yes" CompressionLevel="high" />
-
-    <!-- WindowsVolume is not a StandardDirectory value, but rather a standard property. See https://github.com/wixtoolset/issues/issues/7314 -->
-    <SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]" />
-
-    <Directory ComponentGuidGenerationSeed="289f73df-ade6-4eab-95f1-7d9e76a5db8e" Id="WINDOWSVOLUME">
-      <Directory Id="INSTALLDIR">
-        <Directory Id="Library" Name="Library">
-          <Directory Id="Developer" Name="Developer">
-            <Directory Id="Toolchains" Name="Toolchains">
-              <!-- TODO(compnerd) We should setup a `unknown-Asserts-current.xctoolchain` symlink  -->
-              <Directory Id="xctoolchain" Name="$(var.ToolchainName)">
-                <Directory Id="_usr" Name="usr">
-                  <Directory Id="_usr_bin" Name="bin">
-                    <!-- binutils -->
-
-                    <!-- TODO(compnerd) can we use symbolic links instead? -->
-                    <Component Id="llvm_dlltool.exe">
-                      <File Id="llvm_dlltool.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-dlltool.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_lib.exe">
-                      <File Id="llvm_lib.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-lib.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_ranlib.exe">
-                      <File Id="llvm_ranlib.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-ranlib.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_readelf.exe">
-                      <File Id="llvm_readelf.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-readelf.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_strip.exe">
-                      <File Id="llvm_strip.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-strip.exe" Checksum="yes" />
-                    </Component>
-                    <!--
-                      TODO(compnerd) we should symlink:
-                        - addr2line.exe
-                        - ar.exe
-                        - c++filt.exe
-                        - dwp.exe
-                        - nm.exe
-                        - objcopy.exe
-                        - objdump.exe
-                        - ranlib.exe
-                        - readelf.exe
-                        - size.exe
-                        - strings.exe
-                    -->
-
-                    <Component Id="dsymutil.exe">
-                      <File Id="dsymutil.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\dsymutil.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_ar.exe">
-                      <File Id="llvm_ar.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-ar.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_cov.exe">
-                      <File Id="llvm_cov.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-cov.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_cvtres.exe">
-                      <File Id="llvm_cvtres.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-cvtres.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_cxxfilt.exe">
-                      <File Id="llvm_cxxfilt.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-cxxfilt.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_dwarfdump.exe">
-                      <File Id="llvm_dwarfdump.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-dwarfdump.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_dwp.exe">
-                      <File Id="llvm_dwp.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-dwp.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_lipo.exe">
-                      <File Id="llvm_lipo.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-lipo.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_mt.exe">
-                      <File Id="llvm_mt.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-mt.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_nm.exe">
-                      <File Id="llvm_nm.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-nm.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_objcopy.exe">
-                      <File Id="llvm_objcopy.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-objcopy.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_objdump.exe">
-                      <File Id="llvm_objdump.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-objdump.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_pdbutil.exe">
-                      <File Id="llvm_pdbutil.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-pdbutil.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_profdata.exe">
-                      <File Id="llvm_profdata.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-profdata.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_rc.exe">
-                      <File Id="llvm_rc.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-rc.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_readobj.exe">
-                      <File Id="llvm_readobj.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-readobj.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_size.exe">
-                      <File Id="llvm_size.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-size.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_strings.exe">
-                      <File Id="llvm_strings.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-strings.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_symbolizer.exe">
-                      <File Id="llvm_symbolizer.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-symbolizer.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llvm_undname.exe">
-                      <File Id="llvm_undname.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\llvm-undname.exe" Checksum="yes" />
-                    </Component>
-
-                    <!-- LTO -->
-                    <Component Id="LTO.dll">
-                      <File Id="LTO.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\LTO.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- TODO(compnerd) can we use symbolic links instead? -->
-                    <Component Id="clang_cl.exe">
-                      <File Id="clang_cl.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang-cl.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="clang_cpp.exe">
-                      <File Id="clang_cpp.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang-cpp.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="clang__.exe">
-                      <File Id="clang__.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang++.exe" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="clang_format.exe">
-                      <File Id="clang_format.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang-format.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="clang_tidy.exe">
-                      <File Id="clang_tidy.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang-tidy.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="clang.exe">
-                      <File Id="clang.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clang.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="clangd.exe">
-                      <File Id="clangd.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\clangd.exe" Checksum="yes" />
-                    </Component>
-                    <!--
-                      TODO(compnerd) we should include:
-                      - clang-offload-bundler
-                      - optremarks.dll
-                      - scan-build
-                      - scan-view
-                    -->
-
-                    <Component Id="libclang.dll">
-                      <File Id="libclang.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\libclang.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="libIndexStore.dll">
-                      <File Id="libIndexStore.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\libIndexStore.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- lld -->
-                    <!-- TODO(compnerd) can we use symbolic links instead? -->
-                    <Component Id="ld.lld.exe">
-                      <File Id="ld.lld.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\ld.lld.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="ld64.lld.exe">
-                      <File Id="ld64.lld.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\ld64.lld.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="lld_link.exe">
-                      <File Id="lld_link.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lld-link.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="wasm_ld.exe">
-                      <File Id="wasm_ld.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\wasm-ld.exe" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="lld.exe">
-                      <File Id="lld.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lld.exe" Checksum="yes" />
-                    </Component>
-
-                    <!-- lldb -->
-                    <Component Id="lldb_server.exe">
-                      <File Id="lldb_server.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lldb-server.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="lldb_vscode.exe">
-                      <File Id="lldb_vscode.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lldb-vscode.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="lldb.exe">
-                      <File Id="lldb.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\lldb.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="repl_swift.exe">
-                      <File Id="repl_swift.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\repl_swift.exe" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="liblldb.dll">
-                      <File Id="liblldb.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\liblldb.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- BlocksRuntime -->
-                    <Component Id="BlocksRuntime.dll">
-                      <File Id="BlocksRuntime.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- libdispatch -->
-                    <Component Id="dispatch.dll">
-                      <File Id="dispatch.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\dispatch.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- SourceKit -->
-                    <Component Id="sourcekitdInProc.dll">
-                      <File Id="sourcekitdInProc.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\sourcekitdInProc.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- swift -->
-
-                    <!-- TODO(compnerd) can we use symbolic links instead? -->
-                    <Component Id="swift_api_digester.exe">
-                      <File Id="swift_api_digester.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-api-digester.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="swift_autolink_extract.exe">
-                      <File Id="swift_autolink_extract.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-autolink-extract.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="swift_symbolgraph_extract.exe">
-                      <File Id="swift_symbolgraph_extract.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-symbolgraph-extract.exe" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="swift_demangle.exe">
-                      <File Id="swift_demangle.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-demangle.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="swift_frontend.exe">
-                      <File Id="swift_frontend.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swift-frontend.exe" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="swiftDemangle.dll">
-                      <File Id="swiftDemangle.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\swiftDemangle.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="_InternalSwiftScan.dll">
-                      <File Id="_InternalSwiftScan.dll" Source="$(var.TOOLCHAIN_ROOT)\usr\bin\_InternalSwiftScan.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- llbuild -->
-                    <Component Id="swift_build_tool.exe">
-                      <File Id="swift_build_tool.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-tool.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="llbuildSwift.dll">
-                      <File Id="llbuildSwift.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\llbuildSwift.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- swift-argument-parser -->
-                    <Component Id="ArgumentParser.dll">
-                      <File Id="ArgumentParser.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\ArgumentParser.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- swift-tools-support-core -->
-                    <Component Id="TSCBasic.dll">
-                      <File Id="TSCBasic.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCBasic.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="TSCUtility.dll">
-                      <File Id="TSCUtility.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\TSCUtility.dll" Checksum="yes" />
-                    </Component>
-
-                    <!-- swift-driver -->
-
-                    <!-- TODO(compnerd) can we use symbolic links instead? -->
-                    <Component Id="swiftc.exe">
-                      <File Id="swiftc.exe" Name="swiftc.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="swift.exe">
-                      <File Id="swift.exe" Name="swift.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-driver.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="swift_help.exe">
-                      <File Id="swift_help.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-help.exe" Checksum="yes" />
-                    </Component>
-                    <Component Id="swift_build_sdk_interfaces.exe">
-                      <File Id="swift_build_sdk_interfaces.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build-sdk-interfaces.exe" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="swiftOptions.dll">
-                      <File Id="SwiftOptions.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftOptions.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="swiftDriver.dll">
-                      <File Id="SwiftDriver.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftDriver.dll" Checksum="yes" />
-                    </Component>
-                    <Component Id="swiftDriverExecution.dll">
-                      <File Id="SwiftDriverExecution.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SwiftDriverExecution.dll" Checksum="yes" />
-                    </Component>
-                  </Directory>
-
-                  <Directory Id="_usr_include" Name="include">
-                    <Directory Id="_usr_include__InternalSwiftScan" Name="_InternalSwiftScan">
-                      <Component Id="DependencyScan.h">
-                        <File Id="DependencyScan.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\DependencyScan.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="DependencyScanMacros.h">
-                        <File Id="DependencyScanMacros.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\DependencyScanMacros.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="_InternalSwiftScan.modulemap">
-                        <File Id="_InternalSwiftScan.modulemap" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\_InternalSwiftScan\module.modulemap" Checksum="yes" />
-                      </Component>
-                    </Directory>
-
-                    <Directory Id="_usr_include_clang_c" Name="clang-c">
-                      <Component Id="BuildSystem.h">
-                        <File Id="BuildSystem.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\BuildSystem.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="CXCompilationDatabase.h">
-                        <File Id="CXCompilationDatabase.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\CXCompilationDatabase.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="CXErrorCode.h">
-                        <File Id="CXErrorCode.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\CXErrorCode.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="CXString.h">
-                        <File Id="CXString.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\CXString.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="Documentation.h">
-                        <File Id="Documentation.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\Documentation.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="FatalErrorHandler.h">
-                        <File Id="FatalErrorHandler.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\FatalErrorHandler.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="Index.h">
-                        <File Id="Index.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\Index.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="Platform.h">
-                        <File Id="Platform.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\Platform.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="Refactor.h">
-                        <File Id="Refactor.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\clang-c\Refactor.h" Checksum="yes" />
-                      </Component>
-                    </Directory>
-
-                    <Directory Id="_usr_include_dispatch" Name="dispatch">
-                    </Directory>
-
-                    <Directory Id="_usr_include_indexstore" Name="indexstore">
-                      <Component Id="indexstore.h">
-                        <File Id="indexstore.h" Source="$(var.TOOLCHAIN_ROOT)\usr\local\include\indexstore\indexstore.h" Checksum="yes" />
-                      </Component>
-                      <Component Id="IndexStoreCXX.h">
-                        <File Id="IndexStoreCXX.h" Source="$(var.TOOLCHAIN_ROOT)\usr\local\include\indexstore\IndexStoreCXX.h" Checksum="yes" />
-                      </Component>
-                    </Directory>
-
-                    <Directory Id="_usr_include_lldb" Name="lldb">
-                    </Directory>
-
-                    <Directory Id="_usr_include_llvm_c" Name="llvm-c">
-                      <Component Id="lto.h">
-                        <File Id="lto.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\llvm-c\lto.h" Checksum="yes" />
-                      </Component>
-                    </Directory>
-
-                    <Directory Id="_usr_include_os" Name="os">
-                    </Directory>
-
-                    <!-- TODO(compnerd) should we install the block headers? -->
-
-                    <Directory Id="_usr_include_SourceKit" Name="SourceKit">
-                      <Component Id="sourcekitd.h">
-                        <File Id="sourcekitd.h" Source="$(var.TOOLCHAIN_ROOT)\usr\include\SourceKit\sourcekitd.h" Checksum="yes" />
-                      </Component>
-                    </Directory>
-                  </Directory>
-
-                  <Directory Id="_usr_lib" Name="lib">
-                    <Component Id="LTO.lib">
-                      <File Id="LTO.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\LTO.lib" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="libclang.lib">
-                      <File Id="libclang.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\libclang.lib" Checksum="yes" />
-                    </Component>
-                    <Component Id="libIndexStore.lib">
-                      <File Id="libIndexStore.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\libIndexStore.lib" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="liblldb.lib">
-                      <File Id="liblldb.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\liblldb.lib" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="BlocksRuntime.lib">
-                      <File Id="BlocksRuntime.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\BlocksRuntime.lib" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="dispatch.lib">
-                      <File Id="dispatch.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\dispatch.lib" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="sourcekitdInProc.lib">
-                      <File Id="sourcekitdInProc.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\sourcekitdInProc.lib" Checksum="yes" />
-                    </Component>
-
-                    <Component Id="swiftDemangle.lib">
-                      <File Id="swiftDemangle.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swiftDemangle.lib" Checksum="yes" />
-                    </Component>
-                    <Component Id="_InternalSwiftScan.lib">
-                      <File Id="_InternalSwiftScan.lib" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\windows\_InternalSwiftScan.lib" Checksum="yes" />
-                    </Component>
-
-                    <Directory Id="_usr_lib_clang" Name="clang">
-                    </Directory>
-
-                    <Directory Id="_usr_lib_site_packages" Name="site-packages">
-                      <Directory Id="_usr_lib_site_packages_lldb" Name="lldb">
-                        <Component Id="__init__.py_c31e016e2f8b4fba9eebd73d5009e919">
-                          <File Id="___init__.py_c31e016e2f8b4fba9eebd73d5009e919" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\__init__.py" Checksum="yes" />
-                        </Component>
-                        <Component Id="_lldb.py">
-                          <File Id="_lldb.pyd" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\_lldb.pyd" Checksum="yes" />
-                        </Component>
-                        <Component Id="embedded_interpreter.py">
-                          <File Id="embedded_interpreter.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\embedded_interpreter.py" Checksum="yes" />
-                        </Component>
-                        <Component Id="lldb_argdumper.exe">
-                          <File Id="lldb_argdumper.exe" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\lldb-argdumper.exe" Checksum="yes" />
-                        </Component>
-
-                        <Directory Id="_usr_lib_site_packages_lldb_formatters" Name="formatters">
-                          <Component Id="logger.py">
-                            <File Id="logger.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\Logger.py" Checksum="yes" />
-                          </Component>
-                          <Component Id="__init__.py_6124a6ee9e584275b153b0e1ddb4a2b2">
-                            <File Id="___init__.py_6124a6ee9e584275b153b0e1ddb4a2b2" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\__init__.py" Checksum="yes" />
-                          </Component>
-                          <Component Id="attrib_fromdict.py">
-                            <File Id="attrib_fromdict.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\attrib_fromdict.py" Checksum="yes" />
-                          </Component>
-                          <Component Id="cache.py">
-                            <File Id="cache.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cache.py" Checksum="yes" />
-                          </Component>
-                          <Component Id="metrics.py">
-                            <File Id="metrics.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\metrics.py" Checksum="yes" />
-                          </Component>
-                          <Component Id="synth.py">
-                            <File Id="synth.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\synth.py" Checksum="yes" />
-                          </Component>
-
-                          <Directory Id="_usr_lib_site_packages_lldb_formatters_cpp" Name="cpp">
-                            <Component Id="__init__.py_1bd1d2dc68b7417b83484f6183339af2">
-                              <File Id="___init__.py_1bd1d2dc68b7417b83484f6183339af2" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cpp\__init__.py" Checksum="yes" />
-                            </Component>
-                            <Component Id="gnu_libstdcpp.py">
-                              <File Id="gnu_libstdcpp.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cpp\gnu_libstdcpp.py" Checksum="yes" />
-                            </Component>
-                            <Component Id="libcxx.py">
-                              <File Id="libcxx.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\formatters\cpp\libcxx.py" Checksum="yes" />
-                            </Component>
-                          </Directory>
-                        </Directory>
-
-                        <Directory Id="_usr_lib_site_packages_lldb_utils" Name="utils">
-                          <Component Id="__init__.py_52ef75ed702f4acc8272e6b2f8aa5392">
-                            <File Id="___init__.py_52ef75ed702f4acc8272e6b2f8aa5392" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\utils\__init__.py" Checksum="yes" />
-                          </Component>
-                          <Component Id="in_call_stack.py">
-                            <File Id="in_call_stack.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\utils\in_call_stack.py" Checksum="yes" />
-                          </Component>
-                          <Component Id="symbolication.py">
-                            <File Id="symbolication.py" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\site-packages\lldb\utils\symbolication.py" Checksum="yes" />
-                          </Component>
-                        </Directory>
-                      </Directory>
-                    </Directory>
-
-                    <Directory Id="_usr_lib_swift" Name="swift">
-                      <Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
-                        <Component Id="_SwiftCxxInteroperability.h">
-                          <File Id="_SwiftCxxInteroperability.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftCxxInteroperability.h" Checksum="yes" />
-                        </Component>
-                        <Component Id="_SwiftStdlibCxxOverlay.h">
-                          <File Id="_SwiftStdlibCxxOverlay.h" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\_SwiftStdlibCxxOverlay.h" Checksum="yes" />
-                        </Component>
-                        <Component Id="experimental_interoperability_version.json">
-                          <File Id="experimental_interoperability_version.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\swiftToCxx\experimental-interoperability-version.json" Checksum="yes" />
-                        </Component>
-                      </Directory>
-
-                      <Directory Id="_usr_lib_swift_migrator" Name="migrator">
-                        <Component Id="ios4.json">
-                          <File Id="ios4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios4.json" Checksum="yes" />
-                        </Component>
-                        <Component Id="ios42.json">
-                          <File Id="ios42.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\ios42.json" Checksum="yes" />
-                        </Component>
-                        <Component Id="macos4.json">
-                          <File Id="macos4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\macos4.json" Checksum="yes" />
-                        </Component>
-                        <Component Id="macos42.json">
-                          <File Id="macos42.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\macos42.json" Checksum="yes" />
-                        </Component>
-                        <Component Id="overlay4.json">
-                          <File Id="overlay4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\overlay4.json" Checksum="yes" />
-                        </Component>
-                        <Component Id="overlay42.json">
-                          <File Id="overlay42.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\overlay42.json" Checksum="yes" />
-                        </Component>
-                        <Component Id="tvos4.json">
-                          <File Id="tvos4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\tvos4.json" Checksum="yes" />
-                        </Component>
-                        <Component Id="tvos42.json">
-                          <File Id="tvos42.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\tvos42.json" Checksum="yes" />
-                        </Component>
-                        <Component Id="watchos4.json">
-                          <File Id="watchos4.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\watchos4.json" Checksum="yes" />
-                        </Component>
-                        <Component Id="watchos42.json">
-                          <File Id="watchos42.json" Source="$(var.TOOLCHAIN_ROOT)\usr\lib\swift\migrator\watchos42.json" Checksum="yes" />
-                        </Component>
-                      </Directory>
-
-                      <Directory Id="_usr_lib_swift_shims" Name="shims">
-                      </Directory>
-                    </Directory>
-                  </Directory>
-
-                  <Directory Id="_usr_libexec" Name="libexec">
-                  </Directory>
-
-                  <Directory Id="_usr_share" Name="share">
-                    <Directory Id="_usr_share_swift" Name="swift">
-                      <Component Id="features.json">
-                        <File Id="features.json" Source="$(var.TOOLCHAIN_ROOT)\usr\share\swift\features.json" Checksum="yes" />
-                      </Component>
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-          </Directory>
-        </Directory>
-
-        <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="d01ea5b8-0f8a-4388-9b61-1186efddfc39">
-          <Environment Id="DeveloperDir" Action="set" Name="DEVELOPER_DIR" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer" />
-          <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Toolchains\$(var.ToolchainName)\usr\bin" />
-        </Component>
-      </Directory>
-    </Directory>
-
-    <Feature Id="Toolchain" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Compiler Tools" Level="1" Title="Swift Compiler Tools">
-      <!-- binutils -->
-      <ComponentRef Id="llvm_dlltool.exe" />
-      <ComponentRef Id="llvm_lib.exe" />
-      <ComponentRef Id="llvm_ranlib.exe" />
-      <ComponentRef Id="llvm_readelf.exe" />
-      <ComponentRef Id="llvm_strip.exe" />
-      <ComponentRef Id="dsymutil.exe" />
-      <ComponentRef Id="llvm_ar.exe" />
-      <ComponentRef Id="llvm_cov.exe" />
-      <ComponentRef Id="llvm_cvtres.exe" />
-      <ComponentRef Id="llvm_cxxfilt.exe" />
-      <ComponentRef Id="llvm_dwarfdump.exe" />
-      <ComponentRef Id="llvm_dwp.exe" />
-      <ComponentRef Id="llvm_lipo.exe" />
-      <ComponentRef Id="llvm_mt.exe" />
-      <ComponentRef Id="llvm_nm.exe" />
-      <ComponentRef Id="llvm_objcopy.exe" />
-      <ComponentRef Id="llvm_objdump.exe" />
-      <ComponentRef Id="llvm_pdbutil.exe" />
-      <ComponentRef Id="llvm_profdata.exe" />
-      <ComponentRef Id="llvm_rc.exe" />
-      <ComponentRef Id="llvm_readobj.exe" />
-      <ComponentRef Id="llvm_size.exe" />
-      <ComponentRef Id="llvm_strings.exe" />
-      <ComponentRef Id="llvm_symbolizer.exe" />
-      <ComponentRef Id="llvm_undname.exe" />
-
-      <!-- LTO -->
-      <ComponentRef Id="LTO.dll" />
-      <ComponentRef Id="LTO.lib" />
-      <ComponentRef Id="lto.h" />
-
-      <!-- clang -->
-      <ComponentRef Id="clang_cl.exe" />
-      <ComponentRef Id="clang_cpp.exe" />
-      <ComponentRef Id="clang__.exe" />
-      <ComponentRef Id="clang_format.exe" />
-      <ComponentRef Id="clang_tidy.exe" />
-      <ComponentRef Id="clang.exe" />
-      <ComponentRef Id="clangd.exe" />
-
-      <ComponentRef Id="libclang.dll" />
-      <ComponentRef Id="libclang.lib" />
-      <ComponentRef Id="libIndexStore.dll" />
-      <ComponentRef Id="libIndexStore.lib" />
-
-      <ComponentRef Id="BuildSystem.h" />
-      <ComponentRef Id="CXCompilationDatabase.h" />
-      <ComponentRef Id="CXErrorCode.h" />
-      <ComponentRef Id="CXString.h" />
-      <ComponentRef Id="Documentation.h" />
-      <ComponentRef Id="FatalErrorHandler.h" />
-      <ComponentRef Id="Index.h" />
-      <ComponentRef Id="Platform.h" />
-      <ComponentRef Id="Refactor.h" />
-
-      <ComponentRef Id="indexstore.h" />
-      <ComponentRef Id="IndexStoreCXX.h" />
-
-      <!-- lld -->
-      <ComponentRef Id="ld.lld.exe" />
-      <ComponentRef Id="ld64.lld.exe" />
-      <ComponentRef Id="lld_link.exe" />
-      <ComponentRef Id="wasm_ld.exe" />
-      <ComponentRef Id="lld.exe" />
-
-      <!-- lldb -->
-      <ComponentRef Id="lldb_server.exe" />
-      <ComponentRef Id="lldb_vscode.exe" />
-      <ComponentRef Id="lldb.exe" />
-      <ComponentRef Id="repl_swift.exe" />
-      <ComponentRef Id="liblldb.dll" />
-
-      <ComponentRef Id="liblldb.lib" />
-
-      <ComponentRef Id="__init__.py_c31e016e2f8b4fba9eebd73d5009e919" />
-      <ComponentRef Id="_lldb.py" />
-      <ComponentRef Id="embedded_interpreter.py" />
-      <ComponentRef Id="lldb_argdumper.exe" />
-
-      <ComponentRef Id="logger.py" />
-      <ComponentRef Id="__init__.py_6124a6ee9e584275b153b0e1ddb4a2b2" />
-      <ComponentRef Id="attrib_fromdict.py" />
-      <ComponentRef Id="cache.py" />
-      <ComponentRef Id="metrics.py" />
-      <ComponentRef Id="synth.py" />
-
-      <ComponentRef Id="__init__.py_1bd1d2dc68b7417b83484f6183339af2" />
-      <ComponentRef Id="gnu_libstdcpp.py" />
-      <ComponentRef Id="libcxx.py" />
-
-      <ComponentRef Id="__init__.py_52ef75ed702f4acc8272e6b2f8aa5392" />
-      <ComponentRef Id="in_call_stack.py" />
-      <ComponentRef Id="symbolication.py" />
-
-      <!-- BlocksRuntime -->
-      <ComponentRef Id="BlocksRuntime.dll" />
-      <ComponentRef Id="BlocksRuntime.lib" />
-
-      <!-- libdispatch -->
-      <ComponentRef Id="dispatch.dll" />
-      <ComponentRef Id="dispatch.lib" />
-
-      <!-- SourceKit -->
-      <ComponentRef Id="sourcekitdInProc.dll" />
-      <ComponentRef Id="sourcekitdInProc.lib" />
-      <ComponentRef Id="sourcekitd.h" />
-
-      <!-- swift -->
-      <ComponentRef Id="swift_api_digester.exe" />
-      <ComponentRef Id="swift_autolink_extract.exe" />
-      <ComponentRef Id="swift_symbolgraph_extract.exe" />
-      <ComponentRef Id="swift_demangle.exe" />
-      <ComponentRef Id="swift_frontend.exe" />
-
-      <ComponentRef Id="swiftDemangle.dll" />
-      <ComponentRef Id="swiftDemangle.lib" />
-      <ComponentRef Id="_InternalSwiftScan.dll" />
-      <ComponentRef Id="_InternalSwiftScan.lib" />
-
-      <ComponentRef Id="DependencyScan.h" />
-      <ComponentRef Id="DependencyScanMacros.h" />
-      <ComponentRef Id="_InternalSwiftScan.modulemap" />
-
-      <ComponentRef Id="_SwiftCxxInteroperability.h" />
-      <ComponentRef Id="_SwiftStdlibCxxOverlay.h" />
-      <ComponentRef Id="experimental_interoperability_version.json" />
-
-      <ComponentRef Id="ios4.json" />
-      <ComponentRef Id="ios42.json" />
-      <ComponentRef Id="macos4.json" />
-      <ComponentRef Id="macos42.json" />
-      <ComponentRef Id="overlay4.json" />
-      <ComponentRef Id="overlay42.json" />
-      <ComponentRef Id="tvos4.json" />
-      <ComponentRef Id="tvos42.json" />
-      <ComponentRef Id="watchos4.json" />
-      <ComponentRef Id="watchos42.json" />
-
-      <ComponentRef Id="features.json" />
-
-      <!-- llbuild -->
-      <ComponentRef Id="swift_build_tool.exe" />
-      <ComponentRef Id="llbuildSwift.dll" />
-
-      <!-- swift-argument-parser -->
-      <ComponentRef Id="ArgumentParser.dll" />
-
-      <!-- swift-tools-support-core -->
-      <ComponentRef Id="TSCBasic.dll" />
-      <ComponentRef Id="TSCUtility.dll" />
-
-      <!-- swift-driver -->
-      <ComponentRef Id="swiftc.exe" />
-      <ComponentRef Id="swift.exe" />
-      <ComponentRef Id="swift_help.exe" />
-      <ComponentRef Id="swift_build_sdk_interfaces.exe" />
-      <ComponentRef Id="swiftOptions.dll" />
-      <ComponentRef Id="swiftDriver.dll" />
-      <ComponentRef Id="swiftDriverExecution.dll" />
-
-      <ComponentGroupRef Id="ClangResources" />
-
-      <ComponentRef Id="EnvironmentVariables" />
-    </Feature>
-
-    <UI>
-      <ui:WixUI Id="WixUI_InstallDir" />
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
-    </UI>
-
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
-
-    <WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
-    <WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
-  </Package>
-</Wix>

From d4cddcd911e756e3ed0063073caf4c7bcf30ccff Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Fri, 9 Jun 2023 07:42:47 -0700
Subject: [PATCH 03/10] WiX: shuffle the runtime into `Runtimes\[SemVer]`

This makes it fit more naturally into the layout with the co-located
installation.

Take the opportunity to claw back some storage by enabling compression.
This effectively neurtalises the effects of the split MSIs (and slightly
wins even).
---
 platforms/Windows/runtime.wxs | 179 +++++++++++++++++-----------------
 1 file changed, 91 insertions(+), 88 deletions(-)

diff --git a/platforms/Windows/runtime.wxs b/platforms/Windows/runtime.wxs
index ea4011e0..6e6df334 100644
--- a/platforms/Windows/runtime.wxs
+++ b/platforms/Windows/runtime.wxs
@@ -6,112 +6,115 @@
       Name="Swift Windows Runtime ($(var.ProcessorArchitecture))"
       UpgradeCode="bea8c6dc-f73e-445b-9486-2333d1cf2886"
       Version="$(var.ProductVersion)"
-      Scope="perMachine">
+      Scope="perUserOrMachine">
     <SummaryInformation Description="Swift Windows Runtime ($(var.ProcessorArchitecture))" />
 
-    <Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" />
+    <Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" CompressionLevel="high" />
 
     <StandardDirectory Id="ProgramFiles6432Folder">
       <Directory Id="INSTALLDIR" Name="Swift">
-        <Directory Id="_" Name="$(var.RuntimeName)">
-          <Directory Id="_usr" Name="usr">
-            <Directory Id="_usr_bin" Name="bin">
-              <Component Id="BlocksRuntime.dll">
-                <File Id="BlocksRuntime.dll" Source="$(var.SDK_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" />
-              </Component>
-              <Component Id="dispatch.dll">
-                <File Id="dispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\dispatch.dll" Checksum="yes" />
-              </Component>
-              <Component Id="Foundation.dll">
-                <File Id="Foundation.dll" Source="$(var.SDK_ROOT)\usr\bin\Foundation.dll" Checksum="yes" />
-              </Component>
-              <Component Id="FoundationNetworking.dll">
-                <File Id="FoundationNetworking.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationNetworking.dll" Checksum="yes" />
-              </Component>
-              <Component Id="FoundationXML.dll">
-                <File Id="FoundationXML.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationXML.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swift_Concurrency.dll">
-                <File Id="swift_Concurrency.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swift_Differentiation.dll">
-                <File Id="swift_Differentiation.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swiftDistributed.dll">
-                <File Id="swiftDistributed.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swift_RegexParser.dll">
-                <File Id="swift_RegexParser.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swift_StringProcessing.dll">
-                <File Id="swift_StringProcessing.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swiftCore.dll">
-                <File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swiftCxx.dll">
-                <File Id="swiftCxx.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCxx.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swiftDispatch.dll">
-                <File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
-              </Component>
-              <!--
-              <Component Id="swiftDemangle.dll">
-                <File Id="swiftDemangle.dll" Source="$(var.SDK_ROOT)\bin\swiftDemangle.dll" Checksum="yes" />
-              </Component>
-              -->
-              <Component Id="swiftCRT.dll">
-                <File Id="swiftCRT.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCRT.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swiftRemoteMirror.dll">
-                <File Id="swiftRemoteMirror.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftRemoteMirror.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swiftSwiftOnoneSupport.dll">
-                <File Id="swiftSwiftOnoneSupport.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftSwiftOnoneSupport.dll" Checksum="yes" />
-              </Component>
-              <Component Id="swiftWinSDK.dll">
-                <File Id="swiftWinSDK.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftWinSDK.dll" Checksum="yes" />
-              </Component>
-
-              <Component Id="plutil.exe">
-                <File Id="plutil.exe" Source="$(var.SDK_ROOT)\usr\bin\plutil.exe" Checksum="yes" />
-              </Component>
+        <Directory Id="Runtimes" Name="Runtimes">
+          <Directory Id="_" Name="$(var.ProductVersion)">
+            <Directory Id="_usr" Name="usr">
+              <Directory Id="_usr_bin" Name="bin">
+              </Directory>
             </Directory>
           </Directory>
         </Directory>
-
-        <Component Id="EnvironmentVariables" Guid="8681d813-eb32-46f9-8b1c-f622b38b5eaf">
-          <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]$(var.RuntimeName)\usr\bin" />
-        </Component>
       </Directory>
     </StandardDirectory>
 
+    <ComponentGroup Id="stdlib">
+      <Component Directory="_usr_bin" Id="swift_Concurrency.dll">
+        <File Id="swift_Concurrency.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swift_Differentiation.dll">
+        <File Id="swift_Differentiation.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swiftDistributed.dll">
+        <File Id="swiftDistributed.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swift_RegexParser.dll">
+        <File Id="swift_RegexParser.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swift_StringProcessing.dll">
+        <File Id="swift_StringProcessing.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swiftCore.dll">
+        <File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swiftCxx.dll">
+        <File Id="swiftCxx.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCxx.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <!-- TODO(compnerd) should we distribute the undecoration library in the runtime?
+      <Component Directory="_usr_bin" Id="swiftDemangle.dll">
+        <File Id="swiftDemangle.dll" Source="$(var.SDK_ROOT)\bin\swiftDemangle.dll" Checksum="yes" />
+      </Component>
+      -->
+      <Component Directory="_usr_bin" Id="swiftCRT.dll">
+        <File Id="swiftCRT.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCRT.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swiftRemoteMirror.dll">
+        <File Id="swiftRemoteMirror.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftRemoteMirror.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swiftSwiftOnoneSupport.dll">
+        <File Id="swiftSwiftOnoneSupport.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftSwiftOnoneSupport.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swiftWinSDK.dll">
+        <File Id="swiftWinSDK.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftWinSDK.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="BlocksRuntime">
+      <Component Directory="_usr_bin" Id="BlocksRuntime.dll">
+        <File Id="BlocksRuntime.dll" Source="$(var.SDK_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="libdispatch">
+      <Component Directory="_usr_bin" Id="dispatch.dll">
+        <File Id="dispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\dispatch.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="swiftDispatch.dll">
+        <File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="Foundation">
+      <Component Directory="_usr_bin" Id="Foundation.dll">
+        <File Id="Foundation.dll" Source="$(var.SDK_ROOT)\usr\bin\Foundation.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="FoundationNetworking.dll">
+        <File Id="FoundationNetworking.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationNetworking.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_usr_bin" Id="FoundationXML.dll">
+        <File Id="FoundationXML.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationXML.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="plutil">
+      <Component Directory="_usr_bin" Id="plutil.exe">
+        <File Id="plutil.exe" Source="$(var.SDK_ROOT)\usr\bin\plutil.exe" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <Component Directory="INSTALLDIR" Id="EnvironmentVariables" Guid="8681d813-eb32-46f9-8b1c-f622b38b5eaf">
+      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Runtimes\$(var.ProductVersion)\usr\bin" />
+    </Component>
+
     <!-- Feature -->
     <Feature Id="SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows Runtime ($(var.ProcessorArchitecture))" Level="1" Title="Swift Windows Runtime ($(var.ProcessorArchitecture))">
-      <ComponentRef Id="BlocksRuntime.dll" />
-      <ComponentRef Id="dispatch.dll" />
-      <ComponentRef Id="Foundation.dll" />
-      <ComponentRef Id="FoundationNetworking.dll" />
-      <ComponentRef Id="FoundationXML.dll" />
-      <ComponentRef Id="swift_Concurrency.dll" />
-      <ComponentRef Id="swift_Differentiation.dll" />
-      <ComponentRef Id="swift_RegexParser.dll" />
-      <ComponentRef Id="swift_StringProcessing.dll" />
-      <ComponentRef Id="swiftCore.dll" />
-      <ComponentRef Id="swiftCxx.dll" />
-      <ComponentRef Id="swiftCRT.dll" />
-      <!-- <ComponentRef Id="swiftDemangle.dll" /> -->
-      <ComponentRef Id="swiftDispatch.dll" />
-      <ComponentRef Id="swiftDistributed.dll" />
-      <ComponentRef Id="swiftRemoteMirror.dll" />
-      <ComponentRef Id="swiftSwiftOnoneSupport.dll" />
-      <ComponentRef Id="swiftWinSDK.dll" />
+      <ComponentGroupRef Id="stdlib" />
+      <ComponentGroupRef Id="BlocksRuntime" />
+      <ComponentGroupRef Id="libdispatch" />
+      <ComponentGroupRef Id="Foundation" />
 
       <ComponentRef Id="EnvironmentVariables" />
     </Feature>
 
     <Feature Id="SwiftUtilities" AllowAbsent="yes" AllowAdvertise="yes" Description="Extra Swift Utilities Windows ($(var.ProcessorArchitecture))" Level="1" Title="Swift Utilities Windows ($(var.ProcessorArchitecture))">
-      <ComponentRef Id="plutil.exe" />
+      <ComponentGroupRef Id="plutil" />
     </Feature>
 
     <UI>

From 12d3a1204072e88ebd2769682ae06d30be95a789 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Fri, 9 Jun 2023 11:39:18 -0700
Subject: [PATCH 04/10] WiX: rework the SDK layout

Restore the components, move the install location, and enable the
dual-purpose installer, and enable higher compression.  The higher
compression helps offset some of the associated costs for the split
MSIs.

The SDKs are now relocated to `%ProgramFiles%\Swift\Platforms` to
co-locate the Platform SDKs with the toolchain and runtime.  The
conversion to a dual purpose MSI will relocate this to
`%LocalAppData%\Programs\Swift\Platforms`.  In most cases this should be
a space free path which allows us to finally migrate away from
`C:\Library` and fix the issue of incorrect permissions on directories.
---
 platforms/Windows/sdk.wixproj |   15 +
 platforms/Windows/sdk.wxs     | 1037 +++++++++++++++------------------
 2 files changed, 485 insertions(+), 567 deletions(-)

diff --git a/platforms/Windows/sdk.wixproj b/platforms/Windows/sdk.wixproj
index 3ff2f0a9..af16383d 100644
--- a/platforms/Windows/sdk.wixproj
+++ b/platforms/Windows/sdk.wixproj
@@ -27,6 +27,21 @@
     <HarvestGenerateGuidsNow>true</HarvestGenerateGuidsNow>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
+    <InstallerPlatform>x64</InstallerPlatform>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm64' ">
+    <InstallerPlatform>arm64</InstallerPlatform>
+    <InstallerVersion>500</InstallerVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'arm' ">
+    <InstallerPlatform>arm</InstallerPlatform>
+    <InstallerVersion>500</InstallerVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(ProductArchitecture)' == 'x86' ">
+    <InstallerPlatform>x86</InstallerPlatform>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0" />
     <PackageReference Include="WixToolset.Heat" Version="4.0.0" />
diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs
index 38ca8d42..cc4ee010 100644
--- a/platforms/Windows/sdk.wxs
+++ b/platforms/Windows/sdk.wxs
@@ -6,433 +6,95 @@
       Name="Swift Windows SDK ($(var.ProcessorArchitecture))"
       UpgradeCode="4c37a396-d9e2-490a-89b7-0a3d271d847f"
       Version="$(var.ProductVersion)"
-      Scope="perMachine">
+      Scope="perUserOrMachine">
     <SummaryInformation Description="Swift Windows SDK ($(var.ProcessorArchitecture))" />
 
-    <Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" />
-
-    <!-- WindowsVolume is not a StandardDirectory value, but rather a standard property. See https://github.com/wixtoolset/issues/issues/7314 -->
-    <SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]" />
-
-    <Directory ComponentGuidGenerationSeed="f0594364-d461-4652-96e0-2a7d58642f03" Id="WINDOWSVOLUME">
-      <Directory Id="INSTALLDIR">
-        <Component Id="EnvironmentVariables" Guid="bd3ddc62-4c5c-4f6b-806e-02d2c6a65b65">
-          <!-- <Condition> %PROCESSOR_ARCHITECTURE~="arm64" </Condition> -->
-          <Environment Id="SDKRoot" Action="set" Name="SDKROOT" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Platforms\Windows.platform\Developer\SDKs\Windows.sdk" />
-        </Component>
-
-        <Directory Id="Library" Name="Library">
-          <Directory Id="Developer" Name="Developer">
-            <Directory Id="DeveloperPlatforms" Name="Platforms">
-              <Directory Id="WindowsPlatform" Name="Windows.platform">
-                <Component Id="Info.plist">
-                  <File Id="Info.plist" Source="$(var.PLATFORM_ROOT)\Info.plist" Checksum="yes" />
-                </Component>
-
-                <Directory Id="WindowsPlatform_Developer" Name="Developer">
-                  <Directory Id="WindowsPlatform_Developer_Library" Name="Library">
-
-                    <!-- XCTest -->
-                    <!--
-                      FIXME(compnerd) this should actually be the proper version
-                      of XCTest, and needs to be reflected in the plist as well.
-                    -->
-                    <Directory Id="XCTest" Name="XCTest-development">
-                      <Directory Id="XCTest_usr" Name="usr">
-                        <Directory Id="XCTest_usr_bin" Name="$(var.ArchBinDir)">
-                          <Component Id="XCTest.dll">
-                            <File Id="XCTest.dll" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\bin\XCTest.dll" Checksum="yes" />
-                          </Component>
-                        </Directory>
-
-                        <Directory Id="XCTest_usr_lib" Name="lib">
-                          <Directory Id="XCTest_usr_lib_swift" Name="swift">
-                            <Directory Id="XCTest_usr_lib_swift_windows" Name="windows">
-                              <Directory Id="XCTest_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)">
-                                <Component Id="XCTest.lib">
-                                  <File Id="XCTest.lib" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\XCTest.lib" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule">
-                                <Component Id="XCTest.swiftdoc">
-                                  <File Id="XCTest.swiftdoc" Name="$(var.ArchTriple).swiftdoc" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\$(var.ArchArchDir)\XCTest.swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="XCTest.swiftmodule">
-                                  <File Id="XCTest.swiftmodule" Name="$(var.ArchTriple).swiftmodule" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\$(var.ArchArchDir)\XCTest.swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-                            </Directory>
+    <Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" CompressionLevel="high" />
+
+    <StandardDirectory Id="ProgramFiles64Folder">
+      <Directory Id="INSTALLDIR" Name="Swift">
+        <Directory Id="DeveloperPlatforms" Name="Platforms">
+          <Directory Id="WindowsPlatform" Name="Windows.platform">
+            <Directory Id="WindowsPlatform_Developer" Name="Developer">
+              <Directory Id="WindowsPlatform_Developer_Library" Name="Library">
+                <!-- XCTest -->
+                <!--
+                  FIXME(compnerd) this should actually be the proper version
+                  of XCTest, and needs to be reflected in the plist as well.
+                -->
+                <Directory Id="XCTest" Name="XCTest-development">
+                  <Directory Id="XCTest_usr" Name="usr">
+                    <Directory Id="XCTest_usr_bin" Name="$(var.ArchBinDir)">
+                    </Directory>
+                    <Directory Id="XCTest_usr_lib" Name="lib">
+                      <Directory Id="XCTest_usr_lib_swift" Name="swift">
+                        <Directory Id="XCTest_usr_lib_swift_windows" Name="windows">
+                          <Directory Id="XCTest_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)">
+                          </Directory>
+                          <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule">
                           </Directory>
                         </Directory>
                       </Directory>
                     </Directory>
                   </Directory>
-
-                  <Directory Id="SDKs" Name="SDKs">
-
-                    <!-- Windows.sdk -->
-                    <Directory Id="WindowsSDK" Name="Windows.sdk">
-                      <Component Id="SDKSettings.plist">
-                        <File Id="SDKSettings.plist" Source="$(var.SDK_ROOT)\SDKSettings.plist" Checksum="yes" />
-                      </Component>
-
-                      <Directory Id="WindowsSDK_usr" Name="usr">
-                        <Directory Id="WindowsSDK_usr_include" Name="include">
-                          <Directory Id="WindowsSDK_usr_include_Block" Name="Block">
-                            <Component Id="Block.h">
-                              <File Id="Block.h" Source="$(var.SDK_ROOT)\usr\lib\swift\Block\Block.h" Checksum="yes" />
-                            </Component>
+                </Directory>
+              </Directory>
+              <Directory Id="SDKs" Name="SDKs">
+                <!-- Windows.sdk -->
+                <Directory Id="WindowsSDK" Name="Windows.sdk">
+                  <Directory Id="WindowsSDK_usr" Name="usr">
+                    <Directory Id="WindowsSDK_usr_include" Name="include">
+                      <Directory Id="WindowsSDK_usr_include_Block" Name="Block">
+                      </Directory>
+                      <Directory Id="WindowsSDK_usr_include_dispatch" Name="dispatch">
+                      </Directory>
+                      <Directory Id="WindowsSDK_usr_include_os" Name="os">
+                      </Directory>
+                      <Directory Id="WindowsSDK_usr_include_swift" Name="swift">
+                        <Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror">
+                        </Directory>
+                      </Directory>
+                    </Directory>
+                    <Directory Id="WindowsSDK_usr_lib" Name="lib">
+                      <Directory Id="WindowsSDK_usr_lib_swift" Name="swift">
+                        <Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
+                        </Directory>
+                        <Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
+                          <Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
                           </Directory>
-
-                          <Directory Id="WindowsSDK_usr_include_dispatch" Name="dispatch">
-                            <Component Id="base.h">
-                              <File Id="base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\base.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="block.h">
-                              <File Id="block.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\block.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="data.h">
-                              <File Id="data.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\data.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="dispatch.h">
-                              <File Id="dispatch.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\dispatch.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="group.h">
-                              <File Id="group.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\group.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="introspection.h">
-                              <File Id="introspection.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\introspection.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="io.h">
-                              <File Id="io.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\io.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="dispatch.modulemap">
-                              <File Id="dispatch.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\module.modulemap" Checksum="yes" />
-                            </Component>
-                            <Component Id="object.h_f87c5a369294493489839a2cabdb7ae7">
-                              <File Id="object.h_f87c5a369294493489839a2cabdb7ae7" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\object.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="once.h">
-                              <File Id="once.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\once.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="queue.h">
-                              <File Id="queue.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\queue.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="semaphore.h">
-                              <File Id="semaphore.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\semaphore.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="source.h">
-                              <File Id="source.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\source.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="time.h">
-                              <File Id="time.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\time.h" Checksum="yes" />
-                            </Component>
+                          <Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
                           </Directory>
-
-                          <Directory Id="WindowsSDK_usr_include_os" Name="os">
-                            <Component Id="generic_base.h">
-                              <File Id="generic_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\os\generic_base.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="generic_unix_base.h">
-                              <File Id="generic_unix_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\os\generic_unix_base.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="generic_win_base.h">
-                              <File Id="generic_win_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\os\generic_win_base.h" Checksum="yes" />
-                            </Component>
-                            <Component Id="object.h_3af0f0745780408e9fb16b614066623f">
-                              <File Id="object.h_3af0f0745780408e9fb16b614066623f" Source="$(var.SDK_ROOT)\usr\lib\swift\os\object.h" Checksum="yes" />
-                            </Component>
+                          <Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
                           </Directory>
-
-                          <Directory Id="WindowsSDK_usr_include_swift" Name="swift">
-                            <Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror">
-                              <Component Id="MemoryReaderInterface.h">
-                                <File Id="MemoryReaderInterface.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" Checksum="yes" />
-                              </Component>
-                              <Component Id="Platform.h">
-                                <File Id="Platform.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\Platform.h" Checksum="yes" />
-                              </Component>
-                              <Component Id="SwiftRemoteMirror.h">
-                                <File Id="SwiftRemoteMirror.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" Checksum="yes" />
-                              </Component>
-                              <Component Id="SwiftRemoteMirrorTypes.h">
-                                <File Id="SwiftRemoteMirrorTypes.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" Checksum="yes" />
-                              </Component>
-                              <Component Id="SwiftRemoteMirror.modulemap">
-                                <File Id="SwiftRemoteMirror.modulemap" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\module.modulemap" Checksum="yes" />
-                              </Component>
-                            </Directory>
+                          <Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
                           </Directory>
-                        </Directory>
-
-                        <Directory Id="WindowsSDK_usr_lib" Name="lib">
-                          <Directory Id="WindowsSDK_usr_lib_swift" Name="swift">
-                            <Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
-                            </Directory>
-
-                            <Directory Id="WindowsSDK_usr_lib_swift_windows" Name="windows">
-                              <Directory Id="_Concurrency.swiftmodule" Name="_Concurrency.swiftmodule">
-                                <Component Id="_Concurrency.swiftdoc">
-                                  <File Id="_Concurrency.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="_Concurrency.swiftinterface">
-                                  <File Id="_Concurrency.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
-                                </Component>
-                                <Component Id="_Concurrency.swiftmodule">
-                                  <File Id="_Concurrency.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
-                                <Component Id="_Differentiation.swiftdoc">
-                                  <File Id="_Differentiation.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="_Differentiation.swiftinterface">
-                                  <File Id="_Differentiation.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
-                                </Component>
-                                <Component Id="_Differentiation.swiftmodule">
-                                  <File Id="_Differentiation.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
-                                <Component Id="_RegexParser.swiftdoc">
-                                  <File Id="_RegexParser.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="_RegexParser.swiftinterface">
-                                  <File Id="_RegexParser.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
-                                </Component>
-                                <Component Id="_RegexParser.swiftmodule">
-                                  <File Id="_RegexParser.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
-                                <Component Id="_StringProcessing.swiftdoc">
-                                  <File Id="_StringProcessing.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="_StringProcessing.swiftinterface">
-                                  <File Id="_StringProcessing.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
-                                </Component>
-                                <Component Id="_StringProcessing.swiftmodule">
-                                  <File Id="_StringProcessing.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
-                                <Component Id="CRT.swiftdoc">
-                                  <File Id="CRT.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="CRT.swiftinterface">
-                                  <File Id="CRT.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
-                                </Component>
-                                <Component Id="CRT.swiftmodule">
-                                  <File Id="CRT.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
-                                <Component Id="Cxx.swiftdoc">
-                                  <File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="Cxx.swiftinterface">
-                                  <File Id="Cxx.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
-                                </Component>
-                                <Component Id="Cxx.swiftmodule">
-                                  <File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
-                                <Component Id="Distributed.swiftdoc">
-                                  <File Id="Distributed.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="Distributed.swiftinterface">
-                                  <File Id="Distributed.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
-                                </Component>
-                                <Component Id="Distributed.swiftmodule">
-                                  <File Id="Distributed.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
-                                <Component Id="Dispatch.swiftdoc">
-                                  <File Id="Dispatch.swiftdoc" Name="$(var.ArchTriple).swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\Dispatch.swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="Dispatch.swiftmodule">
-                                  <File Id="Dispatch.swiftmodule" Name="$(var.ArchTriple).swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\Dispatch.swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
-                                <Component Id="Foundation.swiftdoc">
-                                  <File Id="Foundation.swiftdoc" Name="$(var.ArchTriple).swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\Foundation.swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="Foundation.swiftmodule">
-                                  <File Id="Foundation.swiftmodule" Name="$(var.ArchTriple).swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\Foundation.swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule">
-                                <Component Id="FoundationNetworking.swiftdoc">
-                                  <File Id="FoundationNetworking.swiftdoc" Name="$(var.ArchTriple).swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\FoundationNetworking.swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="FoundationNetworking.swiftmodule">
-                                  <File Id="FoundationNetworking.swiftmodule" Name="$(var.ArchTriple).swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\FoundationNetworking.swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule">
-                                <Component Id="FoundationXML.swiftdoc">
-                                  <File Id="FoundationXML.swiftdoc" Name="$(var.ArchTriple).swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\FoundationXML.swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="FoundationXML.swiftmodule">
-                                  <File Id="FoundationXML.swiftmodule" Name="$(var.ArchTriple).swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\FoundationXML.swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
-                                <Component Id="Swift.swiftdoc">
-                                  <File Id="Swift.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="Swift.swiftinterface">
-                                  <File Id="Swift.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
-                                </Component>
-                                <Component Id="Swift.swiftmodule">
-                                  <File Id="Swift.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule">
-                                <Component Id="SwiftOnoneSupport.swiftdoc">
-                                  <File Id="SwiftOnoneSupport.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="SwiftOnoneSupport.swiftinterface">
-                                  <File Id="SwiftOnoneSupport.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
-                                </Component>
-                                <Component Id="SwiftOnoneSupport.swiftmodule">
-                                  <File Id="SwiftOnoneSupport.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule">
-                                <Component Id="WinSDK.swiftdoc">
-                                  <File Id="WinSDK.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" />
-                                </Component>
-                                <Component Id="WinSDK.swiftinterface">
-                                  <File Id="WinSDK.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" />
-                                </Component>
-                                <Component Id="WinSDK.swiftmodule">
-                                  <File Id="WinSDK.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" />
-                                </Component>
-                              </Directory>
-
-                              <Directory Id="WindowsSDK_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)">
-                                <Component Id="swiftRemoteMirror.lib">
-                                  <File Id="swiftRemoteMirror.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftRemoteMirror.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="BlocksRuntime.lib">
-                                  <File Id="BlocksRuntime.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\BlocksRuntime.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="dispatch.lib">
-                                  <File Id="dispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\dispatch.lib" Checksum="yes" />
-                                </Component>
-                                <Component Id="swiftDispatch.lib">
-                                  <File Id="swiftDispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\swiftDispatch.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swift_Concurrency.lib">
-                                  <File Id="swift_Concurrency.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swift_Concurrency.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swift_Differentiation.lib">
-                                  <File Id="swift_Differentiation.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swift_Differentiation.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swift_RegexParser.lib">
-                                  <File Id="swift_RegexParser.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swift_RegexParser.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swift_StringProcessing.lib">
-                                  <File Id="swift_StringProcessing.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swift_StringProcessing.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swiftCRT.lib">
-                                  <File Id="swiftCRT.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftCRT.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swiftCxx.lib">
-                                  <File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftCxx.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swiftDistributed.lib">
-                                  <File Id="swiftDistributed.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftDistributed.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="Foundation.lib">
-                                  <File Id="Foundation.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Foundation.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="FoundationNetworking.lib">
-                                  <File Id="FoundationNetworking.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\FoundationNetworking.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="FoundationXML.lib">
-                                  <File Id="FoundationXML.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\FoundationXML.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swiftCore.lib">
-                                  <File Id="swiftCore.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftCore.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swiftSwiftOnoneSupport.lib">
-                                  <File Id="swiftSwiftOnoneSupport.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftSwiftOnoneSupport.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swiftWinSDK.lib">
-                                  <File Id="swiftWinSDK.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftWinSDK.lib" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="libcxxshim.h">
-                                  <File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\libcxxshim.h" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="libcxxshim.modulemap">
-                                  <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\libcxxshim.modulemap" Checksum="yes" />
-                                </Component>
-
-                                <Component Id="swiftrt.obj">
-                                  <File Id="swiftrt.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftrt.obj" Checksum="yes" />
-                                </Component>
-                                <!--
-                                <Component Id="swiftrtd.obj">
-                                  <File Id="swiftrtd.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftrtd.obj" Checksum="yes" />
-                                </Component>
-                                -->
-                              </Directory>
-                            </Directory>
+                          <Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
+                          </Directory>
+                          <Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
+                          </Directory>
+                          <Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
+                          </Directory>
+                          <Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
+                          </Directory>
+                          <Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
+                          </Directory>
+                          <Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule">
+                          </Directory>
+                          <Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule">
+                          </Directory>
+                          <Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
+                          </Directory>
+                          <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule">
+                          </Directory>
+                          <Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule">
+                          </Directory>
+                          <Directory Id="WindowsSDK_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)">
                           </Directory>
-                        </Directory>
-
-                        <Directory Id="WindowsSDK_usr_share" Name="share">
-                          <Component Id="ucrt.modulemap">
-                            <File Id="ucrt.modulemap" Source="$(var.SDK_ROOT)\usr\share\ucrt.modulemap" Checksum="yes" />
-                          </Component>
-                          <Component Id="winsdk.modulemap">
-                            <File Id="winsdk.modulemap" Source="$(var.SDK_ROOT)\usr\share\winsdk.modulemap" Checksum="yes" />
-                          </Component>
-                          <Component Id="vcruntime.apinotes">
-                            <File Id="vcruntime.apinotes" Source="$(var.SDK_ROOT)\usr\share\vcruntime.apinotes" Checksum="yes" />
-                          </Component>
-                          <Component Id="vcruntime.modulemap">
-                            <File Id="vcruntime.modulemap" Source="$(var.SDK_ROOT)\usr\share\vcruntime.modulemap" Checksum="yes" />
-                          </Component>
                         </Directory>
                       </Directory>
                     </Directory>
+                    <Directory Id="WindowsSDK_usr_share" Name="share">
+                    </Directory>
                   </Directory>
                 </Directory>
               </Directory>
@@ -440,164 +102,405 @@
           </Directory>
         </Directory>
       </Directory>
-    </Directory>
+    </StandardDirectory>
+
+    <ComponentGroup Id="XCTest">
+      <Component Directory="XCTest_usr_bin" Id="XCTest.dll">
+        <File Id="XCTest.dll" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\bin\XCTest.dll" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="XCTest_usr_lib_swift_windows_ARCH" Id="XCTest.lib">
+        <File Id="XCTest.lib" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\XCTest.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="XCTest.swiftmodule" Id="XCTest.swiftdoc">
+        <File Id="XCTest.swiftdoc" Name="$(var.ArchTriple).swiftdoc" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\$(var.ArchArchDir)\XCTest.swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="XCTest.swiftmodule" Id="XCTest.swiftmodule">
+        <File Id="XCTest.swiftmodule" Name="$(var.ArchTriple).swiftmodule" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\$(var.ArchArchDir)\XCTest.swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="SwiftRemoteMirror">
+      <Component Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Id="MemoryReaderInterface.h">
+        <File Id="MemoryReaderInterface.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Id="Platform.h">
+        <File Id="Platform.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\Platform.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Id="SwiftRemoteMirror.h">
+        <File Id="SwiftRemoteMirror.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Id="SwiftRemoteMirrorTypes.h">
+        <File Id="SwiftRemoteMirrorTypes.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Id="SwiftRemoteMirror.modulemap">
+        <File Id="SwiftRemoteMirror.modulemap" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\module.modulemap" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftRemoteMirror.lib">
+        <File Id="swiftRemoteMirror.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftRemoteMirror.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="BlocksRuntime">
+      <Component Directory="WindowsSDK_usr_include_Block" Id="Block.h">
+        <File Id="Block.h" Source="$(var.SDK_ROOT)\usr\lib\swift\Block\Block.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="BlocksRuntime.lib">
+        <File Id="BlocksRuntime.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\BlocksRuntime.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="libdispatch">
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="base.h">
+        <File Id="base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\base.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="block.h">
+        <File Id="block.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\block.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="data.h">
+        <File Id="data.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\data.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="dispatch.h">
+        <File Id="dispatch.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\dispatch.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="group.h">
+        <File Id="group.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\group.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="introspection.h">
+        <File Id="introspection.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\introspection.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="io.h">
+        <File Id="io.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\io.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="dispatch.modulemap">
+        <File Id="dispatch.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\module.modulemap" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="object.h_f87c5a369294493489839a2cabdb7ae7">
+        <File Id="object.h_f87c5a369294493489839a2cabdb7ae7" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\object.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="once.h">
+        <File Id="once.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\once.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="queue.h">
+        <File Id="queue.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\queue.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="semaphore.h">
+        <File Id="semaphore.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\semaphore.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="source.h">
+        <File Id="source.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\source.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_dispatch" Id="time.h">
+        <File Id="time.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\time.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_include_os" Id="generic_base.h">
+        <File Id="generic_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\os\generic_base.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_os" Id="generic_unix_base.h">
+        <File Id="generic_unix_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\os\generic_unix_base.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_os" Id="generic_win_base.h">
+        <File Id="generic_win_base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\os\generic_win_base.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_include_os" Id="object.h_3af0f0745780408e9fb16b614066623f">
+        <File Id="object.h_3af0f0745780408e9fb16b614066623f" Source="$(var.SDK_ROOT)\usr\lib\swift\os\object.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="Dispatch.swiftmodule" Id="Dispatch.swiftdoc">
+        <File Id="Dispatch.swiftdoc" Name="$(var.ArchTriple).swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\Dispatch.swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="Dispatch.swiftmodule" Id="Dispatch.swiftmodule">
+        <File Id="Dispatch.swiftmodule" Name="$(var.ArchTriple).swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\Dispatch.swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="dispatch.lib">
+        <File Id="dispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\dispatch.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftDispatch.lib">
+        <File Id="swiftDispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\swiftDispatch.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="_Concurrency">
+      <Component Directory="_Concurrency.swiftmodule" Id="_Concurrency.swiftdoc">
+        <File Id="_Concurrency.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_Concurrency.swiftmodule" Id="_Concurrency.swiftinterface">
+        <File Id="_Concurrency.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_Concurrency.swiftmodule" Id="_Concurrency.swiftmodule">
+        <File Id="_Concurrency.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swift_Concurrency.lib">
+        <File Id="swift_Concurrency.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swift_Concurrency.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="_Differentiation">
+      <Component Directory="_Differentiation.swiftmodule" Id="_Differentiation.swiftdoc">
+        <File Id="_Differentiation.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_Differentiation.swiftmodule" Id="_Differentiation.swiftinterface">
+        <File Id="_Differentiation.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_Differentiation.swiftmodule" Id="_Differentiation.swiftmodule">
+        <File Id="_Differentiation.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swift_Differentiation.lib">
+        <File Id="swift_Differentiation.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swift_Differentiation.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="_RegexParser">
+      <Component Directory="_RegexParser.swiftmodule" Id="_RegexParser.swiftdoc">
+        <File Id="_RegexParser.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_RegexParser.swiftmodule" Id="_RegexParser.swiftinterface">
+        <File Id="_RegexParser.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_RegexParser.swiftmodule" Id="_RegexParser.swiftmodule">
+        <File Id="_RegexParser.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swift_RegexParser.lib">
+        <File Id="swift_RegexParser.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swift_RegexParser.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="_StringProcessing">
+      <Component Directory="_StringProcessing.swiftmodule" Id="_StringProcessing.swiftdoc">
+        <File Id="_StringProcessing.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_StringProcessing.swiftmodule" Id="_StringProcessing.swiftinterface">
+        <File Id="_StringProcessing.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="_StringProcessing.swiftmodule" Id="_StringProcessing.swiftmodule">
+        <File Id="_StringProcessing.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swift_StringProcessing.lib">
+        <File Id="swift_StringProcessing.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swift_StringProcessing.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="CRT">
+      <Component Directory="CRT.swiftmodule" Id="CRT.swiftdoc">
+        <File Id="CRT.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="CRT.swiftmodule" Id="CRT.swiftinterface">
+        <File Id="CRT.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="CRT.swiftmodule" Id="CRT.swiftmodule">
+        <File Id="CRT.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftCRT.lib">
+        <File Id="swiftCRT.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftCRT.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="Cxx">
+      <Component Directory="Cxx.swiftmodule" Id="Cxx.swiftdoc">
+        <File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="Cxx.swiftmodule" Id="Cxx.swiftinterface">
+        <File Id="Cxx.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="Cxx.swiftmodule" Id="Cxx.swiftmodule">
+        <File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftCxx.lib">
+        <File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftCxx.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="Distributed">
+      <Component Directory="Distributed.swiftmodule" Id="Distributed.swiftdoc">
+        <File Id="Distributed.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="Distributed.swiftmodule" Id="Distributed.swiftinterface">
+        <File Id="Distributed.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="Distributed.swiftmodule" Id="Distributed.swiftmodule">
+        <File Id="Distributed.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftDistributed.lib">
+        <File Id="swiftDistributed.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftDistributed.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="Foundation">
+      <Component Directory="Foundation.swiftmodule" Id="Foundation.swiftdoc">
+        <File Id="Foundation.swiftdoc" Name="$(var.ArchTriple).swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\Foundation.swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="Foundation.swiftmodule" Id="Foundation.swiftmodule">
+        <File Id="Foundation.swiftmodule" Name="$(var.ArchTriple).swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\Foundation.swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="Foundation.lib">
+        <File Id="Foundation.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Foundation.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="FoundationNetworking">
+      <Component Directory="FoundationNetworking.swiftmodule" Id="FoundationNetworking.swiftdoc">
+        <File Id="FoundationNetworking.swiftdoc" Name="$(var.ArchTriple).swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\FoundationNetworking.swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="FoundationNetworking.swiftmodule" Id="FoundationNetworking.swiftmodule">
+        <File Id="FoundationNetworking.swiftmodule" Name="$(var.ArchTriple).swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\FoundationNetworking.swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="FoundationNetworking.lib">
+        <File Id="FoundationNetworking.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\FoundationNetworking.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="FoundationXML">
+      <Component Directory="FoundationXML.swiftmodule" Id="FoundationXML.swiftdoc">
+        <File Id="FoundationXML.swiftdoc" Name="$(var.ArchTriple).swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\FoundationXML.swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="FoundationXML.swiftmodule" Id="FoundationXML.swiftmodule">
+        <File Id="FoundationXML.swiftmodule" Name="$(var.ArchTriple).swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\FoundationXML.swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="FoundationXML.lib">
+        <File Id="FoundationXML.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\FoundationXML.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="Swift">
+      <Component Directory="Swift.swiftmodule" Id="Swift.swiftdoc">
+        <File Id="Swift.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="Swift.swiftmodule" Id="Swift.swiftinterface">
+        <File Id="Swift.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="Swift.swiftmodule" Id="Swift.swiftmodule">
+        <File Id="Swift.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftCore.lib">
+        <File Id="swiftCore.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftCore.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="SwiftOnoneSupport">
+      <Component Directory="SwiftOnoneSupport.swiftmodule" Id="SwiftOnoneSupport.swiftdoc">
+        <File Id="SwiftOnoneSupport.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="SwiftOnoneSupport.swiftmodule" Id="SwiftOnoneSupport.swiftinterface">
+        <File Id="SwiftOnoneSupport.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="SwiftOnoneSupport.swiftmodule" Id="SwiftOnoneSupport.swiftmodule">
+        <File Id="SwiftOnoneSupport.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftSwiftOnoneSupport.lib">
+        <File Id="swiftSwiftOnoneSupport.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftSwiftOnoneSupport.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="WinSDK">
+      <Component Directory="WinSDK.swiftmodule" Id="WinSDK.swiftdoc">
+        <File Id="WinSDK.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\$(var.ArchTriple).swiftdoc" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WinSDK.swiftmodule" Id="WinSDK.swiftinterface">
+        <File Id="WinSDK.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\$(var.ArchTriple).swiftinterface" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WinSDK.swiftmodule" Id="WinSDK.swiftmodule">
+        <File Id="WinSDK.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\$(var.ArchTriple).swiftmodule" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftWinSDK.lib">
+        <File Id="swiftWinSDK.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftWinSDK.lib" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="libcxxshim">
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="libcxxshim.h">
+        <File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\libcxxshim.h" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="libcxxshim.modulemap">
+        <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\libcxxshim.modulemap" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="Registrar">
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftrt.obj">
+        <File Id="swiftrt.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftrt.obj" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <!--
+      <Component Directory="WindowsSDK_usr_lib_swift_windows_ARCH" Id="swiftrtd.obj">
+        <File Id="swiftrtd.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\$(var.ArchArchDir)\swiftrtd.obj" Checksum="yes" KeyPath="yes" />
+      </Component>
+      -->
+    </ComponentGroup>
+
+    <ComponentGroup Id="AuxiliaryFiles">
+      <Component Directory="WindowsSDK_usr_share" Id="ucrt.modulemap">
+        <File Id="ucrt.modulemap" Source="$(var.SDK_ROOT)\usr\share\ucrt.modulemap" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_share" Id="winsdk.modulemap">
+        <File Id="winsdk.modulemap" Source="$(var.SDK_ROOT)\usr\share\winsdk.modulemap" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_share" Id="vcruntime.apinotes">
+        <File Id="vcruntime.apinotes" Source="$(var.SDK_ROOT)\usr\share\vcruntime.apinotes" Checksum="yes" KeyPath="yes" />
+      </Component>
+      <Component Directory="WindowsSDK_usr_share" Id="vcruntime.modulemap">
+        <File Id="vcruntime.modulemap" Source="$(var.SDK_ROOT)\usr\share\vcruntime.modulemap" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <ComponentGroup Id="Configuration">
+      <Component Directory="WindowsSDK" Id="SDKSettings.plist">
+        <File Id="SDKSettings.plist" Source="$(var.SDK_ROOT)\SDKSettings.plist" Checksum="yes" KeyPath="yes" />
+      </Component>
+
+      <Component Directory="WindowsPlatform" Id="Info.plist">
+        <File Id="Info.plist" Source="$(var.PLATFORM_ROOT)\Info.plist" Checksum="yes" KeyPath="yes" />
+      </Component>
+    </ComponentGroup>
+
+    <Component Directory="INSTALLDIR" Id="EnvironmentVariables" Guid="bd3ddc62-4c5c-4f6b-806e-02d2c6a65b65">
+      <!-- <Condition> %PROCESSOR_ARCHITECTURE~="arm64" </Condition> -->
+      <Environment Id="SDKRoot" Action="set" Name="SDKROOT" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Platforms\Windows.platform\Developer\SDKs\Windows.sdk" />
+    </Component>
 
     <!-- Features -->
     <Feature Id="SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows SDK ($(var.ProcessorArchitecture))" Level="1" Title="Swift Windows SDK ($(var.ProcessorArchitecture))">
-      <!-- XCTest -->
-      <ComponentRef Id="XCTest.dll" />
-
-      <ComponentRef Id="XCTest.lib" />
-
-      <ComponentRef Id="XCTest.swiftdoc" />
-      <ComponentRef Id="XCTest.swiftmodule" />
-
-      <!-- SwiftRemoteMirror -->
-      <ComponentRef Id="MemoryReaderInterface.h" />
-      <ComponentRef Id="Platform.h" />
-      <ComponentRef Id="SwiftRemoteMirror.h" />
-      <ComponentRef Id="SwiftRemoteMirrorTypes.h" />
-      <ComponentRef Id="SwiftRemoteMirror.modulemap" />
-
-      <ComponentRef Id="swiftRemoteMirror.lib" />
-
-      <!-- BlocksRuntime -->
-      <ComponentRef Id="Block.h" />
-
-      <ComponentRef Id="BlocksRuntime.lib" />
-
-      <!-- libdispatch -->
-      <ComponentRef Id="base.h" />
-      <ComponentRef Id="block.h" />
-      <ComponentRef Id="data.h" />
-      <ComponentRef Id="dispatch.h" />
-      <ComponentRef Id="group.h" />
-      <ComponentRef Id="introspection.h" />
-      <ComponentRef Id="io.h" />
-      <ComponentRef Id="dispatch.modulemap" />
-      <ComponentRef Id="object.h_f87c5a369294493489839a2cabdb7ae7" />
-      <ComponentRef Id="once.h" />
-      <ComponentRef Id="queue.h" />
-      <ComponentRef Id="semaphore.h" />
-      <ComponentRef Id="source.h" />
-      <ComponentRef Id="time.h" />
-
-      <ComponentRef Id="generic_base.h" />
-      <ComponentRef Id="generic_unix_base.h" />
-      <ComponentRef Id="generic_win_base.h" />
-      <ComponentRef Id="object.h_3af0f0745780408e9fb16b614066623f" />
-
-      <ComponentRef Id="Dispatch.swiftdoc" />
-      <ComponentRef Id="Dispatch.swiftmodule" />
-
-      <ComponentRef Id="dispatch.lib" />
-      <ComponentRef Id="swiftDispatch.lib" />
-
-      <!-- _Concurrency -->
-      <ComponentRef Id="_Concurrency.swiftdoc" />
-      <ComponentRef Id="_Concurrency.swiftinterface" />
-      <ComponentRef Id="_Concurrency.swiftmodule" />
-
-      <ComponentRef Id="swift_Concurrency.lib" />
-
-      <!-- _Differentiation -->
-      <ComponentRef Id="_Differentiation.swiftdoc" />
-      <ComponentRef Id="_Differentiation.swiftinterface" />
-      <ComponentRef Id="_Differentiation.swiftmodule" />
-
-      <ComponentRef Id="swift_Differentiation.lib" />
-
-      <!-- _RegexParser -->
-      <ComponentRef Id="_RegexParser.swiftdoc" />
-      <ComponentRef Id="_RegexParser.swiftinterface" />
-      <ComponentRef Id="_RegexParser.swiftmodule" />
-
-      <ComponentRef Id="swift_RegexParser.lib" />
-
-      <!-- _StringProcessing -->
-      <ComponentRef Id="_StringProcessing.swiftdoc" />
-      <ComponentRef Id="_StringProcessing.swiftinterface" />
-      <ComponentRef Id="_StringProcessing.swiftmodule" />
-
-      <ComponentRef Id="swift_StringProcessing.lib" />
-
-      <!-- CRT -->
-      <ComponentRef Id="CRT.swiftdoc" />
-      <ComponentRef Id="CRT.swiftinterface" />
-      <ComponentRef Id="CRT.swiftmodule" />
-
-      <ComponentRef Id="swiftCRT.lib" />
-
-      <!-- Cxx -->
-      <ComponentRef Id="Cxx.swiftdoc" />
-      <ComponentRef Id="Cxx.swiftinterface" />
-      <ComponentRef Id="Cxx.swiftmodule" />
-
-      <ComponentRef Id="swiftCxx.lib" />
-
-      <!-- Distributed -->
-      <ComponentRef Id="Distributed.swiftdoc" />
-      <ComponentRef Id="Distributed.swiftinterface" />
-      <ComponentRef Id="Distributed.swiftmodule" />
-
-      <ComponentRef Id="swiftDistributed.lib" />
-
-      <!-- Foundation -->
-      <ComponentRef Id="Foundation.swiftdoc" />
-      <ComponentRef Id="Foundation.swiftmodule" />
-
-      <ComponentRef Id="Foundation.lib" />
-
-      <!-- FoundationNetworking -->
-      <ComponentRef Id="FoundationNetworking.swiftdoc" />
-      <ComponentRef Id="FoundationNetworking.swiftmodule" />
-
-      <ComponentRef Id="FoundationNetworking.lib" />
-
-      <!-- FoundationXML -->
-      <ComponentRef Id="FoundationXML.swiftdoc" />
-      <ComponentRef Id="FoundationXML.swiftmodule" />
-
-      <ComponentRef Id="FoundationXML.lib" />
-
-      <!-- Swift -->
-      <ComponentRef Id="Swift.swiftdoc" />
-      <ComponentRef Id="Swift.swiftinterface" />
-      <ComponentRef Id="Swift.swiftmodule" />
-
-      <ComponentRef Id="swiftCore.lib" />
-
-      <!-- SwiftOnoneSupport -->
-      <ComponentRef Id="SwiftOnoneSupport.swiftdoc" />
-      <ComponentRef Id="SwiftOnoneSupport.swiftinterface" />
-      <ComponentRef Id="SwiftOnoneSupport.swiftmodule" />
-
-      <ComponentRef Id="swiftSwiftOnoneSupport.lib" />
-
-      <!-- WinSDK -->
-      <ComponentRef Id="WinSDK.swiftdoc" />
-      <ComponentRef Id="WinSDK.swiftinterface" />
-      <ComponentRef Id="WinSDK.swiftmodule" />
-
-      <ComponentRef Id="swiftWinSDK.lib" />
-
-      <!-- libcxxshim -->
-      <ComponentRef Id="libcxxshim.h" />
-      <ComponentRef Id="libcxxshim.modulemap" />
-
-      <!-- Registrars -->
-      <ComponentRef Id="swiftrt.obj" />
-      <!-- <ComponentRef Id="swiftrtd.obj" /> -->
-
-      <!-- Auxiliary Files -->
-      <ComponentRef Id="ucrt.modulemap" />
-      <ComponentRef Id="winsdk.modulemap" />
-      <ComponentRef Id="vcruntime.apinotes" />
-      <ComponentRef Id="vcruntime.modulemap" />
-
-      <!-- Configuration -->
-      <ComponentRef Id="Info.plist" />
-      <ComponentRef Id="SDKSettings.plist" />
+      <ComponentGroupRef Id="XCTest" />
+      <ComponentGroupRef Id="SwiftRemoteMirror" />
+      <ComponentGroupRef Id="BlocksRuntime" />
+      <ComponentGroupRef Id="libdispatch" />
+      <ComponentGroupRef Id="_Concurrency" />
+      <ComponentGroupRef Id="_Differentiation" />
+      <ComponentGroupRef Id="_RegexParser" />
+      <ComponentGroupRef Id="_StringProcessing" />
+      <ComponentGroupRef Id="CRT" />
+      <ComponentGroupRef Id="Cxx" />
+      <ComponentGroupRef Id="Distributed" />
+      <ComponentGroupRef Id="Foundation" />
+      <ComponentGroupRef Id="FoundationXML" />
+      <ComponentGroupRef Id="FoundationNetworking" />
+      <ComponentGroupRef Id="Swift" />
+      <ComponentGroupRef Id="SwiftOnoneSupport" />
+      <ComponentGroupRef Id="WinSDK" />
+      <ComponentGroupRef Id="libcxxshim" />
+      <ComponentGroupRef Id="Registrar" />
+      <ComponentGroupRef Id="AuxiliaryFiles" />
+      <ComponentGroupRef Id="Configuration" />
+
+      <ComponentGroupRef Id="SwiftShims" />
 
       <ComponentRef Id="EnvironmentVariables" />
     </Feature>

From 4c6638c436e6636f410529875278263f3d02c146 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Fri, 9 Jun 2023 12:43:55 -0700
Subject: [PATCH 05/10] WiX: remove the obsolete `DEVELOPER_SDK` environment
 variable

This was removed from use in SPM in 5.7.  Update the installer to no
longer add this environment variable.
---
 platforms/Windows/bld.wxs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platforms/Windows/bld.wxs b/platforms/Windows/bld.wxs
index 9889d064..f1a3e8c1 100644
--- a/platforms/Windows/bld.wxs
+++ b/platforms/Windows/bld.wxs
@@ -354,7 +354,6 @@
     </ComponentGroup>
 
     <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="d01ea5b8-0f8a-4388-9b61-1186efddfc39">
-      <Environment Id="DeveloperDir" Action="set" Name="DEVELOPER_DIR" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer" />
       <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Toolchains\$(var.ProductVersion)+Asserts\usr\bin" />
     </Component>
 

From 7911586a39e6267d08d0abd5c2e7e0cc61001664 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Fri, 9 Jun 2023 13:54:12 -0700
Subject: [PATCH 06/10] WiX: adjust the environment handling to handle dual
 purpose

Ensure that we properly handle the environment when installing.  When
performing a per-user install, we should modify the user's environment
variables and when performing a per-machine install, modify the system
environment variables.
---
 platforms/Windows/bld.wxs     | 13 +++++++++----
 platforms/Windows/runtime.wxs | 13 +++++++++----
 platforms/Windows/sdk.wxs     | 16 +++++++++++-----
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/platforms/Windows/bld.wxs b/platforms/Windows/bld.wxs
index f1a3e8c1..17a2670f 100644
--- a/platforms/Windows/bld.wxs
+++ b/platforms/Windows/bld.wxs
@@ -353,9 +353,14 @@
       </Component>
     </ComponentGroup>
 
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="d01ea5b8-0f8a-4388-9b61-1186efddfc39">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Toolchains\$(var.ProductVersion)+Asserts\usr\bin" />
-    </Component>
+    <ComponentGroup Id="EnvironmentVariables">
+      <Component Id="SystemEnvironmentVariables" Condition="ALLUSERS=1" Directory="INSTALLDIR" Guid="d01ea5b8-0f8a-4388-9b61-1186efddfc39">
+        <Environment Id="SystemPath" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Toolchains\$(var.ProductVersion)+Asserts\usr\bin" />
+      </Component>
+      <Component Id="UserEnvironmentVariables" Condition="NOT ALLUSERS=1" Directory="INSTALLDIR" Guid="ab52b870-23ee-42e8-9581-3fcbdfb9228c">
+        <Environment Id="UserPath" Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[INSTALLDIR]Toolchains\$(var.ProductVersion)+Asserts\usr\bin" />
+      </Component>
+    </ComponentGroup>
 
     <Feature Id="BuildTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Build Tools" Level="1" Title="Swift Build Tools">
       <ComponentGroupRef Id="binutils" />
@@ -371,7 +376,7 @@
 
       <ComponentGroupRef Id="ClangResources" />
 
-      <ComponentRef Id="EnvironmentVariables" />
+      <ComponentGroupRef Id="EnvironmentVariables" />
     </Feature>
 
     <UI>
diff --git a/platforms/Windows/runtime.wxs b/platforms/Windows/runtime.wxs
index 6e6df334..85106273 100644
--- a/platforms/Windows/runtime.wxs
+++ b/platforms/Windows/runtime.wxs
@@ -99,9 +99,14 @@
       </Component>
     </ComponentGroup>
 
-    <Component Directory="INSTALLDIR" Id="EnvironmentVariables" Guid="8681d813-eb32-46f9-8b1c-f622b38b5eaf">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Runtimes\$(var.ProductVersion)\usr\bin" />
-    </Component>
+    <ComponentGroup Id="EnvironmentVariables">
+      <Component Id="SystemEnvironmentVariables" Condition="ALLUSERS=1" Directory="INSTALLDIR" Guid="8681d813-eb32-46f9-8b1c-f622b38b5eaf">
+        <Environment Id="SystemPath" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Runtimes\$(var.ProductVersion)\usr\bin" />
+      </Component>
+      <Component Id="UserEnvironmentVariables" Condition="NOT ALLUSERS=1" Directory="INSTALLDIR" Guid="b83f6521-8708-4e2d-afef-076d8cdd7528">
+        <Environment Id="UserPath" Action="set" Name="Path" Part="last" Permanent="no" System="no" Value="[INSTALLDIR]Runtimes\$(var.ProductVersion)\usr\bin" />
+      </Component>
+    </ComponentGroup>
 
     <!-- Feature -->
     <Feature Id="SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows Runtime ($(var.ProcessorArchitecture))" Level="1" Title="Swift Windows Runtime ($(var.ProcessorArchitecture))">
@@ -110,7 +115,7 @@
       <ComponentGroupRef Id="libdispatch" />
       <ComponentGroupRef Id="Foundation" />
 
-      <ComponentRef Id="EnvironmentVariables" />
+      <ComponentGroupRef Id="EnvironmentVariables" />
     </Feature>
 
     <Feature Id="SwiftUtilities" AllowAbsent="yes" AllowAdvertise="yes" Description="Extra Swift Utilities Windows ($(var.ProcessorArchitecture))" Level="1" Title="Swift Utilities Windows ($(var.ProcessorArchitecture))">
diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs
index cc4ee010..5cd59a87 100644
--- a/platforms/Windows/sdk.wxs
+++ b/platforms/Windows/sdk.wxs
@@ -471,10 +471,16 @@
       </Component>
     </ComponentGroup>
 
-    <Component Directory="INSTALLDIR" Id="EnvironmentVariables" Guid="bd3ddc62-4c5c-4f6b-806e-02d2c6a65b65">
-      <!-- <Condition> %PROCESSOR_ARCHITECTURE~="arm64" </Condition> -->
-      <Environment Id="SDKRoot" Action="set" Name="SDKROOT" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Platforms\Windows.platform\Developer\SDKs\Windows.sdk" />
-    </Component>
+    <ComponentGroup Id="EnvironmentVariables">
+      <Component Id="SystemEnvironmentVariables" Condition="ALLUSERS=1" Directory="INSTALLDIR" Guid="bd3ddc62-4c5c-4f6b-806e-02d2c6a65b65">
+        <!-- <Condition> %PROCESSOR_ARCHITECTURE~="arm64" </Condition> -->
+        <Environment Id="SystemSDKRoot" Action="set" Name="SDKROOT" Part="all" Permanent="no" System="yes" Value="[INSTALLDIR]Platforms\Windows.platform\Developer\SDKs\Windows.sdk" />
+      </Component>
+      <Component Id="UserEnvironmentVariables" Condition="NOT ALLUSERS=1" Directory="INSTALLDIR" Guid="580f1edd-8744-4be8-8dd8-e519f70a91e4">
+        <!-- <Condition> %PROCESSOR_ARCHITECTURE~="arm64" </Condition> -->
+        <Environment Id="UserSDKRoot" Action="set" Name="SDKROOT" Part="all" Permanent="no" System="no" Value="[INSTALLDIR]Platforms\Windows.platform\Developer\SDKs\Windows.sdk" />
+      </Component>
+    </ComponentGroup>
 
     <!-- Features -->
     <Feature Id="SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows SDK ($(var.ProcessorArchitecture))" Level="1" Title="Swift Windows SDK ($(var.ProcessorArchitecture))">
@@ -502,7 +508,7 @@
 
       <ComponentGroupRef Id="SwiftShims" />
 
-      <ComponentRef Id="EnvironmentVariables" />
+      <ComponentGroupRef Id="EnvironmentVariables" />
     </Feature>
 
     <UI>

From 1d6203c27b1ecc8451d5acd21fcccef40d4847e6 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Fri, 9 Jun 2023 14:02:32 -0700
Subject: [PATCH 07/10] WiX: reduce some vertical whitespace usage

Remove the use of empty nodes and collapse them to the short form.  This
reduces the height of the directory hierarchy listing and makes it
easier to identify the leaf nodes in the file system.
---
 platforms/Windows/bld.wxs     | 23 ++++--------
 platforms/Windows/cli.wxs     | 20 ++++------
 platforms/Windows/dbg.wxs     | 11 ++----
 platforms/Windows/ide.wxs     | 11 ++----
 platforms/Windows/runtime.wxs |  3 +-
 platforms/Windows/sdk.wxs     | 71 ++++++++++++-----------------------
 6 files changed, 48 insertions(+), 91 deletions(-)

diff --git a/platforms/Windows/bld.wxs b/platforms/Windows/bld.wxs
index 17a2670f..89edbdfb 100644
--- a/platforms/Windows/bld.wxs
+++ b/platforms/Windows/bld.wxs
@@ -22,29 +22,22 @@
     <StandardDirectory Id="ProgramFiles64Folder">
       <Directory Id="INSTALLDIR" Name="Swift">
         <Directory Id="Toolchains" Name="Toolchains">
-          <Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
+          <Directory Id="_" Name="$(var.ProductVersion)+Asserts">
             <Directory Id="_usr" Name="usr">
-              <Directory Id="_usr_bin" Name="bin">
-              </Directory>
+              <Directory Id="_usr_bin" Name="bin" />
               <Directory Id="_usr_include" Name="include">
-                <Directory Id="_usr_include_llvm_c" Name="llvm-c">
-                </Directory>
+                <Directory Id="_usr_include_llvm_c" Name="llvm-c" />
               </Directory>
               <Directory Id="_usr_lib" Name="lib">
-                <Directory Id="_usr_lib_clang" Name="clang">
-                </Directory>
+                <Directory Id="_usr_lib_clang" Name="clang" />
                 <Directory Id="_usr_lib_swift" Name="swift">
-                  <Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx">
-                  </Directory>
-                  <Directory Id="_usr_lib_swift_migrator" Name="migrator">
-                  </Directory>
-                  <Directory Id="_usr_lib_swift_shims" Name="shims">
-                  </Directory>
+                  <Directory Id="_usr_lib_swift_swiftToCxx" Name="swiftToCxx" />
+                  <Directory Id="_usr_lib_swift_migrator" Name="migrator" />
+                  <Directory Id="_usr_lib_swift_shims" Name="shims" />
                 </Directory>
               </Directory>
               <Directory Id="_usr_share" Name="share">
-                <Directory Id="_usr_share_swift" Name="swift">
-                </Directory>
+                <Directory Id="_usr_share_swift" Name="swift" />
               </Directory>
             </Directory>
           </Directory>
diff --git a/platforms/Windows/cli.wxs b/platforms/Windows/cli.wxs
index 0182d21a..fbb7994c 100644
--- a/platforms/Windows/cli.wxs
+++ b/platforms/Windows/cli.wxs
@@ -14,25 +14,19 @@
     <StandardDirectory Id="ProgramFiles64Folder">
       <Directory Id="INSTALLDIR" Name="Swift">
         <Directory Id="Toolchains" Name="Toolchains">
-          <Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
+          <Directory Id="_" Name="$(var.ProductVersion)+Asserts">
             <Directory Id="_usr" Name="usr">
-              <Directory Id="_usr_bin" Name="bin">
-              </Directory>
+              <Directory Id="_usr_bin" Name="bin" />
               <Directory Id="_usr_include" Name="include">
-                <Directory Id="_usr_include__InternalSwiftScan" Name="_InternalSwiftScan">
-                </Directory>
-                <Directory Id="_usr_include_clang_c" Name="clang-c">
-                </Directory>
-                <Directory Id="_usr_include_indexstore" Name="indexstore">
-                </Directory>
+                <Directory Id="_usr_include__InternalSwiftScan" Name="_InternalSwiftScan" />
+                <Directory Id="_usr_include_clang_c" Name="clang-c" />
+                <Directory Id="_usr_include_indexstore" Name="indexstore" />
               </Directory>
               <Directory Id="_usr_lib" Name="lib">
                 <Directory Id="_usr_lib_swift" Name="swift">
                   <Directory Id="_usr_lib_swift_pm" Name="pm">
-                    <Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
-                    </Directory>
-                    <Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
-                    </Directory>
+                    <Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI" />
+                    <Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI" />
                   </Directory>
                 </Directory>
               </Directory>
diff --git a/platforms/Windows/dbg.wxs b/platforms/Windows/dbg.wxs
index dfdf81ce..f037fddb 100644
--- a/platforms/Windows/dbg.wxs
+++ b/platforms/Windows/dbg.wxs
@@ -14,19 +14,16 @@
     <StandardDirectory Id="ProgramFiles64Folder">
       <Directory Id="INSTALLDIR" Name="Swift">
         <Directory Id="Toolchains" Name="Toolchains">
-          <Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
+          <Directory Id="_" Name="$(var.ProductVersion)+Asserts">
             <Directory Id="_usr" Name="usr">
-              <Directory Id="_usr_bin" Name="bin">
-              </Directory>
+              <Directory Id="_usr_bin" Name="bin" />
               <Directory Id="_usr_lib" Name="lib">
                 <Directory Id="_usr_lib_site_packages" Name="site-packages">
                   <Directory Id="_usr_lib_site_packages_lldb" Name="lldb">
                     <Directory Id="_usr_lib_site_packages_lldb_formatters" Name="formatters">
-                      <Directory Id="_usr_lib_site_packages_lldb_formatters_cpp" Name="cpp">
-                      </Directory>
-                    </Directory>
-                    <Directory Id="_usr_lib_site_packages_lldb_utils" Name="utils">
+                      <Directory Id="_usr_lib_site_packages_lldb_formatters_cpp" Name="cpp" />
                     </Directory>
+                    <Directory Id="_usr_lib_site_packages_lldb_utils" Name="utils" />
                   </Directory>
                 </Directory>
               </Directory>
diff --git a/platforms/Windows/ide.wxs b/platforms/Windows/ide.wxs
index 7d318cb3..b1833b84 100644
--- a/platforms/Windows/ide.wxs
+++ b/platforms/Windows/ide.wxs
@@ -14,16 +14,13 @@
     <StandardDirectory Id="ProgramFiles64Folder">
       <Directory Id="INSTALLDIR" Name="Swift">
         <Directory Id="Toolchains" Name="Toolchains">
-          <Directory Id="xctoolchain" Name="$(var.ProductVersion)+Asserts">
+          <Directory Id="_" Name="$(var.ProductVersion)+Asserts">
             <Directory Id="_usr" Name="usr">
-              <Directory Id="_usr_bin" Name="bin">
-              </Directory>
+              <Directory Id="_usr_bin" Name="bin" />
               <Directory Id="_usr_include" Name="include">
-                <Directory Id="_usr_include_SourceKit" Name="SourceKit">
-                </Directory>
-              </Directory>
-              <Directory Id="_usr_lib" Name="lib">
+                <Directory Id="_usr_include_SourceKit" Name="SourceKit" />
               </Directory>
+              <Directory Id="_usr_lib" Name="lib" />
             </Directory>
           </Directory>
         </Directory>
diff --git a/platforms/Windows/runtime.wxs b/platforms/Windows/runtime.wxs
index 85106273..53582591 100644
--- a/platforms/Windows/runtime.wxs
+++ b/platforms/Windows/runtime.wxs
@@ -16,8 +16,7 @@
         <Directory Id="Runtimes" Name="Runtimes">
           <Directory Id="_" Name="$(var.ProductVersion)">
             <Directory Id="_usr" Name="usr">
-              <Directory Id="_usr_bin" Name="bin">
-              </Directory>
+              <Directory Id="_usr_bin" Name="bin" />
             </Directory>
           </Directory>
         </Directory>
diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs
index 5cd59a87..2908f75c 100644
--- a/platforms/Windows/sdk.wxs
+++ b/platforms/Windows/sdk.wxs
@@ -13,7 +13,7 @@
 
     <StandardDirectory Id="ProgramFiles64Folder">
       <Directory Id="INSTALLDIR" Name="Swift">
-        <Directory Id="DeveloperPlatforms" Name="Platforms">
+        <Directory Id="Platforms" Name="Platforms">
           <Directory Id="WindowsPlatform" Name="Windows.platform">
             <Directory Id="WindowsPlatform_Developer" Name="Developer">
               <Directory Id="WindowsPlatform_Developer_Library" Name="Library">
@@ -29,10 +29,8 @@
                     <Directory Id="XCTest_usr_lib" Name="lib">
                       <Directory Id="XCTest_usr_lib_swift" Name="swift">
                         <Directory Id="XCTest_usr_lib_swift_windows" Name="windows">
-                          <Directory Id="XCTest_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)">
-                          </Directory>
-                          <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule">
-                          </Directory>
+                          <Directory Id="XCTest_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)" />
+                          <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule" />
                         </Directory>
                       </Directory>
                     </Directory>
@@ -44,57 +42,36 @@
                 <Directory Id="WindowsSDK" Name="Windows.sdk">
                   <Directory Id="WindowsSDK_usr" Name="usr">
                     <Directory Id="WindowsSDK_usr_include" Name="include">
-                      <Directory Id="WindowsSDK_usr_include_Block" Name="Block">
-                      </Directory>
-                      <Directory Id="WindowsSDK_usr_include_dispatch" Name="dispatch">
-                      </Directory>
-                      <Directory Id="WindowsSDK_usr_include_os" Name="os">
-                      </Directory>
+                      <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_swift" Name="swift">
-                        <Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror">
-                        </Directory>
+                        <Directory Id="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Name="SwiftRemoteMirror" />
                       </Directory>
                     </Directory>
                     <Directory Id="WindowsSDK_usr_lib" Name="lib">
                       <Directory Id="WindowsSDK_usr_lib_swift" Name="swift">
-                        <Directory Id="WindowsSDK_usr_lib_swift_shims" Name="shims">
-                        </Directory>
+                        <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>
-                          <Directory Id="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
-                          </Directory>
-                          <Directory Id="_RegexParser.swiftmodule" Name="_RegexParser.swiftmodule">
-                          </Directory>
-                          <Directory Id="_StringProcessing.swiftmodule" Name="_StringProcessing.swiftmodule">
-                          </Directory>
-                          <Directory Id="CRT.swiftmodule" Name="CRT.swiftmodule">
-                          </Directory>
-                          <Directory Id="Cxx.swiftmodule" Name="Cxx.swiftmodule">
-                          </Directory>
-                          <Directory Id="Distributed.swiftmodule" Name="Distributed.swiftmodule">
-                          </Directory>
-                          <Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule">
-                          </Directory>
-                          <Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule">
-                          </Directory>
-                          <Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule">
-                          </Directory>
-                          <Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule">
-                          </Directory>
-                          <Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule">
-                          </Directory>
-                          <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule">
-                          </Directory>
-                          <Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule">
-                          </Directory>
-                          <Directory Id="WindowsSDK_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)">
-                          </Directory>
+                          <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="Distributed.swiftmodule" Name="Distributed.swiftmodule" />
+                          <Directory Id="Dispatch.swiftmodule" Name="Dispatch.swiftmodule" />
+                          <Directory Id="Foundation.swiftmodule" Name="Foundation.swiftmodule" />
+                          <Directory Id="FoundationNetworking.swiftmodule" Name="FoundationNetworking.swiftmodule" />
+                          <Directory Id="FoundationXML.swiftmodule" Name="FoundationXML.swiftmodule" />
+                          <Directory Id="Swift.swiftmodule" Name="Swift.swiftmodule" />
+                          <Directory Id="SwiftOnoneSupport.swiftmodule" Name="SwiftOnoneSupport.swiftmodule" />
+                          <Directory Id="WinSDK.swiftmodule" Name="WinSDK.swiftmodule" />
+                          <Directory Id="WindowsSDK_usr_lib_swift_windows_ARCH" Name="$(var.ArchArchDir)" />
                         </Directory>
                       </Directory>
                     </Directory>
-                    <Directory Id="WindowsSDK_usr_share" Name="share">
-                    </Directory>
+                    <Directory Id="WindowsSDK_usr_share" Name="share" />
                   </Directory>
                 </Directory>
               </Directory>

From 776fa6e805dbe8541ffa4e90c6118294caa5b076 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Tue, 13 Jun 2023 15:44:28 -0700
Subject: [PATCH 08/10] WiX: rename version.wxi to config.wxi

The original version information has been removed from the include file
and now only has the configuration for the build.  This allows us to use
a single definition for the various architectures.
---
 platforms/Windows/bld.wxs                     | 1 -
 platforms/Windows/cli.wxs                     | 1 -
 platforms/Windows/{version.wxi => config.wxi} | 8 --------
 platforms/Windows/dbg.wxs                     | 1 -
 platforms/Windows/ide.wxs                     | 1 -
 platforms/Windows/runtime.wxs                 | 2 +-
 platforms/Windows/sdk.wxs                     | 2 +-
 7 files changed, 2 insertions(+), 14 deletions(-)
 rename platforms/Windows/{version.wxi => config.wxi} (78%)

diff --git a/platforms/Windows/bld.wxs b/platforms/Windows/bld.wxs
index 89edbdfb..a15ccd47 100644
--- a/platforms/Windows/bld.wxs
+++ b/platforms/Windows/bld.wxs
@@ -1,5 +1,4 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"
diff --git a/platforms/Windows/cli.wxs b/platforms/Windows/cli.wxs
index fbb7994c..210da8a6 100644
--- a/platforms/Windows/cli.wxs
+++ b/platforms/Windows/cli.wxs
@@ -1,5 +1,4 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"
diff --git a/platforms/Windows/version.wxi b/platforms/Windows/config.wxi
similarity index 78%
rename from platforms/Windows/version.wxi
rename to platforms/Windows/config.wxi
index 82097e09..cda1f856 100644
--- a/platforms/Windows/version.wxi
+++ b/platforms/Windows/config.wxi
@@ -1,14 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 
 <Include>
-<?if $(var.ProductVersion) = "0.0.0"?>
-<?define RuntimeName = "runtime-development"?>
-<?define ToolchainName = "unknown-Asserts-development.xctoolchain"?>
-<?else?>
-<?define RuntimeName = "runtime-$(var.ProductVersion)"?>
-<?define ToolchainName = "unknown-Asserts-$(var.ProductVersion).xctoolchain"?>
-<?endif?>
-
 <?if $(var.ProductArchitecture) = "amd64"?>
   <?define ProcessorArchitecture = "AMD64"?>
 <?elseif $(var.ProductArchitecture) = "arm64"?>
diff --git a/platforms/Windows/dbg.wxs b/platforms/Windows/dbg.wxs
index f037fddb..11e90360 100644
--- a/platforms/Windows/dbg.wxs
+++ b/platforms/Windows/dbg.wxs
@@ -1,5 +1,4 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"
diff --git a/platforms/Windows/ide.wxs b/platforms/Windows/ide.wxs
index b1833b84..92e487aa 100644
--- a/platforms/Windows/ide.wxs
+++ b/platforms/Windows/ide.wxs
@@ -1,5 +1,4 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"
diff --git a/platforms/Windows/runtime.wxs b/platforms/Windows/runtime.wxs
index 53582591..f3a58cb2 100644
--- a/platforms/Windows/runtime.wxs
+++ b/platforms/Windows/runtime.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
+  <?include config.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"
diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs
index 2908f75c..44f95851 100644
--- a/platforms/Windows/sdk.wxs
+++ b/platforms/Windows/sdk.wxs
@@ -1,5 +1,5 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
+  <?include config.wxi?>
   <Package
       Language="1033"
       Manufacturer="swift.org"

From 78b050ac067ccae128d0485067a6b7aa5981721a Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Wed, 14 Jun 2023 13:20:45 -0700
Subject: [PATCH 09/10] WiX: draw a diagram of the SDK layout

The SDK layout is now the most complex part of the Swift distribution.
Draw a rendering of the layout to make it easier to follow.
---
 platforms/Windows/sdk.wxs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs
index 44f95851..2ceec9de 100644
--- a/platforms/Windows/sdk.wxs
+++ b/platforms/Windows/sdk.wxs
@@ -11,6 +11,19 @@
 
     <Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" CompressionLevel="high" />
 
+    <!--
+      %ProgramFiles64Folder%
+        └─ Swift
+            └─ Platforms
+                └─ Windows.platform
+                    └─ Developer
+                        ├─ Library
+                        │   └─ XCTest-development
+                        │       └─ ...
+                        └─ SDKs
+                            └─ Windows.sdk
+                                    └─ ...
+    -->
     <StandardDirectory Id="ProgramFiles64Folder">
       <Directory Id="INSTALLDIR" Name="Swift">
         <Directory Id="Platforms" Name="Platforms">

From e15ed826aec0af161261e351e53331377f809eb3 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <abdulras@thebrowser.company>
Date: Thu, 15 Jun 2023 08:58:21 -0700
Subject: [PATCH 10/10] WiX: revert to per-machine installs

The uninstallation path is adversely effected by the dual-purpose
builds.  This allows installation and uninstallation to function.  While
this still requires the UAC prompt, a working installation is more
important.  A subsequent change to enable per-user installs is still
feasible.
---
 platforms/Windows/bld.wxs     | 2 +-
 platforms/Windows/cli.wxs     | 2 +-
 platforms/Windows/dbg.wxs     | 2 +-
 platforms/Windows/ide.wxs     | 2 +-
 platforms/Windows/runtime.wxs | 2 +-
 platforms/Windows/sdk.wxs     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platforms/Windows/bld.wxs b/platforms/Windows/bld.wxs
index a15ccd47..7163991e 100644
--- a/platforms/Windows/bld.wxs
+++ b/platforms/Windows/bld.wxs
@@ -5,7 +5,7 @@
       Name="Swift Build Tools"
       UpgradeCode="7e95dc06-7f84-4e8e-a038-8304af0468fb"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perMachine">
     <SummaryInformation Description="Swift Build Tools" />
 
     <!--
diff --git a/platforms/Windows/cli.wxs b/platforms/Windows/cli.wxs
index 210da8a6..de6e96f6 100644
--- a/platforms/Windows/cli.wxs
+++ b/platforms/Windows/cli.wxs
@@ -5,7 +5,7 @@
       Name="Swift Command Line Tools"
       UpgradeCode="87019842-3f3e-4227-b5c5-23a8ef72ad89"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perMachine">
     <SummaryInformation Description="Swift Command Line Tools" />
 
     <Media Id="1" Cabinet="cli.cab" EmbedCab="yes" CompressionLevel="high" />
diff --git a/platforms/Windows/dbg.wxs b/platforms/Windows/dbg.wxs
index 11e90360..0b39ffd6 100644
--- a/platforms/Windows/dbg.wxs
+++ b/platforms/Windows/dbg.wxs
@@ -5,7 +5,7 @@
       Name="Swift Debugging Tools"
       UpgradeCode="91d382af-1e92-44dc-a4ad-aee91c1b5160"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perMachine">
     <SummaryInformation Description="Swift Debugging Tools" />
 
     <Media Id="1" Cabinet="dbg.cab" EmbedCab="yes" CompressionLevel="high" />
diff --git a/platforms/Windows/ide.wxs b/platforms/Windows/ide.wxs
index 92e487aa..69a9d042 100644
--- a/platforms/Windows/ide.wxs
+++ b/platforms/Windows/ide.wxs
@@ -5,7 +5,7 @@
       Name="Swift IDE Integration Tools"
       UpgradeCode="8dd91c86-d13d-490b-b06b-9522a9cf504c"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perMachine">
     <SummaryInformation Description="Swift IDE Integration Tools" />
 
     <Media Id="1" Cabinet="ide.cab" EmbedCab="yes" CompressionLevel="high" />
diff --git a/platforms/Windows/runtime.wxs b/platforms/Windows/runtime.wxs
index f3a58cb2..e0eabaf3 100644
--- a/platforms/Windows/runtime.wxs
+++ b/platforms/Windows/runtime.wxs
@@ -6,7 +6,7 @@
       Name="Swift Windows Runtime ($(var.ProcessorArchitecture))"
       UpgradeCode="bea8c6dc-f73e-445b-9486-2333d1cf2886"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perMachine">
     <SummaryInformation Description="Swift Windows Runtime ($(var.ProcessorArchitecture))" />
 
     <Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" CompressionLevel="high" />
diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs
index 2ceec9de..98e8efc5 100644
--- a/platforms/Windows/sdk.wxs
+++ b/platforms/Windows/sdk.wxs
@@ -6,7 +6,7 @@
       Name="Swift Windows SDK ($(var.ProcessorArchitecture))"
       UpgradeCode="4c37a396-d9e2-490a-89b7-0a3d271d847f"
       Version="$(var.ProductVersion)"
-      Scope="perUserOrMachine">
+      Scope="perMachine">
     <SummaryInformation Description="Swift Windows SDK ($(var.ProcessorArchitecture))" />
 
     <Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" CompressionLevel="high" />