Merge pull request #210 from snakefoot/master

Automatic loading of hidden assemblies for callsite logic in NetCore2

Author: 304NotModified

src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs

@@ -29,7 +29,6 @@ public static ILoggerFactory AddNLog(this ILoggerFactory factory)
         /// <returns>ILoggerFactory for chaining</returns>
         public static ILoggerFactory AddNLog(this ILoggerFactory factory, NLogProviderOptions options)
         {
-            ConfigureHiddenAssemblies();
             using (var provider = new NLogLoggerProvider(options))
             {
                 factory.AddProvider(provider);
@@ -64,44 +63,6 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, NLogProvider
         }
 #endif
 
-        /// <summary>
-        /// Ignore assemblies for ${callsite}
-        /// </summary>
-        private static void ConfigureHiddenAssemblies()
-        {
-#if NETCORE1_0 && !NET451
-            InternalLogger.Trace("Hide assemblies for callsite");
-
-            SafeAddHiddenAssembly("Microsoft.Logging");
-
-            SafeAddHiddenAssembly("Microsoft.Extensions.Logging");
-            SafeAddHiddenAssembly("Microsoft.Extensions.Logging.Abstractions");
-            SafeAddHiddenAssembly("NLog.Extensions.Logging");
-
-            //try the Filter ext, this one is not mandatory so could fail
-            SafeAddHiddenAssembly("Microsoft.Extensions.Logging.Filter", false);
-#endif
-        }
-
-#if NETCORE1_0 && !NET451
-        private static void SafeAddHiddenAssembly(string assemblyName, bool logOnException = true)
-        {
-            try
-            {
-                InternalLogger.Trace("Hide {0}", assemblyName);
-                var assembly = Assembly.Load(new AssemblyName(assemblyName));
-                LogManager.AddHiddenAssembly(assembly);
-            }
-            catch (Exception ex)
-            {
-                if (logOnException)
-                {
-                    InternalLogger.Debug(ex, "Hiding assembly {0} failed. This could influence the ${callsite}", assemblyName);
-                }
-            }
-        }
-#endif
-
         /// <summary>
         /// Apply NLog configuration from XML config.
         /// </summary>
@@ -111,7 +72,7 @@ private static void SafeAddHiddenAssembly(string assemblyName, bool logOnExcepti
         [Obsolete("Instead use NLog.LogManager.LoadConfiguration()")]
         public static LoggingConfiguration ConfigureNLog(this ILoggerFactory loggerFactory, string configFileRelativePath)
         {
-            ConfigureHiddenAssemblies();
+            LogManager.AddHiddenAssembly(typeof(NLogLoggerProvider).GetTypeInfo().Assembly);
             return LogManager.LoadConfiguration(configFileRelativePath).Configuration;
         }
 
@@ -124,7 +85,7 @@ public static LoggingConfiguration ConfigureNLog(this ILoggerFactory loggerFacto
         [Obsolete("Instead assign property NLog.LogManager.Configuration")]
         public static LoggingConfiguration ConfigureNLog(this ILoggerFactory loggerFactory, LoggingConfiguration config)
         {
-            ConfigureHiddenAssemblies();
+            LogManager.AddHiddenAssembly(typeof(NLogLoggerProvider).GetTypeInfo().Assembly);
             LogManager.Configuration = config;
             return config;
         }

src/NLog.Extensions.Logging/Logging/NLogLoggerProvider.cs

@@ -1,6 +1,9 @@
-#if !NETCORE1_0
+using System;
+using System.Reflection;
+#if !NETCORE1_0
 using Microsoft.Extensions.Logging;
 #endif
+using NLog.Common;
 
 namespace NLog.Extensions.Logging
 {
@@ -20,7 +23,8 @@ public class NLogLoggerProvider : Microsoft.Extensions.Logging.ILoggerProvider
         /// <summary>
         /// New provider with default options, see <see cref="Options"/>
         /// </summary>
-        public NLogLoggerProvider() 
+        public NLogLoggerProvider()
+            :this(null)
         {
         }
 
@@ -31,6 +35,7 @@ public NLogLoggerProvider()
         public NLogLoggerProvider(NLogProviderOptions options)
         {
             Options = options;
+            RegisterHiddenAssembliesForCallSite();
         }
 
         /// <summary>
@@ -49,6 +54,58 @@ public Microsoft.Extensions.Logging.ILogger CreateLogger(string name)
         public void Dispose()
         {
         }
+
+        /// <summary>
+        /// Ignore assemblies for ${callsite}
+        /// </summary>
+        private static void RegisterHiddenAssembliesForCallSite()
+        {
+            InternalLogger.Debug("Hide assemblies for callsite");
+            LogManager.AddHiddenAssembly(typeof(NLogLoggerProvider).GetTypeInfo().Assembly);
+
+#if !NETCORE1_0
+            var allAssemblies = AppDomain.CurrentDomain.GetAssemblies();
+            foreach (var assembly in allAssemblies)
+            {
+                if (assembly.FullName.StartsWith("NLog.Extensions.Logging,", StringComparison.OrdinalIgnoreCase)
+                    || assembly.FullName.StartsWith("NLog.Web,", StringComparison.OrdinalIgnoreCase)
+                    || assembly.FullName.StartsWith("NLog.Web.AspNetCore,", StringComparison.OrdinalIgnoreCase)
+                    || assembly.FullName.StartsWith("Microsoft.Extensions.Logging,", StringComparison.OrdinalIgnoreCase)
+                    || assembly.FullName.StartsWith("Microsoft.Extensions.Logging.Abstractions,", StringComparison.OrdinalIgnoreCase)
+                    || assembly.FullName.StartsWith("Microsoft.Extensions.Logging.Filter,", StringComparison.OrdinalIgnoreCase)
+                    || assembly.FullName.StartsWith("Microsoft.Logging,", StringComparison.OrdinalIgnoreCase))
+                {
+                    LogManager.AddHiddenAssembly(assembly);
+                }
+            }
+#else
+            SafeAddHiddenAssembly("Microsoft.Logging");
+            SafeAddHiddenAssembly("Microsoft.Extensions.Logging");
+            SafeAddHiddenAssembly("Microsoft.Extensions.Logging.Abstractions");
+
+            //try the Filter ext, this one is not mandatory so could fail
+            SafeAddHiddenAssembly("Microsoft.Extensions.Logging.Filter", false);
+#endif
+        }
+
+#if NETCORE1_0
+        private static void SafeAddHiddenAssembly(string assemblyName, bool logOnException = true)
+        {
+            try
+            {
+                InternalLogger.Trace("Hide {0}", assemblyName);
+                var assembly = Assembly.Load(new AssemblyName(assemblyName));
+                LogManager.AddHiddenAssembly(assembly);
+            }
+            catch (Exception ex)
+            {
+                if (logOnException)
+                {
+                    InternalLogger.Debug(ex, "Hiding assembly {0} failed. This could influence the ${callsite}", assemblyName);
+                }
+            }
+        }
+#endif
     }
 }