CLI: Fix the switching theme to Lepton problems for nolayers template

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)

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)
         {

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<string>
         {
-            "/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<string>
         {
-            "/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<string> 

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<string> 
         {
-            "/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<string> 
         {
-            "/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server/package.json"
+            "/MyCompanyName.MyProjectName.Blazor.Server/package.json"
         };
 
         var angularPackageJsonFilePaths = new List<string> 
         {
-            "/apps/angular/package.json"
+            "/angular/package.json"
         };
 
         var mvcUiPackageName = "@volo/abp.aspnetcore.mvc.ui.theme.leptonx";