Browse Source

Fix add-module account

pull/6555/head
Yunus Emre Kalkan 6 years ago
parent
commit
6396fc477f
  1. 9
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/SolutionModuleAdder.cs

9
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) foreach (var package in packages)
{ {
if (target == NuGetPackageTarget.Web && package.Name.StartsWith("Volo.Abp.Account"))
{
continue;
}
await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile, package.Name); await SolutionFileModifier.RemoveProjectFromSolutionFileAsync(moduleSolutionFile, package.Name);
var projectPath = Path.Combine(Path.GetDirectoryName(moduleSolutionFile), "src", 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<bool> IsProjectTiered(string[] projectFiles) protected virtual async Task<bool> IsProjectTiered(string[] projectFiles)
{ {
return projectFiles.Select(ProjectFileNameHelper.GetAssemblyNameFromProjectPath) 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"));
} }
} }
} }

Loading…
Cancel
Save