Merge pull request #711 from aydjay/upgradeDetection

Version checker queries application state and not assembley
Procurement-PoE · Aug 7, 2017 · 0a1698c · 0a1698c
2 parents 248c4c6 + 81ded20
commit 0a1698c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/Procurement/ApplicationState.cs b/Procurement/ApplicationState.cs
@@ -10,6 +10,10 @@ namespace Procurement
 {
     public static class ApplicationState
     {
+        /// <summary>
+        /// Application version to check for latest release.
+        /// Must begin with "Procurement ". See: VersionChecker.cs
+        /// </summary>
         public static string Version = "Procurement 1.14.0";
         public static POEModel Model = new POEModel();
         public static Dictionary<string, Stash> Stash = new Dictionary<string, Stash>();

diff --git a/Procurement/Utility/VersionChecker.cs b/Procurement/Utility/VersionChecker.cs
@@ -44,8 +44,9 @@ private static void client_DownloadStringCompleted(object sender, DownloadString
                 string[] updateInfo = e.Result.Split(',');
 
                 updateInfo[0] = updateInfo[0].Replace("Procurement ", "");
-                Version currentVersion = System.Reflection.Assembly.GetExecutingAssembly().GetName().Version;
-                Version latestVersion = new Version(updateInfo[0]);
+                var appVersion = ApplicationState.Version.Replace("Procurement ", "");
+                var currentVersion = new Version(appVersion);
+                var latestVersion = new Version(updateInfo[0]);
 
                 if (currentVersion >= latestVersion || MessageBox.Show("A new version of Procurement is available! Would you like to download now? (Opens in browser)", "Update Available", MessageBoxButton.YesNo, MessageBoxImage.Question) == MessageBoxResult.No)
                     return;