Browse Source

Merge pull request #9715 from abpframework/volo/issues/7450

Fix cli add-module: Do not delete a project that is referenced by solution
pull/9929/head
ebicoglu 5 years ago
committed by GitHub
parent
commit
814e87df5d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

8
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

@ -244,7 +244,7 @@ namespace Volo.Abp.Cli.ProjectModification
foreach (var projectToRemove in projectsToRemove)
{
if (IsReferencedByAnotherModuleProject(moduleDirectory, projectsToRemove, projectToRemove))
if (IsReferencedByAnotherProject(solutionDirectory, projectsToRemove, projectToRemove))
{
continue;
}
@ -253,10 +253,10 @@ namespace Volo.Abp.Cli.ProjectModification
}
}
private bool IsReferencedByAnotherModuleProject(string moduleDirectory, List<string> projectsToRemove, string projectToRemove)
private bool IsReferencedByAnotherProject(string solutionDirectory, List<string> projectsToRemove, string projectToRemove)
{
var moduleProjects = Directory.GetFiles(moduleDirectory, "*.csproj", SearchOption.AllDirectories);
var projectsToKeep = moduleProjects.Where(mp => !projectsToRemove.Contains(Path.GetFileName(mp).RemovePostFix(".csproj"))).ToList();
var projects = Directory.GetFiles(solutionDirectory, "*.csproj", SearchOption.AllDirectories);
var projectsToKeep = projects.Where(mp => !projectsToRemove.Contains(Path.GetFileName(mp).RemovePostFix(".csproj"))).ToList();
return projectsToKeep.Select(File.ReadAllText).Any(content => content.Contains($"\"{projectToRemove}\""));
}

Loading…
Cancel
Save