Query: Expand navigations together in OrderBy/ThenBy

[smitpatel]

Fixes #18904

[psryan]

I've hit a similar sounding issue to this in EF Core 3.1 after upgrading from Core 2.2. I've tried to test my repro case attached against the latest daily build unsuccessfully. Although this could be from my lack of experience with using daily builds. I still get the same issue outcome.

The issue I face is when using OrderBy with an aggregate (e.g. Max, Count) followed by ThenBy with a related entity property, I get "System.InvalidOperationException ... EF.Property called with wrong property name". I use dynamic ordering via System.Linq.Dynamic.Core, but have reproduced the issue using direct OrderBy().ThenBy() in the attached repro case.

             IList<Deal> Deals = ### context.Deal
               .Include(x => x.Customer)
               .Select(x => new Deal {
                  Id = x.Id,
                  SubmitDate = x.SubmitDate,
                  Customer = x.Customer,
                  MaxInstallDate = x.DealEquip.Max(de => de.InstallDate)
               })
               .OrderBy(x => x.MaxInstallDate).ThenBy(x => x.Customer.CustomerName)           // Having aggregate Field/Property first appears to cause issue when others added after it
               //.OrderBy("MaxInstallDate ASC, Customer.CustomerName ASC")                    // <<-- Dynamic OrderBy also encounters the same issue
               .ToList();

Can you please test this repro case attached is no longer an issue with this fix otherwise it may still be an existing problem.

CrashRepro OrderBy(Max)ThenBy(Related).zip

[smitpatel]

@psryan - Please file a new issue with detailed repro code.