diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs index 44b9c20423..10063b84e5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs @@ -132,11 +132,11 @@ public abstract class AppTemplateBase : TemplateInfo case UiFramework.BlazorServer: ConfigureWithBlazorServerUi(context, steps); break; - + case UiFramework.MauiBlazor: ConfigureWithMauiBlazorUi(context, steps); break; - + case UiFramework.Mvc: case UiFramework.NotSpecified: ConfigureWithMvcUi(context, steps); @@ -213,14 +213,14 @@ public abstract class AppTemplateBase : TemplateInfo { steps.Add(new ChangeThemeStyleStep()); } - + RemoveThemeLogoFolders(context, steps); - + if (IsDefaultThemeForTemplate(context.BuildArgs.Theme.Value)) { return; } - + steps.Add(new ChangeThemeStep()); RemoveLeptonXThemePackagesFromPackageJsonFiles(steps, isProTemplate: IsPro(), uiFramework: context.BuildArgs.UiFramework); } @@ -240,15 +240,15 @@ public abstract class AppTemplateBase : TemplateInfo private static bool IsDefaultThemeForTemplate(Theme theme) { - var defaultThemesForTemplates = new[] + var defaultThemesForTemplates = new[] { - AppTemplate.DefaultTheme, AppProTemplate.DefaultTheme, + AppTemplate.DefaultTheme, AppProTemplate.DefaultTheme, AppNoLayersTemplate.DefaultTheme, AppNoLayersProTemplate.DefaultTheme }; - + return defaultThemesForTemplates.Any(defaultTheme => defaultTheme == theme); } - + private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List steps, bool isProTemplate, UiFramework uiFramework) { var mvcUiPackageName = isProTemplate ? "@volo/abp.aspnetcore.mvc.ui.theme.leptonx" : "@abp/aspnetcore.mvc.ui.theme.leptonxlite"; @@ -263,7 +263,7 @@ public abstract class AppTemplateBase : TemplateInfo "/MyCompanyName.MyProjectName.Host/package.json", "/MyCompanyName.MyProjectName.Host.Mongo/package.json" }; - + foreach (var packageJsonFilePath in packageJsonFilePaths) { steps.Add(new RemoveDependencyFromPackageJsonFileStep(packageJsonFilePath, mvcUiPackageName)); @@ -278,7 +278,7 @@ public abstract class AppTemplateBase : TemplateInfo "/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json", "/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json" }; - + foreach (var blazorServerPackageJsonFilePath in blazorServerPackageJsonFilePaths) { steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, mvcUiPackageName)); @@ -288,11 +288,11 @@ public abstract class AppTemplateBase : TemplateInfo else if (uiFramework == UiFramework.Angular) { var ngUiPackageName = isProTemplate ? "@volosoft/abp.ng.theme.lepton-x" : "@abp/ng.theme.lepton-x"; - var angularPackageJsonFilePaths = new List + var angularPackageJsonFilePaths = new List { "/angular/package.json" }; - + foreach (var angularPackageJsonFilePath in angularPackageJsonFilePaths) { steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, ngUiPackageName)); @@ -527,6 +527,7 @@ public abstract class AppTemplateBase : TemplateInfo steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Host")); steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Tests", projectFolderPath: "/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests")); + steps.Add(new RemoveFileStep("/aspnet-core/src/MyCompanyName.MyProjectName.MauiBlazor/Directory.Build.props")); if (context.BuildArgs.ExtraProperties.ContainsKey("separate-identity-server") || context.BuildArgs.ExtraProperties.ContainsKey("separate-auth-server"))