Filtered Include: retarget net10.0, EF Core 10.0.11, add Assignment entity (#2176)

Retargets both projects from net6.0 to net10.0 and lifts the four EF Core
packages from 6.0.8 to 10.0.11, with the test packages moved to
Microsoft.NET.Test.Sdk 18.9.0, xunit 2.9.3, xunit.runner.visualstudio 4.0.0
and coverlet.collector 10.0.1.

Adds TrustServerCertificate=True to the connection string. EF Core 10 loads
Microsoft.Data.SqlClient 6.1.6, where Encrypt defaults to true and
TrustServerCertificate to false, so without it every test fails on the
certificate chain against a local SQL Server.

Adds an Assignment entity and an Assignments collection on Student, with the
migration and a seeding change, so the sample can demonstrate the documented
multi-level ThenInclude form after a filtered Include.

New query methods: GoodFilteringOnMultipleIncludeWithThenInclude,
FilteredIncludeWithSortingAndPaging, FilteredIncludeWithoutMatchingStudents
and ExplicitLoadingWithFilter, each with a test. Renames the shadowed lambda
parameters in FilteringInsideIncludeAndSelectMethod to c and s.

Adds the folder to .github/ci-skip-folders.txt beside its three EF Core
siblings: the ten existing facts and the four new ones need a live SQL Server,
which the runner does not have. Verified locally on SQL Server LocalDB:
14 of 14 passed on net10.0, SDK 10.0.302.

Author: vladimir-pecanac-main

dotnet-efcore/FilteringResultsInsideTheIncludeMethodInEFCore/FilteringResultsInsideInclude/FilteringResultsInsideInclude.csproj

@@ -2,19 +2,19 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.8">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.11" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

dotnet-efcore/FilteringResultsInsideTheIncludeMethodInEFCore/FilteringResultsInsideInclude/Migrations/20260907111628_AddAssignment.Designer.cs

@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace FilteringResultsInsideInclude.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddAssignment : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "Assignments",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "int", nullable: false)
+                        .Annotation("SqlServer:Identity", "1, 1"),
+                    Title = table.Column<string>(type: "nvarchar(max)", nullable: true),
+                    StudentId = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_Assignments", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_Assignments_Students_StudentId",
+                        column: x => x.StudentId,
+                        principalTable: "Students",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Assignments_StudentId",
+                table: "Assignments",
+                column: "StudentId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "Assignments");
+        }
+    }
+}

dotnet-efcore/FilteringResultsInsideTheIncludeMethodInEFCore/FilteringResultsInsideInclude/Migrations/20260907111628_AddAssignment.cs

@@ -16,18 +16,39 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "6.0.8")
+                .HasAnnotation("ProductVersion", "10.0.11")
                 .HasAnnotation("Relational:MaxIdentifierLength", 128);
 
-            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder, 1L, 1);
+            SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+            modelBuilder.Entity("FilteringResultsInsideInclude.Models.Assignment", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("int");
+
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
+
+                    b.Property<int>("StudentId")
+                        .HasColumnType("int");
+
+                    b.Property<string>("Title")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("StudentId");
+
+                    b.ToTable("Assignments");
+                });
 
             modelBuilder.Entity("FilteringResultsInsideInclude.Models.Course", b =>
                 {
                     b.Property<int>("Id")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
                     b.Property<string>("Title")
                         .HasColumnType("nvarchar(max)");
@@ -43,7 +64,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
-                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"), 1L, 1);
+                    SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property<int>("Id"));
 
                     b.Property<int>("CourseId")
                         .HasColumnType("int");
@@ -61,6 +82,17 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.ToTable("Students");
                 });
 
+            modelBuilder.Entity("FilteringResultsInsideInclude.Models.Assignment", b =>
+                {
+                    b.HasOne("FilteringResultsInsideInclude.Models.Student", "Student")
+                        .WithMany("Assignments")
+                        .HasForeignKey("StudentId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
+                    b.Navigation("Student");
+                });
+
             modelBuilder.Entity("FilteringResultsInsideInclude.Models.Student", b =>
                 {
                     b.HasOne("FilteringResultsInsideInclude.Models.Course", "Course")
@@ -76,6 +108,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 {
                     b.Navigation("Students");
                 });
+
+            modelBuilder.Entity("FilteringResultsInsideInclude.Models.Student", b =>
+                {
+                    b.Navigation("Assignments");
+                });
 #pragma warning restore 612, 618
         }
     }

dotnet-efcore/FilteringResultsInsideTheIncludeMethodInEFCore/FilteringResultsInsideInclude/Migrations/AppDbContextModelSnapshot.cs

