From 2b46e2eeb417f0586df6432a1abcc3d305e5f907 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Sat, 27 May 2023 15:32:40 -0700
Subject: [PATCH] WiX: simplify the SDK package definition

- Use durable GUID generation for auto-generation of the GUID.
- Combine the platform definitions into a singular source to avoid drift.

This avoids having to keep the variants in sync and provides an easier
upgrade path. This is the first step towards enabling a non-admin
experience for users.
---
 platforms/Windows/sdk-amd64.wxs | 525 ---------------------------
 platforms/Windows/sdk-arm64.wxs | 525 ---------------------------
 platforms/Windows/sdk-x86.wxs   | 517 ---------------------------
 platforms/Windows/sdk.wixproj   |   4 +-
 platforms/Windows/sdk.wxs       | 616 ++++++++++++++++++++++++++++++++
 platforms/Windows/version.wxi   |  18 +
 6 files changed, 636 insertions(+), 1569 deletions(-)
 delete mode 100644 platforms/Windows/sdk-amd64.wxs
 delete mode 100644 platforms/Windows/sdk-arm64.wxs
 delete mode 100644 platforms/Windows/sdk-x86.wxs
 create mode 100644 platforms/Windows/sdk.wxs

diff --git a/platforms/Windows/sdk-amd64.wxs b/platforms/Windows/sdk-amd64.wxs
deleted file mode 100644
index b723832c..00000000
--- a/platforms/Windows/sdk-amd64.wxs
+++ /dev/null
@@ -1,525 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <Package
-      Language="1033"
-      Manufacturer="swift.org"
-      Name="Swift Windows SDK (AMD64)"
-      UpgradeCode="83af0249-2b57-4ce1-8121-c29c6c555225"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="Swift Windows SDK (AMD64)" />
-
-    <Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" />
-
-    <!-- Directory Structure -->
-    <!-- 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="bedc1fea-99ee-40be-ab38-3101698f2c0b" Id="WINDOWSVOLUME">
-      <Directory Id="INSTALLDIR">
-        <Directory Id="Library" Name="Library">
-          <Directory Id="Developer" Name="Developer">
-            <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_bin64" Name="bin64">
-                        </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_x86_64" Name="x86_64">
-                              </Directory>
-                              <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule">
-                              </Directory>
-                            </Directory>
-                          </Directory>
-                        </Directory>
-                      </Directory>
-                    </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="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
-                              </Directory>
-                              <Directory Id="Distributed.swiftmodule" Name="Distributed.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="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_x86_64" Name="x86_64">
-                              </Directory>
-                            </Directory>
-                          </Directory>
-                        </Directory>
-                        <Directory Id="WindowsSDK_usr_share" Name="share">
-                        </Directory>
-                      </Directory>
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <!-- Components -->
-    <ComponentGroup Id="XCTest">
-      <Component Id="XCTest.dll" Directory="XCTest_usr_bin64" Guid="11b12995-a7e6-4de3-954d-d4ddc977633f">
-        <File Id="XCTest.dll" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\bin\XCTest.dll" Checksum="yes" />
-      </Component>
-      <Component Id="XCTest.lib" Directory="XCTest_usr_lib_swift_windows_x86_64" Guid="3debc3cd-3f48-4cd7-8e9a-7403b1d45b37">
-        <File Id="XCTest.lib" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\XCTest.lib" Checksum="yes" />
-      </Component>
-      <Component Id="XCTest.swiftdoc" Directory="XCTest.swiftmodule" Guid="12731d72-ef57-4c29-a05e-a44534b331c2">
-        <File Id="XCTest.swiftdoc" Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\x86_64\XCTest.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="XCTest.swiftmodule" Directory="XCTest.swiftmodule" Guid="62ecaad6-4f0f-4009-8b0c-cd5128e3615d">
-        <File Id="XCTest.swiftmodule" Name="x86_64-unknown-windows-msvc.swiftmodule" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\x86_64\XCTest.swiftmodule" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftRemoteMirror">
-      <Component Id="MemoryReaderInterface.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="4493ba7f-b3b3-4cb3-b645-6457e81ad752">
-        <File Id="MemoryReaderInterface.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" Checksum="yes" />
-      </Component>
-      <Component Id="Platform.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="61384dc6-be9c-42cd-847b-fb94617fcab1">
-        <File Id="Platform.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\Platform.h" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftRemoteMirror.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="bcc781b4-94ea-4ae6-aa1e-e26e62f04e10">
-        <File Id="SwiftRemoteMirror.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftRemoteMirrorTypes.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="c15a0af1-e521-4ffc-845b-4f7176db4e2c">
-        <File Id="SwiftRemoteMirrorTypes.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftRemoteMirror.modulemap" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="6fbee223-32cd-4406-83d0-6e4df07ea8be">
-        <File Id="SwiftRemoteMirror.modulemap" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\module.modulemap" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftRemoteMirror.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="36e05640-2023-47fa-a81c-ad3f15eae659">
-        <File Id="swiftRemoteMirror.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftRemoteMirror.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="BlocksRuntime">
-      <Component Id="Block.h" Directory="WindowsSDK_usr_include_Block" Guid="46ea8477-b407-41ac-a3ea-d6db791524d9">
-        <File Id="Block.h_46ea8477b40741aca3ead6db791524d9" Source="$(var.SDK_ROOT)\usr\lib\swift\Block\Block.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="BlocksRuntime.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="57b69603-8619-4af4-9056-babbaa76e633">
-        <File Id="BlocksRuntime.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\BlocksRuntime.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="dispatch">
-      <Component Id="base.h" Directory="WindowsSDK_usr_include_dispatch" Guid="a263a074-5bc5-4823-95a9-f91a314b6cf0">
-        <File Id="base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\base.h" Checksum="yes" />
-      </Component>
-      <Component Id="block.h" Directory="WindowsSDK_usr_include_dispatch" Guid="3629b098-826c-4d98-89a7-b486160dddfa">
-        <File Id="block.h_3629b098826c4d9889a7b486160dddfa" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\block.h" Checksum="yes" />
-      </Component>
-      <Component Id="data.h" Directory="WindowsSDK_usr_include_dispatch" Guid="1d9bb083-bb0e-46de-b82b-b582c55df716">
-        <File Id="data.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\data.h" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.h" Directory="WindowsSDK_usr_include_dispatch" Guid="a4e8a91e-b54b-485e-8f47-83e23bb435b3">
-        <File Id="dispatch.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\dispatch.h" Checksum="yes" />
-      </Component>
-      <Component Id="group.h" Directory="WindowsSDK_usr_include_dispatch" Guid="6a992ce8-127a-4826-87fc-009e3666c980">
-        <File Id="group.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\group.h" Checksum="yes" />
-      </Component>
-      <Component Id="introspection.h" Directory="WindowsSDK_usr_include_dispatch" Guid="1177a222-a855-495e-bb4c-40b58bf2a72f">
-        <File Id="introspection.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\introspection.h" Checksum="yes" />
-      </Component>
-      <Component Id="io.h" Directory="WindowsSDK_usr_include_dispatch" Guid="4cbd900b-ea17-42d0-ad01-555e64203e34">
-        <File Id="io.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\io.h" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.modulemap" Directory="WindowsSDK_usr_include_dispatch" Guid="29d12456-9a40-47a8-9f0c-328e27ea9921">
-        <File Id="dispatch.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\module.modulemap" Checksum="yes" />
-      </Component>
-      <Component Id="object.h_f87c5a369294493489839a2cabdb7ae7" Directory="WindowsSDK_usr_include_dispatch" Guid="f87c5a36-9294-4934-8983-9a2cabdb7ae7">
-        <File Id="object.h_f87c5a369294493489839a2cabdb7ae7" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\object.h" Checksum="yes" />
-      </Component>
-      <Component Id="once.h" Directory="WindowsSDK_usr_include_dispatch" Guid="24c2b93d-8912-4cc7-a23d-11df4afa6c10">
-        <File Id="once.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\once.h" Checksum="yes" />
-      </Component>
-      <Component Id="queue.h" Directory="WindowsSDK_usr_include_dispatch" Guid="db4bb4ee-6a95-4692-9793-af888ac633e2">
-        <File Id="queue.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\queue.h" Checksum="yes" />
-      </Component>
-      <Component Id="semaphore.h" Directory="WindowsSDK_usr_include_dispatch" Guid="99b07079-67e8-418c-a4a1-647b28e2bfd0">
-        <File Id="semaphore.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\semaphore.h" Checksum="yes" />
-      </Component>
-      <Component Id="source.h" Directory="WindowsSDK_usr_include_dispatch" Guid="740ec071-b663-461f-8408-83f65a804d7e">
-        <File Id="source.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\source.h" Checksum="yes" />
-      </Component>
-      <Component Id="time.h" Directory="WindowsSDK_usr_include_dispatch" Guid="4f234266-768c-4e42-80fd-829cd6d62c91">
-        <File Id="time.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\time.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="generic_base.h" Directory="WindowsSDK_usr_include_os" Guid="348df76b-0642-4178-a06e-c79ceab474be">
-        <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" Directory="WindowsSDK_usr_include_os" Guid="66347322-84a9-4246-9d69-17b2e03dea63">
-        <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" Directory="WindowsSDK_usr_include_os" Guid="1b418910-d049-4040-a1a0-47844b90cc10">
-        <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" Directory="WindowsSDK_usr_include_os" Guid="3af0f074-5780-408e-9fb1-6b614066623f">
-        <File Id="object.h_3af0f0745780408e9fb16b614066623f" Source="$(var.SDK_ROOT)\usr\lib\swift\os\object.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="dispatch.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="ff370cd8-58c1-476d-9964-b3b41ff69b34">
-        <File Id="dispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\dispatch.lib" Checksum="yes" />
-      </Component>
-
-      <Component Id="Dispatch.swiftdoc" Directory="Dispatch.swiftmodule" Guid="ef314d01-4432-43c4-9b11-5725db379551">
-        <File Id="Dispatch.swiftdoc" Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\Dispatch.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Dispatch.swiftmodule" Directory="Dispatch.swiftmodule" Guid="e9b23638-1dd2-4c95-b053-f97c451625d5">
-        <File Id="Dispatch.swiftmodule" Name="x86_64-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\Dispatch.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftDispatch.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="b3e67468-2c5d-40cd-b332-7b21a0df301f">
-        <File Id="swiftDispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\swiftDispatch.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Concurrency">
-      <Component Id="_Concurrency.swiftdoc" Directory="_Concurrency.swiftmodule" Guid="037314fe-f333-4ce4-b3bc-28947337032c">
-        <File Id="_Concurrency.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_Concurrency.swiftinterface" Directory="_Concurrency.swiftmodule" Guid="43c29738-0629-4cb2-b7b5-be61f603cd6a">
-        <File Id="_Concurrency.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_Concurrency.swiftmodule" Directory="_Concurrency.swiftmodule" Guid="623c170b-2515-4a37-93fc-466cfc1de71c">
-        <File Id="_Concurrency.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_Concurrency.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="ed01d594-ebfc-43a8-8bb5-59207ef9f25d">
-        <File Id="swift_Concurrency.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swift_Concurrency.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Differentiation">
-      <Component Id="_Differentiation.swiftdoc" Directory="_Differentiation.swiftmodule" Guid="a5781b17-c798-4bc5-b52b-2afbb669b39a">
-        <File Id="_Differentiation.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_Differentiation.swiftinterface" Directory="_Differentiation.swiftmodule" Guid="7cc38d95-db0e-4ee5-9e8c-1980ccf17b3a">
-        <File Id="_Differentiation.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_Differentiation.swiftmodule" Directory="_Differentiation.swiftmodule" Guid="81f2ea19-4988-4cbf-9b80-5743660dc542">
-        <File Id="_Differentiation.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_Differentiation.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="d805a096-2e63-4f0a-9ca0-c1e121428914">
-        <File Id="swift_Differentiation.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swift_Differentiation.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Distributed">
-      <Component Id="Distributed.swiftdoc" Directory="Distributed.swiftmodule" Guid="73093dfc-8d44-4530-999d-c0d456ebfe05">
-        <File Id="Distributed.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Distributed.swiftinterface" Directory="Distributed.swiftmodule" Guid="4da938da-e741-49a2-8013-aa0d3e63b96c">
-        <File Id="Distributed.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="Distributed.swiftmodule" Directory="Distributed.swiftmodule" Guid="41a27397-861b-432b-bf5e-7cb80cc5df3d">
-        <File Id="Distributed.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftDistributed.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="71f8c1a0-c7c6-4846-bd2a-7e5004b66025">
-        <File Id="swiftDistributed.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftDistributed.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_RegexParser">
-      <Component Id="_RegexParser.swiftdoc" Directory="_RegexParser.swiftmodule" Guid="865561ee-9a35-4719-a1af-4a80ff047c24">
-        <File Id="_RegexParser.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_RegexParser.swiftinterface" Directory="_RegexParser.swiftmodule" Guid="f68bfb2b-9bda-484e-ab84-673372fcff1f">
-        <File Id="_RegexParser.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_RegexParser.swiftmodule" Directory="_RegexParser.swiftmodule" Guid="0bca67d0-a8b4-4c6e-ae8f-b3024acdb140">
-        <File Id="_RegexParser.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_RegexParser.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="3474a027-0314-42d1-b599-685d38a0f3b4">
-        <File Id="swift_RegexParser.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swift_RegexParser.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_StringProcessing">
-      <Component Id="_StringProcessing.swiftdoc" Directory="_StringProcessing.swiftmodule" Guid="e11d39c3-8e94-4e8c-8ce6-8ccdc0dc68bf">
-        <File Id="_StringProcessing.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_StringProcessing.swiftinterface" Directory="_StringProcessing.swiftmodule" Guid="b96be564-104d-4dc5-85df-b6100f83f386">
-        <File Id="_StringProcessing.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_StringProcessing.swiftmodule" Directory="_StringProcessing.swiftmodule" Guid="8beb4a8c-212e-4932-bdfa-2e33841806bc">
-        <File Id="_StringProcessing.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_StringProcessing.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="f1f57f0b-9856-4371-a346-b02099094179">
-        <File Id="swift_StringProcessing.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swift_StringProcessing.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CRT">
-      <Component Id="CRT.swiftdoc" Directory="CRT.swiftmodule" Guid="c38cbe87-7578-45e5-a3c7-3f235bd9c1a5">
-        <File Id="CRT.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="CRT.swiftinterface" Directory="CRT.swiftmodule" Guid="cb11ce9c-1fe4-4bfa-a8e4-4faf193e86a2">
-        <File Id="CRT.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="CRT.swiftmodule" Directory="CRT.swiftmodule" Guid="64e4fb99-e5ef-418f-ab76-eeac26d91c55">
-        <File Id="CRT.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftCRT.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="9914dbcc-d0a6-4bf5-ab13-e00cda0210ab">
-        <File Id="swiftCRT.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftCRT.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CXX">
-      <Component Id="Cxx.swiftdoc" Directory="Cxx.swiftmodule" Guid="b170a09f-0483-486f-b7de-1e8f4e1644a4">
-        <File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Cxx.swiftinterface" Directory="Cxx.swiftmodule" Guid="49971c71-8cb4-4eac-898d-71bb14d7280e">
-        <File Id="Cxx.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="Cxx.swiftmodule" Directory="Cxx.swiftmodule" Guid="911e165b-21e9-438e-b453-1d0aa1fdf4fe">
-        <File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="a90ba944-b9f6-40a6-8184-f59ae23598fe">
-        <File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftCxx.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Foundation">
-      <Component Id="Foundation.swiftdoc" Directory="Foundation.swiftmodule" Guid="d5ace934-794c-416f-886e-b9ae39eb8208">
-        <File Id="Foundation.swiftdoc" Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\Foundation.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Foundation.swiftmodule" Directory="Foundation.swiftmodule" Guid="059df0fa-17ec-407f-b325-247e3a329235">
-        <File Id="Foundation.swiftmodule" Name="x86_64-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\Foundation.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="Foundation.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="e97a352d-56d9-40b9-9851-afc7f912c017">
-        <File Id="Foundation.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Foundation.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationNetworking">
-      <Component Id="FoundationNetworking.swiftdoc" Directory="FoundationNetworking.swiftmodule" Guid="f545c9fa-5846-487d-befc-34c94fe62ef0">
-        <File Id="FoundationNetworking.swiftdoc" Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\FoundationNetworking.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationNetworking.swiftmodule" Directory="FoundationNetworking.swiftmodule" Guid="f3f5ea84-8277-4c12-b273-79c866a3bf57">
-        <File Id="FoundationNetworking.swiftmodule" Name="x86_64-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\FoundationNetworking.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="FoundationNetworking.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="d9060dd4-3f73-4398-8985-7f51d5f2e838">
-        <File Id="FoundationNetworking.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\FoundationNetworking.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationXML">
-      <Component Id="FoundationXML.swiftdoc" Directory="FoundationXML.swiftmodule" Guid="9586f066-c134-4c4b-af93-b26892234274">
-        <File Id="FoundationXML.swiftdoc" Name="x86_64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\FoundationXML.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationXML.swiftmodule" Directory="FoundationXML.swiftmodule" Guid="fbe5a3ff-d206-4af1-bed4-f314b397fefe">
-        <File Id="FoundationXML.swiftmodule" Name="x86_64-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\FoundationXML.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="FoundationXML.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="1f4549d9-49b8-4b8d-92f6-eab44c5dc2db">
-        <File Id="FoundationXML.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\FoundationXML.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Swift">
-      <Component Id="Swift.swiftdoc" Directory="Swift.swiftmodule" Guid="8be56a7d-a239-4b4f-a6ff-91798da32f5a">
-        <File Id="Swift.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Swift.swiftinterface" Directory="Swift.swiftmodule" Guid="8a648338-518f-48e3-84c2-82e4caa8f8cf">
-        <File Id="Swift.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="Swift.swiftmodule" Directory="Swift.swiftmodule" Guid="1ddfa091-0221-483c-90b8-4a805d9a63ea">
-        <File Id="Swift.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftCore.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="a411246a-7f6c-4309-8546-c067f4d0ec8b">
-        <File Id="swiftCore.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftCore.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftOnoneSupport">
-      <Component Id="SwiftOnoneSupport.swiftdoc" Directory="SwiftOnoneSupport.swiftmodule" Guid="3e824882-1b31-4d24-9357-c781ce222ff4">
-        <File Id="SwiftOnoneSupport.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftOnoneSupport.swiftinterface" Directory="SwiftOnoneSupport.swiftmodule" Guid="3fb52679-e9de-452b-a313-055760eefd6c">
-        <File Id="SwiftOnoneSupport.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftOnoneSupport.swiftmodule" Directory="SwiftOnoneSupport.swiftmodule" Guid="7dced608-bf33-4cf9-8141-385508ed8c97">
-        <File Id="SwiftOnoneSupport.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftSwiftOnoneSupport.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="0b76dc44-edc9-46aa-bd03-719b33df63f0">
-        <File Id="swiftSwiftOnoneSupport.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftSwiftOnoneSupport.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="WinSDK">
-      <Component Id="WinSDK.swiftdoc" Directory="WinSDK.swiftmodule" Guid="2bbd543c-9b6e-44ed-b17a-285edd2e9730">
-        <File Id="WinSDK.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="WinSDK.swiftinterface" Directory="WinSDK.swiftmodule" Guid="803b0ed4-80ae-4762-8090-cc23ffa4d3fc">
-        <File Id="WinSDK.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="WinSDK.swiftmodule" Directory="WinSDK.swiftmodule" Guid="f3f0780d-bcfb-4ea8-8bff-e80d05fe0861">
-        <File Id="WinSDK.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\x86_64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftWinSDK.lib" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="a117b49f-b373-4ae4-a43e-ea71f7a6be3d">
-        <File Id="swiftWinSDK.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftWinSDK.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CXXShims">
-      <Component Id="libcxxshim.h" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="77450677-ce9e-43f9-9db1-35231dcf563e">
-        <File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\libcxxshim.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows_x86_64" Guid="e4fa6e5c-3dd5-49fd-9f27-a72d58c8d156">
-        <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\libcxxshim.modulemap" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_x86_64">
-      <Component Id="swiftrt.obj" Guid="e546282a-79c8-4555-a45a-68a1447fa5d8">
-        <File Id="swiftrt.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftrt.obj" Checksum="yes" />
-      </Component>
-      <!--
-      <Component Id="swiftrtd.obj" Guid="13624873-29b3-41f1-adff-c18d27950980">
-        <File Id="swiftrtd.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\x86_64\swiftrtd.obj" Checksum="yes" />
-      </Component>
-      -->
-    </ComponentGroup>
-
-    <ComponentGroup Id="AuxiliaryFiles" Directory="WindowsSDK_usr_share">
-      <Component Id="ucrt.modulemap" Guid="4b5c1a1d-a6cf-4d06-81f7-e752f0a3f4db">
-        <File Id="ucrt.modulemap" Source="$(var.SDK_ROOT)\usr\share\ucrt.modulemap" Checksum="yes" />
-      </Component>
-      <Component Id="winsdk.modulemap" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
-        <File Id="winsdk.modulemap" Source="$(var.SDK_ROOT)\usr\share\winsdk.modulemap" Checksum="yes" />
-      </Component>
-      <Component Id="vcruntime.apinotes" Guid="11318e14-7d68-490e-8c64-f1332f1d63f7">
-        <File Id="vcruntime.apinotes" Source="$(var.SDK_ROOT)\usr\share\vcruntime.apinotes" Checksum="yes" />
-      </Component>
-      <Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
-        <File Id="vcruntime.modulemap" Source="$(var.SDK_ROOT)\usr\share\vcruntime.modulemap" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Configuration">
-      <Component Id="Info.plist" Directory="WindowsPlatform" Guid="6cc713d1-2f44-4a47-8e1e-7f71e1dce68b">
-        <File Id="Info.plist" Source="$(var.PLATFORM_ROOT)\Info.plist" Checksum="yes" />
-      </Component>
-      <Component Id="SDKSettings.plist" Directory="WindowsSDK" Guid="5e7d06bc-cad8-4c8b-803b-686adfbcb220">
-        <File Id="SDKSettings.plist" Source="$(var.SDK_ROOT)\SDKSettings.plist" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="bd3ddc62-4c5c-4f6b-806e-02d2c6a65b65">
-      <!-- <Condition> %PROCESSOR_ARCHITECTURE~="amd64" </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>
-
-    <!-- Features -->
-    <Feature Id="WinX64SDK" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows SDK (AMD64)" Level="1" Title="Swift Windows SDK (AMD64)" AllowAbsent="no">
-      <ComponentGroupRef Id="BlocksRuntime" />
-      <ComponentGroupRef Id="CRT" />
-      <ComponentGroupRef Id="CXX" />
-      <ComponentGroupRef Id="Distributed" />
-      <ComponentGroupRef Id="Foundation" />
-      <ComponentGroupRef Id="FoundationNetworking" />
-      <ComponentGroupRef Id="FoundationXML" />
-      <ComponentGroupRef Id="Swift" />
-      <ComponentGroupRef Id="SwiftOnoneSupport" />
-      <ComponentGroupRef Id="SwiftRemoteMirror" />
-      <ComponentGroupRef Id="WinSDK" />
-      <ComponentGroupRef Id="XCTest" />
-      <ComponentGroupRef Id="_Concurrency" />
-      <ComponentGroupRef Id="_Differentiation" />
-      <ComponentGroupRef Id="_RegexParser" />
-      <ComponentGroupRef Id="_StringProcessing" />
-      <ComponentGroupRef Id="dispatch" />
-
-      <ComponentGroupRef Id="SwiftShims" />
-      <ComponentGroupRef Id="CXXShims" />
-
-      <ComponentGroupRef Id="Registrar" />
-      <ComponentGroupRef Id="AuxiliaryFiles" />
-      <ComponentGroupRef Id="Configuration" />
-
-      <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/sdk-arm64.wxs b/platforms/Windows/sdk-arm64.wxs
deleted file mode 100644
index eb5ef607..00000000
--- a/platforms/Windows/sdk-arm64.wxs
+++ /dev/null
@@ -1,525 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <Package
-      Language="1033"
-      Manufacturer="swift.org"
-      Name="Swift Windows SDK (ARM64)"
-      UpgradeCode="4c37a396-d9e2-490a-89b7-0a3d271d847f"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="Swift Windows SDK (ARM64)" />
-
-    <Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" />
-
-    <!-- Directory Structure -->
-    <!-- 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">
-        <Directory Id="Library" Name="Library">
-          <Directory Id="Developer" Name="Developer">
-            <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_bin64a" Name="bin64a">
-                        </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_aarch64" Name="aarch64">
-                              </Directory>
-                              <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule">
-                              </Directory>
-                            </Directory>
-                          </Directory>
-                        </Directory>
-                      </Directory>
-                    </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="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
-                              </Directory>
-                              <Directory Id="Distributed.swiftmodule" Name="Distributed.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="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_aarch64" Name="aarch64">
-                              </Directory>
-                            </Directory>
-                          </Directory>
-                        </Directory>
-                        <Directory Id="WindowsSDK_usr_share" Name="share">
-                        </Directory>
-                      </Directory>
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <!-- Components -->
-    <ComponentGroup Id="XCTest">
-      <Component Id="XCTest.dll" Directory="XCTest_usr_bin64a" Guid="1a0dd34e-71eb-4441-af98-fed53631e34d">
-        <File Id="XCTest.dll" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\bin\XCTest.dll" Checksum="yes" />
-      </Component>
-      <Component Id="XCTest.lib" Directory="XCTest_usr_lib_swift_windows_aarch64" Guid="bce787dd-393e-4285-aa81-448557385d40">
-        <File Id="XCTest.lib" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\XCTest.lib" Checksum="yes" />
-      </Component>
-      <Component Id="XCTest.swiftdoc" Directory="XCTest.swiftmodule" Guid="b2b83f97-6639-4b7b-8d32-2396463dfe71">
-        <File Id="XCTest.swiftdoc" Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\aarch64\XCTest.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="XCTest.swiftmodule" Directory="XCTest.swiftmodule" Guid="51ce13c0-ca04-4ee4-bb72-c0804cbbe405">
-        <File Id="XCTest.swiftmodule" Name="aarch64-unknown-windows-msvc.swiftmodule" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\aarch64\XCTest.swiftmodule" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftRemoteMirror">
-      <Component Id="MemoryReaderInterface.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="4493ba7f-b3b3-4cb3-b645-6457e81ad752">
-        <File Id="MemoryReaderInterface.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" Checksum="yes" />
-      </Component>
-      <Component Id="Platform.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="61384dc6-be9c-42cd-847b-fb94617fcab1">
-        <File Id="Platform.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\Platform.h" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftRemoteMirror.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="bcc781b4-94ea-4ae6-aa1e-e26e62f04e10">
-        <File Id="SwiftRemoteMirror.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftRemoteMirrorTypes.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="c15a0af1-e521-4ffc-845b-4f7176db4e2c">
-        <File Id="SwiftRemoteMirrorTypes.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftRemoteMirror.modulemap" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="6fbee223-32cd-4406-83d0-6e4df07ea8be">
-        <File Id="SwiftRemoteMirror.modulemap" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\module.modulemap" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftRemoteMirror.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="10f6539b-f57e-46ca-9d51-9f44b6a71b24">
-        <File Id="swiftRemoteMirror.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftRemoteMirror.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="BlocksRuntime">
-      <Component Id="Block.h" Directory="WindowsSDK_usr_include_Block" Guid="46ea8477-b407-41ac-a3ea-d6db791524d9">
-        <File Id="Block.h_46ea8477b40741aca3ead6db791524d9" Source="$(var.SDK_ROOT)\usr\lib\swift\Block\Block.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="BlocksRuntime.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="56c2dd37-f759-4402-93ed-e29af91da0dc">
-        <File Id="BlocksRuntime.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\BlocksRuntime.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="dispatch">
-      <Component Id="base.h" Directory="WindowsSDK_usr_include_dispatch" Guid="a263a074-5bc5-4823-95a9-f91a314b6cf0">
-        <File Id="base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\base.h" Checksum="yes" />
-      </Component>
-      <Component Id="block.h" Directory="WindowsSDK_usr_include_dispatch" Guid="3629b098-826c-4d98-89a7-b486160dddfa">
-        <File Id="block.h_3629b098826c4d9889a7b486160dddfa" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\block.h" Checksum="yes" />
-      </Component>
-      <Component Id="data.h" Directory="WindowsSDK_usr_include_dispatch" Guid="1d9bb083-bb0e-46de-b82b-b582c55df716">
-        <File Id="data.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\data.h" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.h" Directory="WindowsSDK_usr_include_dispatch" Guid="a4e8a91e-b54b-485e-8f47-83e23bb435b3">
-        <File Id="dispatch.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\dispatch.h" Checksum="yes" />
-      </Component>
-      <Component Id="group.h" Directory="WindowsSDK_usr_include_dispatch" Guid="6a992ce8-127a-4826-87fc-009e3666c980">
-        <File Id="group.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\group.h" Checksum="yes" />
-      </Component>
-      <Component Id="introspection.h" Directory="WindowsSDK_usr_include_dispatch" Guid="1177a222-a855-495e-bb4c-40b58bf2a72f">
-        <File Id="introspection.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\introspection.h" Checksum="yes" />
-      </Component>
-      <Component Id="io.h" Directory="WindowsSDK_usr_include_dispatch" Guid="4cbd900b-ea17-42d0-ad01-555e64203e34">
-        <File Id="io.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\io.h" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.modulemap" Directory="WindowsSDK_usr_include_dispatch" Guid="29d12456-9a40-47a8-9f0c-328e27ea9921">
-        <File Id="dispatch.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\module.modulemap" Checksum="yes" />
-      </Component>
-      <Component Id="object.h_f87c5a369294493489839a2cabdb7ae7" Directory="WindowsSDK_usr_include_dispatch" Guid="f87c5a36-9294-4934-8983-9a2cabdb7ae7">
-        <File Id="object.h_f87c5a369294493489839a2cabdb7ae7" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\object.h" Checksum="yes" />
-      </Component>
-      <Component Id="once.h" Directory="WindowsSDK_usr_include_dispatch" Guid="24c2b93d-8912-4cc7-a23d-11df4afa6c10">
-        <File Id="once.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\once.h" Checksum="yes" />
-      </Component>
-      <Component Id="queue.h" Directory="WindowsSDK_usr_include_dispatch" Guid="db4bb4ee-6a95-4692-9793-af888ac633e2">
-        <File Id="queue.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\queue.h" Checksum="yes" />
-      </Component>
-      <Component Id="semaphore.h" Directory="WindowsSDK_usr_include_dispatch" Guid="99b07079-67e8-418c-a4a1-647b28e2bfd0">
-        <File Id="semaphore.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\semaphore.h" Checksum="yes" />
-      </Component>
-      <Component Id="source.h" Directory="WindowsSDK_usr_include_dispatch" Guid="740ec071-b663-461f-8408-83f65a804d7e">
-        <File Id="source.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\source.h" Checksum="yes" />
-      </Component>
-      <Component Id="time.h" Directory="WindowsSDK_usr_include_dispatch" Guid="4f234266-768c-4e42-80fd-829cd6d62c91">
-        <File Id="time.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\time.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="generic_base.h" Directory="WindowsSDK_usr_include_os" Guid="a136a05a-acc4-489b-96fc-1413f8421715">
-        <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" Directory="WindowsSDK_usr_include_os" Guid="66347322-84a9-4246-9d69-17b2e03dea63">
-        <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" Directory="WindowsSDK_usr_include_os" Guid="1b418910-d049-4040-a1a0-47844b90cc10">
-        <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" Directory="WindowsSDK_usr_include_os" Guid="3af0f074-5780-408e-9fb1-6b614066623f">
-        <File Id="object.h_3af0f0745780408e9fb16b614066623f" Source="$(var.SDK_ROOT)\usr\lib\swift\os\object.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="dispatch.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="c99d7b60-e701-46d9-a5c2-b419a4acc185">
-        <File Id="dispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\dispatch.lib" Checksum="yes" />
-      </Component>
-
-      <Component Id="Dispatch.swiftdoc" Directory="Dispatch.swiftmodule" Guid="528787e5-4f31-4bb0-b152-bb62e675f1ec">
-        <File Id="Dispatch.swiftdoc" Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\Dispatch.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Dispatch.swiftmodule" Directory="Dispatch.swiftmodule" Guid="b569a553-e2f8-46c5-b33a-bfa7a77f9cbb">
-        <File Id="Dispatch.swiftmodule" Name="aarch64-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\Dispatch.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftDispatch.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="9800dd9e-9f94-4350-8e41-f18f19ac610d">
-        <File Id="swiftDispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\swiftDispatch.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Concurrency">
-      <Component Id="_Concurrency.swiftdoc" Directory="_Concurrency.swiftmodule" Guid="35d5d47a-fc38-4c00-949f-8647dc58540f">
-        <File Id="_Concurrency.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_Concurrency.swiftinterface" Directory="_Concurrency.swiftmodule" Guid="149c1e9b-637d-4b6c-9434-cdd73ff02e4d">
-        <File Id="_Concurrency.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_Concurrency.swiftmodule" Directory="_Concurrency.swiftmodule" Guid="5d3d15c1-0cd1-4655-a7a5-f302c4a063fa">
-        <File Id="_Concurrency.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_Concurrency.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="d90a2779-efec-472a-a10a-517beb351344">
-        <File Id="swift_Concurrency.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swift_Concurrency.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Differentiation">
-      <Component Id="_Differentiation.swiftdoc" Directory="_Differentiation.swiftmodule" Guid="0a25a99a-183a-4939-80e1-db618880500f">
-        <File Id="_Differentiation.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_Differentiation.swiftinterface" Directory="_Differentiation.swiftmodule" Guid="6f57afae-51f2-4f40-9bbe-f23829d9d37f">
-        <File Id="_Differentiation.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_Differentiation.swiftmodule" Directory="_Differentiation.swiftmodule" Guid="fa022922-4100-400a-a261-523b9015c7f5">
-        <File Id="_Differentiation.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_Differentiation.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="ffadad49-4ad9-44ba-b2a8-aa0aa17bf504">
-        <File Id="swift_Differentiation.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swift_Differentiation.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Distributed">
-      <Component Id="Distributed.swiftdoc" Directory="Distributed.swiftmodule" Guid="efec6103-719e-4991-9520-903635a4a983">
-        <File Id="Distributed.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Distributed.swiftinterface" Directory="Distributed.swiftmodule" Guid="8e56b03d-8d01-4a85-a5cc-d83a90c97d8a">
-        <File Id="Distributed.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="Distributed.swiftmodule" Directory="Distributed.swiftmodule" Guid="465387dc-f3d9-4412-98bc-16e426e7f0d1">
-        <File Id="Distributed.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftDistributed.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="0d5937de-5677-4f8c-acfd-0b4574020ff9">
-        <File Id="swiftDistributed.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftDistributed.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_RegexParser">
-      <Component Id="_RegexParser.swiftdoc" Directory="_RegexParser.swiftmodule" Guid="e061ecf8-f781-47cc-bc27-c7bb811f41e3">
-        <File Id="_RegexParser.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_RegexParser.swiftinterface" Directory="_RegexParser.swiftmodule" Guid="7516a102-4164-472f-a6d1-cab720445853">
-        <File Id="_RegexParser.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_RegexParser.swiftmodule" Directory="_RegexParser.swiftmodule" Guid="8897018d-1360-4ebd-a708-46ef67d15795">
-        <File Id="_RegexParser.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_RegexParser.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="8dc8aa9b-52e7-4ad6-b96b-73c4fc5dbd43">
-        <File Id="swift_RegexParser.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swift_RegexParser.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_StringProcessing">
-      <Component Id="_StringProcessing.swiftdoc" Directory="_StringProcessing.swiftmodule" Guid="6b0c7495-8009-4404-a0af-e3528a8f1f7c">
-        <File Id="_StringProcessing.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_StringProcessing.swiftinterface" Directory="_StringProcessing.swiftmodule" Guid="dc40a8a2-3233-4131-9cdb-cc0d0fcbe8e3">
-        <File Id="_StringProcessing.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_StringProcessing.swiftmodule" Directory="_StringProcessing.swiftmodule" Guid="9e75c1ec-48cd-4333-87d9-1c8d1d9cfd9a">
-        <File Id="_StringProcessing.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_StringProcessing.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="8383033e-347b-46cd-989c-3fade250bbd8">
-        <File Id="swift_StringProcessing.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swift_StringProcessing.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CRT">
-      <Component Id="CRT.swiftdoc" Directory="CRT.swiftmodule" Guid="cf15b306-ea72-467c-9d26-b7f279ff8b87">
-        <File Id="CRT.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="CRT.swiftinterface" Directory="CRT.swiftmodule" Guid="f575ad67-c6c1-4cb0-9767-cdb394620409">
-        <File Id="CRT.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="CRT.swiftmodule" Directory="CRT.swiftmodule" Guid="41315818-9094-4798-9061-bd3da1304000">
-        <File Id="CRT.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftCRT.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="251c4c34-1674-4b0e-bb5d-34633d19f5b8">
-        <File Id="swiftCRT.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftCRT.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CXX">
-      <Component Id="Cxx.swiftdoc" Directory="Cxx.swiftmodule" Guid="2decbe47-1209-4abb-b94e-1bf6a83e2028">
-        <File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Cxx.swiftinterface" Directory="Cxx.swiftmodule" Guid="3ad27fe2-031c-42de-a4ba-b2aa7bf79aa6">
-        <File Id="Cxx.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="Cxx.swiftmodule" Directory="Cxx.swiftmodule" Guid="e5bd9840-0430-46b8-b3c4-5ab389ac8c07">
-        <File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="f7bcc956-462e-43df-ae25-c5f4636b27d1">
-        <File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftCxx.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Foundation">
-      <Component Id="Foundation.swiftdoc" Directory="Foundation.swiftmodule" Guid="b77de995-ebe7-409b-bfe6-2ae6c24e4d8d">
-        <File Id="Foundation.swiftdoc" Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\Foundation.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Foundation.swiftmodule" Directory="Foundation.swiftmodule" Guid="378ee0d8-4b4c-4ed4-b4ba-e151402889bb">
-        <File Id="Foundation.swiftmodule" Name="aarch64-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\Foundation.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="Foundation.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="16fbbce7-d477-417e-a4ee-38cce52be06f">
-        <File Id="Foundation.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Foundation.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationNetworking">
-      <Component Id="FoundationNetworking.swiftdoc" Directory="FoundationNetworking.swiftmodule" Guid="7307a266-5429-4226-a688-945d9365c3b2">
-        <File Id="FoundationNetworking.swiftdoc" Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\FoundationNetworking.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationNetworking.swiftmodule" Directory="FoundationNetworking.swiftmodule" Guid="1687bb2e-ab81-4ad3-b58a-5a77c806879c">
-        <File Id="FoundationNetworking.swiftmodule" Name="aarch64-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\FoundationNetworking.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="FoundationNetworking.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="ad44a2f5-d525-49ec-a9d9-4bcbcba849c4">
-        <File Id="FoundationNetworking.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\FoundationNetworking.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationXML">
-      <Component Id="FoundationXML.swiftdoc" Directory="FoundationXML.swiftmodule" Guid="b6e1b3c7-870b-4fa6-8989-f246b169179a">
-        <File Id="FoundationXML.swiftdoc" Name="aarch64-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\FoundationXML.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationXML.swiftmodule" Directory="FoundationXML.swiftmodule" Guid="8c0181b4-774d-4b90-b91a-7e5c6ad81ad7">
-        <File Id="FoundationXML.swiftmodule" Name="aarch64-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\FoundationXML.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="FoundationXML.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="a67abcb5-c2a6-4904-ad0e-6d855a07aaa5">
-        <File Id="FoundationXML.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\FoundationXML.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Swift">
-      <Component Id="Swift.swiftdoc" Directory="Swift.swiftmodule" Guid="26d8f53e-55ec-4345-8465-72e9cd291883">
-        <File Id="Swift.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Swift.swiftinterface" Directory="Swift.swiftmodule" Guid="d19ff757-8f0c-4e64-8198-ba83a696bff7">
-        <File Id="Swift.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="Swift.swiftmodule" Directory="Swift.swiftmodule" Guid="447110bf-ef57-4402-8d9d-c73a34e141fc">
-        <File Id="Swift.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftCore.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="4547e5cd-2254-462c-b52d-0e41bc1b5b17">
-        <File Id="swiftCore.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftCore.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftOnoneSupport">
-      <Component Id="SwiftOnoneSupport.swiftdoc" Directory="SwiftOnoneSupport.swiftmodule" Guid="0796a895-1912-4726-ae0b-bc5a5ef8e9f9">
-        <File Id="SwiftOnoneSupport.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftOnoneSupport.swiftinterface" Directory="SwiftOnoneSupport.swiftmodule" Guid="541a7a34-70b3-4f20-888a-47bc40ccb924">
-        <File Id="SwiftOnoneSupport.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftOnoneSupport.swiftmodule" Directory="SwiftOnoneSupport.swiftmodule" Guid="872800ff-6e4f-4a0c-95a7-ff40c4c0202b">
-        <File Id="SwiftOnoneSupport.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftSwiftOnoneSupport.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="c46f5b10-b7e9-4878-b852-74600609bfb0">
-        <File Id="swiftSwiftOnoneSupport.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftSwiftOnoneSupport.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="WinSDK">
-      <Component Id="WinSDK.swiftdoc" Directory="WinSDK.swiftmodule" Guid="0b55e59b-4a5c-4ad7-b92c-b4bf7be2cd66">
-        <File Id="WinSDK.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="WinSDK.swiftinterface" Directory="WinSDK.swiftmodule" Guid="4e748af4-86b6-49d8-ac5e-ca8d60d2afa6">
-        <File Id="WinSDK.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="WinSDK.swiftmodule" Directory="WinSDK.swiftmodule" Guid="26734a29-917e-4dca-9b52-e6a76d839efe">
-        <File Id="WinSDK.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\aarch64-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftWinSDK.lib" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="e67725d6-6cee-423d-a758-487ceabd8f13">
-        <File Id="swiftWinSDK.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftWinSDK.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CXXShims">
-      <Component Id="libcxxshim.h" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="d579019d-d999-47f7-8b35-1d714874de80">
-        <File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\libcxxshim.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows_aarch64" Guid="b5f65b19-cf8f-4862-b378-3e299887afa3">
-        <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\libcxxshim.modulemap" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_aarch64">
-      <Component Id="swiftrt.obj" Guid="7daf0d39-db9e-4ee7-913b-7815b04f30ee">
-        <File Id="swiftrt.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftrt.obj" Checksum="yes" />
-      </Component>
-      <!--
-      <Component Id="swiftrtd.obj" Guid="4f5d8876-6eb5-4d2b-a4fd-3b15d9e5b1e4">
-        <File Id="swiftrtd.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\aarch64\swiftrtd.obj" Checksum="yes" />
-      </Component>
-      -->
-    </ComponentGroup>
-
-    <ComponentGroup Id="AuxiliaryFiles" Directory="WindowsSDK_usr_share">
-      <Component Id="ucrt.modulemap" Guid="4b5c1a1d-a6cf-4d06-81f7-e752f0a3f4db">
-        <File Id="ucrt.modulemap" Source="$(var.SDK_ROOT)\usr\share\ucrt.modulemap" Checksum="yes" />
-      </Component>
-      <Component Id="winsdk.modulemap" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
-        <File Id="winsdk.modulemap" Source="$(var.SDK_ROOT)\usr\share\winsdk.modulemap" Checksum="yes" />
-      </Component>
-      <Component Id="vcruntime.apinotes" Guid="11318e14-7d68-490e-8c64-f1332f1d63f7">
-        <File Id="vcruntime.apinotes" Source="$(var.SDK_ROOT)\usr\share\vcruntime.apinotes" Checksum="yes" />
-      </Component>
-      <Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
-        <File Id="vcruntime.modulemap" Source="$(var.SDK_ROOT)\usr\share\vcruntime.modulemap" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Configuration">
-      <Component Id="Info.plist" Directory="WindowsPlatform" Guid="6cc713d1-2f44-4a47-8e1e-7f71e1dce68b">
-        <File Id="Info.plist" Source="$(var.PLATFORM_ROOT)\Info.plist" Checksum="yes" />
-      </Component>
-      <Component Id="SDKSettings.plist" Directory="WindowsSDK" Guid="5e7d06bc-cad8-4c8b-803b-686adfbcb220">
-        <File Id="SDKSettings.plist" Source="$(var.SDK_ROOT)\SDKSettings.plist" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" 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>
-
-    <!-- Features -->
-    <Feature Id="WinARM64SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows SDK (ARM64)" Level="1" Title="Swift Windows SDK (ARM64)">
-      <ComponentGroupRef Id="BlocksRuntime" />
-      <ComponentGroupRef Id="CRT" />
-      <ComponentGroupRef Id="CXX" />
-      <ComponentGroupRef Id="Distributed" />
-      <ComponentGroupRef Id="Foundation" />
-      <ComponentGroupRef Id="FoundationNetworking" />
-      <ComponentGroupRef Id="FoundationXML" />
-      <ComponentGroupRef Id="Swift" />
-      <ComponentGroupRef Id="SwiftOnoneSupport" />
-      <ComponentGroupRef Id="SwiftRemoteMirror" />
-      <ComponentGroupRef Id="WinSDK" />
-      <ComponentGroupRef Id="XCTest" />
-      <ComponentGroupRef Id="_Concurrency" />
-      <ComponentGroupRef Id="_Differentiation" />
-      <ComponentGroupRef Id="_RegexParser" />
-      <ComponentGroupRef Id="_StringProcessing" />
-      <ComponentGroupRef Id="dispatch" />
-
-      <ComponentGroupRef Id="SwiftShims" />
-      <ComponentGroupRef Id="CXXShims" />
-
-      <ComponentGroupRef Id="Registrar" />
-      <ComponentGroupRef Id="AuxiliaryFiles" />
-      <ComponentGroupRef Id="Configuration" />
-
-      <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/sdk-x86.wxs b/platforms/Windows/sdk-x86.wxs
deleted file mode 100644
index fc85db7d..00000000
--- a/platforms/Windows/sdk-x86.wxs
+++ /dev/null
@@ -1,517 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <Package
-      Language="1033"
-      Manufacturer="swift.org"
-      Name="Swift Windows SDK (x86)"
-      UpgradeCode="7ab082f9-cd6d-480e-9a97-4186782c3db0"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="Swift Windows SDK (x86)" />
-
-    <Media Id="1" Cabinet="WindowsSDK.cab" EmbedCab="yes" />
-
-    <!-- Directory Structure -->
-    <!-- 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="a69e744d-4da2-468c-8438-71c3c66a482c" Id="WINDOWSVOLUME">
-      <Directory Id="INSTALLDIR" Name="Library">
-        <Directory Id="Developer" Name="Developer">
-          <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_bin32" Name="bin32">
-                      </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_i686" Name="i686">
-                            </Directory>
-                            <Directory Id="XCTest.swiftmodule" Name="XCTest.swiftmodule">
-                            </Directory>
-                          </Directory>
-                        </Directory>
-                      </Directory>
-                    </Directory>
-                  </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="_Differentiation.swiftmodule" Name="_Differentiation.swiftmodule">
-                            </Directory>
-                            <Directory Id="Distributed.swiftmodule" Name="Distributed.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="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_i686" Name="i686">
-                            </Directory>
-                          </Directory>
-                        </Directory>
-                      </Directory>
-                      <Directory Id="WindowsSDK_usr_share" Name="share">
-                      </Directory>
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <!-- Components -->
-    <ComponentGroup Id="XCTest">
-      <Component Id="XCTest.dll" Directory="XCTest_usr_bin32" Guid="bbd2f8c3-52a1-49e4-898e-2bfafb9d5985">
-        <File Id="XCTest.dll" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\bin\XCTest.dll" Checksum="yes" />
-      </Component>
-      <Component Id="XCTest.lib" Directory="XCTest_usr_lib_swift_windows_i686" Guid="76f535ad-b9c7-48d9-baf7-033a5c023a23">
-        <File Id="XCTest.lib" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\XCTest.lib" Checksum="yes" />
-      </Component>
-      <Component Id="XCTest.swiftdoc" Directory="XCTest.swiftmodule" Guid="e07c62a7-8463-4dd7-b198-73ffd52d00fa">
-        <File Id="XCTest.swiftdoc" Name="i686-unknown-windows-msvc.swiftdoc" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\i686\XCTest.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="XCTest.swiftmodule" Directory="XCTest.swiftmodule" Guid="39ac696e-f50c-4261-bbb0-7f171ccd969d">
-        <File Id="XCTest.swiftmodule" Name="i686-unknown-windows-msvc.swiftmodule" Source="$(var.PLATFORM_ROOT)\Developer\Library\XCTest-development\usr\lib\swift\windows\i686\XCTest.swiftmodule" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftRemoteMirror">
-      <Component Id="MemoryReaderInterface.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="4493ba7f-b3b3-4cb3-b645-6457e81ad752">
-        <File Id="MemoryReaderInterface.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\MemoryReaderInterface.h" Checksum="yes" />
-      </Component>
-      <Component Id="Platform.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="61384dc6-be9c-42cd-847b-fb94617fcab1">
-        <File Id="Platform.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\Platform.h" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftRemoteMirror.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="bcc781b4-94ea-4ae6-aa1e-e26e62f04e10">
-        <File Id="SwiftRemoteMirror.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirror.h" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftRemoteMirrorTypes.h" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="c15a0af1-e521-4ffc-845b-4f7176db4e2c">
-        <File Id="SwiftRemoteMirrorTypes.h" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\SwiftRemoteMirrorTypes.h" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftRemoteMirror.modulemap" Directory="WindowsSDK_usr_include_swift_SwiftRemoteMirror" Guid="6fbee223-32cd-4406-83d0-6e4df07ea8be">
-        <File Id="SwiftRemoteMirror.modulemap" Source="$(var.SDK_ROOT)\usr\include\swift\SwiftRemoteMirror\module.modulemap" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftRemoteMirror.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="3d429d95-1f9d-4b59-85f2-2676ae95539b">
-        <File Id="swiftRemoteMirror.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftRemoteMirror.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="BlocksRuntime">
-      <Component Id="Block.h" Directory="WindowsSDK_usr_include_Block" Guid="46ea8477-b407-41ac-a3ea-d6db791524d9">
-        <File Id="Block.h_46ea8477b40741aca3ead6db791524d9" Source="$(var.SDK_ROOT)\usr\lib\swift\Block\Block.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="BlocksRuntime.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="0cd38131-8998-4fd7-805d-ca36fb798dbc">
-        <File Id="BlocksRuntime.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\BlocksRuntime.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="dispatch">
-      <Component Id="base.h" Directory="WindowsSDK_usr_include_dispatch" Guid="a263a074-5bc5-4823-95a9-f91a314b6cf0">
-        <File Id="base.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\base.h" Checksum="yes" />
-      </Component>
-      <Component Id="block.h" Directory="WindowsSDK_usr_include_dispatch" Guid="3629b098-826c-4d98-89a7-b486160dddfa">
-        <File Id="block.h_3629b098826c4d9889a7b486160dddfa" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\block.h" Checksum="yes" />
-      </Component>
-      <Component Id="data.h" Directory="WindowsSDK_usr_include_dispatch" Guid="1d9bb083-bb0e-46de-b82b-b582c55df716">
-        <File Id="data.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\data.h" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.h" Directory="WindowsSDK_usr_include_dispatch" Guid="a4e8a91e-b54b-485e-8f47-83e23bb435b3">
-        <File Id="dispatch.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\dispatch.h" Checksum="yes" />
-      </Component>
-      <Component Id="group.h" Directory="WindowsSDK_usr_include_dispatch" Guid="6a992ce8-127a-4826-87fc-009e3666c980">
-        <File Id="group.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\group.h" Checksum="yes" />
-      </Component>
-      <Component Id="introspection.h" Directory="WindowsSDK_usr_include_dispatch" Guid="1177a222-a855-495e-bb4c-40b58bf2a72f">
-        <File Id="introspection.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\introspection.h" Checksum="yes" />
-      </Component>
-      <Component Id="io.h" Directory="WindowsSDK_usr_include_dispatch" Guid="4cbd900b-ea17-42d0-ad01-555e64203e34">
-        <File Id="io.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\io.h" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.modulemap" Directory="WindowsSDK_usr_include_dispatch" Guid="29d12456-9a40-47a8-9f0c-328e27ea9921">
-        <File Id="dispatch.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\module.modulemap" Checksum="yes" />
-      </Component>
-      <Component Id="object.h_f87c5a369294493489839a2cabdb7ae7" Directory="WindowsSDK_usr_include_dispatch" Guid="f87c5a36-9294-4934-8983-9a2cabdb7ae7">
-        <File Id="object.h_f87c5a369294493489839a2cabdb7ae7" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\object.h" Checksum="yes" />
-      </Component>
-      <Component Id="once.h" Directory="WindowsSDK_usr_include_dispatch" Guid="24c2b93d-8912-4cc7-a23d-11df4afa6c10">
-        <File Id="once.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\once.h" Checksum="yes" />
-      </Component>
-      <Component Id="queue.h" Directory="WindowsSDK_usr_include_dispatch" Guid="db4bb4ee-6a95-4692-9793-af888ac633e2">
-        <File Id="queue.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\queue.h" Checksum="yes" />
-      </Component>
-      <Component Id="semaphore.h" Directory="WindowsSDK_usr_include_dispatch" Guid="99b07079-67e8-418c-a4a1-647b28e2bfd0">
-        <File Id="semaphore.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\semaphore.h" Checksum="yes" />
-      </Component>
-      <Component Id="source.h" Directory="WindowsSDK_usr_include_dispatch" Guid="740ec071-b663-461f-8408-83f65a804d7e">
-        <File Id="source.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\source.h" Checksum="yes" />
-      </Component>
-      <Component Id="time.h" Directory="WindowsSDK_usr_include_dispatch" Guid="4f234266-768c-4e42-80fd-829cd6d62c91">
-        <File Id="time.h" Source="$(var.SDK_ROOT)\usr\lib\swift\dispatch\time.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="generic_base.h" Directory="WindowsSDK_usr_include_os" Guid="c3048f41-e208-45ff-a88f-682ff8292eb8">
-        <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" Directory="WindowsSDK_usr_include_os" Guid="66347322-84a9-4246-9d69-17b2e03dea63">
-        <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" Directory="WindowsSDK_usr_include_os" Guid="1b418910-d049-4040-a1a0-47844b90cc10">
-        <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" Directory="WindowsSDK_usr_include_os" Guid="3af0f074-5780-408e-9fb1-6b614066623f">
-        <File Id="object.h_3af0f0745780408e9fb16b614066623f" Source="$(var.SDK_ROOT)\usr\lib\swift\os\object.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="dispatch.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="28cbf6a7-c6fc-40bc-adf3-2fc03aa47251">
-        <File Id="dispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\dispatch.lib" Checksum="yes" />
-      </Component>
-
-      <Component Id="Dispatch.swiftdoc" Directory="Dispatch.swiftmodule" Guid="58f7770e-2cef-4277-8d7f-d0470164442d">
-        <File Id="Dispatch.swiftdoc" Name="i686-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\Dispatch.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Dispatch.swiftmodule" Directory="Dispatch.swiftmodule" Guid="e37a27e0-9462-4eec-8e3d-d028f34a6ff6">
-        <File Id="Dispatch.swiftmodule" Name="i686-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\Dispatch.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftDispatch.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="97e1a280-673c-4eb3-8c79-e0d82c6bc9c9">
-        <File Id="swiftDispatch.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\swiftDispatch.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Concurrency">
-      <Component Id="_Concurrency.swiftdoc" Directory="_Concurrency.swiftmodule" Guid="6e17d82a-42d9-4894-8778-dcc8eca37a3b">
-        <File Id="_Concurrency.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_Concurrency.swiftinterface" Directory="_Concurrency.swiftmodule" Guid="30779706-bee0-4f4c-9af6-b595c4536ec6">
-        <File Id="_Concurrency.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_Concurrency.swiftmodule" Directory="_Concurrency.swiftmodule" Guid="83e40d4d-0dfc-4feb-8005-352a5f42dd7b">
-        <File Id="_Concurrency.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Concurrency.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_Concurrency.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="98293a0c-368f-469e-a412-876d5235cf1b">
-        <File Id="swift_Concurrency.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swift_Concurrency.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_Differentiation">
-      <Component Id="_Differentiation.swiftdoc" Directory="_Differentiation.swiftmodule" Guid="e07ea533-15d2-4f49-aecd-1de6a3068ed7">
-        <File Id="_Differentiation.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_Differentiation.swiftinterface" Directory="_Differentiation.swiftmodule" Guid="f7e74941-7c91-4c58-86d8-7e8441b8a385">
-        <File Id="_Differentiation.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_Differentiation.swiftmodule" Directory="_Differentiation.swiftmodule" Guid="61923e0f-b2f4-4cac-8f11-8ae4c8f32a2a">
-        <File Id="_Differentiation.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_Differentiation.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_Differentiation.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="7bb128ab-fbd7-4f1f-9a95-4dced2262672">
-        <File Id="swift_Differentiation.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swift_Differentiation.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Distributed">
-      <Component Id="Distributed.swiftdoc" Directory="Distributed.swiftmodule" Guid="b0888823-92f6-4bc9-afad-c59a5996c816">
-        <File Id="Distributed.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Distributed.swiftinterface" Directory="Distributed.swiftmodule" Guid="cb1616a5-cab5-4263-bec8-3fcb3c02e113">
-        <File Id="Distributed.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="Distributed.swiftmodule" Directory="Distributed.swiftmodule" Guid="f9f43910-32ad-4c5f-b66f-3f59944223f3">
-        <File Id="Distributed.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Distributed.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftDistributed.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="ab4afcd2-4bd0-4373-a1ba-9936a4c7d405">
-        <File Id="swiftDistributed.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftDistributed.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_RegexParser">
-      <Component Id="_RegexParser.swiftdoc" Directory="_RegexParser.swiftmodule" Guid="ac7461ff-45ae-41ca-90b7-0b0bc5e3f314">
-        <File Id="_RegexParser.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_RegexParser.swiftinterface" Directory="_RegexParser.swiftmodule" Guid="2ac3904d-a2d7-49e2-8423-a2275a0e7bca">
-        <File Id="_RegexParser.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_RegexParser.swiftmodule" Directory="_RegexParser.swiftmodule" Guid="da0d0a3a-f041-4f93-90c1-3d43b480ee1a">
-        <File Id="_RegexParser.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_RegexParser.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_RegexParser.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="7e3f40f3-44ad-4e68-ab41-827cdb6ed3c2">
-        <File Id="swift_RegexParser.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swift_RegexParser.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="_StringProcessing">
-      <Component Id="_StringProcessing.swiftdoc" Directory="_StringProcessing.swiftmodule" Guid="ab423792-6865-439f-bb5d-234a69d4b041">
-        <File Id="_StringProcessing.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="_StringProcessing.swiftinterface" Directory="_StringProcessing.swiftmodule" Guid="9c68230f-6c66-4bf7-9e6b-576a567acf9e">
-        <File Id="_StringProcessing.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="_StringProcessing.swiftmodule" Directory="_StringProcessing.swiftmodule" Guid="2c25d0e8-a8b0-4fb6-938b-f3349aadbd23">
-        <File Id="_StringProcessing.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\_StringProcessing.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_StringProcessing.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="3bc3e09f-5462-4e71-96e2-b46066286444">
-        <File Id="swift_StringProcessing.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swift_StringProcessing.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CRT">
-      <Component Id="CRT.swiftdoc" Directory="CRT.swiftmodule" Guid="925b5dec-5efc-4362-8760-12f1971ed90c">
-        <File Id="CRT.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="CRT.swiftinterface" Directory="CRT.swiftmodule" Guid="9098c012-c049-438b-a1c6-c8c7f59468d6">
-        <File Id="CRT.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="CRT.swiftmodule" Directory="CRT.swiftmodule" Guid="67057ea8-c6d6-490a-acd3-86ef3a109f6d">
-        <File Id="CRT.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\CRT.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftCRT.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="6f0a9b0d-a564-45a1-b01b-081c26fb6d4e">
-        <File Id="swiftCRT.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftCRT.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CXX">
-      <Component Id="Cxx.swiftdoc" Directory="Cxx.swiftmodule" Guid="a7c78d68-abed-4065-ba82-08d4773bf4d8">
-        <File Id="Cxx.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Cxx.swiftinterface" Directory="Cxx.swiftmodule" Guid="4f795ac4-f731-4115-984f-237f044540a0">
-        <File Id="Cxx.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="Cxx.swiftmodule" Directory="Cxx.swiftmodule" Guid="a9acf7c6-7ad7-4176-a280-ec0d534215b9">
-        <File Id="Cxx.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Cxx.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftCxx.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="b2897a7a-65c2-4f0f-b14c-6b466d2e3d34">
-        <File Id="swiftCxx.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftCxx.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Foundation">
-      <Component Id="Foundation.swiftdoc" Directory="Foundation.swiftmodule" Guid="345d3a2b-7b55-4413-82b7-7e7b7ce17798">
-        <File Id="Foundation.swiftdoc" Name="i686-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\Foundation.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Foundation.swiftmodule" Directory="Foundation.swiftmodule" Guid="4e0ac4ae-5937-43fb-963a-901459e4f8ef">
-        <File Id="Foundation.swiftmodule" Name="i686-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\Foundation.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="Foundation.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="742b8a52-5809-4852-a4a4-c8437fd7f6ac">
-        <File Id="Foundation.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Foundation.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationNetworking">
-      <Component Id="FoundationNetworking.swiftdoc" Directory="FoundationNetworking.swiftmodule" Guid="dd44bae6-fa96-4b79-9276-9ffcea0b78b4">
-        <File Id="FoundationNetworking.swiftdoc" Name="i686-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\FoundationNetworking.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationNetworking.swiftmodule" Directory="FoundationNetworking.swiftmodule" Guid="04d1e62a-439c-4693-afee-c672d083ce79">
-        <File Id="FoundationNetworking.swiftmodule" Name="i686-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\FoundationNetworking.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="FoundationNetworking.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="15dc0abc-ce8d-4535-b1a0-b1a1f8b554e0">
-        <File Id="FoundationNetworking.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\FoundationNetworking.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="FoundationXML">
-      <Component Id="FoundationXML.swiftdoc" Directory="FoundationXML.swiftmodule" Guid="4bb9b03a-5e96-4a7f-b4ec-0ad82d51a52c">
-        <File Id="FoundationXML.swiftdoc" Name="i686-unknown-windows-msvc.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\FoundationXML.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationXML.swiftmodule" Directory="FoundationXML.swiftmodule" Guid="37a874a6-228b-4d8e-bfe6-67c5ef42ff30">
-        <File Id="FoundationXML.swiftmodule" Name="i686-unknown-windows-msvc.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\FoundationXML.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="FoundationXML.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="528492ce-aa8f-4628-895e-1941603495a5">
-        <File Id="FoundationXML.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\FoundationXML.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Swift">
-      <Component Id="Swift.swiftdoc" Directory="Swift.swiftmodule" Guid="10d79d0f-1013-42a3-a950-35e9f0037d01">
-        <File Id="Swift.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="Swift.swiftinterface" Directory="Swift.swiftmodule" Guid="d34ccebd-7374-43e2-bbb2-6b5312aa9f7a">
-        <File Id="Swift.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="Swift.swiftmodule" Directory="Swift.swiftmodule" Guid="14db8439-bb0b-4735-8403-1a48998aefe0">
-        <File Id="Swift.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\Swift.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftCore.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="39d9de50-66d5-4b4e-99af-30ccbf84507a">
-        <File Id="swiftCore.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftCore.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftOnoneSupport">
-      <Component Id="SwiftOnoneSupport.swiftdoc" Directory="SwiftOnoneSupport.swiftmodule" Guid="56054ec3-b957-4924-9bb2-83de1aa5cafe">
-        <File Id="SwiftOnoneSupport.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftOnoneSupport.swiftinterface" Directory="SwiftOnoneSupport.swiftmodule" Guid="6026a5a8-f096-416c-bd06-ceadd8e75519">
-        <File Id="SwiftOnoneSupport.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="SwiftOnoneSupport.swiftmodule" Directory="SwiftOnoneSupport.swiftmodule" Guid="d7802f37-7a5d-4c20-9dcf-1687e0ff4146">
-        <File Id="SwiftOnoneSupport.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\SwiftOnoneSupport.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftSwiftOnoneSupport.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="5394f49f-99b4-4049-81c4-c601d17700d4">
-        <File Id="swiftSwiftOnoneSupport.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftSwiftOnoneSupport.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="WinSDK">
-      <Component Id="WinSDK.swiftdoc" Directory="WinSDK.swiftmodule" Guid="fb9ca366-fbf6-4da1-b9ee-5fc924a4e62c">
-        <File Id="WinSDK.swiftdoc" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="WinSDK.swiftinterface" Directory="WinSDK.swiftmodule" Guid="6613b7c0-91f8-4c9e-a699-a3db00bd2ae4">
-        <File Id="WinSDK.swiftinterface" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftinterface" Checksum="yes" />
-      </Component>
-      <Component Id="WinSDK.swiftmodule" Directory="WinSDK.swiftmodule" Guid="daae10d4-8450-41e3-a8fc-9bdffa398d78">
-        <File Id="WinSDK.swiftmodule" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\WinSDK.swiftmodule\i686-unknown-windows-msvc.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="swiftWinSDK.lib" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="1f9e4d1b-4a7e-4849-b319-d55510114903">
-        <File Id="swiftWinSDK.lib" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftWinSDK.lib" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="CXXShims">
-      <Component Id="libcxxshim.h" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="d9653245-ca31-442a-b122-f5df3a3ad752">
-        <File Id="libcxxshim.h" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\libcxxshim.h" Checksum="yes" />
-      </Component>
-
-      <Component Id="libcxxshim.modulemap" Directory="WindowsSDK_usr_lib_swift_windows_i686" Guid="52c178a4-f65b-46a4-9089-c686c755bf2e">
-        <File Id="libcxxshim.modulemap" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\libcxxshim.modulemap" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Registrar" Directory="WindowsSDK_usr_lib_swift_windows_i686">
-      <Component Id="swiftrt.obj" Guid="a3da165c-3b42-4ad2-a412-a0bb4e31cba5">
-        <File Id="swiftrt.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftrt.obj" Checksum="yes" />
-      </Component>
-      <!--
-      <Component Id="swiftrtd.obj" Guid="457b9d66-ebc9-40be-9e3d-6d3fd75c01f6">
-        <File Id="swiftrtd.obj" Source="$(var.SDK_ROOT)\usr\lib\swift\windows\i686\swiftrtd.obj" Checksum="yes" />
-      </Component>
-      -->
-    </ComponentGroup>
-
-    <ComponentGroup Id="AuxiliaryFiles" Directory="WindowsSDK_usr_share">
-      <Component Id="ucrt.modulemap" Guid="4b5c1a1d-a6cf-4d06-81f7-e752f0a3f4db">
-        <File Id="ucrt.modulemap" Source="$(var.SDK_ROOT)\usr\share\ucrt.modulemap" Checksum="yes" />
-      </Component>
-      <Component Id="winsdk.modulemap" Guid="a3b7cb7c-730e-4c6b-ada8-d39f4c72f41e">
-        <File Id="winsdk.modulemap" Source="$(var.SDK_ROOT)\usr\share\winsdk.modulemap" Checksum="yes" />
-      </Component>
-      <Component Id="vcruntime.apinotes" Guid="11318e14-7d68-490e-8c64-f1332f1d63f7">
-        <File Id="vcruntime.apinotes" Source="$(var.SDK_ROOT)\usr\share\vcruntime.apinotes" Checksum="yes" />
-      </Component>
-      <Component Id="vcruntime.modulemap" Guid="cd59b968-d431-44a0-870b-16c9fbfde01d">
-        <File Id="vcruntime.modulemap" Source="$(var.SDK_ROOT)\usr\share\vcruntime.modulemap" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="Configuration">
-      <Component Id="Info.plist" Directory="WindowsPlatform" Guid="6cc713d1-2f44-4a47-8e1e-7f71e1dce68b">
-        <File Id="Info.plist" Source="$(var.PLATFORM_ROOT)\Info.plist" Checksum="yes" />
-      </Component>
-      <Component Id="SDKSettings.plist" Directory="WindowsSDK" Guid="5e7d06bc-cad8-4c8b-803b-686adfbcb220">
-        <File Id="SDKSettings.plist" Source="$(var.SDK_ROOT)\SDKSettings.plist" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-
-    <!-- Features -->
-    <Feature Id="Win32SDK" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows SDK (x86)" Level="1" Title="Swift Windows SDK (x86)">
-      <ComponentGroupRef Id="BlocksRuntime" />
-      <ComponentGroupRef Id="CRT" />
-      <ComponentGroupRef Id="CXX" />
-      <ComponentGroupRef Id="Distributed" />
-      <ComponentGroupRef Id="Foundation" />
-      <ComponentGroupRef Id="FoundationNetworking" />
-      <ComponentGroupRef Id="FoundationXML" />
-      <ComponentGroupRef Id="Swift" />
-      <ComponentGroupRef Id="SwiftOnoneSupport" />
-      <ComponentGroupRef Id="SwiftRemoteMirror" />
-      <ComponentGroupRef Id="WinSDK" />
-      <ComponentGroupRef Id="XCTest" />
-      <ComponentGroupRef Id="_Concurrency" />
-      <ComponentGroupRef Id="_Differentiation" />
-      <ComponentGroupRef Id="_RegexParser" />
-      <ComponentGroupRef Id="_StringProcessing" />
-      <ComponentGroupRef Id="dispatch" />
-
-      <ComponentGroupRef Id="SwiftShims" />
-      <ComponentGroupRef Id="CXXShims" />
-
-      <ComponentGroupRef Id="Registrar" />
-      <ComponentGroupRef Id="AuxiliaryFiles" />
-      <ComponentGroupRef Id="Configuration" />
-    </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/sdk.wixproj b/platforms/Windows/sdk.wixproj
index 9212265c..62fcf2c7 100644
--- a/platforms/Windows/sdk.wixproj
+++ b/platforms/Windows/sdk.wixproj
@@ -19,7 +19,7 @@
   <Import Project="WiXCodeSigning.targets" />
 
   <PropertyGroup>
