From af18dbaf23002fa2fef48e933f9d137b0cbb32b7 Mon Sep 17 00:00:00 2001
From: Saleem Abdulrasool <compnerd@compnerd.org>
Date: Sat, 27 May 2023 12:16:57 -0700
Subject: [PATCH] WiX: simplify the devtools 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/devtools-amd64.wxs | 172 ----------------------
 platforms/Windows/devtools-arm64.wxs | 172 ----------------------
 platforms/Windows/devtools.wixproj   |   6 +-
 platforms/Windows/devtools.wxs       | 205 +++++++++++++++++++++++++++
 4 files changed, 208 insertions(+), 347 deletions(-)
 delete mode 100644 platforms/Windows/devtools-amd64.wxs
 delete mode 100644 platforms/Windows/devtools-arm64.wxs
 create mode 100644 platforms/Windows/devtools.wxs

diff --git a/platforms/Windows/devtools-amd64.wxs b/platforms/Windows/devtools-amd64.wxs
deleted file mode 100644
index 0b4f659f..00000000
--- a/platforms/Windows/devtools-amd64.wxs
+++ /dev/null
@@ -1,172 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
-  <Package
-      Language="1033"
-      Manufacturer="swift.org"
-      Name="Swift Developer Tools"
-      UpgradeCode="5778fa7a-f1a6-4133-b4e0-fc0d9caf4544"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="Swift Developer Tools" />
-
-    <Media Id="1" Cabinet="devtools.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="07cd7a30-e084-447d-af16-ca3a013c5147" Id="WINDOWSVOLUME">
-      <Directory Id="INSTALLDIR">
-        <Directory Id="Library" Name="Library">
-          <Directory Id="Developer" Name="Developer">
-            <Directory Id="Toolchains" Name="Toolchains">
-              <Directory Id="xctoolchain" Name="$(var.ToolchainName)">
-                <Directory Id="_usr" Name="usr">
-                  <Directory Id="_usr_bin" Name="bin">
-                  </Directory>
-                  <Directory Id="_usr_lib" Name="lib">
-                    <!-- FIXME(compnerd) should we include the SPM import libraries? -->
-                    <Directory Id="_usr_lib_swift" Name="swift">
-                      <Directory Id="_usr_lib_swift_pm" Name="pm">
-                        <Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
-                        </Directory>
-                        <Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
-                        </Directory>
-                      </Directory>
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <!-- Components -->
-    <ComponentGroup Id="SwiftCollections">
-      <Component Id="Collections.dll" Directory="_usr_bin" Guid="fd0862f1-2e80-4040-8736-b73fc9c4230d">
-        <File Id="Collections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Collections.dll" Checksum="yes" />
-      </Component>
-      <Component Id="DequeModule.dll" Directory="_usr_bin" Guid="c365ca88-b4d7-4257-bd91-47b50d18a02f">
-        <File Id="DequeModule.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\DequeModule.dll" Checksum="yes" />
-      </Component>
-      <Component Id="OrderedCollections.dll" Directory="_usr_bin" Guid="626e8064-dc13-45b3-a7e0-dada2939b786">
-        <File Id="OrderedCollections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\OrderedCollections.dll" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftSystem">
-      <Component Id="SystemPackage.dll" Directory="_usr_bin" Guid="16215499-75a2-49b2-bb9c-18b72cc059ef">
-        <File Id="SystemPackage.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SystemPackage.dll" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftPackageManager">
-      <Component Id="Basics.dll" Directory="_usr_bin" Guid="b8032e5d-802d-4ce0-963a-c799873db876">
-        <File Id="Basics.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Basics.dll" Checksum="yes" />
-      </Component>
-      <Component Id="Build.dll" Directory="_usr_bin" Guid="ca159fa2-d672-4e1d-ac16-44dc38ad6db2">
-        <File Id="Build.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Build.dll" Checksum="yes" />
-      </Component>
-      <Component Id="Commands.dll" Directory="_usr_bin" Guid="5648becc-7676-4f6e-a60e-6967f9b0ba4f">
-        <File Id="Commands.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Commands.dll" Checksum="yes" />
-      </Component>
-      <Component Id="CoreCommands.dll" Directory="_usr_bin" Guid="03cf68fb-da2b-47b8-8417-a44e4ece5438">
-        <File Id="CoreCommands.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\CoreCommands.dll" Checksum="yes" />
-      </Component>
-      <Component Id="DriverSupport.dll" Directory="_usr_bin" Guid="43b50a02-5180-49c9-b0a4-86273c822f87">
-        <File Id="DriverSUpport.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\DriverSupport.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PackageGraph.dll" Directory="_usr_bin" Guid="254500b8-b2ac-4c9f-add3-6511b0e5bfa7">
-        <File Id="PackageGraph.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageGraph.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PackageLoading.dll" Directory="_usr_bin" Guid="cdbb8b34-7b84-48ed-8929-209a158f5d01">
-        <File Id="PackageLoading.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageLoading.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PackageModel.dll" Directory="_usr_bin" Guid="1e8f566e-83f0-4657-9eed-598a96a957d9">
-        <File Id="PackageModel.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageModel.dll" Checksum="yes" />
-      </Component>
-      <Component Id="SPMBuildCore.dll" Directory="_usr_bin" Guid="a4f1dc7d-8f1e-4d0d-8f71-974ddcb9e09a">
-        <File Id="SPMBuildCore.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SPMBuildCore.dll" Checksum="yes" />
-      </Component>
-      <Component Id="Workspace.dll" Directory="_usr_bin" Guid="b86661de-9783-416f-ab1b-cc4c658bca3b">
-        <File Id="Workspace.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Workspace.dll" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_build.exe" Directory="_usr_bin" Guid="5b3f6590-545c-42e3-9081-8582eb37a822">
-        <File Id="swift_build.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build.exe" Checksum="yes" />
-      </Component>
-      <Component Id="swift_package.exe" Directory="_usr_bin" Guid="40cee004-aa80-4948-ae39-f6ad32da56eb">
-        <File Id="swift_package.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-package.exe" Checksum="yes" />
-      </Component>
-      <Component Id="swift_run.exe" Directory="_usr_bin" Guid="dd9432af-c962-46ff-9639-6da39fea14f3">
-        <File Id="swift_run.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-run.exe" Checksum="yes" />
-      </Component>
-      <Component Id="swift_test.exe" Directory="_usr_bin" Guid="b8e43529-83f1-4c75-8630-e0937ad5d50d">
-        <File Id="swift_test.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-test.exe" Checksum="yes" />
-      </Component>
-
-      <Component Id="PackageDescription.dll" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="6fc98caf-05c4-456c-b005-cb390a9389be">
-        <File Id="PackageDescription.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PackageDescription.lib" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="dd357616-fcdf-4b80-b3e7-37d7ab3ced12">
-        <File Id="PackageDescription.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" Checksum="yes" />
-      </Component>
-      <Component Id="PackageDescription.swiftdoc" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="bc633eff-f7ae-4c79-ac0b-2cfabfa09fee">
-        <File Id="PackageDescription.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="PackageDescription.swiftmodule" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="279cd44c-7ed8-4ed4-befc-9ce020e55398">
-        <File Id="PackageDescription.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="CompilerPluginSupport.dll" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="e70c1625-68a6-4b1b-8476-ccf6951008cb">
-        <File Id="CompilerPluginSupport.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" Checksum="yes" />
-      </Component>
-      <Component Id="CompilerPluginSupport.lib" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="be8d4b68-9273-49bd-b7d2-e8edde22d64d">
-        <File Id="CompilerPluginSupport.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" Checksum="yes" />
-      </Component>
-      <Component Id="CompilerPluginSupport.swiftdoc" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="fb0b2c0c-49f3-4639-b31f-7d80fa6a8841">
-        <File Id="CompilerPluginSupport.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="CompilerPluginSupport.swiftmodule" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="8af5e404-7e2d-4b86-99f3-03ce1bb03fff">
-        <File Id="CompilerPluginSupport.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="PackagePlugin.dll" Directory="_usr_lib_swift_pm_PluginAPI" Guid="35bcc747-7923-420c-80c0-e95b6673b3b1">
-        <File Id="PackagePlugin.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PackagePlugin.lib" Directory="_usr_lib_swift_pm_PluginAPI" Guid="9b94e0c0-4ea1-4cbb-97e3-c668f43eb576">
-        <File Id="PackagePlugin.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" Checksum="yes" />
-      </Component>
-      <Component Id="PackagePlugin.swiftdoc" Directory="_usr_lib_swift_pm_PluginAPI" Guid="4b5ea540-ed27-4c24-9fea-c9284a59af01">
-        <File Id="PackagePlugin.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="PackagePlugin.swiftmodule" Directory="_usr_lib_swift_pm_PluginAPI" Guid="89fddf67-8afc-4254-a57b-f74cbb2a958e">
-        <File Id="PackagePlugin.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SourceKitLSP">
-      <Component Id="sourcekit_lsp.exe" Directory="_usr_bin" Guid="61d82a9e-2f72-415c-b6bb-9f43ec3f6bcd">
-        <File Id="sourcekit_lsp.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\sourcekit-lsp.exe" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools" Level="1" Title="Swift Developer Tools">
-      <ComponentGroupRef Id="SwiftCollections" />
-      <ComponentGroupRef Id="SwiftSystem" />
-      <ComponentGroupRef Id="SwiftPackageManager" />
-      <ComponentGroupRef Id="SourceKitLSP" />
-    </Feature>
-
-    <UI>
-      <ui:WixUI Id="WixUI_InstallDir" />
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
-    </UI>
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
-    <WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
-    <WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
-
-  </Package>
-</Wix>
diff --git a/platforms/Windows/devtools-arm64.wxs b/platforms/Windows/devtools-arm64.wxs
deleted file mode 100644
index 2dfa0ac5..00000000
--- a/platforms/Windows/devtools-arm64.wxs
+++ /dev/null
@@ -1,172 +0,0 @@
-<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
-  <?include version.wxi?>
-  <Package
-      Language="1033"
-      Manufacturer="swift.org"
-      Name="Swift Developer Tools"
-      UpgradeCode="87019842-3f3e-4227-b5c5-23a8ef72ad89"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="Swift Developer Tools" />
-
-    <Media Id="1" Cabinet="devtools.cab" EmbedCab="yes" />
-
-    <!-- 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="61297eca-77a2-4749-b2f7-3b7ae6304140" Id="WINDOWSVOLUME">
-      <Directory Id="INSTALLDIR">
-        <Directory Id="Library" Name="Library">
-          <Directory Id="Developer" Name="Developer">
-            <Directory Id="Toolchains" Name="Toolchains">
-              <Directory Id="xctoolchain" Name="$(var.ToolchainName)">
-                <Directory Id="_usr" Name="usr">
-                  <Directory Id="_usr_bin" Name="bin">
-                  </Directory>
-                  <Directory Id="_usr_lib" Name="lib">
-                    <!-- FIXME(compnerd) should we include the SPM import libraries? -->
-                    <Directory Id="_usr_lib_swift" Name="swift">
-                      <Directory Id="_usr_lib_swift_pm" Name="pm">
-                        <Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
-                        </Directory>
-                        <Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
-                        </Directory>
-                      </Directory>
-                    </Directory>
-                  </Directory>
-                </Directory>
-              </Directory>
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </Directory>
-
-    <!-- Components -->
-    <ComponentGroup Id="SwiftCollections">
-      <Component Id="Collections.dll" Directory="_usr_bin" Guid="b705e7a1-698a-4608-b53f-48578380696c">
-        <File Id="Collections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Collections.dll" Checksum="yes" />
-      </Component>
-      <Component Id="DequeModule.dll" Directory="_usr_bin" Guid="7459f8ec-563c-4220-ae5a-3c52a31b2a93">
-        <File Id="DequeModule.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\DequeModule.dll" Checksum="yes" />
-      </Component>
-      <Component Id="OrderedCollections.dll" Directory="_usr_bin" Guid="7437801f-15d1-43b2-8649-7c3cdfeeb0d7">
-        <File Id="OrderedCollections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\OrderedCollections.dll" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftSystem">
-      <Component Id="SystemPackage.dll" Directory="_usr_bin" Guid="3a77763d-f9fb-4f1e-a056-f785bb1912e9">
-        <File Id="SystemPackage.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SystemPackage.dll" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftPackageManager">
-      <Component Id="Basics.dll" Directory="_usr_bin" Guid="03e5871a-9ded-4010-9708-6217f294edc4">
-        <File Id="Basics.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Basics.dll" Checksum="yes" />
-      </Component>
-      <Component Id="Build.dll" Directory="_usr_bin" Guid="4a7280fc-5018-485a-b15f-dec6b19eb5d1">
-        <File Id="Build.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Build.dll" Checksum="yes" />
-      </Component>
-      <Component Id="Commands.dll" Directory="_usr_bin" Guid="b5a08920-f173-4a1b-8b80-dae0c3d21975">
-        <File Id="Commands.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Commands.dll" Checksum="yes" />
-      </Component>
-      <Component Id="CoreCommands.dll" Directory="_usr_bin" Guid="d3434998-9fa8-46e3-9a94-11d3bf34462d">
-        <File Id="CoreCommands.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\CoreCommands.dll" Checksum="yes" />
-      </Component>
-      <Component Id="DriverSupport.dll" Directory="_usr_bin" Guid="2c8f8a23-e0f3-4535-9c25-0e1300c24c32">
-        <File Id="DriverSupport.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\DriverSupport.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PackageGraph.dll" Directory="_usr_bin" Guid="0f4cd16f-a931-401c-9b49-9fc988e8d87e">
-        <File Id="PackageGraph.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageGraph.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PackageLoading.dll" Directory="_usr_bin" Guid="9f086102-597f-448f-ac82-127138fba0ba">
-        <File Id="PackageLoading.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageLoading.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PackageModel.dll" Directory="_usr_bin" Guid="faa15fdd-9ef2-46d8-af96-7a26a6c756f2">
-        <File Id="PackageModel.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageModel.dll" Checksum="yes" />
-      </Component>
-      <Component Id="SPMBuildCore.dll" Directory="_usr_bin" Guid="221b7bd2-9f99-4ef0-9a7e-b261e9370a77">
-        <File Id="SPMBuildCore.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SPMBuildCore.dll" Checksum="yes" />
-      </Component>
-      <Component Id="Workspace.dll" Directory="_usr_bin" Guid="9740f123-1701-47d1-b18f-6ff89ac31edd">
-        <File Id="Workspace.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Workspace.dll" Checksum="yes" />
-      </Component>
-
-      <Component Id="swift_build.exe" Directory="_usr_bin" Guid="a1feb617-1b46-446c-8002-08729f3fa267">
-        <File Id="swift_build.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build.exe" Checksum="yes" />
-      </Component>
-      <Component Id="swift_package.exe" Directory="_usr_bin" Guid="2d46cc7c-1831-4caf-a225-9d2f283b4c10">
-        <File Id="swift_package.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-package.exe" Checksum="yes" />
-      </Component>
-      <Component Id="swift_run.exe" Directory="_usr_bin" Guid="247b8727-71d3-4e80-bcaf-917a478598db">
-        <File Id="swift_run.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-run.exe" Checksum="yes" />
-      </Component>
-      <Component Id="swift_test.exe" Directory="_usr_bin" Guid="ba9a9e55-d620-49b0-8647-5fa1778e3693">
-        <File Id="swift_test.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-test.exe" Checksum="yes" />
-      </Component>
-
-      <Component Id="PackageDescription.dll" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="f182c092-90b2-453e-b820-445d76c29477">
-        <File Id="PackageDescription.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PackageDescription.lib" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="cac0bbb7-184d-4b57-a414-e727660bb004">
-        <File Id="PackageDescription.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" Checksum="yes" />
-      </Component>
-      <Component Id="PackageDescription.swiftdoc" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="488bcd93-32c6-422d-a2b3-45a4913b4dc8">
-        <File Id="PackageDescription.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="PackageDescription.swiftmodule" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="47fdf73a-dbfe-47b9-973f-ca5b8856b162">
-        <File Id="PackageDescription.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="CompilerPluginSupport.dll" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="ca3c9c96-3e52-4632-a72b-e071559561fc">
-        <File Id="CompilerPluginSupport.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" Checksum="yes" />
-      </Component>
-      <Component Id="CompilerPluginSupport.lib" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="2255f581-ddef-4633-8f3f-19b84d46b51b">
-        <File Id="CompilerPluginSupport.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" Checksum="yes" />
-      </Component>
-      <Component Id="CompilerPluginSupport.swiftdoc" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="7ac085c2-0a74-4936-b150-0aef32568e65">
-        <File Id="CompilerPluginSupport.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="CompilerPluginSupport.swiftmodule" Directory="_usr_lib_swift_pm_ManifestAPI" Guid="eaf41e9f-4f71-4479-a3b3-b75a95f248ac">
-        <File Id="CompilerPluginSupport.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" Checksum="yes" />
-      </Component>
-
-      <Component Id="PackagePlugin.dll" Directory="_usr_lib_swift_pm_PluginAPI" Guid="7ca18c18-6efa-44e9-af2c-b0196dfb9778">
-        <File Id="PackagePlugin.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" Checksum="yes" />
-      </Component>
-      <Component Id="PackagePlugin.lib" Directory="_usr_lib_swift_pm_PluginAPI" Guid="4b4345d1-3ab0-4742-bdd2-e3d61df5a74e">
-        <File Id="PackagePlugin.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" Checksum="yes" />
-      </Component>
-      <Component Id="PackagePlugin.swiftdoc" Directory="_usr_lib_swift_pm_PluginAPI" Guid="d8427dc3-4879-40bb-8f8b-439ef9c09143">
-        <File Id="PackagePlugin.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" Checksum="yes" />
-      </Component>
-      <Component Id="PackagePlugin.swiftmodule" Directory="_usr_lib_swift_pm_PluginAPI" Guid="250941c3-16a6-48f5-9142-1629c107ee7a">
-        <File Id="PackagePlugin.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SourceKitLSP">
-      <Component Id="sourcekit_lsp.exe" Directory="_usr_bin" Guid="1e4d7fbd-a435-4d11-bd17-2dec0b235c28">
-        <File Id="sourcekit_lsp.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\sourcekit-lsp.exe" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools" Level="1" Title="Swift Developer Tools">
-      <ComponentGroupRef Id="SwiftCollections" />
-      <ComponentGroupRef Id="SwiftSystem" />
-      <ComponentGroupRef Id="SwiftPackageManager" />
-      <ComponentGroupRef Id="SourceKitLSP" />
-    </Feature>
-
-    <UI>
-      <ui:WixUI Id="WixUI_InstallDir" />
-      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
-      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
-    </UI>
-    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
-    <WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
-    <WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
-
-  </Package>
-</Wix>
diff --git a/platforms/Windows/devtools.wixproj b/platforms/Windows/devtools.wixproj
index ae3f5d6a..dc02c500 100644
--- a/platforms/Windows/devtools.wixproj
+++ b/platforms/Windows/devtools.wixproj
@@ -32,8 +32,8 @@
   <ItemGroup>
     <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0" />
   </ItemGroup>
