From d4659fd00c7a3370b4f0db7855c2e6f59bb34748 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 17 Mar 2021 10:50:56 +0300 Subject: [PATCH] Cli SolutionModuleAdder improvement --- .../ProjectModification/SolutionModuleAdder.cs | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs index b84ac546a7..e5b75cb129 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs @@ -175,6 +175,7 @@ namespace Volo.Abp.Cli.ProjectModification { await RemoveProjectByTarget(module, moduleSolutionFile, NuGetPackageTarget.EntityFrameworkCore, isProjectTiered); await RemoveProjectByPostFix(module, moduleSolutionFile, "test", ".EntityFrameworkCore.Tests"); + await RemoveProjectByPostFix(module, moduleSolutionFile, "test", ".Application.Tests"); ChangeDomainTestReferenceToMongoDB(module, moduleSolutionFile); } } @@ -215,18 +216,16 @@ namespace Volo.Abp.Cli.ProjectModification return; } - var projectFolderPath = Directory.GetDirectories(srcPath).FirstOrDefault(d => d.EndsWith(postFix)); + var projectFolderPaths = Directory.GetDirectories(srcPath).Where(d => d.EndsWith(postFix)).ToList(); - if (projectFolderPath == null) + foreach (var projectFolderPath in projectFolderPaths) { - return; - } - - await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile, new DirectoryInfo(projectFolderPath).Name); + await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile, new DirectoryInfo(projectFolderPath).Name); - if (Directory.Exists(projectFolderPath)) - { - Directory.Delete(projectFolderPath, true); + if (Directory.Exists(projectFolderPath)) + { + Directory.Delete(projectFolderPath, true); + } } }