tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

CLI: Fix theme selection for blazor-server nolayer template.

pull/18731/head
Engincan VESKE 3 years ago
parent
7dfe96d645
commit
21c63c0ae6
2 changed files with 19 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs
  2. 1
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs

35
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs
View File

@ -372,7 +372,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
return; return;
} }
lines[lineIndex] = lines[lineIndex].Replace(lines[lineIndex], $"\t<ProjectReference Include=\"{projectReference}\" />"); lines[lineIndex] = lines[lineIndex].Replace(lines[lineIndex], $"\t\t<ProjectReference Include=\"{projectReference}\" />\n");
file.SetLines(lines); file.SetLines(lines);
} }
@ -568,7 +568,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
private static void ChangeThemeToBasicForMvcProjects(ProjectBuildContext context, string defaultThemeName) private static void ChangeThemeToBasicForMvcProjects(ProjectBuildContext context, string defaultThemeName)
{ {
var projectNames = new[] var projectNames = new[]
{ {
".Web", ".HttpApi.Host", ".AuthServer", ".Web.Public", ".Web.Public.Host", ".Web", ".HttpApi.Host", ".AuthServer", ".Web.Public", ".Web.Public.Host",
"" //for app-nolayers-mvc "" //for app-nolayers-mvc
}; };
@ -608,45 +608,46 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
{ {
var projects = new Dictionary<string, string> var projects = new Dictionary<string, string>
{ {
{"Blazor", "MyProjectNameBlazorModule"}, {".Blazor", "MyProjectNameBlazorModule"},
{"Blazor.Server.Tiered", "MyProjectNameBlazorModule"}, {".Blazor.Server.Tiered", "MyProjectNameBlazorModule"},
{"Blazor.Server", "MyProjectNameModule"}, {".Blazor.Server", "MyProjectNameModule"},
{"Blazor.Server.Mongo", "MyProjectNameModule"} {"Blazor.Server.Mongo", "MyProjectNameModule"},
{"", ""} //for app-nolayers blazor-server
}; };
foreach (var project in projects) foreach (var project in projects)
{ {
ReplacePackageReferenceWithProjectReference( ReplacePackageReferenceWithProjectReference(
context, context,
$"/MyCompanyName.MyProjectName.{project.Key}/MyCompanyName.MyProjectName.{project.Key}.csproj", $"/MyCompanyName.MyProjectName{project.Key}/MyCompanyName.MyProjectName{project.Key}.csproj",
$"Volo.Abp.AspNetCore.Components.Server.{defaultThemeName}Theme", $"Volo.Abp.AspNetCore.Components.Server.{defaultThemeName}",
@"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj"
); );
ReplacePackageReferenceWithProjectReference( ReplacePackageReferenceWithProjectReference(
context, 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}", $"Volo.Abp.AspNetCore.Mvc.UI.Theme.{defaultThemeName}",
@"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj"
); );
ReplaceAllKeywords( ReplaceAllKeywords(
context, context,
$"/MyCompanyName.MyProjectName.{project.Key}/Pages/_Host.cshtml", $"/Pages/_Host.cshtml",
$"{defaultThemeName}Theme.Components", $"{defaultThemeName}Theme.Components",
Basic Basic
); );
ReplaceAllKeywords( ReplaceAllKeywords(
context, context,
$"/MyCompanyName.MyProjectName.{project.Key}/{project.Value}.cs", $"/MyCompanyName.MyProjectName{project.Key}/{project.Value}.cs",
defaultThemeName, defaultThemeName,
Basic Basic + "Theme"
); );
ReplaceAllKeywords( ReplaceAllKeywords(
context, context,
$"/MyCompanyName.MyProjectName.{project.Key}/Pages/_Host.cshtml", $"/Pages/_Host.cshtml",
defaultThemeName, defaultThemeName,
Basic Basic
); );
@ -682,7 +683,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
ReplaceAllKeywords( ReplaceAllKeywords(
context, context,
$"/MyCompanyName.MyProjectName.{projectName}/Pages/_Host.cshtml", $"/Pages/_Host.cshtml",
LeptonX, LeptonX,
Lepton Lepton
); );
@ -731,7 +732,7 @@ public class ChangeThemeStep : ProjectBuildPipelineStep
ReplaceAllKeywords( ReplaceAllKeywords(
context, context,
$"/MyCompanyName.MyProjectName.{projectName}/Pages/_Host.cshtml", $"/Pages/_Host.cshtml",
LeptonX, LeptonX,
Lepton Lepton
); );

1
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs
View File

@ -346,6 +346,7 @@ public abstract class AppNoLayersTemplateBase : TemplateInfo
var blazorServerUiPackageName = isProTemplate ? "@volo/aspnetcore.components.server.leptonxtheme" : "@abp/aspnetcore.components.server.leptonxlitetheme"; var blazorServerUiPackageName = isProTemplate ? "@volo/aspnetcore.components.server.leptonxtheme" : "@abp/aspnetcore.components.server.leptonxlitetheme";
var blazorServerPackageJsonFilePaths = new List<string> var blazorServerPackageJsonFilePaths = new List<string>
{ {
"/MyCompanyName.MyProjectName/package.json",
"/MyCompanyName.MyProjectName.Blazor/package.json", "/MyCompanyName.MyProjectName.Blazor/package.json",
"/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json" "/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json"
}; };

Write Preview
Loading…
Cancel
Save