From 37331565a7d28ad28749277048417de5bbf6e93c Mon Sep 17 00:00:00 2001 From: maliming Date: Tue, 8 Feb 2022 16:23:22 +0800 Subject: [PATCH] `IsMicroserviceTemplate` --- .../Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs | 2 +- .../Volo/Abp/Cli/LIbs/InstallLibsService.cs | 4 +++- .../Microservice/MicroserviceServiceTemplateBase.cs | 5 +++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs index 86398e5c5f..d638a21f87 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs @@ -312,7 +312,7 @@ public abstract class ProjectCreationCommandBase if (AppTemplateBase.IsAppTemplate(projectArgs.TemplateName) || ModuleTemplateBase.IsModuleTemplate(projectArgs.TemplateName) || AppNoLayersTemplateBase.IsAppNoLayersTemplate(projectArgs.TemplateName) || - MicroserviceServiceTemplateBase.IsMicroserviceServiceTemplate(projectArgs.TemplateName)) + MicroserviceServiceTemplateBase.IsMicroserviceTemplate(projectArgs.TemplateName)) { CmdHelper.RunCmd("abp install-libs", projectArgs.OutputFolder); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs index cd01f895ae..3984f0ca08 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs @@ -54,9 +54,10 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency return; } + Logger.LogInformation($"Found {projectPaths.Count} projects."); foreach (var projectPath in projectPaths) { - Logger.LogInformation($"Found {projectPath}"); + Logger.LogInformation($"{Path.GetDirectoryName(projectPath)}"); } foreach (var projectPath in projectPaths) @@ -109,6 +110,7 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency } return true; }) + .OrderBy(x => x) .ToList(); } diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceServiceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceServiceTemplateBase.cs index 4627b57cda..3aa6754c19 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceServiceTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceServiceTemplateBase.cs @@ -14,6 +14,11 @@ public abstract class MicroserviceServiceTemplateBase : TemplateInfo { } + public static bool IsMicroserviceTemplate(string templateName) + { + return templateName == MicroserviceProTemplate.TemplateName; + } + public static bool IsMicroserviceServiceTemplate(string templateName) { return templateName == MicroserviceServiceProTemplate.TemplateName;