Merge pull request #223 from kll/feature/merged-assembly-support

damianh · web-flow · commit 64633100eecd · 2019-02-16T10:36:01.000+01:00
Add support for merged assemblies.
diff --git a/src/LibLog/LogExtensions.cs.pp b/src/LibLog/LogExtensions.cs.pp
@@ -1,15 +1,16 @@
-﻿// <auto-generated/>
+// <auto-generated/>
 // ReSharper disable CheckNamespace
 namespace $rootnamespace$.Logging
 {
     using System;
+#if LIBLOG_EXCLUDE_CODE_COVERAGE
+    using System.Diagnostics.CodeAnalysis;
+#endif
 
     /// <summary>
     ///     Extension methods for the <see cref="ILog"/> interface.
     /// </summary>
 #if LIBLOG_EXCLUDE_CODE_COVERAGE
-    using System.Diagnostics.CodeAnalysis;
-
     [ExcludeFromCodeCoverage]
 #endif
 #if LIBLOG_PUBLIC
diff --git a/src/LibLog/LogProviders/Log4NetLogProvider.cs b/src/LibLog/LogProviders/Log4NetLogProvider.cs
@@ -36,7 +36,7 @@ internal static bool IsLoggerAvailable()
 
         protected override OpenNdc GetOpenNdcMethod()
         {
-            var logicalThreadContextType = Type.GetType("log4net.LogicalThreadContext, log4net");
+            var logicalThreadContextType = FindType("log4net.LogicalThreadContext", "log4net");
             var stacksProperty = logicalThreadContextType.GetProperty("Stacks");
             var logicalThreadContextStacksType = stacksProperty.PropertyType;
             var stacksIndexerProperty = logicalThreadContextStacksType.GetProperty("Item");
@@ -64,7 +64,7 @@ protected override OpenNdc GetOpenNdcMethod()
 
         protected override OpenMdc GetOpenMdcMethod()
         {
-            var logicalThreadContextType = Type.GetType("log4net.LogicalThreadContext, log4net");
+            var logicalThreadContextType = FindType("log4net.LogicalThreadContext", "log4net");
             var propertiesProperty = logicalThreadContextType.GetProperty("Properties");
             var logicalThreadContextPropertiesType = propertiesProperty.PropertyType;
             var propertiesIndexerProperty = logicalThreadContextPropertiesType.GetProperty("Item");
@@ -101,7 +101,7 @@ protected override OpenMdc GetOpenMdcMethod()
 
         private static Type GetLogManagerType()
         {
-            return Type.GetType("log4net.LogManager, log4net");
+            return FindType("log4net.LogManager", "log4net");
         }
 
         private static Func<string, object> GetGetLoggerMethodCall()
@@ -149,7 +149,7 @@ private static bool Initialize()
             {
                 try
                 {
-                    var logEventLevelType = Type.GetType("log4net.Core.Level, log4net");
+                    var logEventLevelType = FindType("log4net.Core.Level", "log4net");
                     if (logEventLevelType == null) throw new LibLogException("Type log4net.Core.Level was not found.");
 
                     var levelFields = logEventLevelType.GetFields().ToList();
@@ -161,7 +161,7 @@ private static bool Initialize()
                     s_levelFatal = levelFields.First(x => x.Name == "Fatal").GetValue(null);
 
                     // Func<object, object, bool> isEnabledFor = (logger, level) => { return ((log4net.Core.ILogger)logger).IsEnabled(level); }
-                    var loggerType = Type.GetType("log4net.Core.ILogger, log4net");
+                    var loggerType = FindType("log4net.Core.ILogger", "log4net");
                     if (loggerType == null) throw new LibLogException("Type log4net.Core.ILogger, was not found.");
                     var instanceParam = Expression.Parameter(typeof(object));
                     var instanceCast = Expression.Convert(instanceParam, loggerType);
@@ -170,7 +170,7 @@ private static bool Initialize()
                     s_isEnabledForDelegate = GetIsEnabledFor(loggerType, logEventLevelType, instanceCast, levelCast,
                         instanceParam, levelParam);
 
-                    var loggingEventType = Type.GetType("log4net.Core.LoggingEvent, log4net");
+                    var loggingEventType = FindType("log4net.Core.LoggingEvent", "log4net");
 
                     s_createLoggingEvent = GetCreateLoggingEvent(instanceParam, instanceCast, levelParam, levelCast,
                         loggingEventType);
diff --git a/src/LibLog/LogProviders/Log4NetLogProvider.cs.pp b/src/LibLog/LogProviders/Log4NetLogProvider.cs.pp
@@ -38,7 +38,7 @@
 
         protected override OpenNdc GetOpenNdcMethod()
         {
-            var logicalThreadContextType = Type.GetType("log4net.LogicalThreadContext, log4net");
+            var logicalThreadContextType = FindType("log4net.LogicalThreadContext", "log4net");
             var stacksProperty = logicalThreadContextType.GetProperty("Stacks");
             var logicalThreadContextStacksType = stacksProperty.PropertyType;
             var stacksIndexerProperty = logicalThreadContextStacksType.GetProperty("Item");
@@ -66,7 +66,7 @@
 
         protected override OpenMdc GetOpenMdcMethod()
         {
-            var logicalThreadContextType = Type.GetType("log4net.LogicalThreadContext, log4net");
+            var logicalThreadContextType = FindType("log4net.LogicalThreadContext", "log4net");
             var propertiesProperty = logicalThreadContextType.GetProperty("Properties");
             var logicalThreadContextPropertiesType = propertiesProperty.PropertyType;
             var propertiesIndexerProperty = logicalThreadContextPropertiesType.GetProperty("Item");
@@ -103,7 +103,7 @@
 
         private static Type GetLogManagerType()
         {
-            return Type.GetType("log4net.LogManager, log4net");
+            return FindType("log4net.LogManager", "log4net");
         }
 
         private static Func<string, object> GetGetLoggerMethodCall()
@@ -151,7 +151,7 @@
             {
                 try
                 {
-                    var logEventLevelType = Type.GetType("log4net.Core.Level, log4net");
+                    var logEventLevelType = FindType("log4net.Core.Level", "log4net");
                     if (logEventLevelType == null) throw new LibLogException("Type log4net.Core.Level was not found.");
 
                     var levelFields = logEventLevelType.GetFields().ToList();
@@ -163,7 +163,7 @@
                     s_levelFatal = levelFields.First(x => x.Name == "Fatal").GetValue(null);
 
                     // Func<object, object, bool> isEnabledFor = (logger, level) => { return ((log4net.Core.ILogger)logger).IsEnabled(level); }
-                    var loggerType = Type.GetType("log4net.Core.ILogger, log4net");
+                    var loggerType = FindType("log4net.Core.ILogger", "log4net");
                     if (loggerType == null) throw new LibLogException("Type log4net.Core.ILogger, was not found.");
                     var instanceParam = Expression.Parameter(typeof(object));
                     var instanceCast = Expression.Convert(instanceParam, loggerType);
@@ -172,7 +172,7 @@
                     s_isEnabledForDelegate = GetIsEnabledFor(loggerType, logEventLevelType, instanceCast, levelCast,
                         instanceParam, levelParam);
 
-                    var loggingEventType = Type.GetType("log4net.Core.LoggingEvent, log4net");
+                    var loggingEventType = FindType("log4net.Core.LoggingEvent", "log4net");
 
                     s_createLoggingEvent = GetCreateLoggingEvent(instanceParam, instanceCast, levelParam, levelCast,
                         loggingEventType);
diff --git a/src/LibLog/LogProviders/LogProviderBase.cs b/src/LibLog/LogProviders/LogProviderBase.cs
@@ -1,6 +1,9 @@
 ﻿namespace YourRootNamespace.Logging.LogProviders
 {
     using System;
+    using System.Collections.Generic;
+    using System.Linq;
+
 #if LIBLOG_EXCLUDE_CODE_COVERAGE
     using System.Diagnostics.CodeAnalysis;
 #endif
@@ -102,5 +105,29 @@ protected virtual OpenMdc GetOpenMdcMethod()
         /// <param name="destructure">Determines whether to call the destructor or not.</param>
         /// <returns>A disposable that when disposed removes the map from the context.</returns>
         protected delegate IDisposable OpenMdc(string key, object value, bool destructure);
+
+        /// <summary>
+        ///     Finds a type using a type name and assembly name.
+        /// </summary>
+        /// <param name="typeName">The name of the type.</param>
+        /// <param name="assemblyName">The name of the assembly.</param>
+        /// <returns>The requested type or null if it was not found.</returns>
+        protected static Type FindType(string typeName, string assemblyName)
+        {
+            return FindType(typeName, new[] {assemblyName});
+        }
+
+        /// <summary>
+        ///     Finds a type using a type name and a list of assembly names to search.
+        /// </summary>
+        /// <param name="typeName">The name of the type.</param>
+        /// <param name="assemblyNames">A list of assembly names to search.</param>
+        /// <returns>The request type or null if it was not found.</returns>
+        protected static Type FindType(string typeName, IReadOnlyList<string> assemblyNames)
+        {
+            return assemblyNames
+                       .Select(assemblyName => Type.GetType($"{typeName}, {assemblyName}"))
+                       .FirstOrDefault(type => type != null) ?? Type.GetType(typeName);
+        }
     }
 }
diff --git a/src/LibLog/LogProviders/LogProviderBase.cs.pp b/src/LibLog/LogProviders/LogProviderBase.cs.pp
@@ -3,13 +3,17 @@
 namespace $rootnamespace$.Logging.LogProviders
 {
     using System;
+    using System.Collections.Generic;
+    using System.Linq;
+
+#if LIBLOG_EXCLUDE_CODE_COVERAGE
+    using System.Diagnostics.CodeAnalysis;
+#endif
 
     /// <summary>
     ///     Base class for specific log providers.
     /// </summary>
 #if LIBLOG_EXCLUDE_CODE_COVERAGE
-    using System.Diagnostics.CodeAnalysis;
-
     [ExcludeFromCodeCoverage]
 #endif
 #if LIBLOG_PUBLIC
@@ -103,5 +107,29 @@
         /// <param name="destructure">Determines whether to call the destructor or not.</param>
         /// <returns>A disposable that when disposed removes the map from the context.</returns>
         protected delegate IDisposable OpenMdc(string key, object value, bool destructure);
+
+        /// <summary>
+        ///     Finds a type using a type name and assembly name.
+        /// </summary>
+        /// <param name="typeName">The name of the type.</param>
+        /// <param name="assemblyName">The name of the assembly.</param>
+        /// <returns>The requested type or null if it was not found.</returns>
+        protected static Type FindType(string typeName, string assemblyName)
+        {
+            return FindType(typeName, new[] {assemblyName});
+        }
+
+        /// <summary>
+        ///     Finds a type using a type name and a list of assembly names to search.
+        /// </summary>
+        /// <param name="typeName">The name of the type.</param>
+        /// <param name="assemblyNames">A list of assembly names to search.</param>
+        /// <returns>The request type or null if it was not found.</returns>
+        protected static Type FindType(string typeName, IReadOnlyList<string> assemblyNames)
+        {
+            return assemblyNames
+                       .Select(assemblyName => Type.GetType($"{typeName}, {assemblyName}"))
+                       .FirstOrDefault(type => type != null) ?? Type.GetType(typeName);
+        }
     }
 }
diff --git a/src/LibLog/LogProviders/LoupeLogProvidercs.cs b/src/LibLog/LogProviders/LoupeLogProvidercs.cs
@@ -57,7 +57,7 @@ public static bool IsLoggerAvailable()
 
         private static Type GetTypeFromCoreOrFrameworkDll(string typeName)
         {
-            return Type.GetType($"{typeName}, {LoupeAgentNetCoreDll}") ?? Type.GetType($"{typeName}, {LoupeAgentNetFrameworkDll}");
+            return FindType(typeName, new[] {LoupeAgentNetCoreDll, LoupeAgentNetFrameworkDll});
         }
 
         private static Type GetLogManagerType()
diff --git a/src/LibLog/LogProviders/LoupeLogProvidercs.cs.pp b/src/LibLog/LogProviders/LoupeLogProvidercs.cs.pp
@@ -59,7 +59,7 @@
 
         private static Type GetTypeFromCoreOrFrameworkDll(string typeName)
         {
-            return Type.GetType($"{typeName}, {LoupeAgentNetCoreDll}") ?? Type.GetType($"{typeName}, {LoupeAgentNetFrameworkDll}");
+            return FindType(typeName, new[] {LoupeAgentNetCoreDll, LoupeAgentNetFrameworkDll});
         }
 
         private static Type GetLogManagerType()
diff --git a/src/LibLog/LogProviders/NLogLogProvider.cs b/src/LibLog/LogProviders/NLogLogProvider.cs
@@ -42,7 +42,7 @@ protected override OpenNdc GetOpenNdcMethod()
         {
             var messageParam = Expression.Parameter(typeof(string), "message");
 
-            var ndlcContextType = Type.GetType("NLog.NestedDiagnosticsLogicalContext, NLog");
+            var ndlcContextType = FindType("NLog.NestedDiagnosticsLogicalContext", "NLog");
             if (ndlcContextType != null)
             {
                 var pushObjectMethod = ndlcContextType.GetMethod("PushObject", typeof(object));
@@ -53,7 +53,7 @@ protected override OpenNdc GetOpenNdcMethod()
                 }
             }
 
-            var ndcContextType = Type.GetType("NLog.NestedDiagnosticsContext, NLog");
+            var ndcContextType = FindType("NLog.NestedDiagnosticsContext", "NLog");
             var pushMethod = ndcContextType.GetMethod("Push", typeof(string));
 
             var pushMethodCall = Expression.Call(null, pushMethod, messageParam);
@@ -64,13 +64,13 @@ protected override OpenMdc GetOpenMdcMethod()
         {
             var keyParam = Expression.Parameter(typeof(string), "key");
 
-            var ndlcContextType = Type.GetType("NLog.NestedDiagnosticsLogicalContext, NLog");
+            var ndlcContextType = FindType("NLog.NestedDiagnosticsLogicalContext", "NLog");
             if (ndlcContextType != null)
             {
                 var pushObjectMethod = ndlcContextType.GetMethod("PushObject", typeof(object));
                 if (pushObjectMethod != null)
                 {
-                    var mdlcContextType = Type.GetType("NLog.MappedDiagnosticsLogicalContext, NLog");
+                    var mdlcContextType = FindType("NLog.MappedDiagnosticsLogicalContext", "NLog");
                     if (mdlcContextType != null)
                     {
                         var setScopedMethod = mdlcContextType.GetMethod("SetScoped", typeof(string), typeof(object));
@@ -85,7 +85,7 @@ protected override OpenMdc GetOpenMdcMethod()
                 }
             }
 
-            var mdcContextType = Type.GetType("NLog.MappedDiagnosticsContext, NLog");
+            var mdcContextType = FindType("NLog.MappedDiagnosticsContext", "NLog");
             var setMethod = mdcContextType.GetMethod("Set", typeof(string), typeof(string));
             var removeMethod = mdcContextType.GetMethod("Remove", typeof(string));
             var valueParam = Expression.Parameter(typeof(string), "value");
@@ -108,7 +108,7 @@ protected override OpenMdc GetOpenMdcMethod()
 
         private static Type GetLogManagerType()
         {
-            return Type.GetType("NLog.LogManager, NLog");
+            return FindType("NLog.LogManager", "NLog");
         }
 
         private static Func<string, object> GetGetLoggerMethodCall()
@@ -194,7 +194,7 @@ internal NLogLogger(object logger)
 
                 _nameDelegate = (NameDelegate)loggerType.GetProperty("Name").GetGetMethod().CreateDelegate(typeof(NameDelegate), logger);
 
-                var logEventInfoType = Type.GetType("NLog.LogEventInfo, NLog");
+                var logEventInfoType = FindType("NLog.LogEventInfo", "NLog");
                 _logEventDelegate = (type, e) => loggerType.GetMethod("Log", new Type[] { typeof(Type), logEventInfoType }).Invoke(logger, new object[] { type, e });
 
                 _isTraceEnabledDelegate = GetIsEnabledDelegate(logger, "IsTraceEnabled");
@@ -223,7 +223,7 @@ private static bool Initialize()
             {
                 try
                 {
-                    var logEventLevelType = Type.GetType("NLog.LogLevel, NLog");
+                    var logEventLevelType = FindType("NLog.LogLevel", "NLog");
                     if (logEventLevelType == null) throw new LibLogException("Type NLog.LogLevel was not found.");
 
                     var levelFields = logEventLevelType.GetFields().ToList();
@@ -234,7 +234,7 @@ private static bool Initialize()
                     s_levelError = levelFields.First(x => x.Name == "Error").GetValue(null);
                     s_levelFatal = levelFields.First(x => x.Name == "Fatal").GetValue(null);
 
-                    var logEventInfoType = Type.GetType("NLog.LogEventInfo, NLog");
+                    var logEventInfoType = FindType("NLog.LogEventInfo", "NLog");
                     if (logEventInfoType == null) throw new LibLogException("Type NLog.LogEventInfo was not found.");
 
                     var loggingEventConstructor =
@@ -474,7 +474,7 @@ private object TranslateLevel(LogLevel logLevel)
 
             private static bool IsStructuredLoggingEnabled()
             {
-                var configFactoryType = Type.GetType("NLog.Config.ConfigurationItemFactory, NLog");
+                var configFactoryType = FindType("NLog.Config.ConfigurationItemFactory", "NLog");
                 if (configFactoryType != null)
                 {
                     var parseMessagesProperty = configFactoryType.GetProperty("ParseMessageTemplates");
diff --git a/src/LibLog/LogProviders/NLogLogProvider.cs.pp b/src/LibLog/LogProviders/NLogLogProvider.cs.pp
diff --git a/src/LibLog/LogProviders/SerilogLogProvider.cs b/src/LibLog/LogProviders/SerilogLogProvider.cs
diff --git a/src/LibLog/LogProviders/SerilogLogProvider.cs.pp b/src/LibLog/LogProviders/SerilogLogProvider.cs.pp

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public static bool IsLoggerAvailable()`
`57`	`57`
`58`	`58`	`private static Type GetTypeFromCoreOrFrameworkDll(string typeName)`
`59`	`59`	`{`
`60`		`- return Type.GetType($"{typeName}, {LoupeAgentNetCoreDll}") ?? Type.GetType($"{typeName}, {LoupeAgentNetFrameworkDll}");`
	`60`	`+ return FindType(typeName, new[] {LoupeAgentNetCoreDll, LoupeAgentNetFrameworkDll});`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`private static Type GetLogManagerType()`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`
`60`	`60`	`private static Type GetTypeFromCoreOrFrameworkDll(string typeName)`
`61`	`61`	`{`
`62`		`- return Type.GetType($"{typeName}, {LoupeAgentNetCoreDll}") ?? Type.GetType($"{typeName}, {LoupeAgentNetFrameworkDll}");`
	`62`	`+ return FindType(typeName, new[] {LoupeAgentNetCoreDll, LoupeAgentNetFrameworkDll});`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`private static Type GetLogManagerType()`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ protected override OpenNdc GetOpenNdcMethod()`
`42`	`42`	`{`
`43`	`43`	`var messageParam = Expression.Parameter(typeof(string), "message");`
`44`	`44`
`45`		`- var ndlcContextType = Type.GetType("NLog.NestedDiagnosticsLogicalContext, NLog");`
	`45`	`+ var ndlcContextType = FindType("NLog.NestedDiagnosticsLogicalContext", "NLog");`
`46`	`46`	`if (ndlcContextType != null)`
`47`	`47`	`{`
`48`	`48`	`var pushObjectMethod = ndlcContextType.GetMethod("PushObject", typeof(object));`
`@@ -53,7 +53,7 @@ protected override OpenNdc GetOpenNdcMethod()`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- var ndcContextType = Type.GetType("NLog.NestedDiagnosticsContext, NLog");`
	`56`	`+ var ndcContextType = FindType("NLog.NestedDiagnosticsContext", "NLog");`
`57`	`57`	`var pushMethod = ndcContextType.GetMethod("Push", typeof(string));`
`58`	`58`
`59`	`59`	`var pushMethodCall = Expression.Call(null, pushMethod, messageParam);`
`@@ -64,13 +64,13 @@ protected override OpenMdc GetOpenMdcMethod()`
`64`	`64`	`{`
`65`	`65`	`var keyParam = Expression.Parameter(typeof(string), "key");`
`66`	`66`
`67`		`- var ndlcContextType = Type.GetType("NLog.NestedDiagnosticsLogicalContext, NLog");`
	`67`	`+ var ndlcContextType = FindType("NLog.NestedDiagnosticsLogicalContext", "NLog");`
`68`	`68`	`if (ndlcContextType != null)`
`69`	`69`	`{`
`70`	`70`	`var pushObjectMethod = ndlcContextType.GetMethod("PushObject", typeof(object));`
`71`	`71`	`if (pushObjectMethod != null)`
`72`	`72`	`{`
`73`		`- var mdlcContextType = Type.GetType("NLog.MappedDiagnosticsLogicalContext, NLog");`
	`73`	`+ var mdlcContextType = FindType("NLog.MappedDiagnosticsLogicalContext", "NLog");`
`74`	`74`	`if (mdlcContextType != null)`
`75`	`75`	`{`
`76`	`76`	`var setScopedMethod = mdlcContextType.GetMethod("SetScoped", typeof(string), typeof(object));`
`@@ -85,7 +85,7 @@ protected override OpenMdc GetOpenMdcMethod()`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`- var mdcContextType = Type.GetType("NLog.MappedDiagnosticsContext, NLog");`
	`88`	`+ var mdcContextType = FindType("NLog.MappedDiagnosticsContext", "NLog");`
`89`	`89`	`var setMethod = mdcContextType.GetMethod("Set", typeof(string), typeof(string));`
`90`	`90`	`var removeMethod = mdcContextType.GetMethod("Remove", typeof(string));`
`91`	`91`	`var valueParam = Expression.Parameter(typeof(string), "value");`
`@@ -108,7 +108,7 @@ protected override OpenMdc GetOpenMdcMethod()`
`108`	`108`
`109`	`109`	`private static Type GetLogManagerType()`
`110`	`110`	`{`
`111`		`- return Type.GetType("NLog.LogManager, NLog");`
	`111`	`+ return FindType("NLog.LogManager", "NLog");`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`private static Func<string, object> GetGetLoggerMethodCall()`
`@@ -194,7 +194,7 @@ internal NLogLogger(object logger)`
`194`	`194`
`195`	`195`	`_nameDelegate = (NameDelegate)loggerType.GetProperty("Name").GetGetMethod().CreateDelegate(typeof(NameDelegate), logger);`
`196`	`196`
`197`		`- var logEventInfoType = Type.GetType("NLog.LogEventInfo, NLog");`
	`197`	`+ var logEventInfoType = FindType("NLog.LogEventInfo", "NLog");`
`198`	`198`	`_logEventDelegate = (type, e) => loggerType.GetMethod("Log", new Type[] { typeof(Type), logEventInfoType }).Invoke(logger, new object[] { type, e });`
`199`	`199`
`200`	`200`	`_isTraceEnabledDelegate = GetIsEnabledDelegate(logger, "IsTraceEnabled");`
`@@ -223,7 +223,7 @@ private static bool Initialize()`
`223`	`223`	`{`
`224`	`224`	`try`
`225`	`225`	`{`
`226`		`- var logEventLevelType = Type.GetType("NLog.LogLevel, NLog");`
	`226`	`+ var logEventLevelType = FindType("NLog.LogLevel", "NLog");`
`227`	`227`	`if (logEventLevelType == null) throw new LibLogException("Type NLog.LogLevel was not found.");`
`228`	`228`
`229`	`229`	`var levelFields = logEventLevelType.GetFields().ToList();`
`@@ -234,7 +234,7 @@ private static bool Initialize()`
`234`	`234`	`s_levelError = levelFields.First(x => x.Name == "Error").GetValue(null);`
`235`	`235`	`s_levelFatal = levelFields.First(x => x.Name == "Fatal").GetValue(null);`
`236`	`236`
`237`		`- var logEventInfoType = Type.GetType("NLog.LogEventInfo, NLog");`
	`237`	`+ var logEventInfoType = FindType("NLog.LogEventInfo", "NLog");`
`238`	`238`	`if (logEventInfoType == null) throw new LibLogException("Type NLog.LogEventInfo was not found.");`
`239`	`239`
`240`	`240`	`var loggingEventConstructor =`
`@@ -474,7 +474,7 @@ private object TranslateLevel(LogLevel logLevel)`
`474`	`474`
`475`	`475`	`private static bool IsStructuredLoggingEnabled()`
`476`	`476`	`{`
`477`		`- var configFactoryType = Type.GetType("NLog.Config.ConfigurationItemFactory, NLog");`
	`477`	`+ var configFactoryType = FindType("NLog.Config.ConfigurationItemFactory", "NLog");`
`478`	`478`	`if (configFactoryType != null)`
`479`	`479`	`{`
`480`	`480`	`var parseMessagesProperty = configFactoryType.GetProperty("ParseMessageTemplates");`