Merge pull request #90 from zoriya/master

Fix eager includes not working

Author: koenbeuk

samples/BasicSample/Program.cs

@@ -200,6 +200,18 @@ public static void Main(string[] args)
                 Console.WriteLine($"Our users bought the following products starting with 'Red': {string.Join(", ", result.Ordered)}");
             }
 
+            {
+                var ret = dbContext.Users
+                    .Include(x => x.Orders)
+                    .ThenInclude(x => x.Items)
+                    .ThenInclude(x => x.Product)
+                    .First();
+                Console.WriteLine($"User name: {ret.FullName}, Orders: {string.Join(", ", ret.Orders
+                    .SelectMany(x => x.Items
+                        .Select(y => y.Product.Name)
+                    ))}");
+            }
+
         }
     }
 }

src/EntityFrameworkCore.Projectables/Services/ProjectableExpressionReplacer.cs

@@ -59,6 +59,7 @@ bool TryGetReflectedExpression(MemberInfo memberInfo, [NotNullWhen(true)] out La
         [return: NotNullIfNotNull(nameof(node))]
         public Expression? Replace(Expression? node)
         {
+            _disableRootRewrite = false;
             var ret = Visit(node);
 
             if (_disableRootRewrite)
@@ -254,6 +255,9 @@ private Expression _AddProjectableSelect(Expression node, IEntityType entityType
             var properties = entityType.GetProperties()
                 .Where(x => !x.IsShadowProperty())
                 .Select(x => x.GetMemberInfo(false, false))
+                .Concat(entityType.GetNavigations()
+                    .Where(x => !x.IsShadowProperty())
+                    .Select(x => x.GetMemberInfo(false, false)))
                 // Remove projectable properties from the ef properties. Since properties returned here for auto
                 // properties (like `public string Test {get;set;}`) are generated fields, we also need to take them into account.
                 .Where(x => projectableProperties.All(y => x.Name != y.Name && x.Name != $"<{y.Name}>k__BackingField"));