From 08961d140f428edf70ee282d708ee6abf08ae1c5 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 5 Aug 2021 09:23:03 +0800 Subject: [PATCH 1/3] Update name of DbContexts. --- .../Cli/Commands/CreateMigrationAndRunMigratorCommand.cs | 6 +++--- .../Abp/Cli/ProjectModification/EfCoreMigrationManager.cs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs index 2a3c4652af..051b4a1da5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs @@ -71,7 +71,7 @@ namespace Volo.Abp.Cli.Commands private string FindTenantDbContextName(string dbMigrationsFolder) { var tenantDbContext = Directory - .GetFiles(dbMigrationsFolder, "*TenantMigrationsDbContext.cs", SearchOption.AllDirectories) + .GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories) .FirstOrDefault(); if (tenantDbContext == null) @@ -85,8 +85,8 @@ namespace Volo.Abp.Cli.Commands private string FindDbContextName(string dbMigrationsFolder) { var dbContext = Directory - .GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories) - .FirstOrDefault(fp => !fp.EndsWith("TenantMigrationsDbContext.cs")); + .GetFiles(dbMigrationsFolder, "*DbContext.cs", SearchOption.AllDirectories) + .FirstOrDefault(fp => !fp.EndsWith("TenantDbContext.cs")); if (dbContext == null) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs index 8143acf7b8..77c2ec0649 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs @@ -70,8 +70,8 @@ namespace Volo.Abp.Cli.ProjectModification protected virtual string FindDbContextName(string dbMigrationsFolder) { var dbContext = Directory - .GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories) - .FirstOrDefault(fp => !fp.EndsWith("TenantMigrationsDbContext.cs")); + .GetFiles(dbMigrationsFolder, "*DbContext.cs", SearchOption.AllDirectories) + .FirstOrDefault(fp => !fp.EndsWith("TenantDbContext.cs")); if (dbContext == null) { @@ -84,7 +84,7 @@ namespace Volo.Abp.Cli.ProjectModification protected virtual string FindTenantDbContextName(string dbMigrationsFolder) { var tenantDbContext = Directory - .GetFiles(dbMigrationsFolder, "*TenantMigrationsDbContext.cs", SearchOption.AllDirectories) + .GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories) .FirstOrDefault(); if (tenantDbContext == null) From ebb1bb3a403e1ee443a1e2ee624b675cf99efb35 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 5 Aug 2021 09:56:54 +0800 Subject: [PATCH 2/3] Compatible with old projects. --- .../CreateMigrationAndRunMigratorCommand.cs | 14 ++++++++------ .../ProjectModification/EfCoreMigrationManager.cs | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs index 051b4a1da5..e8a131189b 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs @@ -70,9 +70,10 @@ namespace Volo.Abp.Cli.Commands private string FindTenantDbContextName(string dbMigrationsFolder) { - var tenantDbContext = Directory - .GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories) - .FirstOrDefault(); + var tenantDbContext = Directory.GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories) + .FirstOrDefault() ?? + Directory.GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories) + .FirstOrDefault(); if (tenantDbContext == null) { @@ -84,9 +85,10 @@ namespace Volo.Abp.Cli.Commands private string FindDbContextName(string dbMigrationsFolder) { - var dbContext = Directory - .GetFiles(dbMigrationsFolder, "*DbContext.cs", SearchOption.AllDirectories) - .FirstOrDefault(fp => !fp.EndsWith("TenantDbContext.cs")); + var dbContext = Directory.GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories) + .FirstOrDefault(fp => !fp.EndsWith("TenantMigrationsDbContext.cs")) ?? + Directory.GetFiles(dbMigrationsFolder, "*DbContext.cs", SearchOption.AllDirectories) + .FirstOrDefault(fp => !fp.EndsWith("TenantDbContext.cs")); if (dbContext == null) { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs index 77c2ec0649..05996b90d7 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/EfCoreMigrationManager.cs @@ -69,9 +69,10 @@ namespace Volo.Abp.Cli.ProjectModification protected virtual string FindDbContextName(string dbMigrationsFolder) { - var dbContext = Directory - .GetFiles(dbMigrationsFolder, "*DbContext.cs", SearchOption.AllDirectories) - .FirstOrDefault(fp => !fp.EndsWith("TenantDbContext.cs")); + var dbContext = Directory.GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories) + .FirstOrDefault(fp => !fp.EndsWith("TenantMigrationsDbContext.cs")) ?? + Directory.GetFiles(dbMigrationsFolder, "*DbContext.cs", SearchOption.AllDirectories) + .FirstOrDefault(fp => !fp.EndsWith("TenantDbContext.cs")); if (dbContext == null) { @@ -83,9 +84,10 @@ namespace Volo.Abp.Cli.ProjectModification protected virtual string FindTenantDbContextName(string dbMigrationsFolder) { - var tenantDbContext = Directory - .GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories) - .FirstOrDefault(); + var tenantDbContext = Directory.GetFiles(dbMigrationsFolder, "*TenantMigrationsDbContext.cs", SearchOption.AllDirectories) + .FirstOrDefault() ?? + Directory.GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories) + .FirstOrDefault(); if (tenantDbContext == null) { From 87c1e5ccc0f515e4bc21a8f7382904cd058a0311 Mon Sep 17 00:00:00 2001 From: maliming Date: Thu, 5 Aug 2021 09:58:24 +0800 Subject: [PATCH 3/3] Update CreateMigrationAndRunMigratorCommand.cs --- .../Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs index e8a131189b..7b9fbd35fe 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CreateMigrationAndRunMigratorCommand.cs @@ -70,7 +70,7 @@ namespace Volo.Abp.Cli.Commands private string FindTenantDbContextName(string dbMigrationsFolder) { - var tenantDbContext = Directory.GetFiles(dbMigrationsFolder, "*MigrationsDbContext.cs", SearchOption.AllDirectories) + var tenantDbContext = Directory.GetFiles(dbMigrationsFolder, "*TenantMigrationsDbContext.cs", SearchOption.AllDirectories) .FirstOrDefault() ?? Directory.GetFiles(dbMigrationsFolder, "*TenantDbContext.cs", SearchOption.AllDirectories) .FirstOrDefault();