From 4d063f25d32268bc086aca5384d17220ae94cc21 Mon Sep 17 00:00:00 2001 From: Moien Tajik Date: Thu, 14 Jul 2022 23:54:03 +0430 Subject: [PATCH] remove extra duplicate migration existence check --- .../Migrations/Design/MigrationsScaffolder.cs | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/EFCore.Design/Migrations/Design/MigrationsScaffolder.cs b/src/EFCore.Design/Migrations/Design/MigrationsScaffolder.cs index 18ae0f012d6..4cb7ea8d101 100644 --- a/src/EFCore.Design/Migrations/Design/MigrationsScaffolder.cs +++ b/src/EFCore.Design/Migrations/Design/MigrationsScaffolder.cs @@ -68,6 +68,11 @@ public virtual ScaffoldedMigration ScaffoldMigration( string? subNamespace = null, string? language = null) { + if (string.Equals(migrationName, "migration", StringComparison.OrdinalIgnoreCase)) + { + throw new OperationException(DesignStrings.CircularBaseClassDependency); + } + if (Dependencies.MigrationsAssembly.FindMigrationId(migrationName) != null) { throw new OperationException(DesignStrings.DuplicateMigrationName(migrationName)); @@ -80,16 +85,6 @@ public virtual ScaffoldedMigration ScaffoldMigration( subNamespaceDefaulted = true; subNamespace = "Migrations"; } - - if (string.Equals(migrationName, "migration", StringComparison.OrdinalIgnoreCase)) - { - throw new OperationException(DesignStrings.CircularBaseClassDependency); - } - - if (Dependencies.MigrationsAssembly.FindMigrationId(migrationName) != null) - { - throw new OperationException(DesignStrings.DuplicateMigrationName(migrationName)); - } var (key, typeInfo) = Dependencies.MigrationsAssembly.Migrations.LastOrDefault();