Browse Source

Merge pull request #22015 from abpframework/auto-merge/rel-9-1/3431

Merge branch dev with rel-9.1
pull/22034/head
maliming 2 years ago
committed by GitHub
parent
commit
a5b9b5bb7d
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 15
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs

15
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs

@ -37,9 +37,9 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
{ {
var defaultThemeName = context.BuildArgs.TemplateName is AppTemplate.TemplateName or AppNoLayersTemplate.TemplateName var defaultThemeName = context.BuildArgs.TemplateName is AppTemplate.TemplateName or AppNoLayersTemplate.TemplateName
? LeptonXLite : LeptonX; ? LeptonXLite : LeptonX;
new RemoveFilesStep($"/Themes/{defaultThemeName}").Execute(context); new RemoveFilesStep($"/Themes/{defaultThemeName}").Execute(context);
ChangeThemeToBasicForMvcProjects(context, defaultThemeName); ChangeThemeToBasicForMvcProjects(context, defaultThemeName);
ChangeThemeToBasicForBlazorProjects(context, defaultThemeName); ChangeThemeToBasicForBlazorProjects(context, defaultThemeName);
ChangeThemeToBasicForBlazorServerProjects(context, defaultThemeName); ChangeThemeToBasicForBlazorServerProjects(context, defaultThemeName);
@ -622,6 +622,11 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
return; return;
} }
if (!file.Content.Contains("ThemeModule"))
{
return;
}
file.NormalizeLineEndings(); file.NormalizeLineEndings();
var lines = file.GetLines().ToList(); var lines = file.GetLines().ToList();
@ -630,7 +635,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
{ {
lines.AddFirst(@namespace); lines.AddFirst(@namespace);
} }
file.SetLines(lines); file.SetLines(lines);
} }
@ -641,7 +646,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
".Web", ".AuthServer", ".Web.Public", ".Web.Public.Host", ".Web", ".AuthServer", ".Web.Public", ".Web.Public.Host",
"" //for app-nolayers-mvc "" //for app-nolayers-mvc
}; };
if(!context.Symbols.Contains("tiered")) if(!context.Symbols.Contains("tiered"))
{ {
projectNames.Add(".HttpApi.Host"); projectNames.Add(".HttpApi.Host");
@ -716,7 +721,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
context, context,
$"_Host.cshtml", $"_Host.cshtml",
$"{defaultThemeName}Theme.Components", $"{defaultThemeName}Theme.Components",
"BasicTheme.Themes.Basic" "BasicTheme.Themes.Basic"
); );
ReplaceAllKeywords( ReplaceAllKeywords(

Loading…
Cancel
Save