From c4ab2822e73ff5e7548d8da02a76bffa42e02cba Mon Sep 17 00:00:00 2001 From: Engincan VESKE Date: Mon, 18 Jul 2022 11:35:25 +0300 Subject: [PATCH] CLI: Fix the switching theme to Lepton problems for nolayers template --- .../Building/Steps/ChangeThemeStep.cs | 2 +- ...RemoveDependencyFromPackageJsonFileStep.cs | 2 +- .../Templates/App/AppTemplateBase.cs | 24 +++++++++---------- .../Microservice/MicroserviceTemplateBase.cs | 8 +++---- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs index cfa41c65e1..105f2d6e23 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs @@ -213,7 +213,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep { var projectNames = new[] { - "Web", "HttpApi.Host", "AuthServer", "Web.Mvc", "Web.Mvc.Mongo" + "Web", "HttpApi.Host", "AuthServer", "Mvc", "Mvc.Mongo" }; foreach (var projectName in projectNames) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs index 00f7629f52..3eabb6621e 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/RemoveDependencyFromPackageJsonFileStep.cs @@ -17,7 +17,7 @@ public class RemoveDependencyFromPackageJsonFileStep : ProjectBuildPipelineStep public override void Execute(ProjectBuildContext context) { - var packageJsonFile = context.Files.FirstOrDefault(f => f.Name == _packageJsonFilePath); + var packageJsonFile = context.Files.FirstOrDefault(f => f.Name.Contains(_packageJsonFilePath)); if (packageJsonFile == null) { 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 b8a8bf7be3..118a188443 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 @@ -216,22 +216,22 @@ public abstract class AppTemplateBase : TemplateInfo { var packageJsonFilePaths = new List { - "/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json", - "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json", - "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json", - "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Host/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json" + "/MyCompanyName.MyProjectName.Web/package.json", + "/MyCompanyName.MyProjectName.Web.Host/package.json", + "/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json", + "/MyCompanyName.MyProjectName.AuthServer/package.json", + "/MyCompanyName.MyProjectName.Mvc/package.json", + "/MyCompanyName.MyProjectName.Mvc.Mongo/package.json", + "/MyCompanyName.MyProjectName.Host/package.json", + "/MyCompanyName.MyProjectName.Host.Mongo/package.json" }; var blazorServerPackageJsonFilePaths = new List { - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json", - "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json", - "/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json" + "/MyCompanyName.MyProjectName.Blazor.Server/package.json", + "/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json", + "/MyCompanyName.MyProjectName.Blazor.Server/package.json", + "/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json" }; var angularPackageJsonFilePaths = new List diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs index 6ca88cb469..71f090a576 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Microservice/MicroserviceTemplateBase.cs @@ -51,18 +51,18 @@ public abstract class MicroserviceTemplateBase : TemplateInfo { var packageJsonFilePaths = new List { - "/apps/auth-server/src/MyCompanyName.MyProjectName.AuthServer/package.json", - "/apps/web/src/MyCompanyName.MyProjectName.Web/package.json" + "/MyCompanyName.MyProjectName.AuthServer/package.json", + "/MyCompanyName.MyProjectName.Web/package.json" }; var blazorServerPackageJsonFilePaths = new List { - "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server/package.json" + "/MyCompanyName.MyProjectName.Blazor.Server/package.json" }; var angularPackageJsonFilePaths = new List { - "/apps/angular/package.json" + "/angular/package.json" }; var mvcUiPackageName = "@volo/abp.aspnetcore.mvc.ui.theme.leptonx";