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 4a88ada34a..7430f2a288 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 @@ -556,7 +556,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep { if (!lines[i].Contains(oldKeyword)) { - continue;; + continue; } lines[i] = lines[i].Replace(oldKeyword, newKeyword); @@ -565,6 +565,26 @@ public class ChangeThemeStep : ProjectBuildPipelineStep file.SetLines(lines); } + private static void AddNamespaces(ProjectBuildContext context, string targetModuleFilePath, params string[] namespaces) + { + var file = context.Files.FirstOrDefault(x => x.Name.Contains(targetModuleFilePath)); + if (file == null) + { + return; + } + + file.NormalizeLineEndings(); + + var lines = file.GetLines().ToList(); + + foreach (var @namespace in namespaces) + { + lines.AddFirst(@namespace); + } + + file.SetLines(lines); + } + private static void ChangeThemeToBasicForMvcProjects(ProjectBuildContext context, string defaultThemeName) { var projectNames = new[] @@ -601,6 +621,13 @@ public class ChangeThemeStep : ProjectBuildPipelineStep defaultThemeName, Basic ); + + AddNamespaces( + context, + moduleFile.Name, + "using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;", + "using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;" + ); } }