From 4a24742b22806f1bc2e27805e701404d9783fb18 Mon Sep 17 00:00:00 2001
From: Justin Konratt <codesdowork@gmail.com>
Date: Mon, 3 Jan 2022 10:33:21 +0100
Subject: [PATCH] Fixed installer not being able to perform upgrades

---
 Installer/Installer.wixproj                | 3 +++
 Installer/Product.wxs                      | 4 ++--
 MediaDownloader/MediaDownloader.csproj     | 2 ++
 MediaDownloader/Properties/AssemblyInfo.cs | 4 ++--
 MediaDownloader/makeRelease.bat            | 2 +-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Installer/Installer.wixproj b/Installer/Installer.wixproj
index b069acf..d328751 100644
--- a/Installer/Installer.wixproj
+++ b/Installer/Installer.wixproj
@@ -23,6 +23,9 @@
   <ItemGroup>
     <Compile Include="Product.wxs" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="makeRelease.bat" />
+  </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') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
diff --git a/Installer/Product.wxs b/Installer/Product.wxs
index 56ebc96..1d884e3 100644
--- a/Installer/Product.wxs
+++ b/Installer/Product.wxs
@@ -2,11 +2,11 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 	<?define releaseFolder="..\Releases\1.1.0\MediaDownloader\bin" ?>
 	<?define sourceFolder="..\MediaDownloader" ?>
-  <Product Id="EEEFD72E-4451-4AFA-8994-61A99EA63288" Name="Media Downloader" Language="1033" Version="1.1.0" Manufacturer="CodesDoWork" UpgradeCode="DF9618DD-729E-427F-BA34-D99EAA20D02C">
+  <Product Id="*" Name="Media Downloader" Language="1033" Version="1.1.1" Manufacturer="CodesDoWork" UpgradeCode="DF9618DD-729E-427F-BA34-D99EAA20D02C">
 		<Package Languages="1033" Manufacturer="CodesDoWork" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <Media Id="1" Cabinet="md_installer.cab" EmbedCab="yes" />
 
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MajorUpgrade Schedule="afterInstallExecute" DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 
     <Icon Id="icon.ico" SourceFile="$(var.sourceFolder)\Resources\icon.ico" />
     <Property Id="ARPPRODUCTICON" Value="icon.ico" />
diff --git a/MediaDownloader/MediaDownloader.csproj b/MediaDownloader/MediaDownloader.csproj
index 823eaac..5b4d49b 100644
--- a/MediaDownloader/MediaDownloader.csproj
+++ b/MediaDownloader/MediaDownloader.csproj
@@ -218,10 +218,12 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include=".releaseIgnore" />
     <None Include="db\db.db">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="dl\dl.7z" />
+    <None Include="makeRelease.bat" />
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
diff --git a/MediaDownloader/Properties/AssemblyInfo.cs b/MediaDownloader/Properties/AssemblyInfo.cs
index 6577e3d..710a054 100644
--- a/MediaDownloader/Properties/AssemblyInfo.cs
+++ b/MediaDownloader/Properties/AssemblyInfo.cs
@@ -15,5 +15,5 @@
 
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: AssemblyVersion("1.1.0")]
-[assembly: AssemblyFileVersion("1.1.0")]
+[assembly: AssemblyVersion("1.1.1")]
+[assembly: AssemblyFileVersion("1.1.1")]
diff --git a/MediaDownloader/makeRelease.bat b/MediaDownloader/makeRelease.bat
index d2b47fa..df86b5f 100644
--- a/MediaDownloader/makeRelease.bat
+++ b/MediaDownloader/makeRelease.bat
@@ -30,5 +30,5 @@ del %SCRIPT%
 echo:
 
 :: create portable release
-echo Creating archive for protable release...
+echo Creating archive for portable release...
 "C:\Program Files\7-Zip\7z.exe" a ..\Releases\%ver%\MediaDownloader.zip ..\Releases\%ver%\MediaDownloader\* -r
\ No newline at end of file