Update installer

srwi · Feb 6, 2021 · e3f0366 · e3f0366
1 parent fd2af3f
commit e3f0366
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -259,3 +259,5 @@ paket-files/
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
 *.pyc
+
+HeatGeneratedFileList.wxs
diff --git a/EverythingToolbar.Installer/HeatXsl.xslt b/EverythingToolbar.Installer/HeatXsl.xslt
@@ -21,4 +21,8 @@
 
 	<xsl:key name="DllConfigFile" match="wix:Component[wix:File[@Source = '$(var.HarvestPath)\EverythingToolbar.dll.config']]" use="@Id"/>
 	<xsl:template match="*[self::wix:Component or self::wix:ComponentRef][key('DllConfigFile', @Id)]" />
+	<xsl:key name="InstallScript" match="wix:Component[wix:File[@Source = '$(var.HarvestPath)\install.cmd']]" use="@Id"/>
+	<xsl:template match="*[self::wix:Component or self::wix:ComponentRef][key('InstallScript', @Id)]" />
+	<xsl:key name="UninstallScript" match="wix:Component[wix:File[@Source = '$(var.HarvestPath)\uninstall.cmd']]" use="@Id"/>
+	<xsl:template match="*[self::wix:Component or self::wix:ComponentRef][key('UninstallScript', @Id)]" />
 </xsl:stylesheet>
diff --git a/EverythingToolbar.Installer/Product.wxs b/EverythingToolbar.Installer/Product.wxs
@@ -5,7 +5,7 @@
 	<Product Id="*" UpgradeCode="744f23c4-7adb-42fa-a781-ac940dc4b454" Version="!(bind.fileVersion.EverythingToolbarDll)" Language="1033" Name="EverythingToolbar" Manufacturer="Stephan Rumswinkel">
 		<Package InstallerVersion="300" Compressed="yes" InstallScope="perUser" />
 		<Media Id="1" Cabinet="myapplication.cab" EmbedCab="yes" />
-		<MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." />
+		<MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit." AllowSameVersionUpgrades="yes" />
 
 		<PropertyRef Id="NETFRAMEWORK45"/>
 		<Condition Message="This application requires at least .NET Framework 4.7. Please install the .NET Framework then run this installer again."><![CDATA[Installed OR (NETFRAMEWORK45 AND NETFRAMEWORK45 >= "#460798")]]></Condition>

diff --git a/EverythingToolbar/Properties/AssemblyInfo.cs b/EverythingToolbar/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.6.2")]
-[assembly: AssemblyFileVersion("0.6.2")]
+[assembly: AssemblyVersion("0.6.2.1")]
+[assembly: AssemblyFileVersion("0.6.2.1")]