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

Reviewed-on: #5

CarManager3Setup/CarManager3Setup.vdproj

@@ -332,15 +332,15 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Car Manager 3"
-        "ProductCode" = "8:{24769DBA-B806-4E47-9F4C-17BC8AD0528E}"
+        "ProductCode" = "8:{8FDFF7ED-D464-4F87-BA8F-BDC1000520E4}"
-        "PackageCode" = "8:{741BAAEC-3EE7-46C4-94AB-575C677186BB}"
+        "PackageCode" = "8:{83DA7553-805F-4A70-921B-9A6FB0787780}"
         "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.1"
+        "ProductVersion" = "8:1.4.0"
         "Manufacturer" = "8:Jaro Digital"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"

CarManagerV3.sln

@@ -19,7 +19,6 @@ 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.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)";
-            }
 
         }
 
@@ -32,6 +28,15 @@ 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
             {
@@ -53,7 +58,7 @@ namespace CarManagerV3.Forms
 
         private void btnReadChangelog_Click(object sender, EventArgs e)
         {
-            Updater.OpenReleasePage();
+            Updater.openReleasePage();
         }
     }
 }

CarManagerV3/Manager/Updater.cs

@@ -3,7 +3,6 @@ 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;
 
@@ -23,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)
@@ -84,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
@@ -92,31 +79,21 @@ 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.ToString();
+                            var preReleaseVersion = releases[0].tag_name;
-                            //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);
@@ -203,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);
             }
@@ -216,11 +193,5 @@ namespace CarManagerV3.Manager
                 UseShellExecute = true
             });
         }
-
-        public static bool IsLatestVersionPrerelease()
-        {
-            // Ensure we have the latest version info in cache
-            return isLatestVersionPrerelease;
-        }
     }
 }