Merge branch 'develop' into main

Codeh4ck · Aug 6, 2023 · 9d0c0f8 · 9d0c0f8
2 parents 843ba91 + 44167fa
commit 9d0c0f8
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Codelux.ServiceStack/CoreService.cs b/Codelux.ServiceStack/CoreService.cs
@@ -11,13 +11,15 @@ public sealed class CoreService : Service
     {
         public Task<VersionResponse> Get(VersionRequest request)
         {
-            Assembly assembly = Assembly.GetCallingAssembly();
-            FileVersionInfo versionInfo = FileVersionInfo.GetVersionInfo(Assembly.GetCallingAssembly().Location);
+            Assembly assembly = Assembly.GetEntryAssembly();
+            if (assembly == null) assembly = Assembly.GetExecutingAssembly();
+
+            FileVersionInfo versionInfo = FileVersionInfo.GetVersionInfo(assembly.Location);
 
             return Task.FromResult(new VersionResponse()
             {
                 Version = versionInfo
             });
         }
     }
-}
+}