bump: installer version

Reviewed-on: #7

CarManager3Setup/CarManager3Setup.vdproj

@@ -332,15 +332,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Car Manager 3"
-        "ProductCode" = "8:{8FDFF7ED-D464-4F87-BA8F-BDC1000520E4}"
-        "PackageCode" = "8:{83DA7553-805F-4A70-921B-9A6FB0787780}"
+        "ProductCode" = "8:{3979D343-890D-4FBC-B3FE-E88437307108}"
+        "PackageCode" = "8:{8B59CA5B-CD06-41DC-95A6-3323553D4997}"
         "UpgradeCode" = "8:{6FF57925-465E-4DB9-85DA-CE933191A3DD}"
         "AspNetVersion" = "8:2.0.50727.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:TRUE"
         "InstallAllUsers" = "11:FALSE"
-        "ProductVersion" = "8:1.4.0"
+        "ProductVersion" = "8:1.4.2"
         "Manufacturer" = "8:Jaro Digital"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
@@ -413,10 +413,32 @@
                             "Name" = "8:[Manufacturer]"
                             "Condition" = "8:"
                             "AlwaysCreate" = "11:FALSE"
-                            "DeleteAtUninstall" = "11:FALSE"
+                            "DeleteAtUninstall" = "11:TRUE"
                             "Transitive" = "11:FALSE"
                                 "Keys"
                                 {
+                                    "{60EA8692-D2D5-43EB-80DC-7906BF13D6EF}:_022FD53D0D4C4621A160F70F2E4A81DE"
+                                    {
+                                    "Name" = "8:CarManager3"
+                                    "Condition" = "8:"
+                                    "AlwaysCreate" = "11:FALSE"
+                                    "DeleteAtUninstall" = "11:TRUE"
+                                    "Transitive" = "11:FALSE"
+                                        "Keys"
+                                        {
+                                        }
+                                        "Values"
+                                        {
+                                            "{ADCFDA98-8FDD-45E4-90BC-E3D20B029870}:_22123BF42909409F8D665A142188737C"
+                                            {
+                                            "Name" = "8:InstallType"
+                                            "Condition" = "8:"
+                                            "Transitive" = "11:TRUE"
+                                            "ValueTypes" = "3:1"
+                                            "Value" = "8:MSI"
+                                            }
+                                        }
+                                    }
                                 }
                                 "Values"
                                 {
@@ -1036,7 +1058,7 @@
         {
             "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_A6F761D38264485ABAB61B553E1CAE3C"
             {
-            "SourcePath" = "8:..\\CarManagerV3\\bin\\Release\\net8.0-windows\\win-x64\\publish\\CarManagerV3.exe"
+            "SourcePath" = "8:..\\CarManagerV3\\bin\\Debug\\net8.0-windows\\win-x64\\publish\\CarManagerV3.exe"
             "TargetName" = "8:"
             "Tag" = "8:"
             "Folder" = "8:_B69138933B80450EA18D704C54E8913F"

CarManagerV3.sln

@@ -19,6 +19,7 @@ Global
 		{93CA258B-A645-41A8-A24F-59036ABC173F}.Release|Any CPU.Build.0 = Release|Any CPU
 		{47ED51EB-1DD0-B8F0-88C8-92C6E3E06030}.Debug|Any CPU.ActiveCfg = Debug
 		{47ED51EB-1DD0-B8F0-88C8-92C6E3E06030}.Release|Any CPU.ActiveCfg = Release
+		{47ED51EB-1DD0-B8F0-88C8-92C6E3E06030}.Release|Any CPU.Build.0 = Release
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

CarManagerV3/CarManagerV3.csproj

@@ -15,7 +15,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.4.0</ApplicationVersion>
+    <ApplicationVersion>1.4.2</ApplicationVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -23,9 +23,12 @@
     <UseWindowsForms>true</UseWindowsForms>
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
     <ApplicationIcon>CarMgm_Icon.ico</ApplicationIcon>
-    <AssemblyTitle>Car Manager 3</AssemblyTitle>
-    <Product>Car Manager 3</Product>
-    <Version>1.4.0</Version>
+    <AssemblyTitle>CarManager3</AssemblyTitle>
+    <Product>CarManager3</Product>
+    <Version>1.4.2</Version>
+    <Authors>Jaro Digital</Authors>
+    <Company>Jaro Digital</Company>
+    <Title>Car Manager 3</Title>
     
   </PropertyGroup>
   <ItemGroup>

CarManagerV3/Forms/MainForm.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 using System.Windows.Forms;
 using CarManagerV3.Forms;
 using CarManagerV3.Manager;
+using CarManagerV3.Util;
 
 namespace CarManagerV3
 {
@@ -65,8 +66,19 @@ namespace CarManagerV3
             {
                 if (Updater.IsUpdateAvailable(Properties.Settings.Default.AllowPrerelease))
                 {
-                    UpdatePromptForm updatePrompt = new UpdatePromptForm(Updater.GetCurrentVersion(), Updater.GetLatestVersion());
+                    if (InstallModeDetector.IsInstalledViaMsi())
+                    {
+                        UpdatePromptForm updatePrompt = new UpdatePromptForm(Updater.GetCurrentVersion(true), Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease));
                         updatePrompt.ShowDialog();
+                    } else
+                    {
+                        DialogResult updateResult = MessageBox.Show($"A new version of Car Manager is available! \nYour Version: {Updater.GetCurrentVersion(true)} \nLatest Version: {Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease)} \n\nDo you want to open the Git repository to download the update?", "Update Available", MessageBoxButtons.YesNo, MessageBoxIcon.Information);
+                        if (updateResult == DialogResult.Yes)
+                        {
+                            Updater.OpenReleasePage(Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease));
+                        }
+                    }
+                    
                 }
             }
             catch (Exception ex)
@@ -571,12 +583,12 @@ namespace CarManagerV3
             {
                 if (Updater.IsUpdateAvailable(Properties.Settings.Default.AllowPrerelease))
                 {
-                    UpdatePromptForm updatePrompt = new UpdatePromptForm(Updater.GetCurrentVersion(), Updater.GetLatestVersion());
+                    UpdatePromptForm updatePrompt = new UpdatePromptForm(Updater.GetCurrentVersion(true), Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease));
                     updatePrompt.ShowDialog();
                 }
                 else
                 {
-                    MessageBox.Show($"You are already using the latest version. ({Updater.GetCurrentVersion()})", "No Updates Available", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                    MessageBox.Show($"You are already using the latest version. \nYour Version: {Updater.GetCurrentVersion(true)} \nLatest Version: {Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease)}", "No Updates Available", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
             }
             catch (Exception ex)

CarManagerV3/Forms/SettingsForm.Designer.cs

@@ -38,13 +38,16 @@
             tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             lblDataLocation = new System.Windows.Forms.Label();
             tbxDataLocation = new System.Windows.Forms.TextBox();
+            cbxPreRelease = new System.Windows.Forms.CheckBox();
             tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
             btnReset = new System.Windows.Forms.Button();
-            cbxPreRelease = new System.Windows.Forms.CheckBox();
+            flowLayoutPanel3 = new System.Windows.Forms.FlowLayoutPanel();
+            lblEnv = new System.Windows.Forms.Label();
             flowLayoutPanel1.SuspendLayout();
             flowLayoutPanel2.SuspendLayout();
             tableLayoutPanel1.SuspendLayout();
             tableLayoutPanel2.SuspendLayout();
+            flowLayoutPanel3.SuspendLayout();
             SuspendLayout();
             // 
             // flowLayoutPanel1
@@ -84,10 +87,10 @@
             flowLayoutPanel2.Controls.Add(btnDiscard);
             flowLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
             flowLayoutPanel2.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
-            flowLayoutPanel2.Location = new System.Drawing.Point(249, 0);
+            flowLayoutPanel2.Location = new System.Drawing.Point(249, 30);
             flowLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);
             flowLayoutPanel2.Name = "flowLayoutPanel2";
-            flowLayoutPanel2.Size = new System.Drawing.Size(240, 64);
+            flowLayoutPanel2.Size = new System.Drawing.Size(240, 44);
             flowLayoutPanel2.TabIndex = 2;
             // 
             // btnAccept
@@ -151,33 +154,6 @@
             tbxDataLocation.Size = new System.Drawing.Size(365, 27);
             tbxDataLocation.TabIndex = 1;
             // 
-            // tableLayoutPanel2
-            // 
-            tableLayoutPanel2.ColumnCount = 2;
-            tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            tableLayoutPanel2.Controls.Add(flowLayoutPanel2, 1, 0);
-            tableLayoutPanel2.Controls.Add(btnReset, 0, 0);
-            tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
-            tableLayoutPanel2.Location = new System.Drawing.Point(0, 553);
-            tableLayoutPanel2.Name = "tableLayoutPanel2";
-            tableLayoutPanel2.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
-            tableLayoutPanel2.RowCount = 1;
-            tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
-            tableLayoutPanel2.Size = new System.Drawing.Size(499, 64);
-            tableLayoutPanel2.TabIndex = 4;
-            // 
-            // btnReset
-            // 
-            btnReset.AutoSize = true;
-            btnReset.Location = new System.Drawing.Point(13, 3);
-            btnReset.Name = "btnReset";
-            btnReset.Size = new System.Drawing.Size(130, 30);
-            btnReset.TabIndex = 3;
-            btnReset.Text = "Revert to default";
-            btnReset.UseVisualStyleBackColor = true;
-            btnReset.Click += btnReset_Click;
-            // 
             // cbxPreRelease
             // 
             cbxPreRelease.AutoSize = true;
@@ -190,6 +166,59 @@
             cbxPreRelease.Text = "Pre-Release channel";
             cbxPreRelease.UseVisualStyleBackColor = true;
             // 
+            // tableLayoutPanel2
+            // 
+            tableLayoutPanel2.AutoSize = true;
+            tableLayoutPanel2.ColumnCount = 2;
+            tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            tableLayoutPanel2.Controls.Add(flowLayoutPanel2, 1, 1);
+            tableLayoutPanel2.Controls.Add(btnReset, 0, 1);
+            tableLayoutPanel2.Controls.Add(flowLayoutPanel3, 0, 0);
+            tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            tableLayoutPanel2.Location = new System.Drawing.Point(0, 543);
+            tableLayoutPanel2.Name = "tableLayoutPanel2";
+            tableLayoutPanel2.Padding = new System.Windows.Forms.Padding(10, 0, 10, 0);
+            tableLayoutPanel2.RowCount = 2;
+            tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle());
+            tableLayoutPanel2.Size = new System.Drawing.Size(499, 74);
+            tableLayoutPanel2.TabIndex = 4;
+            // 
+            // btnReset
+            // 
+            btnReset.AutoSize = true;
+            btnReset.Location = new System.Drawing.Point(13, 33);
+            btnReset.Name = "btnReset";
+            btnReset.Size = new System.Drawing.Size(130, 30);
+            btnReset.TabIndex = 3;
+            btnReset.Text = "Revert to default";
+            btnReset.UseVisualStyleBackColor = true;
+            btnReset.Click += btnReset_Click;
+            // 
+            // flowLayoutPanel3
+            // 
+            flowLayoutPanel3.AutoSize = true;
+            flowLayoutPanel3.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            tableLayoutPanel2.SetColumnSpan(flowLayoutPanel3, 2);
+            flowLayoutPanel3.Controls.Add(lblEnv);
+            flowLayoutPanel3.Dock = System.Windows.Forms.DockStyle.Fill;
+            flowLayoutPanel3.Location = new System.Drawing.Point(10, 5);
+            flowLayoutPanel3.Margin = new System.Windows.Forms.Padding(0, 5, 0, 5);
+            flowLayoutPanel3.Name = "flowLayoutPanel3";
+            flowLayoutPanel3.Size = new System.Drawing.Size(479, 20);
+            flowLayoutPanel3.TabIndex = 4;
+            // 
+            // lblEnv
+            // 
+            lblEnv.AutoSize = true;
+            lblEnv.ForeColor = System.Drawing.SystemColors.GrayText;
+            lblEnv.Location = new System.Drawing.Point(3, 0);
+            lblEnv.Name = "lblEnv";
+            lblEnv.Size = new System.Drawing.Size(131, 20);
+            lblEnv.TabIndex = 0;
+            lblEnv.Text = "Environment: %E%";
+            // 
             // SettingsForm
             // 
             AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F);
@@ -213,7 +242,10 @@
             tableLayoutPanel1.PerformLayout();
             tableLayoutPanel2.ResumeLayout(false);
             tableLayoutPanel2.PerformLayout();
+            flowLayoutPanel3.ResumeLayout(false);
+            flowLayoutPanel3.PerformLayout();
             ResumeLayout(false);
+            PerformLayout();
         }
 
         #endregion
