Merge pull request #239 from servicetitan/fix_AttributeSearchOptions

Fix AttributeSearchOptions.InheritFromAllBase flag value

Author: alex-kulakov

Orm/Xtensive.Orm/Reflection/AttributeHelper.cs

@@ -97,13 +97,14 @@ private static IEnumerable<Attribute> ExtractAttributes((MemberInfo member, Type
           attributes = poe.GetAttributes(attributeType).ToList();
         }
         if ((options & AttributeSearchOptions.InheritFromBase) != 0
-            && (options & AttributeSearchOptions.InheritFromAllBase) == 0
+            && (options & AttributeSearchOptions.InheritRecursively) == 0
             && member.GetBaseMember() is MemberInfo bm) {
           attributes.AddRange(GetAttributes(bm, attributeType, options));
+          return attributes;
         }
       }
 
-      if ((options & AttributeSearchOptions.InheritFromAllBase) != 0
+      if ((options & AttributeSearchOptions.InheritFromAllBase) == AttributeSearchOptions.InheritFromAllBase
           && member.DeclaringType != WellKnownTypes.Object
           && member.GetBaseMember() is MemberInfo bm2) {
         attributes.AddRange(GetAttributes(bm2, attributeType, options));

Orm/Xtensive.Orm/Reflection/AttributeSearchOptions.cs

@@ -29,9 +29,13 @@ public enum AttributeSearchOptions
     /// </summary>
     InheritFromBase = 1,
     /// <summary>
+    /// Attributes inherit recursively.
+    /// </summary>
+    InheritRecursively = 2,
+    /// <summary>
     /// Attributes from all the bases should be inherited.
     /// </summary>
-    InheritFromAllBase = 3,
+    InheritFromAllBase = InheritFromBase | InheritRecursively,
     /// <summary>
     /// If no attributes are found on the specified method,
     /// attributes from the property or event it belongs to should be inherited.