-  
+
   <ItemGroup>
-    <Compile Include="devtools-$(ProductArchitecture).wxs" />
+    <Compile Include="devtools.wxs" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/platforms/Windows/devtools.wxs b/platforms/Windows/devtools.wxs
new file mode 100644
index 00000000..cd4707a0
--- /dev/null
+++ b/platforms/Windows/devtools.wxs
@@ -0,0 +1,205 @@
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs" xmlns:ui="http://wixtoolset.org/schemas/v4/wxs/ui">
+  <?include version.wxi?>
+  <Package
+      Language="1033"
+      Manufacturer="swift.org"
+      Name="Swift Developer Tools"
+      UpgradeCode="87019842-3f3e-4227-b5c5-23a8ef72ad89"
+      Version="$(var.ProductVersion)"
+      Scope="perMachine">
+    <SummaryInformation Description="Swift Developer Tools" />
+
+    <Media Id="1" Cabinet="devtools.cab" EmbedCab="yes" />
+
+    <!-- WindowsVolume is not a StandardDirectory value, but rather a standard property. See https://github.com/wixtoolset/issues/issues/7314 -->
+    <SetDirectory Id="WINDOWSVOLUME" Value="[WindowsVolume]" />
+
+    <Directory ComponentGuidGenerationSeed="61297eca-77a2-4749-b2f7-3b7ae6304140" Id="WINDOWSVOLUME">
+      <Directory Id="INSTALLDIR">
+        <Directory Id="Library" Name="Library">
+          <Directory Id="Developer" Name="Developer">
+            <Directory Id="Toolchains" Name="Toolchains">
+              <Directory Id="xctoolchain" Name="$(var.ToolchainName)">
+                <Directory Id="_usr" Name="usr">
+                  <Directory Id="_usr_bin" Name="bin">
+                    <!-- swift-collections -->
+                    <Component Id="Collections.dll">
+                      <File Id="Collections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Collections.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="DequeModule.dll">
+                      <File Id="DequeModule.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\DequeModule.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="OrderedCollections.dll">
+                      <File Id="OrderedCollections.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\OrderedCollections.dll" Checksum="yes" />
+                    </Component>
+
+                    <!-- swift-system -->
+                    <Component Id="SystemPackage.dll">
+                      <File Id="SystemPackage.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SystemPackage.dll" Checksum="yes" />
+                    </Component>
+
+                    <!-- swift-package-manager -->
+                    <Component Id="Basics.dll">
+                      <File Id="Basics.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Basics.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="Build.dll">
+                      <File Id="Build.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Build.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="Commands.dll">
+                      <File Id="Commands.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Commands.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="CoreCommands.dll">
+                      <File Id="CoreCommands.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\CoreCommands.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="DriverSupport.dll">
+                      <File Id="DriverSupport.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\DriverSupport.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="PackageGraph.dll">
+                      <File Id="PackageGraph.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageGraph.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="PackageLoading.dll">
+                      <File Id="PackageLoading.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageLoading.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="PackageModel.dll">
+                      <File Id="PackageModel.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\PackageModel.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="SPMBuildCore.dll">
+                      <File Id="SPMBuildCore.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\SPMBuildCore.dll" Checksum="yes" />
+                    </Component>
+                    <Component Id="Workspace.dll">
+                      <File Id="Workspace.dll" Source="$(var.DEVTOOLS_ROOT)\usr\bin\Workspace.dll" Checksum="yes" />
+                    </Component>
+
+                    <Component Id="swift_build.exe">
+                      <File Id="swift_build.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-build.exe" Checksum="yes" />
+                    </Component>
+                    <Component Id="swift_package.exe">
+                      <File Id="swift_package.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-package.exe" Checksum="yes" />
+                    </Component>
+                    <Component Id="swift_run.exe">
+                      <File Id="swift_run.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-run.exe" Checksum="yes" />
+                    </Component>
+                    <Component Id="swift_test.exe">
+                      <File Id="swift_test.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\swift-test.exe" Checksum="yes" />
+                    </Component>
+
+                    <!-- sourcekit-lsp -->
+                    <Component Id="sourcekit_lsp.exe">
+                      <File Id="sourcekit_lsp.exe" Source="$(var.DEVTOOLS_ROOT)\usr\bin\sourcekit-lsp.exe" Checksum="yes" />
+                    </Component>
+                  </Directory>
+
+                  <Directory Id="_usr_lib" Name="lib">
+                    <!-- FIXME(compnerd) should we include the SPM import libraries? -->
+                    <Directory Id="_usr_lib_swift" Name="swift">
+                      <Directory Id="_usr_lib_swift_pm" Name="pm">
+                        <Directory Id="_usr_lib_swift_pm_ManifestAPI" Name="ManifestAPI">
+                          <Component Id="PackageDescription.dll">
+                            <File Id="PackageDescription.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.dll" Checksum="yes" />
+                          </Component>
+                          <Component Id="PackageDescription.lib">
+                            <File Id="PackageDescription.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.lib" Checksum="yes" />
+                          </Component>
+                          <Component Id="PackageDescription.swiftdoc">
+                            <File Id="PackageDescription.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftdoc" Checksum="yes" />
+                          </Component>
+                          <Component Id="PackageDescription.swiftmodule">
+                            <File Id="PackageDescription.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\PackageDescription.swiftmodule" Checksum="yes" />
+                          </Component>
+
+                          <Component Id="CompilerPluginSupport.dll">
+                            <File Id="CompilerPluginSupport.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.dll" Checksum="yes" />
+                          </Component>
+                          <Component Id="CompilerPluginSupport.lib">
+                            <File Id="CompilerPluginSupport.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.lib" Checksum="yes" />
+                          </Component>
+                          <Component Id="CompilerPluginSupport.swiftdoc">
+                            <File Id="CompilerPluginSupport.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftdoc" Checksum="yes" />
+                          </Component>
+                          <Component Id="CompilerPluginSupport.swiftmodule">
+                            <File Id="CompilerPluginSupport.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\ManifestAPI\CompilerPluginSupport.swiftmodule" Checksum="yes" />
+                          </Component>
+                        </Directory>
+
+                        <Directory Id="_usr_lib_swift_pm_PluginAPI" Name="PluginAPI">
+                          <Component Id="PackagePlugin.dll">
+                            <File Id="PackagePlugin.dll" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.dll" Checksum="yes" />
+                          </Component>
+                          <Component Id="PackagePlugin.lib">
+                            <File Id="PackagePlugin.lib" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.lib" Checksum="yes" />
+                          </Component>
+                          <Component Id="PackagePlugin.swiftdoc">
+                            <File Id="PackagePlugin.swiftdoc" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftdoc" Checksum="yes" />
+                          </Component>
+                          <Component Id="PackagePlugin.swiftmodule">
+                            <File Id="PackagePlugin.swiftmodule" Source="$(var.DEVTOOLS_ROOT)\usr\lib\swift\pm\PluginAPI\PackagePlugin.swiftmodule" Checksum="yes" />
+                          </Component>
+                        </Directory>
+                      </Directory>
+                    </Directory>
+                  </Directory>
+                </Directory>
+              </Directory>
+            </Directory>
+          </Directory>
+        </Directory>
+      </Directory>
+    </Directory>
+
+    <Feature Id="DeveloperTools" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Developer Tools" Level="1" Title="Swift Developer Tools">
+      <!-- swift-collections -->
+      <ComponentRef Id="Collections.dll" />
+      <ComponentRef Id="DequeModule.dll" />
+      <ComponentRef Id="OrderedCollections.dll" />
+
+      <!-- swift-system -->
+      <ComponentRef Id="SystemPackage.dll" />
+
+      <!-- swift-system -->
+      <ComponentRef Id="Basics.dll" />
+      <ComponentRef Id="Build.dll" />
+      <ComponentRef Id="Commands.dll" />
+      <ComponentRef Id="CoreCommands.dll" />
+      <ComponentRef Id="DriverSupport.dll" />
+      <ComponentRef Id="PackageGraph.dll" />
+      <ComponentRef Id="PackageLoading.dll" />
+      <ComponentRef Id="PackageModel.dll" />
+      <ComponentRef Id="SPMBuildCore.dll" />
+      <ComponentRef Id="Workspace.dll" />
+
+      <ComponentRef Id="swift_build.exe" />
+      <ComponentRef Id="swift_package.exe" />
+      <ComponentRef Id="swift_run.exe" />
+      <ComponentRef Id="swift_test.exe" />
+
+      <ComponentRef Id="PackageDescription.dll" />
+      <ComponentRef Id="PackageDescription.lib" />
+      <ComponentRef Id="PackageDescription.swiftdoc" />
+      <ComponentRef Id="PackageDescription.swiftmodule" />
+
+      <ComponentRef Id="CompilerPluginSupport.dll" />
+      <ComponentRef Id="CompilerPluginSupport.lib" />
+      <ComponentRef Id="CompilerPluginSupport.swiftdoc" />
+      <ComponentRef Id="CompilerPluginSupport.swiftmodule" />
+
+      <ComponentRef Id="PackagePlugin.dll" />
+      <ComponentRef Id="PackagePlugin.lib" />
+      <ComponentRef Id="PackagePlugin.swiftdoc" />
+      <ComponentRef Id="PackagePlugin.swiftmodule" />
+
+      <!-- sourcekit-lsp -->
+      <ComponentRef Id="sourcekit_lsp.exe" />
+    </Feature>
+
+    <UI>
+      <ui:WixUI Id="WixUI_InstallDir" />
+      <Publish Dialog="WelcomeDlg" Control="Next" Event="NewDialog" Value="InstallDirDlg" Order="2" />
+      <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="WelcomeDlg" Order="2" />
+    </UI>
+
+    <Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR"></Property>
+
+    <WixVariable Id="WixUIDialogBmp" Value="Resources\swift_dialog.png" />
+    <WixVariable Id="WixUIBannerBmp" Value="Resources\swift_banner.png" />
+  </Package>
+</Wix>