Add NWNX.NET version to server log. Use anvil to resolve NWNX.NET dep…

…endency. (#800)
nwn-dotnet · Jan 26, 2025 · 69ed36a · 69ed36a
1 parent 3075e2d
commit 69ed36a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/NWN.Anvil/src/main/AnvilCore.RuntimeInfo.cs b/NWN.Anvil/src/main/AnvilCore.RuntimeInfo.cs
@@ -10,6 +10,7 @@ private struct RuntimeInfo
       public string? AssemblyVersion;
       public string? CoreVersion;
       public string? NativeVersion;
+      public string? NWNXDotNetVersion;
     }
   }
 }
diff --git a/NWN.Anvil/src/main/AnvilCore.cs b/NWN.Anvil/src/main/AnvilCore.cs
@@ -100,6 +100,7 @@ private void Init()
         AssemblyVersion = AssemblyInfo.VersionInfo.InformationalVersion,
         CoreVersion = Assemblies.Core.GetName().Version?.ToString(),
         NativeVersion = Assemblies.Native.GetName().Version?.ToString(),
+        NWNXDotNetVersion = Assemblies.NWNXDotNet.GetName().Version?.ToString(),
       };
 
       serviceManager.Init();
@@ -110,11 +111,11 @@ private void Init()
       }
       catch (Exception e)
       {
-        Log.Fatal(e, $"Failed to load {runtimeInfo.AssemblyName} {runtimeInfo.AssemblyVersion} (NWN.Core: {runtimeInfo.CoreVersion}, NWN.Native: {runtimeInfo.NativeVersion})");
+        Log.Fatal(e, $"Failed to load {runtimeInfo.AssemblyName} {runtimeInfo.AssemblyVersion} (NWN.Core: {runtimeInfo.CoreVersion}, NWN.Native: {runtimeInfo.NativeVersion}, NWNX.NET: {runtimeInfo.NWNXDotNetVersion})");
         throw;
       }
 
-      Log.Info($"Loading {runtimeInfo.AssemblyName} {runtimeInfo.AssemblyVersion} (NWN.Core: {runtimeInfo.CoreVersion}, NWN.Native: {runtimeInfo.NativeVersion})");
+      Log.Info($"Loading {runtimeInfo.AssemblyName} {runtimeInfo.AssemblyVersion} (NWN.Core: {runtimeInfo.CoreVersion}, NWN.Native: {runtimeInfo.NativeVersion}, NWNX.NET: {runtimeInfo.NWNXDotNetVersion})");
       CheckServerVersion();
     }
 

diff --git a/NWN.Anvil/src/main/Internal/Assemblies.cs b/NWN.Anvil/src/main/Internal/Assemblies.cs
@@ -11,6 +11,7 @@ internal static class Assemblies
     public static readonly Assembly Anvil = typeof(Assemblies).Assembly;
     public static readonly Assembly Core = typeof(NWN.Core.NWNCore).Assembly;
     public static readonly Assembly Native = typeof(NWN.Native.API.NWNXLib).Assembly;
+    public static readonly Assembly NWNXDotNet = typeof(NWNX.NET.NWNXAPI).Assembly;
 
     public static readonly Assembly[] AllAssemblies;
     public static readonly Type[] AllTypes;
@@ -27,6 +28,7 @@ static Assemblies()
         Anvil,
         Core,
         Native,
+        NWNXDotNet,
         typeof(NLog.Logger).Assembly,
         typeof(LightInject.ServiceContainer).Assembly,
         typeof(Newtonsoft.Json.JsonConvert).Assembly,