|
|
|
@ -23,19 +23,20 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
|
|
|
|
|
|
|
|
|
|
|
|
DeleteUnrelatedProjects(context, steps);
|
|
|
|
DeleteUnrelatedProjects(context, steps);
|
|
|
|
RandomizeStringEncryption(context, steps);
|
|
|
|
RandomizeStringEncryption(context, steps);
|
|
|
|
|
|
|
|
RandomizeAuthServerPassPhrase(context, steps);
|
|
|
|
UpdateNuGetConfig(context, steps);
|
|
|
|
UpdateNuGetConfig(context, steps);
|
|
|
|
ConfigureTheme(context, steps);
|
|
|
|
ConfigureTheme(context, steps);
|
|
|
|
|
|
|
|
|
|
|
|
return steps;
|
|
|
|
return steps;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
protected void ConfigureTheme(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
|
|
|
|
protected void ConfigureTheme(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!context.BuildArgs.Theme.HasValue)
|
|
|
|
if (!context.BuildArgs.Theme.HasValue)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (context.BuildArgs.Theme != Theme.NotSpecified)
|
|
|
|
if (context.BuildArgs.Theme != Theme.NotSpecified)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper());
|
|
|
|
context.Symbols.Add(context.BuildArgs.Theme.Value.ToString().ToUpper());
|
|
|
|
@ -54,7 +55,7 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
|
|
|
|
private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List<ProjectBuildPipelineStep> steps, UiFramework uiFramework)
|
|
|
|
private static void RemoveLeptonXThemePackagesFromPackageJsonFiles(List<ProjectBuildPipelineStep> steps, UiFramework uiFramework)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var mvcUiPackageName = "@volo/abp.aspnetcore.mvc.ui.theme.leptonx";
|
|
|
|
var mvcUiPackageName = "@volo/abp.aspnetcore.mvc.ui.theme.leptonx";
|
|
|
|
var packageJsonFilePaths = new List<string>
|
|
|
|
var packageJsonFilePaths = new List<string>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"/MyCompanyName.MyProjectName.AuthServer/package.json",
|
|
|
|
"/MyCompanyName.MyProjectName.AuthServer/package.json",
|
|
|
|
"/MyCompanyName.MyProjectName.Web/package.json"
|
|
|
|
"/MyCompanyName.MyProjectName.Web/package.json"
|
|
|
|
@ -68,11 +69,11 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
|
|
|
|
if (uiFramework == UiFramework.BlazorServer)
|
|
|
|
if (uiFramework == UiFramework.BlazorServer)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var blazorServerUiPackageName = "@volo/aspnetcore.components.server.leptonxtheme";
|
|
|
|
var blazorServerUiPackageName = "@volo/aspnetcore.components.server.leptonxtheme";
|
|
|
|
var blazorServerPackageJsonFilePaths = new List<string>
|
|
|
|
var blazorServerPackageJsonFilePaths = new List<string>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"/MyCompanyName.MyProjectName.Blazor/package.json"
|
|
|
|
"/MyCompanyName.MyProjectName.Blazor/package.json"
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
foreach (var blazorServerPackageJsonFilePath in blazorServerPackageJsonFilePaths)
|
|
|
|
foreach (var blazorServerPackageJsonFilePath in blazorServerPackageJsonFilePaths)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, mvcUiPackageName));
|
|
|
|
steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, mvcUiPackageName));
|
|
|
|
@ -82,11 +83,11 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
|
|
|
|
else if (uiFramework == UiFramework.Angular)
|
|
|
|
else if (uiFramework == UiFramework.Angular)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var ngUiPackageName = "@volosoft/abp.ng.theme.lepton-x";
|
|
|
|
var ngUiPackageName = "@volosoft/abp.ng.theme.lepton-x";
|
|
|
|
var angularPackageJsonFilePaths = new List<string>
|
|
|
|
var angularPackageJsonFilePaths = new List<string>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
"/angular/package.json"
|
|
|
|
"/angular/package.json"
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
foreach (var angularPackageJsonFilePath in angularPackageJsonFilePaths)
|
|
|
|
foreach (var angularPackageJsonFilePath in angularPackageJsonFilePaths)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, ngUiPackageName));
|
|
|
|
steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, ngUiPackageName));
|
|
|
|
@ -138,7 +139,7 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
|
|
|
|
steps.Add(new RemoveFolderStep("/apps/blazor"));
|
|
|
|
steps.Add(new RemoveFolderStep("/apps/blazor"));
|
|
|
|
steps.Add(new RemoveProjectFromTyeStep("blazor"));
|
|
|
|
steps.Add(new RemoveProjectFromTyeStep("blazor"));
|
|
|
|
steps.Add(new RemoveProjectFromTyeStep("blazor-server"));
|
|
|
|
steps.Add(new RemoveProjectFromTyeStep("blazor-server"));
|
|
|
|
|
|
|
|
|
|
|
|
context.Symbols.Add("ui:angular");
|
|
|
|
context.Symbols.Add("ui:angular");
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
@ -157,7 +158,7 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
|
|
|
|
null,
|
|
|
|
null,
|
|
|
|
"/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server"));
|
|
|
|
"/apps/blazor/src/MyCompanyName.MyProjectName.Blazor.Server"));
|
|
|
|
steps.Add(new RemoveProjectFromTyeStep("blazor-server"));
|
|
|
|
steps.Add(new RemoveProjectFromTyeStep("blazor-server"));
|
|
|
|
|
|
|
|
|
|
|
|
context.Symbols.Add("ui:blazor");
|
|
|
|
context.Symbols.Add("ui:blazor");
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
@ -180,7 +181,7 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
|
|
|
|
steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.Blazor.Server",
|
|
|
|
steps.Add(new TemplateProjectRenameStep("MyCompanyName.MyProjectName.Blazor.Server",
|
|
|
|
"MyCompanyName.MyProjectName.Blazor"));
|
|
|
|
"MyCompanyName.MyProjectName.Blazor"));
|
|
|
|
steps.Add(new RenameProjectInTyeStep("blazor-server", "blazor"));
|
|
|
|
steps.Add(new RenameProjectInTyeStep("blazor-server", "blazor"));
|
|
|
|
|
|
|
|
|
|
|
|
context.Symbols.Add("ui:blazor-server");
|
|
|
|
context.Symbols.Add("ui:blazor-server");
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
|
|
@ -198,7 +199,7 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
|
|
|
|
steps.Add(new RemoveProjectFromTyeStep("blazor-server"));
|
|
|
|
steps.Add(new RemoveProjectFromTyeStep("blazor-server"));
|
|
|
|
|
|
|
|
|
|
|
|
steps.Add(new RemoveFolderStep("/apps/angular"));
|
|
|
|
steps.Add(new RemoveFolderStep("/apps/angular"));
|
|
|
|
|
|
|
|
|
|
|
|
context.Symbols.Add("ui:mvc");
|
|
|
|
context.Symbols.Add("ui:mvc");
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -215,4 +216,9 @@ public abstract class MicroserviceTemplateBase : TemplateInfo
|
|
|
|
{
|
|
|
|
{
|
|
|
|
steps.Add(new UpdateNuGetConfigStep("/NuGet.Config"));
|
|
|
|
steps.Add(new UpdateNuGetConfigStep("/NuGet.Config"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private static void RandomizeAuthServerPassPhrase(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
steps.Add(new RandomizeAuthServerPassPhraseStep());
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|