Skip to content

Commit 0f2005e

Browse files
ignore assemblies - prevent assembly.load
1 parent 6279e77 commit 0f2005e

File tree

1 file changed

+20
-11
lines changed

1 file changed

+20
-11
lines changed

src/NLog.Extensions.Logging/ConfigureExtensions.cs

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using System.IO;
33
using System.Reflection;
44
using Microsoft.Extensions.Logging;
5+
using NLog.Common;
56
using NLog.Config;
67

78
namespace NLog.Extensions.Logging
@@ -71,22 +72,30 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, NLogProvider
7172

7273
private static void ConfigureHiddenAssemblies()
7374
{
74-
//ignore this
75-
LogManager.AddHiddenAssembly(Assembly.Load(new AssemblyName("Microsoft.Extensions.Logging")));
76-
LogManager.AddHiddenAssembly(Assembly.Load(new AssemblyName("Microsoft.Extensions.Logging.Abstractions")));
77-
7875
try
7976
{
80-
//try the Filter ext
81-
var filterAssembly = Assembly.Load(new AssemblyName("Microsoft.Extensions.Logging.Filter"));
82-
LogManager.AddHiddenAssembly(filterAssembly);
77+
//ignore these assemblies for ${callsite}
78+
LogManager.AddHiddenAssembly(typeof(Microsoft.Extensions.Logging.LoggerFactoryExtensions).GetTypeInfo().Assembly); //Microsoft.Extensions.Logging
79+
LogManager.AddHiddenAssembly(typeof(Microsoft.Extensions.Logging.ILogger).GetTypeInfo().Assembly); // Microsoft.Extensions.Logging.Abstractions
80+
LogManager.AddHiddenAssembly(typeof(NLog.Extensions.Logging.ConfigureExtensions).GetTypeInfo().Assembly); //NLog.Extensions.Logging
81+
82+
try
83+
{
84+
//try the Filter ext
85+
var filterAssembly = Assembly.Load(new AssemblyName("Microsoft.Extensions.Logging.Filter"));
86+
LogManager.AddHiddenAssembly(filterAssembly);
87+
88+
}
89+
catch (Exception ex)
90+
{
91+
InternalLogger.Trace(ex, "filtering Microsoft.Extensions.Logging.Filter failed. Not an issue probably");
92+
}
93+
8394
}
84-
catch (Exception)
95+
catch (Exception ex)
8596
{
86-
//ignore
97+
InternalLogger.Debug(ex, "failure in ignoring assemblies. This could influence the ${callsite}");
8798
}
88-
89-
LogManager.AddHiddenAssembly(typeof(ConfigureExtensions).GetTypeInfo().Assembly);
9099
}
91100

92101
/// <summary>

0 commit comments

Comments
 (0)