From 7eff0e8feb2949963784bb9a8ecfd1a56953762d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Tue, 6 Aug 2019 15:59:00 +0300
Subject: [PATCH] ModuleTemplate generation fix.

---
 .../Templates/MvcModule/ModuleTemplate.cs     | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcModule/ModuleTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcModule/ModuleTemplate.cs
index c144f947a4..b3eab61ac9 100644
--- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcModule/ModuleTemplate.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/MvcModule/ModuleTemplate.cs
@@ -22,14 +22,8 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule
             var steps = new List<ProjectBuildPipelineStep>();
 
             DeleteUnrelatedProjects(context, steps);
-
-            steps.Add(new TemplateRandomSslPortStep(new List<string>
-            {
-                "https://localhost:44300",
-                "https://localhost:44301",
-                "https://localhost:44302",
-                "https://localhost:44303"
-            }));
+            RandomizeSslPorts(context, steps);
+            CleanupFolderHierarchy(context, steps);
 
             return steps;
         }
@@ -53,5 +47,21 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule
                 ));
             }
         }
+
+        private void RandomizeSslPorts(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            steps.Add(new TemplateRandomSslPortStep(new List<string>
+            {
+                "https://localhost:44300",
+                "https://localhost:44301",
+                "https://localhost:44302",
+                "https://localhost:44303"
+            }));
+        }
+
+        private void CleanupFolderHierarchy(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            steps.Add(new MoveFolderStep("/aspnet-core/", "/"));
+        }
     }
 }