WiX: simplify the swift-format 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.

Author: compnerd

platforms/Windows/swift-format-amd64.wxs

@@ -27,6 +27,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="swift-format-$(ProductArchitecture).wxs" />
+    <Compile Include="swift-format.wxs" />
   </ItemGroup>
 </Project>

platforms/Windows/swift-format.wixproj

@@ -2,42 +2,38 @@
   <Package
       Language="1033"
       Manufacturer="swift.org"
-      Name="Swift Code Formatter for Windows aarch64"
+      Name="Swift Code Formatter"
       UpgradeCode="45f1ae7a-4d90-414d-80b3-a5a45898b212"
       Version="$(var.ProductVersion)"
       Scope="perMachine">
-    <SummaryInformation Description="Swift Code Formatter for Windows aarch64" />
+    <SummaryInformation Description="Swift Code Formatter" />
 
     <!-- NOTE(compnerd) use pre-3.0 schema for better compatibility. -->
     <Media Id="1" Cabinet="SwiftFormat.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="ab1b7ca9-b240-44c7-be8b-3cf1e34ad747" Id="WINDOWSVOLUME">
       <Directory Id="INSTALLDIR">
         <Directory Id="Library" Name="Library">
           <Directory Id="Developer" Name="Developer">
             <Directory Id="Tools" Name="Tools">
+              <Component Id="swift_format.exe">
+                <File Id="swift_format.exe" Source="$(var.SWIFT_FORMAT_BUILD)\swift-format.exe" Checksum="yes" />
+              </Component>
             </Directory>
           </Directory>
         </Directory>
+
+        <Component Id="EnvironmentVariables" Guid="c1a01e55-3353-4eca-8b58-9960e57a3758">
+          <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Tools" />
+        </Component>
       </Directory>
     </Directory>
 
-    <!-- Components -->
-    <ComponentGroup Id="SwiftFormat">
-      <Component Id="swift_format.exe" Directory="Tools" Guid="1e6c84e1-6cf4-4e34-90f6-eb76c278f7e2">
-        <File Id="swift_format.exe" Source="$(var.SWIFT_FORMAT_BUILD)\swift-format.exe" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="c1a01e55-3353-4eca-8b58-9960e57a3758">
-      <Environment Id="Path" Action="set" Name="Path" Part="last" Permanent="no" System="yes" Value="[INSTALLDIR]Library\Developer\Tools" />
-    </Component>
-
-    <Feature Id="SwiftFormat" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Code Formatter for Windows aarch64" Level="1" Title="Swift Code Formatter (Windows aarch64)">
-      <ComponentGroupRef Id="SwiftFormat" />
+    <Feature Id="SwiftFormat" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="Swift Code Formatter" Level="1" Title="Swift Code Formatter">
+      <ComponentRef Id="swift_format.exe" />
       <ComponentRef Id="EnvironmentVariables" />
     </Feature>
 
@@ -49,6 +45,5 @@
     <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>