@@ -6,10 +6,11 @@ public class AppDbContext : DbContext
     {
         public DbSet<Student>? Students { get; set; }
         public DbSet<Course>? Courses { get; set; }
+        public DbSet<Assignment>? Assignments { get; set; }
 
         protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            optionsBuilder.UseSqlServer(@"Server=.;Database=AppDB;Trusted_Connection=True;");
+            optionsBuilder.UseSqlServer(@"Server=.;Database=AppDB;Trusted_Connection=True;TrustServerCertificate=True;");
         }
     }
 }

dotnet-efcore/FilteringResultsInsideTheIncludeMethodInEFCore/FilteringResultsInsideInclude/Models/AppDbContext.cs

@@ -0,0 +1,11 @@
+namespace FilteringResultsInsideInclude.Models
+{
+    public class Assignment
+    {
+        public int Id { get; set; }
+        public string? Title { get; set; }
+
+        public int StudentId { get; set; }
+        public Student? Student { get; set; }
+    }
+}

dotnet-efcore/FilteringResultsInsideTheIncludeMethodInEFCore/FilteringResultsInsideInclude/Models/Assignment.cs

@@ -8,5 +8,7 @@ public class Student
 
         public int CourseId { get; set; }
         public Course? Course { get; set; }
+
+        public ICollection<Assignment>? Assignments { get; set; }
     }
 }

dotnet-efcore/FilteringResultsInsideTheIncludeMethodInEFCore/FilteringResultsInsideInclude/Models/Student.cs

@@ -7,7 +7,8 @@ public class Queries
     {
         public const int CourseCount = 10;
         public const int StudentCountPerCourse = 100;
-        
+        public const int AssignmentCountPerStudent = 2;
+
         public static async Task SeedData(AppDbContext context)
         {
             if (!context.Courses!.Any())
@@ -18,7 +19,11 @@ public static async Task SeedData(AppDbContext context)
                     Students = Enumerable.Range(1, StudentCountPerCourse).Select(j => new Student()
                     {
                         Name = $"Student {10 * i + j}",
-                        Mark = j
+                        Mark = j,
+                        Assignments = Enumerable.Range(1, AssignmentCountPerStudent).Select(k => new Assignment
+                        {
+                            Title = $"Assignment {k}"
+                        }).ToList()
                     }).ToList()
                 }).ToList();
 
@@ -55,6 +60,18 @@ public static List<Course> GoodFilteringOnMultipleInclude(AppDbContext context)
             return goodQuery;
         }
 
+        public static List<Course> GoodFilteringOnMultipleIncludeWithThenInclude(AppDbContext context)
+        {
+            var goodQuery = context.Courses!
+                .Include(c => c.Students!.Where(s => s.Mark > 50))
+                    .ThenInclude(s => s.Assignments)
+                .Include(c => c.Students!)
+                    .ThenInclude(s => s.Assignments)
+                .ToList();
+
+            return goodQuery;
+        }
+
         public static List<Course> BadFilteringOnMultipleInclude(AppDbContext context)
         {
             var badQuery = context.Courses!
@@ -98,7 +115,7 @@ public static List<Course> FilteredIncludeWithTrackingQueries2(AppDbContext cont
         public static List<Course> FilteringInsideIncludeAndSelectMethod(AppDbContext context)
         {
             var courses = context.Courses!
-                .Include(x => x.Students!.Where(x => x.Mark > 50))
+                .Include(c => c.Students!.Where(s => s.Mark > 50))
                 .Select(c => new Course 
                 { 
                     Id = c.Id,
@@ -122,5 +139,37 @@ public static List<Course> FilteringInsideSelectMethodWithoutInclude(AppDbContex
             return courses;
         }
 
+        public static List<Course> FilteredIncludeWithSortingAndPaging(AppDbContext context)
+        {
+            var topStudents = context.Courses!
+                .Include(c => c.Students!
+                    .Where(s => s.Mark > 50)
+                    .OrderByDescending(s => s.Mark)
+                    .Take(3))
+                .ToList();
+
+            return topStudents;
+        }
+
+        public static List<Course> FilteredIncludeWithoutMatchingStudents(AppDbContext context)
+        {
+            var courses = context.Courses!
+                .Include(c => c.Students!.Where(s => s.Mark > StudentCountPerCourse))
+                .ToList();
+
+            return courses;
+        }
+
+        public static List<Student> ExplicitLoadingWithFilter(AppDbContext context, Course course)
+        {
+            var students = context.Entry(course)
+                .Collection(c => c.Students!)
+                .Query()
+                .Where(s => s.Mark > 50)
+                .ToList();
+
+            return students;
+        }
+
     }
 }