SAVEPOINT

dennisdoomen · Sep 29, 2024 · ecad064 · ecad064
1 parent a8e7f17
commit ecad064
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 254 deletions.
diff --git a/Src/FluentAssertions/Common/TypeMemberReflector.cs b/Src/FluentAssertions/Common/TypeMemberReflector.cs
@@ -106,7 +106,7 @@ private static List<TMemberInfo> GetMembersFromHierarchy<TMemberInfo>(
             return GetInterfaceMembers(typeToReflect, getMembers);
         }
 
-        return GetClassMembers(typeToReflect, getMembers);
+        return GetClassMembers(typeToReflect, getMembers).Union(GetInterfaceMembers(typeToReflect, getMembers)).ToList();
     }
 
     private static List<TMemberInfo> GetInterfaceMembers<TMemberInfo>(Type typeToReflect,
@@ -161,7 +161,7 @@ private static List<TMemberInfo> GetClassMembers<TMemberInfo>(Type typeToReflect
                 }
             }
 
-            typeToReflect = typeToReflect.BaseType;
+            typeToReflect = typeToReflect.BaseType != typeof(object) ? typeToReflect.BaseType : null;
         }
 
         return members;

diff --git a/Tests/FluentAssertions.Equivalency.Specs/FluentAssertions.Equivalency.Specs.csproj b/Tests/FluentAssertions.Equivalency.Specs/FluentAssertions.Equivalency.Specs.csproj
@@ -7,6 +7,7 @@
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn),IDE0052,1573,1591,1712</NoWarn>
     <DebugType>full</DebugType>
+    <LangVersion>12</LangVersion>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net47'">