From 1df2009d94c0ce02cc0a87f9526334f4c9d34592 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 runtime 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.wixproj  |   2 +-
 platforms/Windows/runtime-amd64.wxs | 116 -------------------------
 platforms/Windows/runtime-arm64.wxs | 116 -------------------------
 platforms/Windows/runtime-x86.wxs   | 115 -------------------------
 platforms/Windows/runtime.wixproj   |   4 +-
 platforms/Windows/runtime.wxs       | 128 ++++++++++++++++++++++++++++
 platforms/Windows/toolchain.wixproj |   2 +-
 platforms/Windows/version.wxi       |  10 +++
 8 files changed, 142 insertions(+), 351 deletions(-)
 delete mode 100644 platforms/Windows/runtime-amd64.wxs
 delete mode 100644 platforms/Windows/runtime-arm64.wxs
 delete mode 100644 platforms/Windows/runtime-x86.wxs
 create mode 100644 platforms/Windows/runtime.wxs

diff --git a/platforms/Windows/devtools.wixproj b/platforms/Windows/devtools.wixproj
index ae3f5d6a..de04e2ae 100644
--- a/platforms/Windows/devtools.wixproj
+++ b/platforms/Windows/devtools.wixproj
@@ -19,7 +19,7 @@
   <Import Project="WiXCodeSigning.targets" />
 
   <PropertyGroup>
-    <DefineConstants>ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);</DefineConstants>
+    <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);</DefineConstants>
     <HarvestDirectoryAutogenerateGuids>false</HarvestDirectoryAutogenerateGuids>
     <HarvestDirectoryGenerateGuidsNow>true</HarvestDirectoryGenerateGuidsNow>
     <HarvestDirectoryNoLogo>true</HarvestDirectoryNoLogo>
