From 1eabc127f6bb8f6398c1a001a46220faf909b5e5 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 17 Apr 2020 15:23:25 +0800 Subject: [PATCH 1/2] Replace the NuGet.Config file in the module template. --- .../Templates/Module/ModuleTemplateBase.cs | 8 +++++++- .../Templates/{App => }/UpdateNuGetConfigStep.cs | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) rename framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/{App => }/UpdateNuGetConfigStep.cs (95%) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs index 3faf920ab0..d5b32e53ef 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs @@ -18,6 +18,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module DeleteUnrelatedProjects(context, steps); RandomizeSslPorts(context, steps); + UpdateNuGetConfig(context, steps); CleanupFolderHierarchy(context, steps); return steps; @@ -46,7 +47,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module steps.Add(new RemoveFolderStep("/angular")); } - + private void RandomizeSslPorts(ProjectBuildContext context, List steps) { steps.Add(new TemplateRandomSslPortStep(new List @@ -58,6 +59,11 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module })); } + private static void UpdateNuGetConfig(ProjectBuildContext context, List steps) + { + steps.Add(new UpdateNuGetConfigStep("/aspnet-core/NuGet.Config")); + } + private void CleanupFolderHierarchy(ProjectBuildContext context, List steps) { steps.Add(new MoveFolderStep("/aspnet-core/", "/")); diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/UpdateNuGetConfigStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/UpdateNuGetConfigStep.cs similarity index 95% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/UpdateNuGetConfigStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/UpdateNuGetConfigStep.cs index 1a40eff341..deeb297047 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/UpdateNuGetConfigStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/UpdateNuGetConfigStep.cs @@ -4,7 +4,7 @@ using System.Linq; using Volo.Abp.Cli.ProjectBuilding.Building; using Volo.Abp.Cli.ProjectBuilding.Files; -namespace Volo.Abp.Cli.ProjectBuilding.Templates.App +namespace Volo.Abp.Cli.ProjectBuilding.Templates { public class UpdateNuGetConfigStep : ProjectBuildPipelineStep { From 0a3c0636a968018f474a304567ba114673202219 Mon Sep 17 00:00:00 2001 From: maliming Date: Fri, 17 Apr 2020 15:25:00 +0800 Subject: [PATCH 2/2] Remove spaces. --- .../Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs index d5b32e53ef..c9976712c9 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Module/ModuleTemplateBase.cs @@ -47,7 +47,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Module steps.Add(new RemoveFolderStep("/angular")); } - + private void RandomizeSslPorts(ProjectBuildContext context, List steps) { steps.Add(new TemplateRandomSslPortStep(new List