Merge branch 'lmmarsano-fix-attribute-error' into develop

commandlineparser · Aug 19, 2020 · 074d050 · 074d050
2 parents 690136e + d64451e
commit 074d050
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/CommandLine/Core/ReflectionExtensions.cs b/src/CommandLine/Core/ReflectionExtensions.cs
@@ -40,8 +40,8 @@ public static Maybe<Tuple<PropertyInfo, UsageAttribute>> GetUsageData(this Type
         {
             return
                 (from pi in type.FlattenHierarchy().SelectMany(x => x.GetTypeInfo().GetProperties())
-                    let attrs = pi.GetCustomAttributes(true)
-                    where attrs.OfType<UsageAttribute>().Any()
+                    let attrs = pi.GetCustomAttributes(typeof(UsageAttribute), true)
+                    where attrs.Any()
                     select Tuple.Create(pi, (UsageAttribute)attrs.First()))
                         .SingleOrDefault()
                         .ToMaybe();

diff --git a/tests/CommandLine.Tests/Fakes/CustomAttribute.cs b/tests/CommandLine.Tests/Fakes/CustomAttribute.cs
@@ -0,0 +1,4 @@
+using System;
+
+[AttributeUsage(AttributeTargets.All)]
+class CustomAttribute: Attribute {}
diff --git a/tests/CommandLine.Tests/Fakes/Help_Fakes.cs b/tests/CommandLine.Tests/Fakes/Help_Fakes.cs
@@ -79,7 +79,9 @@ class Options_With_Usage_Attribute
         [Option("secert-option", Hidden = true, HelpText = "This is a description for a secert hidden option that should never be visibile to the user via help text.")]
         public string SecertOption { get; set; }
 
-        [Usage(ApplicationAlias = "mono testapp.exe")]
+        [ Custom
+        , Usage(ApplicationAlias = "mono testapp.exe")
+        ]
         public static IEnumerable<Example> Examples
         {
             get