diff --git a/platforms/Windows/runtime-amd64.wxs b/platforms/Windows/runtime-amd64.wxs
deleted file mode 100644
index 80d88b42..00000000
--- a/platforms/Windows/runtime-amd64.wxs
+++ /dev/null
@@ -1,116 +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 Windows Runtime (AMD64)"
-      UpgradeCode="850349e4-5a24-44eb-bded-f49a2709d26f"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="Swift Windows Runtime (AMD64)" />
-
-    <Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" />
-
-    <!-- Directory Structure -->
-    <StandardDirectory Id="ProgramFiles64Folder">
-      <Directory Id="INSTALLDIR" Name="Swift">
-        <Directory Id="_" Name="$(var.RuntimeName)">
-          <Directory Id="_usr" Name="usr">
-            <Directory Id="_usr_bin" Name="bin">
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </StandardDirectory>
-
-    <!-- Components -->
-    <ComponentGroup Id="SwiftRuntime" Directory="_usr_bin">
-      <Component Id="BlocksRuntime.dll" Guid="bf2447f9-0ff5-48b6-864f-e738f9c51fb0">
-        <File Id="BlocksRuntime.dll" Source="$(var.SDK_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.dll" Guid="3167f6ca-0a20-445e-87eb-c65c2db4e17c">
-        <File Id="dispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\dispatch.dll" Checksum="yes" />
-      </Component>
-      <Component Id="Foundation.dll" Guid="9f47536a-4fae-41c4-b20f-1ffacd3d46d0">
-        <File Id="Foundation.dll" Source="$(var.SDK_ROOT)\usr\bin\Foundation.dll" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationNetworking.dll" Guid="f36f2cc6-0034-4ddd-924f-865523fdf4e2">
-        <File Id="FoundationNetworking.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationNetworking.dll" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationXML.dll" Guid="e5bc9e2b-3083-4b61-a553-59224bc1f6f3">
-        <File Id="FoundationXML.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationXML.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_Concurrency.dll" Guid="ce77eb06-eb96-4ea5-b9ce-c103f0b74063">
-        <File Id="swift_Concurrency.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_Differentiation.dll" Guid="cef7dda7-cbfc-478c-932b-211f9b9d12f0">
-        <File Id="swift_Differentiation.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftDistributed.dll" Guid="455f1af2-2c0a-40d4-b2a0-5a3479f6970f">
-        <File Id="swiftDistributed.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_RegexParser.dll" Guid="bd2d3e51-1091-4a80-a9b5-5daae6c36881">
-        <File Id="swift_RegexParser.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_StringProcessing.dll" Guid="198f58ad-8797-40ee-b109-dec6f9b57b27">
-        <File Id="swift_StringProcessing.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftCore.dll" Guid="4098dff8-8b8d-48ee-a234-d29104d4c809">
-        <File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftCxx.dll" Guid="45eb46fc-a006-4fe9-abf0-42e26e3d3c87">
-        <File Id="swiftCxx.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCxx.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftDispatch.dll" Guid="312ffb9e-7ecf-423f-8f59-3041d2776e4a">
-        <File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
-      </Component>
-      <!--
-      <Component Id="swiftDemangle.dll" Guid="baa8777d-cd9b-4da8-8a88-353b95602fbd">
-        <File Id="swiftDemangle.dll" Source="$(var.SDK_ROOT)\bin\swiftDemangle.dll" Checksum="yes" />
-      </Component>
-      -->
-      <Component Id="swiftCRT.dll" Guid="6ef8eecb-780a-46a0-bddd-79b9a7bb8316">
-        <File Id="swiftCRT.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCRT.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftRemoteMirror.dll" Guid="2292dd48-e253-446d-9eb3-650d9264af77">
-        <File Id="swiftRemoteMirror.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftRemoteMirror.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftSwiftOnoneSupport.dll" Guid="bb44ff8b-a243-4986-a11a-3800323994a9">
-        <File Id="swiftSwiftOnoneSupport.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftSwiftOnoneSupport.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftWinSDK.dll" Guid="42cda8cb-fb2f-4967-8720-2d2c012b72a0">
-        <File Id="swiftWinSDK.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftWinSDK.dll" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftUtilities" Directory="_usr_bin">
-      <Component Id="plutil.exe" Guid="49b166e5-98e4-47dd-bfff-e73fd2e38b4c">
-        <File Id="plutil.exe" Source="$(var.SDK_ROOT)\usr\bin\plutil.exe" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="f249625e-aacd-4b17-a464-8f8df05ba5f3">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]$(var.RuntimeName)\usr\bin" />
-    </Component>
-
-    <!-- Feature -->
-    <Feature Id="WinX64SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows Runtime (AMD64)" Level="1" Title="Swift Windows Runtime (AMD64)">
-      <ComponentGroupRef Id="SwiftRuntime" />
-      <ComponentRef Id="EnvironmentVariables" />
-    </Feature>
-
-    <Feature Id="WinX64SwiftUtilities" AllowAbsent="yes" AllowAdvertise="yes" Description="Extra Swift Utilities for Windows x86_64" Level="1" Title="Swift Utilities for Windows x86_64">
-      <ComponentGroupRef Id="SwiftUtilities" />
-    </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/runtime-arm64.wxs b/platforms/Windows/runtime-arm64.wxs
deleted file mode 100644
index 0868ac47..00000000
--- a/platforms/Windows/runtime-arm64.wxs
+++ /dev/null
@@ -1,116 +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 Windows Runtime (ARM64)"
-      UpgradeCode="bea8c6dc-f73e-445b-9486-2333d1cf2886"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="Swift Windows Runtime (ARM64)" />
-
-    <Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" />
-
-    <!-- Directory Structure -->
-    <StandardDirectory Id="ProgramFiles64Folder">
-      <Directory Id="INSTALLDIR" Name="Swift">
-        <Directory Id="_" Name="$(var.RuntimeName)">
-          <Directory Id="_usr" Name="usr">
-            <Directory Id="_usr_bin" Name="bin">
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </StandardDirectory>
-
-    <!-- Components -->
-    <ComponentGroup Id="SwiftRuntime" Directory="_usr_bin">
-      <Component Id="BlocksRuntime.dll" Guid="5040be00-a175-4813-81d4-ef77a4c7a01c">
-        <File Id="BlocksRuntime.dll" Source="$(var.SDK_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.dll" Guid="48d9a273-cf10-46aa-a902-f32abce68198">
-        <File Id="dispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\dispatch.dll" Checksum="yes" />
-      </Component>
-      <Component Id="Foundation.dll" Guid="91eab4aa-865d-41e3-ac7c-9153aec3e271">
-        <File Id="Foundation.dll" Source="$(var.SDK_ROOT)\usr\bin\Foundation.dll" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationNetworking.dll" Guid="efa0addb-a974-4adf-b452-ec0a0f278e44">
-        <File Id="FoundationNetworking.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationNetworking.dll" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationXML.dll" Guid="959fd680-b5b7-4c1d-bdd2-6c019a611874">
-        <File Id="FoundationXML.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationXML.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_Concurrency.dll" Guid="67373728-5a66-401f-b62d-dc7ced8b87e8">
-        <File Id="swift_Concurrency.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_Differentiation.dll" Guid="ba696988-87b4-41da-aaea-949602e86758">
-        <File Id="swift_Differentiation.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftDistributed.dll" Guid="8cc487d0-0fb7-45c1-a900-50ba929f6711">
-        <File Id="swiftDistributed.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_RegexParser.dll" Guid="20f67580-0116-4e77-8670-65fec75abacb">
-        <File Id="swift_RegexParser.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_StringProcessing.dll" Guid="0e0dc47f-1e80-4ed1-8ee9-7de8139086ed">
-        <File Id="swift_StringProcessing.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftCore.dll" Guid="b11c37b0-b6ad-4e55-b4e7-0517ff7a161f">
-        <File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftCxx.dll" Guid="7bbf8fd4-769d-4e4f-8d62-f1d07d568ccf">
-        <File Id="swiftCxx.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCxx.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftDispatch.dll" Guid="ce50982a-4bb3-43fc-a5ce-9fc709143b47">
-        <File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
-      </Component>
-      <!--
-      <Component Id="swiftDemangle.dll" Guid="160fec66-5211-45e8-aaed-6e5d7c7608f3">
-        <File Id="swiftDemangle.dll" Source="$(var.SDK_ROOT)\bin\swiftDemangle.dll" Checksum="yes" />
-      </Component>
-      -->
-      <Component Id="swiftCRT.dll" Guid="8588d340-2466-4c38-a22e-ed4bb89cdf25">
-        <File Id="swiftCRT.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCRT.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftRemoteMirror.dll" Guid="a9e05463-5af6-41ad-8a31-01da624d3b7a">
-        <File Id="swiftRemoteMirror.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftRemoteMirror.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftSwiftOnoneSupport.dll" Guid="771925a8-e5fd-4dc9-92d0-d6952c15c181">
-        <File Id="swiftSwiftOnoneSupport.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftSwiftOnoneSupport.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftWinSDK.dll" Guid="78df14d6-2f0d-4ee1-ad1e-f0c0521565e0">
-        <File Id="swiftWinSDK.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftWinSDK.dll" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftUtilities" Directory="_usr_bin">
-      <Component Id="plutil.exe" Guid="b96bf921-fbad-4d1b-9559-38707605de06">
-        <File Id="plutil.exe" Source="$(var.SDK_ROOT)\usr\bin\plutil.exe" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="8681d813-eb32-46f9-8b1c-f622b38b5eaf">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]$(var.RuntimeName)\usr\bin" />
-    </Component>
-
-    <!-- Feature -->
-    <Feature Id="WinARM64SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows Runtime (ARM64)" Level="1" Title="Swift Windows Runtime (ARM64)">
-      <ComponentGroupRef Id="SwiftRuntime" />
-      <ComponentRef Id="EnvironmentVariables" />
-    </Feature>
-
-    <Feature Id="WinARM64SwiftUtilities" AllowAbsent="yes" AllowAdvertise="yes" Description="Extra Swift Utilities for Windows aarch64" Level="1" Title="Swift Utilities for Windows aarch64">
-      <ComponentGroupRef Id="SwiftUtilities" />
-    </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/runtime-x86.wxs b/platforms/Windows/runtime-x86.wxs
deleted file mode 100644
index b289c29f..00000000
--- a/platforms/Windows/runtime-x86.wxs
+++ /dev/null
@@ -1,115 +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 Windows Runtime (x86)"
-      UpgradeCode="01a3fe60-8c3e-4249-8477-deba39b99dd9"
-      Version="$(var.ProductVersion)"
-      Scope="perMachine">
-    <SummaryInformation Description="Swift Windows Runtime (x86)" />
-
-    <Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" />
-
-    <!-- Directory Structure -->
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLDIR" Name="Swift">
-        <Directory Id="_" Name="$(var.RuntimeName)">
-          <Directory Id="_usr" Name="usr">
-            <Directory Id="_usr_bin" Name="bin">
-            </Directory>
-          </Directory>
-        </Directory>
-      </Directory>
-    </StandardDirectory>
-
-    <!-- Components -->
-    <ComponentGroup Id="SwiftRuntime" Directory="_usr_bin">
-      <Component Id="BlocksRuntime.dll" Guid="06162783-5e61-42ec-af15-3f8b09e8562a">
-        <File Id="BlocksRuntime.dll" Source="$(var.SDK_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" />
-      </Component>
-      <Component Id="dispatch.dll" Guid="204e99a2-1404-4523-b13a-d471650f3d10">
-        <File Id="dispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\dispatch.dll" Checksum="yes" />
-      </Component>
-      <Component Id="Foundation.dll" Guid="aef0c5c5-c381-4c5a-8ac9-ccd2fba70265">
-        <File Id="Foundation.dll" Source="$(var.SDK_ROOT)\usr\bin\Foundation.dll" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationNetworking.dll" Guid="4d31dc16-130d-499c-b861-c9147e20069c">
-        <File Id="FoundationNetworking.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationNetworking.dll" Checksum="yes" />
-      </Component>
-      <Component Id="FoundationXML.dll" Guid="154951da-1a4a-4034-b318-51aa3069a512">
-        <File Id="FoundationXML.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationXML.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_Concurrency.dll" Guid="08d4e353-00af-4db0-9c55-2ea50eeddeb7">
-        <File Id="swift_Concurrency.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_Differentiation.dll" Guid="cf6be869-0b63-4b81-9bc6-5b7cad7ee629">
-        <File Id="swift_Differentiation.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftDistributed.dll" Guid="4c730ba2-47fc-4d96-ad87-e16646a3f310">
-        <File Id="swiftDistributed.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_RegexParser.dll" Guid="cfb0432b-01c4-4ef4-9e8a-b90236f20606">
-        <File Id="swift_RegexParser.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swift_StringProcessing.dll" Guid="e6070d4e-9e60-46cb-94a4-ec499c354099">
-        <File Id="swift_StringProcessing.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftCore.dll" Guid="d816134d-2de1-4e50-90dd-a36675c09c3e">
-        <File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftCxx.dll" Guid="9752dfcf-b9fd-457d-b983-e2f346f97c3d">
-        <File Id="swiftCxx.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCxx.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftDispatch.dll" Guid="fd38df32-2bcd-4da4-98b3-f26abd1ac6de">
-        <File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
-      </Component>
-      <!--
-      <Component Id="swiftDemangle.dll" Guid="3a9cc33f-df6f-4700-8e82-d908e4e1093d">
-        <File Id="swiftDemangle.dll" Source="$(var.SDK_ROOT)\bin\swiftDemangle.dll" Checksum="yes" />
-      </Component>
-      -->
-      <Component Id="swiftCRT.dll" Guid="c457345e-7d64-4fdb-9c84-0dc5586aa1c5">
-        <File Id="swiftCRT.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCRT.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftRemoteMirror.dll" Guid="a7b35013-cff3-4199-a26a-4d222f6dcc49">
-        <File Id="swiftRemoteMirror.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftRemoteMirror.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftSwiftOnoneSupport.dll" Guid="3d438ca5-a22f-4870-9db9-7ac783550029">
-        <File Id="swiftSwiftOnoneSupport.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftSwiftOnoneSupport.dll" Checksum="yes" />
-      </Component>
-      <Component Id="swiftWinSDK.dll" Guid="a1f69b1c-a649-46dd-849b-03373a0911c7">
-        <File Id="swiftWinSDK.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftWinSDK.dll" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <ComponentGroup Id="SwiftUtilities" Directory="_usr_bin">
-      <Component Id="plutil.exe" Guid="0f4a9a59-b623-4cd3-a1f5-e7f05a81744f">
-        <File Id="plutil.exe" Source="$(var.SDK_ROOT)\usr\bin\plutil.exe" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="3b4386ac-3341-407d-b946-6e670f4a83f6">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]$(var.RuntimeName)\usr\bin" />
-    </Component>
-
-    <!-- Feature -->
-    <Feature Id="Win32SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows Runtime (x86)" Level="1" Title="Swift Windows Runtime (x86)">
-      <ComponentGroupRef Id="SwiftRuntime" />
-      <ComponentRef Id="EnvironmentVariables" />
-    </Feature>
-
-    <Feature Id="Win32SwiftUtilities" AllowAbsent="yes" AllowAdvertise="yes" Description="Extra Swift Utilities for Windows i686" Level="1" Title="Swift Utilities for Windows i686">
-      <ComponentGroupRef Id="SwiftUtilities" />
-    </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/runtime.wixproj b/platforms/Windows/runtime.wixproj
index b6281d90..3ce2494e 100644
--- a/platforms/Windows/runtime.wixproj
+++ b/platforms/Windows/runtime.wixproj
@@ -19,7 +19,7 @@
   <Import Project="WiXCodeSigning.targets" />
 
   <PropertyGroup>
