Default to getting the DLL's file version in AppVersionHelper.

immense · May 3, 2023 · cfc4ddb · cfc4ddb
1 parent 757086b
commit cfc4ddb
Showing 1 changed file with 28 additions and 9 deletions.
diff --git a/Shared/Utilities/AppVersionHelper.cs b/Shared/Utilities/AppVersionHelper.cs
@@ -15,19 +15,15 @@ public static string GetAppVersion(string defaultVersion = "1.0.0")
         {
             try
             {
-                if (File.Exists(Environment.ProcessPath))
+                var filePath = Assembly.GetEntryAssembly()?.Location;
+                if (TryGetFileVersion(filePath, out var asmVersion))
                 {
-                    var versionInfo = FileVersionInfo.GetVersionInfo(Environment.ProcessPath);
-                    if (!string.IsNullOrEmpty(versionInfo.FileVersion))
-                    {
-                        return versionInfo.FileVersion;
-                    }
+                    return asmVersion;
                 }
 
-                var asmVersion = Assembly.GetEntryAssembly()?.GetName().Version;
-                if (asmVersion is not null && asmVersion > new Version(1, 0, 0))
+                if (TryGetFileVersion(Environment.ProcessPath, out var exeVersion))
                 {
-                    return asmVersion.ToString();
+                    return exeVersion;
                 }
 
                 return defaultVersion;
@@ -37,5 +33,28 @@ public static string GetAppVersion(string defaultVersion = "1.0.0")
                 return defaultVersion;
             }
         }
+
+        private static bool TryGetFileVersion(string filePath, out string version)
+        {
+            try
+            {
+                if (File.Exists(filePath))
+                {
+                    var versionInfo = FileVersionInfo.GetVersionInfo(filePath);
+                    if (Version.TryParse(versionInfo.FileVersion, out _))
+                    {
+                        version = versionInfo.FileVersion;
+                        return true;
+                    }
+                }
+            }
+            catch
+            {
+                // Ignored.
+            }
+
+            version = string.Empty;
+            return false;
+        }
     }
 }