Clean up PR dotnet#31164

src/EFCore.Design/Design/Internal/MigrationsOperations.cs

@@ -249,7 +249,7 @@ public virtual MigrationFiles RemoveMigration(
     ///     any release. You should only use it directly in your code with extreme caution and knowing that
     ///     doing so can result in application failures when updating to a new Entity Framework Core release.
     /// </summary>
-    public virtual void CheckPendingMigrations(string? contextType)
+    public virtual void HasPendingModelChanges(string? contextType)
     {
         using var context = _contextOperations.CreateContext(contextType);
 

src/EFCore.Design/Design/OperationExecutor.cs

@@ -686,10 +686,10 @@ private string ScriptDbContextImpl(string? contextType)
     /// <summary>
     ///     Represents an operation to check if there are any pending migrations.
     /// </summary>
-    public class CheckPendingMigrations : OperationBase
+    public class HasPendingModelChanges : OperationBase
     {
         /// <summary>
-        ///     Initializes a new instance of the <see cref="CheckPendingMigrations" /> class.
+        ///     Initializes a new instance of the <see cref="HasPendingModelChanges" /> class.
         /// </summary>
         /// <remarks>
         ///     <para>The arguments supported by <paramref name="args" /> are:</para>
@@ -698,7 +698,7 @@ public class CheckPendingMigrations : OperationBase
         /// <param name="executor">The operation executor.</param>
         /// <param name="resultHandler">The <see cref="IOperationResultHandler" />.</param>
         /// <param name="args">The operation arguments.</param>
-        public CheckPendingMigrations(
+        public HasPendingModelChanges(
             OperationExecutor executor,
             IOperationResultHandler resultHandler,
             IDictionary args)
@@ -709,12 +709,12 @@ public CheckPendingMigrations(
 
             var contextType = (string?)args["contextType"];
 
-            Execute(() => executor.CheckPendingMigrationsImpl(contextType));
+            Execute(() => executor.HasPendingModelChangesImpl(contextType));
         }
     }
 
-    private void CheckPendingMigrationsImpl(string? contextType)
-        => MigrationsOperations.CheckPendingMigrations(contextType);
+    private void HasPendingModelChangesImpl(string? contextType)
+        => MigrationsOperations.HasPendingModelChanges(contextType);
 
 
     /// <summary>

src/EFCore.Relational/Extensions/RelationalDatabaseFacadeExtensions.cs

@@ -955,7 +955,7 @@ public static bool IsRelational(this DatabaseFacade databaseFacade)
     /// <summary>
     ///     Returns <see langword="true" /> if the model has pending changes to be applied.
     /// </summary>
-    /// <param name="databaseFacade">Tbe facade from <see cref="DbContext.Database"/>.</param>
+    /// <param name="databaseFacade">The facade from <see cref="DbContext.Database"/>.</param>
     /// <returns>
     ///     <see langword="true"/> if the database model has pending changes.
     ///     <see langword="false"/> if a new migration has to be added.

src/ef/Commands/MigrationsHasPendingModelChangesCommand.cs

@@ -9,7 +9,7 @@ protected override int Execute(string[] args)
     {
         using var executor = CreateExecutor(args);
 
-        executor.CheckPendingMigrations(Context!.Value());
+        executor.HasPendingModelChanges(Context!.Value());
 
         return base.Execute(args);
     }

src/ef/IOperationExecutor.cs

@@ -37,5 +37,5 @@ IDictionary ScaffoldContext(
     string ScriptMigration(string? fromMigration, string? toMigration, bool idempotent, bool noTransactions, string? contextType);
 
     string ScriptDbContext(string? contextType);
-    void CheckPendingMigrations(string? contextType);
+    void HasPendingModelChanges(string? contextType);
 }

src/ef/OperationExecutorBase.cs

@@ -207,8 +207,8 @@ public string ScriptDbContext(string? contextType)
             "ScriptDbContext",
             new Dictionary<string, object?> { ["contextType"] = contextType });
 
-    public void CheckPendingMigrations(string? contextType)
+    public void HasPendingModelChanges(string? contextType)
         => InvokeOperation<string>(
-            "CheckPendingMigrations",
+            "HasPendingModelChanges",
             new Dictionary<string, object?> { ["contextType"] = contextType });
 }

test/EFCore.Relational.Tests/RelationalDatabaseFacadeExtensionsTest.cs

@@ -3,7 +3,6 @@
 
 using System.Transactions;
 using Microsoft.EntityFrameworkCore.InMemory.Storage.Internal;
-using Microsoft.EntityFrameworkCore.TestModels.UpdatesModel;
 using Microsoft.EntityFrameworkCore.TestUtilities.FakeProvider;
 using IsolationLevel = System.Data.IsolationLevel;
 
@@ -275,14 +274,11 @@ public void HasPendingModelChanges_has_migrations_and_no_new_context_changes_ret
     {
         var fakeModelSnapshot = new FakeModelSnapshot(builder =>
         {
-            // TODO: This seems fragile, what should I do?
-            builder.HasAnnotation("ProductVersion", "8.0.0-dev");
-
             builder.Entity("Microsoft.EntityFrameworkCore.RelationalDatabaseFacadeExtensionsTests.TestDbContext.Simple", b =>
             {
                 b.Property<int>("Id")
                     .ValueGeneratedOnAdd()
-                    .HasColumnType("int");
+                    .HasColumnType("default_int_mapping");
 
                 b.HasKey("Id");
 
@@ -291,7 +287,7 @@ public void HasPendingModelChanges_has_migrations_and_no_new_context_changes_ret
         });
         var migrationsAssembly = new FakeIMigrationsAssembly
         {
-            ModelSnapshot = null,
+            ModelSnapshot = fakeModelSnapshot,
             Migrations = new Dictionary<string, TypeInfo>(),
         };
 
@@ -302,7 +298,7 @@ public void HasPendingModelChanges_has_migrations_and_no_new_context_changes_ret
 
         var testContext = new TestDbContext(contextOptions);
 
-        Assert.True(testContext.Database.HasPendingModelChanges());
+        Assert.False(testContext.Database.HasPendingModelChanges());
     }
 
     private class TestDbContext : DbContext