Merge branch 'development'

Author: jhett12321

.github/workflows/ci.yml

@@ -173,10 +173,11 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: nuget-binaries
+          path: output
 
       - name: NuGet Publish
         run: dotnet nuget push output/*.nupkg --api-key ${{ secrets.NUGET_KEY }} --source https://api.nuget.org/v3/index.json
-        
+
       - name: GitHub Publish
         run: dotnet nuget push output/*.nupkg --api-key ${{ secrets.GITHUB_TOKEN }} --source https://nuget.pkg.github.com/nwn-dotnet/index.json
 
@@ -192,7 +193,8 @@ jobs:
         uses: actions/download-artifact@v2
         with:
           name: nuget-binaries
-          
+          path: output
+
       - name: Remove NuGet packages
         run: rm output/*nupkg
 

CHANGELOG.md

@@ -3,6 +3,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## 8193.33.4
+https://github.com/nwn-dotnet/Anvil/compare/v8193.33.3...v8193.33.4
+
+### Package Updates
+- (Docker) Update NWNX to [16b2c88](https://github.com/nwnxee/unified/commit/16b2c88b1f3e0ff929a8cad759090ce98d7d0b3c).
+
+### Changed
+- Startup log now includes the git revision of the current running server binary.
+- Server revision is now printed to stdout if startup fails.
+
 ## 8193.33.3
 https://github.com/nwn-dotnet/Anvil/compare/v8193.33.2...v8193.33.3
 

NWN.Anvil/NWN.Anvil.csproj

@@ -10,6 +10,7 @@
 
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <SourceControlInformationFeatureSupported>true</SourceControlInformationFeatureSupported>
     <EnableDynamicLoading>true</EnableDynamicLoading>
 
     <NoWarn>1591</NoWarn>
@@ -82,6 +83,12 @@
     <Compile Remove="docs\**" />
   </ItemGroup>
 
+  <Target Name="SetSourceRevisionId" BeforeTargets="InitializeSourceControlInformation">
+    <Exec Command="git describe --long --always --dirty --exclude=* --abbrev=8" ConsoleToMSBuild="True" IgnoreExitCode="False">
+      <Output PropertyName="SourceRevisionId" TaskParameter="ConsoleOutput" />
+    </Exec>
+  </Target>
+
   <Target Name="ZipOutputPath" AfterTargets="Build">
     <ZipDirectory Overwrite="true" SourceDirectory="$(OutputPath)" DestinationFile="$(OutputPath)\..\$(MSBuildProjectName).zip" />
   </Target>

NWN.Anvil/src/main/AnvilCore.cs

@@ -103,15 +103,27 @@ void IServerLifeCycleEventHandler.HandleLifeCycleEvent(LifeCycleEvent eventType)
     private void InitCore()
     {
       loggerManager.Init();
-      PrelinkNative();
+
+      try
+      {
+        PrelinkNative();
+      }
+      catch (Exception e)
+      {
+        Log.Fatal(e, "Failed to load {Name:l} {Version:l} (NWN.Core: {CoreVersion}, NWN.Native: {NativeVersion})",
+          Assemblies.Anvil.GetName().Name,
+          AssemblyInfo.VersionInfo.InformationalVersion,
+          Assemblies.Core.GetName().Version,
+          Assemblies.Native.GetName().Version);
+        throw;
+      }
+
       loggerManager.InitVariables();
       unhandledExceptionLogger.Init();
 
-      AssemblyName anvilAssemblyName = Assemblies.Anvil.GetName();
-
-      Log.Info("Loading {Name} {Version} (NWN.Core: {CoreVersion}, NWN.Native: {NativeVersion})",
-        anvilAssemblyName.Name,
-        anvilAssemblyName.Version,
+      Log.Info("Loading {Name:l} {Version:l} (NWN.Core: {CoreVersion}, NWN.Native: {NativeVersion})",
+        Assemblies.Anvil.GetName().Name,
+        AssemblyInfo.VersionInfo.InformationalVersion,
         Assemblies.Core.GetName().Version,
         Assemblies.Native.GetName().Version);
 

NWN.Anvil/src/main/Internal/AssemblyInfo.cs

@@ -0,0 +1,9 @@
+using System.Reflection;
+
+namespace Anvil.Internal
+{
+  internal static class AssemblyInfo
+  {
+    public static readonly AssemblyInformationalVersionAttribute VersionInfo = typeof(AssemblyInfo).Assembly.GetCustomAttribute<AssemblyInformationalVersionAttribute>();
+  }
+}

dockerfile

@@ -1,5 +1,6 @@
 # Configure nwserver to run with nwnx
-FROM nwnxee/unified:864fb00
+FROM nwnxee/unified:16b2c88
+
 ARG BINARY_PATH
 COPY ${BINARY_PATH} /nwn/anvil/