From 6396fc477fb638604a15536f2aed88909f1d055f Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 9 Dec 2020 10:46:13 +0300 Subject: [PATCH] Fix add-module account --- .../Abp/Cli/ProjectModification/SolutionModuleAdder.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 3bcdc34bc9..364763c7b1 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 @@ -163,6 +163,11 @@ namespace Volo.Abp.Cli.ProjectModification foreach (var package in packages) { + if (target == NuGetPackageTarget.Web && package.Name.StartsWith("Volo.Abp.Account")) + { + continue; + } + await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile, package.Name); var projectPath = Path.Combine(Path.GetDirectoryName(moduleSolutionFile), "src", package.Name); @@ -523,7 +528,9 @@ namespace Volo.Abp.Cli.ProjectModification protected virtual async Task IsProjectTiered(string[] projectFiles) { return projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath) - .Any(p => p.EndsWith(".IdentityServer") || p.EndsWith(".HttpApi.Host")); + .Any(p =>p.EndsWith(".HttpApi.Host")) + && projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath) + .Any(p => p.EndsWith(".IdentityServer")); } } }