Simplify wix files for SwiftFormat.

Use autogenerated GUIDs.
Merge the two wxs files into one.

Author: hjyamauchi

installer-scripts/SwiftFormat-arm64.wxs

@@ -19,14 +19,14 @@
   <!-- <Import Project="WiXCodeSigning.targets" /> -->
 
   <PropertyGroup>
-    <DefineConstants>ProductVersion=$(ProductVersion);SWIFTFORMAT_BUILD=$(SWIFTFORMAT_BUILD)</DefineConstants>
+    <DefineConstants>ProductVersion=$(ProductVersion);ProductArchitecture=$(ProductArchitecture);SWIFTFORMAT_BUILD=$(SWIFTFORMAT_BUILD)</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="WixToolset.UI.wixext" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="SwiftFormat-$(ProductArchitecture).wxs" />
+    <Compile Include="SwiftFormat.wxs" />
   </ItemGroup>
 </Project>

installer-scripts/SwiftFormat.wixproj

@@ -2,42 +2,41 @@
   <Package
       Language="1033"
       Manufacturer="nicklockwood"
-      Name="SwiftFormat for Windows x86_64"
+      Name="SwiftFormat for Windows $(var.ProductArchitecture)"
       UpgradeCode="98e01ac8-a17d-43fd-99ed-1cd8b58715bf"
       Version="$(var.ProductVersion)"
       Scope="perMachine">
-    <SummaryInformation Description="SwiftFormat for Windows x86_64" />
+    <SummaryInformation Description="SwiftFormat for Windows $(var.ProductArchitecture)" />
 
     <!-- NOTE(compnerd) use pre-3.0 schema for better compatibility. -->
     <Media Id="1" Cabinet="SwiftFormat.cab" EmbedCab="yes" />
 
     <!-- Directory Structure -->
+    <!-- Components -->
+
     <!-- 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="7818d7fe-5173-4a41-9809-e72263ea9738" Id="WINDOWSVOLUME">
       <Directory Id="INSTALLDIR">
         <Directory Id="Library" Name="Library">
           <Directory Id="Developer" Name="Developer">
             <Directory Id="Tools" Name="Tools">
+              <Component Id="swiftformat.exe">
+                <File Id="swiftformat.exe" Source="$(var.SWIFTFORMAT_BUILD)\swiftformat.exe" Checksum="yes" />
+              </Component>
             </Directory>
           </Directory>
         </Directory>
+        <Component Id="EnvironmentVariables" Guid="b46687c3-f836-47e5-9b43-d9fd2552a731">
+        <!-- <Component Id="EnvironmentVariables"> -->
+          <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="swiftformat.exe" Directory="Tools" Guid="77126634-5f91-40a7-b344-035ce99ef46f">
-        <File Id="swiftformat.exe" Source="$(var.SWIFTFORMAT_BUILD)\swiftformat.exe" Checksum="yes" />
-      </Component>
-    </ComponentGroup>
-
-    <Component Id="EnvironmentVariables" Directory="INSTALLDIR" Guid="b46687c3-f836-47e5-9b43-d9fd2552a731">
-      <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="SwiftFormat for Windows x86_64" Level="1" Title="SwiftFormat (Windows x86_64)">
-      <ComponentGroupRef Id="SwiftFormat" />
+    <Feature Id="SwiftFormat" AllowAbsent="no" AllowAdvertise="yes" ConfigurableDirectory="INSTALLDIR" Description="SwiftFormat for Windows $(var.ProductArchitecture)" Level="1" Title="SwiftFormat (Windows $(var.ProductArchitecture))">
+      <ComponentRef Id="swiftformat.exe" />
       <ComponentRef Id="EnvironmentVariables" />
     </Feature>