@@ -230,5 +262,7 @@
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
         private System.Windows.Forms.Button btnReset;
         private System.Windows.Forms.CheckBox cbxPreRelease;
+        private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel3;
+        private System.Windows.Forms.Label lblEnv;
     }
 }

CarManagerV3/Forms/SettingsForm.cs

@@ -7,6 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using CarManagerV3.Util;
 
 namespace CarManagerV3.Forms
 {
@@ -42,6 +43,8 @@ namespace CarManagerV3.Forms
                     read: () => Properties.Settings.Default.AllowPrerelease,
                     write: v => Properties.Settings.Default.AllowPrerelease = v);
 
+            lblEnv.Text = lblEnv.Text.Replace("%E%", InstallModeDetector.IsInstalledViaMsi() ? "Installed via MSI" : "Running in portable mode");
+
         }
 
         private void SettingsForm_Load(object sender, EventArgs e)

CarManagerV3/Forms/UpdatePromptForm.cs

@@ -18,6 +18,10 @@ namespace CarManagerV3.Forms
             InitializeComponent();
             lblInstalledVersion.Text = lblInstalledVersion.Text.Replace("?.?.?", currentVersion);
             lblLatestVersion.Text = lblLatestVersion.Text.Replace("?.?.?", latestVersion);
+            if (Updater.IsLatestVersionPrerelease())
+            {
+                lblLatestVersion.Text += " (Pre-release)";
+            }
 
         }
 
