Fix static services accessor (temporary). Create AppVersionHelper for…

… getting app version.
immense · May 2, 2023 · 4230ad7 · 4230ad7
1 parent db056a6
commit 4230ad7
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 12 deletions.
diff --git a/Agent/Program.cs b/Agent/Program.cs
@@ -38,13 +38,15 @@ public static async Task Main(string[] args)
 
             await host.StartAsync();
 
+            Services = host.Services;
+
             await Init(host.Services);
 
             await host.WaitForShutdownAsync();
         }
         catch (Exception ex)
         {
-            var version = typeof(Program).Assembly.GetName().Version?.ToString() ?? "0.0.0";
+            var version = AppVersionHelper.GetAppVersion();
             var logger = new FileLogger("Remotely_Agent", version, "Main");
             logger.LogError(ex, "Error during agent startup.");
             throw;

diff --git a/Desktop.Linux/Program.cs b/Desktop.Linux/Program.cs
@@ -14,7 +14,7 @@
 using Immense.RemoteControl.Desktop.Shared.Startup;
 using System.Linq;
 
-var version = typeof(Program).Assembly.GetName().Version?.ToString() ?? "0.0.0";
+var version = AppVersionHelper.GetAppVersion();
 var logger = new FileLogger("Remotely_Desktop", version, "Program.cs");
 var filePath = Environment.ProcessPath ?? Environment.GetCommandLineArgs().First();
 var serverUrl = Debugger.IsAttached ? "http://localhost:5000" : string.Empty;

diff --git a/Desktop.Win/Program.cs b/Desktop.Win/Program.cs
@@ -15,7 +15,7 @@
 using Immense.RemoteControl.Desktop.Shared.Startup;
 using System.Linq;
 
-var version = typeof(Program).Assembly.GetName().Version?.ToString() ?? "0.0.0";
+var version = AppVersionHelper.GetAppVersion();
 var logger = new FileLogger("Remotely_Desktop", version, "Program.cs");
 var filePath = Environment.ProcessPath ?? Environment.GetCommandLineArgs().First();
 var serverUrl = Debugger.IsAttached ? "https://localhost:5001" : string.Empty;

diff --git a/Server/Pages/About.razor b/Server/Pages/About.razor
@@ -12,13 +12,5 @@
     Open-Source Licenses: <a href="/credits">Credits</a>
 </p>
 <p>
-    Version: @if (System.IO.File.Exists("Remotely_Server.dll"))
-    {
-        <span>@System.Diagnostics.FileVersionInfo.GetVersionInfo("Remotely_Server.dll").FileVersion</span>
-    }
-    else
-    {
-        <span>1.0.0.0</span>
-    }
-
+    Version: @(AppVersionHelper.GetAppVersion())
 </p>
diff --git a/Shared/Utilities/AppVersionHelper.cs b/Shared/Utilities/AppVersionHelper.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Remotely.Shared.Utilities
+{
+    public static class AppVersionHelper
+    {
+        public static string GetAppVersion(string defaultVersion = "1.0.0")
+        {
+            try
+            {
+                if (File.Exists(Environment.ProcessPath))
+                {
+                    var versionInfo = FileVersionInfo.GetVersionInfo(Environment.ProcessPath);
+                    if (!string.IsNullOrEmpty(versionInfo.FileVersion))
+                    {
+                        return versionInfo.FileVersion;
+                    }
+                }
+
+                var asmVersion = Assembly.GetEntryAssembly()?.GetName().Version;
+                if (asmVersion is not null && asmVersion > new Version(1, 0, 0))
+                {
+                    return asmVersion.ToString();
+                }
+
+                return defaultVersion;
+            }
+            catch
+            {
+                return defaultVersion;
+            }
+        }
+    }
+}