From 04a26b9c3ffbb7e4fc2a6926de9edd3f1b1cd8e6 Mon Sep 17 00:00:00 2001
From: Engincan VESKE <enginveske@gmail.com>
Date: Mon, 18 Jul 2022 13:16:39 +0300
Subject: [PATCH] CLI: Fix wrong path for mvc nolayers template

---
 .../Building/Steps/ChangeThemeStep.cs         | 23 +++++++++----------
 .../Templates/App/AppTemplateBase.cs          |  6 ++---
 2 files changed, 13 insertions(+), 16 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 7920a8b1b4..dcf8496e66 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
@@ -182,8 +182,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
         #region MyCompanyName.MyProjectName.Mvc && MyCompanyName.MyProjectName.Mvc.Mongo
 
         var projectNames = new[] {"Web", "HttpApi", "Application"};
-        ConfigureLeptonManagementPackagesForNoLayersMvc(context, @"/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj", projectNames);
-        ConfigureLeptonManagementPackagesForNoLayersMvc(context, @"/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.Mongo.csproj", projectNames);
+        ConfigureLeptonManagementPackagesForNoLayersMvc(context, @"/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.csproj", projectNames);
 
         #endregion
 
@@ -219,12 +218,13 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
     {
         var projectNames = new[] 
         {
-            "Web", "HttpApi.Host", "AuthServer", "Mvc", "Mvc.Mongo"
+            ".Web", ".HttpApi.Host", ".AuthServer", 
+            "" //for app-nolayers-mvc
         };
         
         foreach (var projectName in projectNames)
         {
-            var projectPath = $"/MyCompanyName.MyProjectName.{projectName}/MyCompanyName.MyProjectName.{projectName}.csproj";
+            var projectPath = $"/MyCompanyName.MyProjectName{projectName}/MyCompanyName.MyProjectName{projectName}.csproj";
             var projectFile = context.Files.FirstOrDefault(x => x.Name.Contains(projectPath));
             if (projectFile == null)
             {
@@ -607,25 +607,24 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
     {
         var projects = new Dictionary<string, string>
         {
-            {"Web", "MyProjectNameWebModule"},
-            {"HttpApi.Host", "MyProjectNameHttpApiHostModule"},
-            {"AuthServer", "MyProjectNameAuthServerModule"},
-            {"Mvc", "MyProjectNameWebModule"},
-            {"Mvc.Mongo", "MyProjectNameWebModule"},
+            {".Web", "MyProjectNameWebModule"},
+            {".HttpApi.Host", "MyProjectNameHttpApiHostModule"},
+            {".AuthServer", "MyProjectNameAuthServerModule"},
+            {"", "MyProjectNameWebModule"}
         };
 
         foreach (var project in projects)
         {
             ReplacePackageReferenceWithProjectReference(
                 context,
-                $"/MyCompanyName.MyProjectName.{project.Key}/MyCompanyName.MyProjectName.{project.Key}.csproj",
+                $"/MyCompanyName.MyProjectName{project.Key}/MyCompanyName.MyProjectName{project.Key}.csproj",
                 $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}",
                 @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj"
             );
         
             ChangeNamespaceAndKeyword(
                 context,
-                $"/MyCompanyName.MyProjectName.{project.Key}/{project.Value}.cs",
+                $"/MyCompanyName.MyProjectName{project.Key}/{project.Value}.cs",
                 $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}",
                 "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
                 $"AbpAspNetCoreMvcUi{defaultThemeName}ThemeModule",
@@ -634,7 +633,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
 
             ChangeNamespaceAndKeyword(
                 context,
-                $"/MyCompanyName.MyProjectName.{project.Key}/{project.Value}.cs",
+                $"/MyCompanyName.MyProjectName{project.Key}/{project.Value}.cs",
                 $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}.Bundling",
                 "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling",
                 $"{defaultThemeName}ThemeBundles.Styles.Global",
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 118a188443..a1194d928a 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
@@ -209,7 +209,7 @@ public abstract class AppTemplateBase : TemplateInfo
             AppNoLayersTemplate.DefaultTheme, AppNoLayersProTemplate.DefaultTheme
         };
         
-        return defaultThemesForTemplates.Contains(theme);
+        return defaultThemesForTemplates.Any(defaultTheme => defaultTheme == theme);
     }
     
     private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List<ProjectBuildPipelineStep> steps, bool isProTemplate)
@@ -220,8 +220,7 @@ public abstract class AppTemplateBase : TemplateInfo
             "/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/package.json",
             "/MyCompanyName.MyProjectName.Host/package.json",
             "/MyCompanyName.MyProjectName.Host.Mongo/package.json"
         };
@@ -230,7 +229,6 @@ public abstract class AppTemplateBase : TemplateInfo
         {
             "/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"
         };