WIP

NLog.Web.AspNetCore.Tests/LayoutRenderers/AssemblyVersionLayoutRendererTests.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NLog.Layouts;
+using NLog.Web.Tests.LayoutRenderers;
+using Xunit;
+
+namespace NLog.Web.AspNetCore.Tests.LayoutRenderers
+{
+    public class AssemblyVersionLayoutRendererTests : TestBase
+    {
+        [Fact]
+        public void AssemblyNameVersionTest()
+        {
+            Layout l = "${assembly-version:NLog.Web.AspNetCore.Tests}";
+            var result = l.Render(LogEventInfo.CreateNullEvent());
+            Assert.Equal("1.2.3.0", result);
+        }
+    }
+}

NLog.Web.AspNetCore.Tests/NLog.Web.AspNetCore.Tests.csproj

@@ -4,6 +4,7 @@
     <TargetFrameworks>net452</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NETSTANDARD_1plus</DefineConstants>
     <AssemblyName>NLog.Web.AspNetCore.Tests</AssemblyName>
+    <AssemblyVersion>1.2.3.0</AssemblyVersion>
   </PropertyGroup>
 
   <ItemGroup>
@@ -23,11 +24,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Folder Include="Properties\" />
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
   <ItemGroup>
-    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+    <Folder Include="Properties\" />
   </ItemGroup>
 
 

NLog.Web.AspNetCore/LayoutRenderers/AssemblyVersionLayoutRenderer.cs

@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+using NLog.Common;
+using NLog.Config;
+using NLog.LayoutRenderers;
+
+#if NETSTANDARD_1plus
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.Http;
+using Microsoft.Extensions.PlatformAbstractions;
+#endif
+
+namespace NLog.Web.LayoutRenderers
+{
+    /// <summary>
+    /// Overwrite the NLog.LayoutRenderers.AssemblyVersionLayoutRenderer
+    /// </summary>
+    [LayoutRenderer("assembly-version")]
+    public class AssemblyVersionLayoutRenderer : LayoutRenderer
+    {
+        /// <summary>
+        /// The (full) name of the assembly. If <c>null</c>, using the entry assembly.
+        /// </summary>
+        [DefaultParameter]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Implemented by subclasses to render request information and append it to the specified <see cref="StringBuilder" />.
+        /// 
+        /// Won't be called if <see cref="AspNetLayoutRendererBase.HttpContextAccessor"/> of <see cref="IHttpContextAccessor.HttpContext"/> is <c>null</c>.
+        /// </summary>
+        /// <param name="builder">The <see cref="StringBuilder"/> to append the rendered data to.</param>
+        /// <param name="logEvent">Logging event.</param>
+        protected override void Append(StringBuilder builder, LogEventInfo logEvent)
+        {
+            InternalLogger.Trace("Using ${assembly-version} of NLog.Web");
+
+            var nameNotEmpty = !string.IsNullOrEmpty(Name);
+            if (nameNotEmpty)
+            {
+                var assembly = Assembly.Load(new AssemblyName(Name));
+                if (assembly == null)
+                {
+                    builder.Append("Could not find assembly " + Name);
+                }
+                else
+                {
+                    builder.Append(assembly.GetName().Version.ToString());
+                }
+            }
+            else
+            {
+                //try entry assembly
+
+#if NETSTANDARD_1plus
+                string assemblyVersion = PlatformServices.Default.Application.RuntimeFramework.Version.ToString();
+
+                builder.Append(assemblyVersion);
+#else
+
+                var assembly = Assembly.GetEntryAssembly();
+
+                if (assembly == null)
+                {
+                    assembly = GetAspNetEntryAssembly();
+                }
+                if (assembly == null)
+                {
+                    builder.Append("Could not entry assembly");
+                }
+                else
+                {
+                    builder.Append(assembly.GetName().Version.ToString());
+                }
+#endif
+
+            }
+
+        }
+
+#if !NETSTANDARD_1plus
+        private static Assembly GetAspNetEntryAssembly()
+        {
+            if (System.Web.HttpContext.Current == null || System.Web.HttpContext.Current.ApplicationInstance == null)
+            {
+                return null;
+            }
+           var type = System.Web.HttpContext.Current.ApplicationInstance.GetType();
+            while (type != null && type.Namespace == "ASP")
+            {
+                type = type.BaseType;
+            }
+            return type != null ? type.Assembly : null;
+        }
+#endif
+    }
+}

NLog.Web.Tests/AssemblyVersionLayoutRendererTests.cs

@@ -0,0 +1,22 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using NLog.Config;
+using NLog.Layouts;
+using NLog.Web.Tests.LayoutRenderers;
+using Xunit;
+
+namespace NLog.Web.AspNetCore.Tests.LayoutRenderers
+{
+    public class AssemblyVersionLayoutRendererTests : TestBase
+    {
+        [Fact]
+        public void AssemblyNameVersionTest()
+        {
+            Layout l = "${assembly-version:NLog.Web.Tests}";
+            var result = l.Render(LogEventInfo.CreateNullEvent());
+            Assert.Equal("1.2.3.0", result);
+        }
+    }
+}

NLog.Web.Tests/NLog.Web.Tests.csproj

@@ -99,6 +99,7 @@
     <Compile Include="..\NLog.Web.AspNetCore.Tests\TestBase.cs">
       <Link>TestBase.cs</Link>
     </Compile>
+    <Compile Include="AssemblyVersionLayoutRendererTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

NLog.Web.Tests/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.2.3.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]

NLog.Web/NLog.Web.csproj

@@ -70,6 +70,9 @@
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetSessionValueLayoutRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetUserAuthTypeLayoutRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetUserIdentityLayoutRenderer.cs" />
+    <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AssemblyVersionLayoutRenderer.cs">
+      <Link>AssemblyVersionLayoutRenderer.cs</Link>
+    </Compile>
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\IISInstanceNameLayoutRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetRequestReferrerRenderer.cs" />
     <Compile Include="..\NLog.Web.AspNetCore\LayoutRenderers\AspNetRequestUrlRenderer.cs" />