update based on review comments

Author: ElizabethOkerio

src/Microsoft.AspNetCore.OData/Query/Expressions/SelectExpandBinder.cs

@@ -9,6 +9,7 @@
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
+using System.Diagnostics.Tracing;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -377,14 +378,20 @@ internal Expression ProjectElement(QueryBinderContext context, Expression source
                 // If we have an EF query provider, then we remove the non-structural properties. The reason for this is to avoid 
                 // Creating an expression that will generate duplicate LEFT joins when a LEFT join already exists in the IQueryable 
                 // as observed here: https://github.com/OData/AspNetCoreOData/issues/497
+
+                Expression updatedExpression = null;
                 if (IsEfQueryProvider())
-                { 
-                    source = SelectExpandBinder.RemoveNonStructucalProperties(source, structuredType);
+                {
+                    updatedExpression = SelectExpandBinder.RemoveNonStructucalProperties(source, structuredType);
+                }
+                else 
+                {
+                    updatedExpression = source;
                 }
 
                 // Initialize property 'Instance' on the wrapper class
                 wrapperProperty = wrapperType.GetProperty("Instance");
-                wrapperTypeMemberAssignments.Add(Expression.Bind(wrapperProperty, source));
+                wrapperTypeMemberAssignments.Add(Expression.Bind(wrapperProperty, updatedExpression));
 
                 wrapperProperty = wrapperType.GetProperty("UseInstanceForProperties");
                 wrapperTypeMemberAssignments.Add(Expression.Bind(wrapperProperty, Expression.Constant(true)));

test/Microsoft.AspNetCore.OData.Tests/Query/Expressions/SelectExpandBinderTest.cs

@@ -214,7 +214,7 @@ public void Bind_GeneratedExpression_ContainsExpandedObject()
         [InlineData(HandleNullPropagationOptionHelper.ObjectContextQueryProviderNamespaceEFCore2)]
         [InlineData(HandleNullPropagationOptionHelper.ObjectContextQueryProviderNamespaceEF5)]
         [InlineData(HandleNullPropagationOptionHelper.ObjectContextQueryProviderNamespaceEF6)]
-        public void Bind_UsingEFQueryProvider_GeneratedExpression_ContainsExpandedObject(string queryProvider)
+        public void Bind_UsingEFQueryProvider_GeneratedExpression__DoesNot_ContainExpandedObject(string queryProvider)
         {
             // Arrange
             SelectExpandQueryOption selectExpand = new SelectExpandQueryOption("Orders", "Orders,Orders($expand=Customer)", _context);