Merge pull request 'feature/auto-update' (#5) from feature/auto-update into master

Reviewed-on: #5

CarManagerV3/CarManagerV3.csproj

@@ -15,7 +15,7 @@
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.4.1</ApplicationVersion>
+    <ApplicationVersion>1.4.0</ApplicationVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
@@ -25,7 +25,7 @@
     <ApplicationIcon>CarMgm_Icon.ico</ApplicationIcon>
     <AssemblyTitle>Car Manager 3</AssemblyTitle>
     <Product>Car Manager 3</Product>
-    <Version>1.4.1</Version>
+    <Version>1.4.0</Version>
     
   </PropertyGroup>
   <ItemGroup>

CarManagerV3/Forms/MainForm.cs

@@ -65,7 +65,7 @@ namespace CarManagerV3
             {
                 if (Updater.IsUpdateAvailable(Properties.Settings.Default.AllowPrerelease))
                 {
-                    UpdatePromptForm updatePrompt = new UpdatePromptForm(Updater.GetCurrentVersion(true), Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease));
+                    UpdatePromptForm updatePrompt = new UpdatePromptForm(Updater.GetCurrentVersion(), Updater.GetLatestVersion());
                     updatePrompt.ShowDialog();
                 }
             }
@@ -571,12 +571,12 @@ namespace CarManagerV3
             {
                 if (Updater.IsUpdateAvailable(Properties.Settings.Default.AllowPrerelease))
                 {
-                    UpdatePromptForm updatePrompt = new UpdatePromptForm(Updater.GetCurrentVersion(true), Updater.GetLatestVersion(Properties.Settings.Default.AllowPrerelease));
+                    UpdatePromptForm updatePrompt = new UpdatePromptForm(Updater.GetCurrentVersion(), Updater.GetLatestVersion());
                     updatePrompt.ShowDialog();
                 }
                 else
                 {
-                    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);
+                    MessageBox.Show($"You are already using the latest version. ({Updater.GetCurrentVersion()})", "No Updates Available", MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
             }
             catch (Exception ex)

CarManagerV3/Forms/UpdatePromptForm.cs

@@ -18,10 +18,6 @@ namespace CarManagerV3.Forms
             InitializeComponent();
             lblInstalledVersion.Text = lblInstalledVersion.Text.Replace("?.?.?", currentVersion);
             lblLatestVersion.Text = lblLatestVersion.Text.Replace("?.?.?", latestVersion);
-            if (Updater.IsLatestVersionPrerelease())
-            {
-                lblLatestVersion.Text += " (Pre-release)";
-            }
 
         }
 
@@ -62,7 +58,7 @@ namespace CarManagerV3.Forms
 
         private void btnReadChangelog_Click(object sender, EventArgs e)
         {
-            Updater.OpenReleasePage();
+            Updater.openReleasePage();
         }
     }
 }

CarManagerV3/Manager/Updater.cs

@@ -22,29 +22,18 @@ 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(bool cutTrailingZeros = false)
+        public static string GetCurrentVersion()
         {
             //DEBUG::
-            if (debugVersion != null)
+            if(debugVersion != null)
             {
                 return debugVersion;
             }
 
             var asm = Assembly.GetEntryAssembly()!;
             Version v = asm.GetName().Version ?? new Version(0, 0, 0, 0);
-            string VersionString = v.ToString();
+            return 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)
@@ -83,7 +72,6 @@ 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
@@ -103,7 +91,6 @@ namespace CarManagerV3.Manager
                             if (IsNewerVersion(preReleaseVersion, latestVersion))
                             {
                                 latestVersion = preReleaseVersion;
-                                isLatestVersionPrerelease = true;
                             }
                         }
                     }
@@ -150,11 +137,11 @@ namespace CarManagerV3.Manager
                             break;
                         }
                     }
-
+                    
                     if (downloadUrl != null)
                     {
-
+                        
-
+                        
                         // Download the installer to the users set Data dir, run it, and then exit the application.
                         string tempFilePath = System.IO.Path.Combine(System.IO.Path.GetTempPath(), $"CarManagerInstaller_{latestVersion}.msi");
                         using (var downloadClient = new System.Net.WebClient())
@@ -168,8 +155,8 @@ namespace CarManagerV3.Manager
                             UseShellExecute = true
                         };
                         System.Diagnostics.Process.Start(processStartInfo);
-
+                        
-
+                        
                         Application.Exit();
                     }
                     else
@@ -193,9 +180,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);
             }
@@ -206,11 +193,5 @@ namespace CarManagerV3.Manager
                 UseShellExecute = true
             });
         }
-
-        public static bool IsLatestVersionPrerelease()
-        {
-            // Ensure we have the latest version info in cache
-            return isLatestVersionPrerelease;
-        }
     }
 }