@@ -28,15 +32,6 @@ namespace CarManagerV3.Forms
 
         private void btnInstallUpdate_Click(object sender, EventArgs e)
         {
-            /*
-                     var msgbox = new PleaseWait();
-            msgbox.Show();
-            Application.DoEvents();
-            StateManager.UpdateCar(car);
-            Image fooimg = ImageManager.GetImage(car);
-            msgbox.Close();
-            this.Close();
-                     */
             PleaseWait loadForm = new PleaseWait("Downloading the newest version...");
             try
             {
@@ -58,7 +53,7 @@ namespace CarManagerV3.Forms
 
         private void btnReadChangelog_Click(object sender, EventArgs e)
         {
-            Updater.openReleasePage();
+            Updater.OpenReleasePage();
         }
     }
 }

CarManagerV3/Manager/Updater.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using System.Text.Encodings.Web;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -22,18 +23,29 @@ namespace CarManagerV3.Manager
         private static readonly int CacheDurationMinutes = 60;
         private static bool cacheIncludesPrerelease = false;
         private static readonly string debugVersion = null;//"1.2.0";
+        private static bool isLatestVersionPrerelease = false;
 
-        public static string GetCurrentVersion()
+        public static string GetCurrentVersion(bool cutTrailingZeros = false)
         {
             //DEBUG::
-            if(debugVersion != null)
+            if (debugVersion != null)
             {
                 return debugVersion;
             }
 
             var asm = Assembly.GetEntryAssembly()!;
             Version v = asm.GetName().Version ?? new Version(0, 0, 0, 0);
-            return v.ToString();
+            string VersionString = v.ToString();
+            if(cutTrailingZeros)
+            {
+                // Remove trailing .0 parts
+                while (VersionString.EndsWith(".0"))
+                {
+                    VersionString = VersionString.Substring(0, VersionString.Length - 2);
+                }
+                return VersionString;
+            }
+            return VersionString;
         }
 
         private static bool IsCacheValid(bool includePreRelease = false)
@@ -72,6 +84,7 @@ namespace CarManagerV3.Manager
                     var content = response.Content.ReadAsStringAsync().Result;
                     dynamic release = Newtonsoft.Json.JsonConvert.DeserializeObject(content);
                     latestVersion = release.tag_name;
+                    isLatestVersionPrerelease = false;
                 }
             }
             // If pre-release is requested, check for the latest pre-release version
@@ -79,21 +92,31 @@ namespace CarManagerV3.Manager
             {
                 using (var client = new System.Net.Http.HttpClient())
                 {
+                    UrlEncoder encoder = System.Text.Encodings.Web.UrlEncoder.Default;
                     var response = client.GetAsync(PreReleaseEndpoint).Result;
                     if (response.IsSuccessStatusCode)
                     {
+                        
                         var content = response.Content.ReadAsStringAsync().Result;
                         dynamic releases = Newtonsoft.Json.JsonConvert.DeserializeObject(content);
+                        //System.Diagnostics.Debug.WriteLine("Fetched pre-release versions, count: " + releases.Count);
                         if (releases.Count > 0)
                         {
-                            var preReleaseVersion = releases[0].tag_name;
+                            var preReleaseVersion = releases[0].tag_name.ToString();
+                            //System.Diagnostics.Debug.WriteLine("Latest unstable version: " + preReleaseVersion);
+                            
                             // Compare versions and return the newer one
                             if (IsNewerVersion(preReleaseVersion, latestVersion))
                             {
                                 latestVersion = preReleaseVersion;
+                                isLatestVersionPrerelease = true;
                             }
                         }
                     }
+                    else
+                    {
+                        System.Diagnostics.Debug.WriteLine("Failed to fetch pre-release versions, status code: " + response.StatusCode + " at: " + PreReleaseEndpoint);
+                    }
                 }
             }
             SetCache(latestVersion, includePreRelease);
@@ -180,9 +203,9 @@ namespace CarManagerV3.Manager
             return IsNewerVersion(latestVersion, currentVersion);
         }
 
-        public static void openReleasePage(string version = null)
+        public static void OpenReleasePage(string version = null)
         {
-            if(version == null)
+            if (version == null)
             {
                 version = GetLatestVersion(true);
             }
@@ -193,5 +216,11 @@ namespace CarManagerV3.Manager
                 UseShellExecute = true
             });
         }
+
+        public static bool IsLatestVersionPrerelease()
+        {
+            // Ensure we have the latest version info in cache
+            return isLatestVersionPrerelease;
+        }
     }
 }

CarManagerV3/Util/InstallModeDetector.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Microsoft.Win32;
+
+namespace CarManagerV3.Util
+{
+    public static class InstallModeDetector
+    {
+        private const string _keyPath = @"Software\Jaro Digital\CarManager3";
+        private const string KeyPath = _keyPath;
+        private const string ValueName = "InstallType";
+
+        public static bool IsInstalledViaMsi()
+        {
+            // Prefer HKLM if your MSI is per-machine; fallback to HKCU if per-user.
+            System.Diagnostics.Debug.WriteLine($"Checking registry for install type at HKLM\\{KeyPath} and HKCU\\{KeyPath}");
+            object? val =
+                Registry.GetValue($@"HKEY_LOCAL_MACHINE\{KeyPath}", ValueName, null)
+                ?? Registry.GetValue($@"HKEY_CURRENT_USER\{KeyPath}", ValueName, null);
+
+            return val is string s && string.Equals(s, "MSI", StringComparison.OrdinalIgnoreCase);
+        }
+
+        public static bool IsPortable() => !IsInstalledViaMsi();
+
+        public static string GetInstallType()
+        {
+            object? val =
+                Registry.GetValue($@"HKEY_LOCAL_MACHINE\{KeyPath}", ValueName, null)
+                ?? Registry.GetValue($@"HKEY_CURRENT_USER\{KeyPath}", ValueName, null);
+            return val as string ?? "Unknown";
+        }
+    }
+}