Installer now has a visual component and adds shortcut to desktop

borisonekenobi · borisonekenobi · commit 8adce5eacc13 · 2022-06-28T13:23:52.000-04:00
diff --git a/.vs/imageResizer/v17/.suo b/.vs/imageResizer/v17/.suo
diff --git a/imageResizer/AboutBox.Designer.cs b/imageResizer/AboutBox.Designer.cs
diff --git a/imageResizer/AboutBox.cs b/imageResizer/AboutBox.cs
@@ -24,5 +24,10 @@ private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
         {
             System.Diagnostics.Process.Start("mailto:borisonekenobi@gmail.com");
         }
+
+        private void AboutBox_Load(object sender, EventArgs e)
+        {
+            label5.Text = "Current: v" + Form1.CurrentVersion + "\nLatest: v" + Form1.LatestVersion;
+        }
     }
 }
diff --git a/imageResizer/Form1.cs b/imageResizer/Form1.cs
@@ -9,6 +9,8 @@ namespace imageResizer
     public partial class Form1 : Form
     {
         private bool checkedVersion = false;
+        public static Version CurrentVersion { get; set; }
+        public static Version LatestVersion { get; set; }
         public Form1()
         {
             InitializeComponent();
@@ -179,10 +181,10 @@ private void Form1_Activated(object sender, EventArgs e)
                 int major = int.Parse(versionNums[0].Split('v')[1]);
                 int minor = int.Parse(versionNums[1]);
                 int patch = int.Parse(versionNums[2]);
-                Version latestVersion = new Version(major, minor, patch);
-                Version version = new Version(System.Windows.Forms.Application.ProductVersion);
+                LatestVersion = new Version(major, minor, patch);
+                CurrentVersion = new Version(System.Windows.Forms.Application.ProductVersion);
 
-                if (latestVersion > version)
+                if (LatestVersion > CurrentVersion)
                 {
                     if (MessageBox.Show(this, "A newer version of the software is available. Would you like to download it?", "New version available!", MessageBoxButtons.YesNo) == DialogResult.Yes)
                     {
diff --git a/imageResizer/Properties/AssemblyInfo.cs b/imageResizer/Properties/AssemblyInfo.cs
@@ -31,5 +31,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("6.0.0")]
-[assembly: AssemblyFileVersion("6.0.0")]
+[assembly: AssemblyVersion("6.1.0")]
+[assembly: AssemblyFileVersion("6.1.0")]
diff --git a/imageResizerInstaller/Product.wxs b/imageResizerInstaller/Product.wxs
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="imageResizer" Language="1033" Version="6.0.0" Manufacturer="Boris Vasilev" UpgradeCode="d5f843f3-27cf-45a2-acd7-1ad08d67fe61">
+	<Product Id="*" Name="imageResizer" Language="1033" Version="6.1.0" Manufacturer="Boris Vasilev" UpgradeCode="d5f843f3-27cf-45a2-acd7-1ad08d67fe61">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Platform="x64"/>
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 		<MediaTemplate EmbedCab="yes"/>
 
 		<Feature Id="ProductFeature" Title="imageResizerInstaller" Level="1">
 			<ComponentGroupRef Id="ProductComponents" />
+			<ComponentRef Id="imageResizerShortcut" />
 		</Feature>
 	</Product>
 
@@ -16,7 +17,25 @@
 			<Directory Id="ProgramFiles64Folder">
 				<Directory Id="INSTALLFOLDER" Name="imageResizer" />
 			</Directory>
+			<Directory Id="DesktopFolder" Name="Desktop">
+				<Component Id="imageResizerShortcut" Guid="*">
+					<Shortcut Id="imageResizerShortcutShortcut"
+						Name="Image Resizer"
+						Description="Resizer for your images"
+						Target="[INSTALLFOLDER]imageResizer.exe"
+						WorkingDirectory="INSTALLFOLDER"/>
+					<RegistryValue
+						Root="HKCU"
+						Key="Software\imageResizer\imageResizer"
+						Name="installed"
+						Type="integer"
+						Value="1"
+						KeyPath="yes"/>
+				</Component>
+			</Directory>
 		</Directory>
+				<Property Id="WIXUI_INSTALLDIR" Value="INSTALLFOLDER" />
+		<UIRef Id="WixUI_InstallDir" />
 	</Fragment>
 
 	<Fragment>
diff --git a/imageResizerInstaller/imageResizerInstaller.wixproj b/imageResizerInstaller/imageResizerInstaller.wixproj
@@ -32,6 +32,12 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <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') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,10 @@ private void linkLabel2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs`
`24`	`24`	`{`
`25`	`25`	`System.Diagnostics.Process.Start("mailto:borisonekenobi@gmail.com");`
`26`	`26`	`}`
	`27`	`+`
	`28`	`+ private void AboutBox_Load(object sender, EventArgs e)`
	`29`	`+ {`
	`30`	`+ label5.Text = "Current: v" + Form1.CurrentVersion + "\nLatest: v" + Form1.LatestVersion;`
	`31`	`+ }`
`27`	`32`	`}`
`28`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,8 @@ namespace imageResizer`
`9`	`9`	`public partial class Form1 : Form`
`10`	`10`	`{`
`11`	`11`	`private bool checkedVersion = false;`
	`12`	`+ public static Version CurrentVersion { get; set; }`
	`13`	`+ public static Version LatestVersion { get; set; }`
`12`	`14`	`public Form1()`
`13`	`15`	`{`
`14`	`16`	`InitializeComponent();`
`@@ -179,10 +181,10 @@ private void Form1_Activated(object sender, EventArgs e)`
`179`	`181`	`int major = int.Parse(versionNums[0].Split('v')[1]);`
`180`	`182`	`int minor = int.Parse(versionNums[1]);`
`181`	`183`	`int patch = int.Parse(versionNums[2]);`
`182`		`- Version latestVersion = new Version(major, minor, patch);`
`183`		`- Version version = new Version(System.Windows.Forms.Application.ProductVersion);`
	`184`	`+ LatestVersion = new Version(major, minor, patch);`
	`185`	`+ CurrentVersion = new Version(System.Windows.Forms.Application.ProductVersion);`
`184`	`186`
`185`		`- if (latestVersion > version)`
	`187`	`+ if (LatestVersion > CurrentVersion)`
`186`	`188`	`{`
`187`	`189`	`if (MessageBox.Show(this, "A newer version of the software is available. Would you like to download it?", "New version available!", MessageBoxButtons.YesNo) == DialogResult.Yes)`
`188`	`190`	`{`