From 0a8a9e1e53ce2820ba41f57be7cb64b2cb6327d4 Mon Sep 17 00:00:00 2001
From: Anna Clemens <git@annaclemens.io>
Date: Thu, 24 Dec 2020 04:54:51 -0500
Subject: [PATCH] feat(installer): add ui and allow upgrades correctly

---
 XIVChat Desktop Installer/Product.wxs         | 43 ++++++++++++++++---
 .../XIVChat Desktop Installer.wixproj         |  4 ++
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/XIVChat Desktop Installer/Product.wxs b/XIVChat Desktop Installer/Product.wxs
index 1b72475..a6cb20b 100644
--- a/XIVChat Desktop Installer/Product.wxs	
+++ b/XIVChat Desktop Installer/Product.wxs	
@@ -1,17 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="B0180BA2-96D4-49FE-9091-C8A0B3E991F1" Name="XIVChat for Windows" Language="1033" Version="1.0.0.0"
+    <Product Id="*" Name="XIVChat for Windows" Language="1033" Version="1.0.2"
              Manufacturer="XIVChat"
              UpgradeCode="D792BC67-EE1E-46D7-8C68-1A794875E1D1">
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
 
-        <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed."/>
+        <MajorUpgrade
+                DowngradeErrorMessage="A newer version of [ProductName] is already installed."
+                AllowSameVersionUpgrades="yes"/>
         <MediaTemplate EmbedCab="yes"/>
 
         <Feature Id="ProductFeature" Title="XIVChat for Windows" Level="1">
             <ComponentGroupRef Id="XIVChat_Desktop"/>
             <ComponentRef Id="App_Start_Menu_Shortcut"/>
         </Feature>
+
+        <UI>
+            <UIRef Id="WixUI_InstallDir"/>
+            <Publish Dialog="WelcomeDlg"
+                     Control="Next"
+                     Event="NewDialog"
+                     Value="InstallDirDlg"
+                     Order="2">
+                1
+            </Publish>
+            <Publish Dialog="InstallDirDlg"
+                     Control="Back"
+                     Event="NewDialog"
+                     Value="WelcomeDlg"
+                     Order="2">
+                1
+            </Publish>
+        </UI>
+        <Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER"/>
     </Product>
 
     <Fragment>
@@ -26,18 +47,26 @@
 
         <DirectoryRef Id="ApplicationProgramsFolder">
             <Component Id="App_Start_Menu_Shortcut" Guid="6EF30C67-2EAA-4988-8470-E1149D5C1B50">
-                <Shortcut Id="ApplicationStartMenuShortcut" Name="XIVChat for Windows"
-                          Target="[INSTALLFOLDER]XIVChat Desktop.exe" WorkingDirectory="INSTALLFOLDER">
+                <Shortcut Id="ApplicationStartMenuShortcut"
+                          Name="XIVChat for Windows"
+                          Target="[INSTALLFOLDER]XIVChat Desktop.exe"
+                          WorkingDirectory="INSTALLFOLDER">
                     <!-- AUMID -->
-                    <ShortcutProperty Key="System.AppUserModel.ID" Value="XIVChat.XIVChat_Desktop"/>
+                    <ShortcutProperty Key="System.AppUserModel.ID"
+                                      Value="XIVChat.XIVChat_Desktop"/>
 
                     <!-- COM CLSID -->
                     <ShortcutProperty Key="System.AppUserModel.ToastActivatorCLSID"
                                       Value="{F12BCC85-6FEE-4A9A-BBB8-08DFAA7BE1A8}"/>
                 </Shortcut>
-                <RemoveFolder Id="RemoveApplicationProgramsFolder" Directory="ApplicationProgramsFolder"
+                <RemoveFolder Id="RemoveApplicationProgramsFolder"
+                              Directory="ApplicationProgramsFolder"
                               On="uninstall"/>
-                <RegistryValue Root="HKCU" Key="Software\XIVChat for Windows" Name="installed" Type="integer" Value="1"
+                <RegistryValue Root="HKCU"
+                               Key="Software\XIVChat for Windows"
+                               Name="installed"
+                               Type="integer"
+                               Value="1"
                                KeyPath="yes"/>
             </Component>
         </DirectoryRef>
diff --git a/XIVChat Desktop Installer/XIVChat Desktop Installer.wixproj b/XIVChat Desktop Installer/XIVChat Desktop Installer.wixproj
index 7c30695..438ae81 100644
--- a/XIVChat Desktop Installer/XIVChat Desktop Installer.wixproj	
+++ b/XIVChat Desktop Installer/XIVChat Desktop Installer.wixproj	
@@ -27,6 +27,10 @@
       <HintPath>$(WixExtDir)\WixBalExtension.dll</HintPath>
       <Name>WixBalExtension</Name>
     </WixExtension>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />