|
2 | 2 | // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. |
3 | 3 |
|
4 | 4 | using System; |
| 5 | +using System.Collections.Generic; |
5 | 6 | using System.ComponentModel.DataAnnotations; |
6 | 7 | using System.Linq; |
7 | 8 | using System.Reflection; |
@@ -35,25 +36,25 @@ public static SetPropertyDelegate GetPropertySetter(PropertyInfo prop) |
35 | 36 |
|
36 | 37 | public static MethodInfo[] GetPropertyOrMethod(Type type, string name) |
37 | 38 | { |
38 | | - const BindingFlags binding = BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance | BindingFlags.Static; |
39 | | - return type.GetTypeInfo() |
40 | | - .GetMethods(binding) |
| 39 | + var members = GetAllMembers(type.GetTypeInfo()).ToList(); |
| 40 | + return members |
| 41 | + .OfType<MethodInfo>() |
41 | 42 | .Where(m => m.Name == name) |
42 | | - .Concat(type.GetTypeInfo().GetProperties(binding).Where(m => m.Name == name).Select(p => p.GetMethod)) |
| 43 | + .Concat(members.OfType<PropertyInfo>().Where(m => m.Name == name).Select(p => p.GetMethod)) |
43 | 44 | .Where(m => m.ReturnType == typeof(string) && m.GetParameters().Length == 0) |
44 | 45 | .ToArray(); |
45 | 46 | } |
46 | 47 |
|
47 | 48 | public static PropertyInfo[] GetProperties(Type type) |
48 | 49 | { |
49 | | - const BindingFlags binding = BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public; |
50 | | - return type.GetTypeInfo().GetProperties(binding); |
| 50 | + return GetAllMembers(type.GetTypeInfo()) |
| 51 | + .OfType<PropertyInfo>() |
| 52 | + .ToArray(); |
51 | 53 | } |
52 | 54 |
|
53 | 55 | public static MemberInfo[] GetMembers(Type type) |
54 | 56 | { |
55 | | - const BindingFlags binding = BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public; |
56 | | - return type.GetTypeInfo().GetMembers(binding); |
| 57 | + return GetAllMembers(type.GetTypeInfo()).ToArray(); |
57 | 58 | } |
58 | 59 |
|
59 | 60 | public static object[] BindParameters(MethodInfo method, CommandLineApplication command, CancellationToken cancellationToken) |
@@ -102,5 +103,21 @@ public static bool IsNullableType(TypeInfo typeInfo, out Type? wrappedType) |
102 | 103 |
|
103 | 104 | return result; |
104 | 105 | } |
| 106 | + |
| 107 | + static IEnumerable<MemberInfo> GetAllMembers(TypeInfo typeInfo) |
| 108 | + { |
| 109 | + const BindingFlags binding = BindingFlags.Instance | BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.DeclaredOnly; |
| 110 | + |
| 111 | + while (typeInfo != null) |
| 112 | + { |
| 113 | + var members = typeInfo.GetMembers(binding); |
| 114 | + foreach (var member in members) |
| 115 | + { |
| 116 | + yield return member; |
| 117 | + } |
| 118 | + |
| 119 | + typeInfo = typeInfo.BaseType?.GetTypeInfo(); |
| 120 | + } |
| 121 | + } |
105 | 122 | } |
106 | 123 | } |
0 commit comments