Merge pull request #5 from genexuslabs/NetCoreOData_Issue85715

Fix BindingRestrictions for NetCore 
(BindGetMember & BindInvokeMember), Issue 85715

Author: gusbro

src/GXOdata.Client.All/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<AssemblyVersion>5.2.3.4</AssemblyVersion>
+		<AssemblyVersion>5.2.3.5</AssemblyVersion>
 		<FileVersion>$(AssemblyVersion)</FileVersion>
 		<InformationalVersion>$([System.DateTime]::UtcNow.ToString("yyyyMMddHHmmss")).$(GITHUB_SHA)</InformationalVersion>
 		<Company>GeneXus</Company>

src/Simple.OData.Client.Dynamic/DynamicODataExpression.cs

@@ -69,13 +69,17 @@ public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
             {
                 ConstructorInfo ctor;
                 Expression[] ctorArguments;
+                BindingRestrictions bindingRestrictions = BindingRestrictions.GetTypeRestriction(Expression, LimitType);
                 if (FunctionMapping.ContainsFunction(binder.Name, 0))
                 {
                     ctor = CtorWithExpressionAndString;
                     ctorArguments = new[] { Expression.Constant(this.Value), Expression.Constant(binder.Name) };
                 }
                 else
                 {
+                    if(this.HasValue)
+                        bindingRestrictions = bindingRestrictions.Merge(BindingRestrictions.GetInstanceRestriction(Expression, Value));
+
                     var reference = this.HasValue && !string.IsNullOrEmpty((this.Value as ODataExpression).Reference)
                         ? string.Join("/", (this.Value as ODataExpression).Reference, binder.Name)
                         : binder.Name;
@@ -85,7 +89,7 @@ public override DynamicMetaObject BindGetMember(GetMemberBinder binder)
 
                 return new DynamicMetaObject(
                     Expression.New(ctor, ctorArguments),
-                    BindingRestrictions.GetTypeRestriction(Expression, LimitType));
+                    bindingRestrictions);
             }
 
             public override DynamicMetaObject BindSetMember(SetMemberBinder binder, DynamicMetaObject value)
@@ -114,8 +118,10 @@ public override DynamicMetaObject BindInvokeMember(
                         {
                             Expression.Constant(this.Value),
                             Expression.Constant(new ExpressionFunction(binder.Name, args.Select(x => x.Value)))
-                        }) ;
-                    BindingRestrictions bindingRestrictions = args.Aggregate(BindingRestrictions.Empty, (acc, x) => acc.Merge(BindingRestrictions.GetInstanceRestriction(x.Expression, x.Value)));
+                        }) ;                    
+                    BindingRestrictions bindingRestrictions = BindingRestrictions.GetTypeRestriction(Expression, LimitType)
+                                                                                 .Merge(BindingRestrictions.GetInstanceRestriction(Expression, Value));
+
                     return new DynamicMetaObject(
                         expression,
                         bindingRestrictions);