-    <DefineConstants>ProductVersion=$(ProductVersion);SDK_ROOT=$(SDK_ROOT)</DefineConstants>
+    <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);SDK_ROOT=$(SDK_ROOT)</DefineConstants>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(ProductArchitecture)' == 'amd64' ">
@@ -42,6 +42,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="runtime-$(ProductArchitecture).wxs" />
+    <Compile Include="runtime.wxs" />
   </ItemGroup>
 </Project>
diff --git a/platforms/Windows/runtime.wxs b/platforms/Windows/runtime.wxs
new file mode 100644
index 00000000..ea4011e0
--- /dev/null
+++ b/platforms/Windows/runtime.wxs
@@ -0,0 +1,128 @@
+<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 Runtime ($(var.ProcessorArchitecture))"
+      UpgradeCode="bea8c6dc-f73e-445b-9486-2333d1cf2886"
+      Version="$(var.ProductVersion)"
+      Scope="perMachine">
+    <SummaryInformation Description="Swift Windows Runtime ($(var.ProcessorArchitecture))" />
+
+    <Media Id="1" Cabinet="runtime.cab" EmbedCab="yes" />
+
+    <StandardDirectory Id="ProgramFiles6432Folder">
+      <Directory Id="INSTALLDIR" Name="Swift">
+        <Directory Id="_" Name="$(var.RuntimeName)">
+          <Directory Id="_usr" Name="usr">
+            <Directory Id="_usr_bin" Name="bin">
+              <Component Id="BlocksRuntime.dll">
+                <File Id="BlocksRuntime.dll" Source="$(var.SDK_ROOT)\usr\bin\BlocksRuntime.dll" Checksum="yes" />
+              </Component>
+              <Component Id="dispatch.dll">
+                <File Id="dispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\dispatch.dll" Checksum="yes" />
+              </Component>
+              <Component Id="Foundation.dll">
+                <File Id="Foundation.dll" Source="$(var.SDK_ROOT)\usr\bin\Foundation.dll" Checksum="yes" />
+              </Component>
+              <Component Id="FoundationNetworking.dll">
+                <File Id="FoundationNetworking.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationNetworking.dll" Checksum="yes" />
+              </Component>
+              <Component Id="FoundationXML.dll">
+                <File Id="FoundationXML.dll" Source="$(var.SDK_ROOT)\usr\bin\FoundationXML.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swift_Concurrency.dll">
+                <File Id="swift_Concurrency.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Concurrency.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swift_Differentiation.dll">
+                <File Id="swift_Differentiation.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_Differentiation.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swiftDistributed.dll">
+                <File Id="swiftDistributed.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDistributed.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swift_RegexParser.dll">
+                <File Id="swift_RegexParser.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_RegexParser.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swift_StringProcessing.dll">
+                <File Id="swift_StringProcessing.dll" Source="$(var.SDK_ROOT)\usr\bin\swift_StringProcessing.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swiftCore.dll">
+                <File Id="swiftCore.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCore.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swiftCxx.dll">
+                <File Id="swiftCxx.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCxx.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swiftDispatch.dll">
+                <File Id="swiftDispatch.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftDispatch.dll" Checksum="yes" />
+              </Component>
+              <!--
+              <Component Id="swiftDemangle.dll">
+                <File Id="swiftDemangle.dll" Source="$(var.SDK_ROOT)\bin\swiftDemangle.dll" Checksum="yes" />
+              </Component>
+              -->
+              <Component Id="swiftCRT.dll">
+                <File Id="swiftCRT.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftCRT.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swiftRemoteMirror.dll">
+                <File Id="swiftRemoteMirror.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftRemoteMirror.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swiftSwiftOnoneSupport.dll">
+                <File Id="swiftSwiftOnoneSupport.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftSwiftOnoneSupport.dll" Checksum="yes" />
+              </Component>
+              <Component Id="swiftWinSDK.dll">
+                <File Id="swiftWinSDK.dll" Source="$(var.SDK_ROOT)\usr\bin\swiftWinSDK.dll" Checksum="yes" />
+              </Component>
+
+              <Component Id="plutil.exe">
+                <File Id="plutil.exe" Source="$(var.SDK_ROOT)\usr\bin\plutil.exe" Checksum="yes" />
+              </Component>
+            </Directory>
+          </Directory>
+        </Directory>
+
+        <Component Id="EnvironmentVariables" Guid="8681d813-eb32-46f9-8b1c-f622b38b5eaf">
+          <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]$(var.RuntimeName)\usr\bin" />
+        </Component>
+      </Directory>
+    </StandardDirectory>
+
+    <!-- Feature -->
+    <Feature Id="SwiftRuntime" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Windows Runtime ($(var.ProcessorArchitecture))" Level="1" Title="Swift Windows Runtime ($(var.ProcessorArchitecture))">
+      <ComponentRef Id="BlocksRuntime.dll" />
+      <ComponentRef Id="dispatch.dll" />
+      <ComponentRef Id="Foundation.dll" />
+      <ComponentRef Id="FoundationNetworking.dll" />
+      <ComponentRef Id="FoundationXML.dll" />
+      <ComponentRef Id="swift_Concurrency.dll" />
+      <ComponentRef Id="swift_Differentiation.dll" />
+      <ComponentRef Id="swift_RegexParser.dll" />
+      <ComponentRef Id="swift_StringProcessing.dll" />
+      <ComponentRef Id="swiftCore.dll" />
+      <ComponentRef Id="swiftCxx.dll" />
+      <ComponentRef Id="swiftCRT.dll" />
+      <!-- <ComponentRef Id="swiftDemangle.dll" /> -->
+      <ComponentRef Id="swiftDispatch.dll" />
+      <ComponentRef Id="swiftDistributed.dll" />
+      <ComponentRef Id="swiftRemoteMirror.dll" />
+      <ComponentRef Id="swiftSwiftOnoneSupport.dll" />
+      <ComponentRef Id="swiftWinSDK.dll" />
+
+      <ComponentRef Id="EnvironmentVariables" />
+    </Feature>
+
+    <Feature Id="SwiftUtilities" AllowAbsent="yes" AllowAdvertise="yes" Description="Extra Swift Utilities Windows ($(var.ProcessorArchitecture))" Level="1" Title="Swift Utilities Windows ($(var.ProcessorArchitecture))">
+      <ComponentRef Id="plutil.exe" />
+    </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/toolchain.wixproj b/platforms/Windows/toolchain.wixproj
index 89a8f692..744ec0a7 100644
--- a/platforms/Windows/toolchain.wixproj
+++ b/platforms/Windows/toolchain.wixproj
@@ -19,7 +19,7 @@
   <Import Project="WiXCodeSigning.targets" />
 
   <PropertyGroup>