-    <DefineConstants>ProductVersion=$(ProductVersion);PLATFORM_ROOT=$(PLATFORM_ROOT);SDK_ROOT=$(SDK_ROOT);SwiftShimsPath=$(SDK_ROOT)\usr\lib\swift\shims;</DefineConstants>
+    <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>
@@ -40,6 +40,6 @@
       <DirectoryRefId>WindowsSDK_usr_lib_swift_shims</DirectoryRefId>
       <PreprocessorVariable>var.SwiftShimsPath</PreprocessorVariable>
     </HarvestDirectory>
-    <Compile Include="sdk-$(ProductArchitecture).wxs" />
+    <Compile Include="sdk.wxs" />
   </ItemGroup>
 </Project>
diff --git a/platforms/Windows/sdk.wxs b/platforms/Windows/sdk.wxs
new file mode 100644
index 00000000..38ca8d42
--- /dev/null
+++ b/platforms/Windows/sdk.wxs
@@ -0,0 +1,616 @@
+<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 Windows SDK ($(var.ProcessorArchitecture))"
+      UpgradeCode="4c37a396-d9e2-490a-89b7-0a3d271d847f"
+      Version="$(var.ProductVersion)"
+      Scope="perMachine">
+    <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>
+                          </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 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>
+
+                          <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>
+
+                          <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>
+                        </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>
+                        </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>
+                </Directory>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <!-- 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" />
+
+      <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/version.wxi b/platforms/Windows/version.wxi
index 3065d0fc..82097e09 100644
--- a/platforms/Windows/version.wxi
+++ b/platforms/Windows/version.wxi
@@ -18,4 +18,22 @@
 <?elseif $(var.ProductArchitecture) = "x86"?>
   <?define ProcessorArchitecture = "x86"?>
 <?endif?>
+
+<?if $(var.ProductArchitecture) = "amd64"?>
+  <?define ArchBinDir = "bin64"?>
+  <?define ArchArchDir = "x86_64"?>
+  <?define ArchTriple = "x86_64-unknown-windows-msvc"?>
+<?elseif $(var.ProductArchitecture) = "arm64"?>
+  <?define ArchBinDir = "bin64a"?>
+  <?define ArchArchDir = "aarch64"?>
+  <?define ArchTriple = "aarch64-unknown-windows-msvc"?>
+<?elseif $(var.ProductArchitecture) = "arm"?>
+  <?define ArchBinDir = "bin32a"?>
+  <?define ArchArchDir = "armv7"?>
+  <?define ArchTriple = "armv7-unknown-windows-msvc"?>
+<?elseif $(var.ProductArchitecture) = "x86"?>
+  <?define ArchBinDir = "bin32"?>
+  <?define ArchArchDir = "i686"?>
+  <?define ArchTriple = "i686-unknown-windows-msvc"?>
+<?endif?>
 </Include>