From e645649fcda952a242cf2c5b45da777462d3b004 Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Thu, 3 Nov 2022 16:12:17 +0300 Subject: [PATCH] Update TemplateProjectBuilder.cs --- .../Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs index 7d6844f714..9ab587e3ec 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs @@ -236,10 +236,14 @@ public class TemplateProjectBuilder : IProjectBuilder, ITransientDependency { Logger.LogInformation("Theme: " + args.Theme); - if (args.UiFramework == UiFramework.Angular && (args.Theme != AppTemplate.DefaultTheme || args.Theme != AppProTemplate.DefaultTheme)) + var isProTemplate = !args.TemplateName.IsNullOrEmpty() && args.TemplateName.EndsWith("-pro", StringComparison.OrdinalIgnoreCase); + + if (args.UiFramework == UiFramework.Angular && ((isProTemplate && args.Theme != AppProTemplate.DefaultTheme) || + (!isProTemplate && args.Theme != AppTemplate.DefaultTheme))) { Logger.LogWarning("You may need to make some additional changes for this theme. " + - "See the documentation for more information: https://docs.abp.io/en/abp/latest/UI/Angular/Theme-Configurations"); + "See the documentation for more information: " + + "https://docs.abp.io/en/abp/latest/UI/Angular/Theme-Configurations"); } }