-    <DefineConstants>ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang</DefineConstants>
+    <DefineConstants>ProductArchitecture=$(ProductArchitecture);ProductVersion=$(ProductVersion);DEVTOOLS_ROOT=$(DEVTOOLS_ROOT);TOOLCHAIN_ROOT=$(TOOLCHAIN_ROOT);TOOLCHAIN_ROOT_USR_LIB_CLANG=$(TOOLCHAIN_ROOT)\usr\lib\clang</DefineConstants>
     <HarvestDirectoryAutogenerateGuids>false</HarvestDirectoryAutogenerateGuids>
     <HarvestDirectoryGenerateGuidsNow>true</HarvestDirectoryGenerateGuidsNow>
     <HarvestDirectoryNoLogo>true</HarvestDirectoryNoLogo>
diff --git a/platforms/Windows/version.wxi b/platforms/Windows/version.wxi
index c16f26bc..3065d0fc 100644
--- a/platforms/Windows/version.wxi
+++ b/platforms/Windows/version.wxi
@@ -8,4 +8,14 @@
 <?define RuntimeName = "runtime-$(var.ProductVersion)"?>
 <?define ToolchainName = "unknown-Asserts-$(var.ProductVersion).xctoolchain"?>
 <?endif?>
+
+<?if $(var.ProductArchitecture) = "amd64"?>
+  <?define ProcessorArchitecture = "AMD64"?>
+<?elseif $(var.ProductArchitecture) = "arm64"?>
+  <?define ProcessorArchitecture = "ARM64"?>
+<?elseif $(var.ProductArchitecture) = "arm"?>
+  <?define ProcessorArchitecture = "ARM"?>
+<?elseif $(var.ProductArchitecture) = "x86"?>
+  <?define ProcessorArchitecture = "x86"?>
+<?endif?>
 </Include>