From 23e281cf1d0f042cdf1b711eb78e873ad2690368 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 16 Mar 2021 12:42:14 +0300 Subject: [PATCH 1/3] Cli: Fix SolutionModuleAdder ChangeDomainTestReferenceToMongoDB --- .../Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 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 d550912691..a67bf60c08 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 @@ -245,8 +245,8 @@ namespace Volo.Abp.Cli.ProjectModification return; } - var csprojFile = Directory.GetFiles(projectFolderPath).FirstOrDefault(p => p.EndsWith(".csproj")); - var moduleFile = Directory.GetFiles(projectFolderPath).FirstOrDefault(p => p.EndsWith("DomainTestModule.cs")); + var csprojFile = Directory.GetFiles(projectFolderPath, ".csproj", SearchOption.AllDirectories).FirstOrDefault(); + var moduleFile = Directory.GetFiles(projectFolderPath, "*DomainTestModule.cs", SearchOption.AllDirectories).FirstOrDefault(); if (csprojFile == null || moduleFile == null) { From a85ff122ccd522dc1c10e9c86ea225aac0da8cf7 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 16 Mar 2021 13:35:35 +0300 Subject: [PATCH 2/3] Update SolutionModuleAdder.cs --- .../Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 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 a67bf60c08..b84ac546a7 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 @@ -1,4 +1,5 @@ -using JetBrains.Annotations; +using System; +using JetBrains.Annotations; using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Abstractions; using System.Collections.Generic; @@ -245,7 +246,7 @@ namespace Volo.Abp.Cli.ProjectModification return; } - var csprojFile = Directory.GetFiles(projectFolderPath, ".csproj", SearchOption.AllDirectories).FirstOrDefault(); + var csprojFile = Directory.GetFiles(projectFolderPath, "*.csproj", SearchOption.AllDirectories).FirstOrDefault(); var moduleFile = Directory.GetFiles(projectFolderPath, "*DomainTestModule.cs", SearchOption.AllDirectories).FirstOrDefault(); if (csprojFile == null || moduleFile == null) From d4659fd00c7a3370b4f0db7855c2e6f59bb34748 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 17 Mar 2021 10:50:56 +0300 Subject: [PATCH 3/3] 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); + } } }