Merge pull request #333 from skomis-mm/extMethodDiscoveryFix

Extensions method discovery workaround
serilog · Oct 13, 2022 · e171429 · e171429
2 parents 8f241f8 + 8391832
commit e171429
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs b/src/Serilog.Settings.Configuration/Settings/Configuration/ConfigurationReader.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using System.Text.RegularExpressions;
 
 using Microsoft.Extensions.Configuration;
@@ -548,15 +549,24 @@ static IReadOnlyCollection<MethodInfo> FindEventEnricherConfigurationMethods(IRe
         static List<MethodInfo> FindConfigurationExtensionMethods(IReadOnlyCollection<Assembly> configurationAssemblies, Type configType)
         {
             // ExtensionAttribute can be polyfilled to support extension methods
-            bool HasExtensionAttribute(MethodInfo m) =>
-                m.CustomAttributes.Any(a => a.AttributeType.FullName == "System.Runtime.CompilerServices.ExtensionAttribute");
+            static bool HasCustomExtensionAttribute(MethodInfo m)
+            {
+                try
+                {
+                    return m.CustomAttributes.Any(a => a.AttributeType.FullName == "System.Runtime.CompilerServices.ExtensionAttribute");
+                }
+                catch (CustomAttributeFormatException)
+                {
+                    return false;
+                }
+            }
 
             return configurationAssemblies
                 .SelectMany(a => a.ExportedTypes
                     .Select(t => t.GetTypeInfo())
                     .Where(t => t.IsSealed && t.IsAbstract && !t.IsNested))
                 .SelectMany(t => t.DeclaredMethods)
-                .Where(m => m.IsStatic && m.IsPublic && HasExtensionAttribute(m))
+                .Where(m => m.IsStatic && m.IsPublic && (m.IsDefined(typeof(ExtensionAttribute), false) || HasCustomExtensionAttribute(m)))
                 .Where(m => m.GetParameters()[0].ParameterType == configType)
                 .ToList();
         }