System.InvalidOperationException: The expression 'r' is invalid inside an 'Include' operation, since it does not represent a property access

In EF core 3.1, we were able to use .Include(r => r) to turn an IQueryable<TEntity> to An IIncludeableQueryable<TEntity,TEntity> to allow code resuse. ex. here, TestIncludeDataPointTemplate can be used on the base IQueryable, or on any include that gets to the same type.

public class QueryTests
{
    [Test]
    public void TestIncludeDefault()
    {
        var optionsBuilder = new DbContextOptionsBuilder<DefaultContext>();
        optionsBuilder.ConfigureMysql(TestingDbOptions.ConnectionString, false, true);
        var dbOptions = optionsBuilder.Options;
        var _context = new DefaultContext(dbOptions);
        var query = _context.AssetTemplateRevisions.TestIncludeDataPointTemplate(q => q.Include(r => r));
    }
}

public static class TestQueryExtensions
{
    public static IQueryable<TEntity> TestIncludeDataPointTemplate<TEntity, TProperty>(
        this IQueryable<TEntity> source,
        Func<IQueryable<TEntity>, IIncludableQueryable<TEntity, TProperty>> defaultInclude
    )
        where TEntity : class where TProperty : DataPointTemplate
    {
        return defaultInclude(source).ThenInclude(e => e.DataPointAssignments);
    }
}

But in .net 6, the same code ends in the following error:

System.InvalidOperationException: The expression 'r' is invalid inside an 'Include' operation, since it does not represent a property access: 't => t.MyProperty'. To target navigations declared on derived types, use casting ('t => (
(Derived)t).MyProperty') or the 'as' operator ('t => (t as Derived).MyProperty'). Collection navigation access can be filtered by composing Where, OrderBy(Descending), ThenBy(Descending), Skip or Take operations. For more informatio
n on including related data, see http://go.microsoft.com/fwlink/?LinkID=746393.

This completely breaks the ability to include navigational properties regardless if it is the base query or not. This unfortunately breaks code reuse and forces the developer to include by strings or duplicate their code.

EF Core version: 6.0.4 Database provider: Pomelo.EntityFrameworkCore.MySql Target framework: .NET 6.0 Operating system: Windows 10