diff --git a/CarManagerV3/CarManagerV3.csproj b/CarManagerV3/CarManagerV3.csproj
index 4f45086..2f26333 100644
--- a/CarManagerV3/CarManagerV3.csproj
+++ b/CarManagerV3/CarManagerV3.csproj
@@ -15,7 +15,7 @@
false
true
0
- 1.4.0
+ 1.4.1
false
false
true
@@ -25,7 +25,7 @@
CarMgm_Icon.ico
Car Manager 3
Car Manager 3
- 1.4.0
+ 1.4.1
diff --git a/CarManagerV3/Forms/MainForm.cs b/CarManagerV3/Forms/MainForm.cs
index 45f23d5..5b097ad 100644
--- a/CarManagerV3/Forms/MainForm.cs
+++ b/CarManagerV3/Forms/MainForm.cs
@@ -65,7 +65,7 @@ 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();
}
}
@@ -571,12 +571,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)
diff --git a/CarManagerV3/Forms/UpdatePromptForm.cs b/CarManagerV3/Forms/UpdatePromptForm.cs
index cf95a73..976c253 100644
--- a/CarManagerV3/Forms/UpdatePromptForm.cs
+++ b/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)";
+ }
}
@@ -58,7 +62,7 @@ namespace CarManagerV3.Forms
private void btnReadChangelog_Click(object sender, EventArgs e)
{
- Updater.openReleasePage();
+ Updater.OpenReleasePage();
}
}
}
diff --git a/CarManagerV3/Manager/Updater.cs b/CarManagerV3/Manager/Updater.cs
index 019744c..72133a9 100644
--- a/CarManagerV3/Manager/Updater.cs
+++ b/CarManagerV3/Manager/Updater.cs
@@ -22,18 +22,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 +83,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
@@ -91,6 +103,7 @@ namespace CarManagerV3.Manager
if (IsNewerVersion(preReleaseVersion, latestVersion))
{
latestVersion = preReleaseVersion;
+ isLatestVersionPrerelease = true;
}
}
}
@@ -137,11 +150,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())
@@ -155,8 +168,8 @@ namespace CarManagerV3.Manager
UseShellExecute = true
};
System.Diagnostics.Process.Start(processStartInfo);
-
-
+
+
Application.Exit();
}
else
@@ -180,9 +193,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 +206,11 @@ namespace CarManagerV3.Manager
UseShellExecute = true
});
}
+
+ public static bool IsLatestVersionPrerelease()
+ {
+ // Ensure we have the latest version info in cache
+ return isLatestVersionPrerelease;
+ }
}
}