Don't pull entity types from the context when building the Migrations…

… history table

I think this is one of the root causes of the ASP.NET failures in dotnet/aspnetcore#10939 (comment)

The issue is that now that we discover DbSets from a context as a convention, re-using the convention-laden ModelBuilder for creating the history table also brings in types from the context.

For now, the fix is to remove this convention, but we may want to consider other options for building the history table.

src/EFCore.Relational/Migrations/HistoryRepository.cs

@@ -10,6 +10,8 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
+using Microsoft.EntityFrameworkCore.Metadata.Conventions;
+using Microsoft.EntityFrameworkCore.Metadata.Conventions.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.EntityFrameworkCore.Utilities;
 using Microsoft.Extensions.DependencyInjection;
@@ -92,8 +94,10 @@ private IModel EnsureModel()
         {
             if (_model == null)
             {
-                var modelBuilder = new ModelBuilder(Dependencies.ConventionSetBuilder.CreateConventionSet());
+                var conventionSet = Dependencies.ConventionSetBuilder.CreateConventionSet();
+                ConventionSet.Remove(conventionSet.ModelInitializedConventions, typeof(DbSetFindingConvention));
 
+                var modelBuilder = new ModelBuilder(conventionSet);
                 modelBuilder.Entity<HistoryRow>(
                     x =>
                     {

test/EFCore.Relational.Specification.Tests/MigrationsFixtureBase.cs

@@ -40,6 +40,13 @@ public MigrationsContext(DbContextOptions options)
                 : base(options)
             {
             }
+
+            public DbSet<Foo> Foos { get; set; }
+        }
+
+        public class Foo
+        {
+            public int Id { get; set; }
         }
 
         [DbContext(typeof(MigrationsContext))]

test/EFCore.SqlServer.FunctionalTests/MigrationsSqlServerTest.cs

@@ -359,6 +359,9 @@ protected override async Task AssertFirstMigrationAsync(DbConnection connection)
     Id int NOT NULL
     ColumnWithDefaultToDrop int NULL DEFAULT ((0))
     ColumnWithDefaultToAlter int NULL DEFAULT ((1))
+
+Foos
+    Id int NOT NULL
 ",
                 sql,
                 ignoreLineEndingDifferences: true);
@@ -372,6 +375,9 @@ protected override async Task AssertSecondMigrationAsync(DbConnection connection
 CreatedTable
     Id int NOT NULL
     ColumnWithDefaultToAlter int NULL
+
+Foos
+    Id int NOT NULL
 ",
                 sql,
                 ignoreLineEndingDifferences: true);

test/EFCore.Sqlite.FunctionalTests/MigrationsSqliteTest.cs

@@ -185,6 +185,13 @@ protected override void AssertFirstMigration(DbConnection connection)
     Id INTEGER NOT NULL
     ColumnWithDefaultToDrop INTEGER NULL DEFAULT 0
     ColumnWithDefaultToAlter INTEGER NULL DEFAULT 1
+
+Foos
+    Id INTEGER NOT NULL
+
+sqlite_sequence
+    name  NULL
+    seq  NULL
 ",
                 sql,
                 ignoreLineEndingDifferences: true);
@@ -214,6 +221,13 @@ protected override void AssertSecondMigration(DbConnection connection)
     Id INTEGER NOT NULL
     ColumnWithDefaultToDrop INTEGER NULL DEFAULT 0
     ColumnWithDefaultToAlter INTEGER NULL DEFAULT 1
+
+Foos
+    Id INTEGER NOT NULL
+
+sqlite_sequence
+    name  NULL
+    seq  NULL
 ",
                 sql,
                 ignoreLineEndingDifferences: true);