Resolve PR feedback

heaths · heaths · commit 2fa3de9ba49c · 2021-09-07T23:02:59.000-07:00
diff --git a/.github/workflows/releases.yml b/.github/workflows/releases.yml
@@ -132,8 +132,7 @@ jobs:
           ZIP_FILE: ${{ steps.download_exe.outputs.zip }}
         run: |
           name="$(basename "$ZIP_FILE" ".zip")"
-          printf "::set-output name=msi::%s\n" "$name.msi"
-          msbuild .\build\windows\gh.wixproj /p:SourceDir="$PWD" /p:OutputPath="$PWD" /p:OutputName="$name" /p:ProductVersion="${GITHUB_REF#refs/tags/}"
+          msbuild .\build\windows\gh.wixproj /p:SourceDir="$PWD" /p:OutputPath="$PWD" /p:OutputName="$name" /p:ProductVersion="${GITHUB_REF#refs/tags/v}"
       - name: Obtain signing cert
         id: obtain_cert
         env:
diff --git a/build/windows/gh.wixproj b/build/windows/gh.wixproj
@@ -13,6 +13,7 @@
             $(DefineConstants);
             ProductVersion=$(ProductVersion);
         </DefineConstants>
+        <SuppressIces Condition="'$(Platform)' == 'arm' Or '$(Platform)' == 'arm64'">ICE39</SuppressIces>
         <DefineSolutionProperties>false</DefineSolutionProperties>
         <WixTargetsPath Condition="'$(WixTargetsPath)' == ''">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     </PropertyGroup>
diff --git a/build/windows/gh.wxs b/build/windows/gh.wxs
@@ -5,11 +5,27 @@
 <?endif?>
 
 <!-- Define a unique UpgradeCode per platform -->
-<?define UpgradeCode=8CFB9531-B959-4E1B-AA2E-4AF0FFCC4AF4?>
+<?if $(var.Platform) = "x64"?>
+<?define InstallerVersion = "200"?>
+<?define UpgradeCode = "8CFB9531-B959-4E1B-AA2E-4AF0FFCC4AF4"?>
+<?define ProgramFilesFolder = "ProgramFiles64Folder"?>
+<?elseif $(var.Platform) = "x86"?>
+<?define InstallerVersion = "200"?>
+<?define UpgradeCode = "767EC5D2-C8F0-4912-9901-45E21F59A284"?>
+<?define ProgramFilesFolder = "ProgramFilesFolder"?>
+<?elseif $(var.Platform) = "arm64"?>
+<?define InstallerVersion = "500"?>
+<?define UpgradeCode = "5D15E95C-F979-41B0-826C-C33C8CB5A7EB"?>
+<?define ProgramFilesFolder = "ProgramFiles64Folder"?>
+<?elseif $(var.Platform) = "arm"?>
+<?define InstallerVersion = "500"?>
+<?define UpgradeCode = "DDDE52AA-42DA-404B-9238-77DC86117CFF"?>
+<?define ProgramFilesFolder = "ProgramFilesFolder"?>
+<?endif?>
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <Product Id="*" Name="GitHub CLI" Version="$(var.ProductVersion)" Language="1033" Manufacturer="GitHub, Inc." UpgradeCode="$(var.UpgradeCode)">
-        <Package Compressed="yes" InstallerVersion="200" InstallScope="perMachine"/>
+        <Package Compressed="yes" InstallerVersion="$(var.InstallerVersion)" InstallScope="perMachine"/>
         <MediaTemplate EmbedCab="yes"/>
 
         <!-- Remove older product(s) early but within the transaction -->
@@ -21,7 +37,7 @@
         </Upgrade>
 
         <Directory Id="TARGETDIR" Name="SourceDir">
-            <Directory Id="ProgramFiles64Folder" Name="Program Files">
+            <Directory Id="$(var.ProgramFilesFolder)" Name="Program Files">
                 <Directory Id="INSTALLDIR" Name="GitHub CLI"/>
             </Directory>
         </Directory>
@@ -35,15 +51,19 @@
             <!-- @Guid will be automatically and durably assigned based on key path -->
             <Component Directory="INSTALLDIR">
                 <File Name="gh.exe"/>
+                <Environment Id="Path" Action="set" Name="PATH" Part="last" System="yes" Value="[INSTALLDIR]"/>
             </Component>
 
             <!-- Persist the INSTALLDIR and restore it in subsequent installs -->
             <Component Directory="INSTALLDIR">
                 <RegistryValue Root="HKLM" Key="SOFTWARE\GitHub\CLI" Name="InstallDir" Type="string" Value="[INSTALLDIR]"/>
             </Component>
 
-            <Component Id="Env" Guid="94FAAC3D-4478-431C-8497-FBA55DCFB249" Directory="TARGETDIR">
-                <Environment Id="Path" Action="set" Name="PATH" Part="last" System="yes" Value="[INSTALLDIR]"/>
+            <Component Id="OlderX86Env" Guid="50C15744-A674-404B-873C-6B58957E2A32" Directory="TARGETDIR" Win64="no">
+                <Condition><![CDATA[OLDERX86VERSIONDETECTED]]></Condition>
+
+                <!-- Clean up the old x86 package default directory from the user environment -->
+                <Environment Id="OlderX86Path" Action="remove" Name="PATH" Part="last" System="no" Value="[ProgramFilesFolder]GitHub CLI\"/>
             </Component>
         </Feature>
 
