Fix incorrect GetProperties method logic (based on dotnet docs)

majorb84 · Jul 13, 2021 · 89bc046 · 89bc046
1 parent 924083f
commit 89bc046
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Microsoft.AspNetCore.OData/Query/Expressions/SelectExpandBinder.cs b/src/Microsoft.AspNetCore.OData/Query/Expressions/SelectExpandBinder.cs
@@ -170,7 +170,13 @@ internal Expression CreatePropertyValueExpression(IEdmStructuredType elementType
 
             // Expression:  source.Property
             string propertyName = _model.GetClrPropertyName(property);
-            PropertyInfo propertyInfo = source.Type.GetProperties().First(p => p.Name == propertyName);
+
+            PropertyInfo propertyInfo = source.Type.GetProperty(propertyName, BindingFlags.DeclaredOnly);
+            if (propertyInfo == null)
+            {
+                propertyInfo = source.Type.GetProperty(propertyName);
+            }
+
             Expression propertyValue = Expression.Property(source, propertyInfo);
             Type nullablePropertyType = TypeHelper.ToNullable(propertyValue.Type);
             Expression nullablePropertyValue = ExpressionHelpers.ToNullable(propertyValue);