Merge branch 'dev' of https://github.com/abpframework/abp into feature/globalize-modal

abp_io/AbpIoLocalization/AbpIoLocalization/Www/Localization/Resources/en.json

@@ -153,6 +153,7 @@
     "Code": "Code",
     "Result": "Result",
     "SeeTheDocumentForMoreInformation": "See the <a href=\"{1}\">{0} document</a> for more information",
-    "IndexPageHeroSection": "<span class=\"first-line shine\"><strong>open source</strong></span><span class=\"second-line text-uppercase\">Web Application<br />Framework </span><span class=\"third-line shine2\"><strong>for asp.net core</strong></span>"
+    "IndexPageHeroSection": "<span class=\"first-line shine\"><strong>open source</strong></span><span class=\"second-line text-uppercase\">Web Application<br />Framework </span><span class=\"third-line shine2\"><strong>for asp.net core</strong></span>",
+    "UiFramework": "UI Framework"
   }
 }

build-all.ps1

@@ -20,7 +20,7 @@ $solutionPaths = (
     "modules/background-jobs",
     "modules/client-simulation",
     "templates/mvc-module",
-    "templates/mvc",
+    "templates/app/aspnet-core",
     "samples/MicroserviceDemo",
     "abp_io/AbpIoLocalization"
 )

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliConsts.cs

@@ -3,5 +3,7 @@
     public static class CliConsts
     {
         public const string Command = "AbpCliCommand";
+
+        public const string BranchPrefix = "branch@";
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@@ -46,7 +46,9 @@ namespace Volo.Abp.Cli.Commands
                 new ProjectBuildArgs(
                     SolutionName.Parse(commandLineArgs.Target),
                     commandLineArgs.Options.GetOrNull(Options.Template.Short, Options.Template.Long),
-                    GetDatabaseProviderOrNull(commandLineArgs),
+                    commandLineArgs.Options.GetOrNull(Options.Version.Short, Options.Version.Long),
+                    GetDatabaseProvider(commandLineArgs),
+                    GetUiFramework(commandLineArgs),
                     commandLineArgs.Options
                 )
             );
@@ -93,6 +95,7 @@ namespace Volo.Abp.Cli.Commands
                         {
                             StreamUtils.Copy(zipInputStream, streamWriter, buffer);
                         }
+
                         zipEntry = zipInputStream.GetNextEntry();
                     }
                 }
@@ -111,13 +114,14 @@ namespace Volo.Abp.Cli.Commands
             sb.AppendLine("  abp new <project-name> [-t|--template] [-d|--database-provider] [-o|--output-folder]");
             sb.AppendLine("");
             sb.AppendLine("Options:");
-            sb.AppendLine("-t|--template <template-name>");
+            sb.AppendLine("-t|--template <template-name>               (default: app)");
-            sb.AppendLine("-o|--output-folder <output-folder>");
+            sb.AppendLine("-o|--output-folder <output-folder>          (default: current folder)");
+            sb.AppendLine("-v|--version <version>                      (default: latest version)");
             sb.AppendLine("-d|--database-provider <database-provider>  (if supported by the template)");
             sb.AppendLine("--tiered                                    (if supported by the template)");
             sb.AppendLine("--no-ui                                     (if supported by the template)");
             sb.AppendLine("");
-            sb.AppendLine("Some examples:");
+            sb.AppendLine("Examples:");
             sb.AppendLine("  abp new Acme.BookStore");
             sb.AppendLine("  abp new Acme.BookStore --tiered");
             sb.AppendLine("  abp new Acme.BookStore -t mvc-module");
@@ -136,7 +140,7 @@ namespace Volo.Abp.Cli.Commands
             return "Generates a new solution based on the ABP startup templates.";
         }
 
-        protected virtual DatabaseProvider GetDatabaseProviderOrNull(CommandLineArgs commandLineArgs)
+        protected virtual DatabaseProvider GetDatabaseProvider(CommandLineArgs commandLineArgs)
         {
             var optionValue = commandLineArgs.Options.GetOrNull(Options.DatabaseProvider.Short, Options.DatabaseProvider.Long);
             switch (optionValue)
@@ -150,6 +154,20 @@ namespace Volo.Abp.Cli.Commands
             }
         }
 
+        private UiFramework GetUiFramework(CommandLineArgs commandLineArgs)
+        {
+            var optionValue = commandLineArgs.Options.GetOrNull(Options.UiFramework.Short, Options.UiFramework.Long);
+            switch (optionValue)
+            {
+                case "mvc":
+                    return UiFramework.Mvc;
+                case "angular":
+                    return UiFramework.Angular;
+                default:
+                    return UiFramework.NotSpecified;
+            }
+        }
+
         public static class Options
         {
             public static class Template
@@ -169,6 +187,18 @@ namespace Volo.Abp.Cli.Commands
                 public const string Short = "o";
                 public const string Long = "output-folder";
             }
+
+            public static class Version
+            {
+                public const string Short = "v";
+                public const string Long = "version";
+            }
+
+            public static class UiFramework
+            {
+                public const string Short = "u";
+                public const string Long = "ui";
+            }
         }
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Http/CliHttpClient.cs

@@ -7,9 +7,9 @@ namespace Volo.Abp.Cli.Http
 {
     public class CliHttpClient : HttpClient
     {
-        public CliHttpClient() : base(new CliHttpClientHandler())
+        public CliHttpClient(TimeSpan? timeout = null) : base(new CliHttpClientHandler())
         {
-            Timeout = TimeSpan.FromSeconds(30);
+            Timeout = timeout ?? TimeSpan.FromMinutes(1);
 
             AddAuthentication(this);
         }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoTemplateStore.cs

@@ -7,7 +7,6 @@ using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
 using Volo.Abp.Cli.Http;
-using Volo.Abp.Cli.ProjectBuilding.Building;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Http;
 using Volo.Abp.IO;
@@ -40,13 +39,12 @@ namespace Volo.Abp.Cli.ProjectBuilding
 
         public async Task<TemplateFile> GetAsync(
             string name,
-            DatabaseProvider databaseProvider,
-            string projectName,
             string version = null)
         {
+            var latestVersion = await GetLatestTemplateVersionAsync(name);
             if (version == null)
             {
-                version = await GetLatestTemplateVersionAsync(name);
+                version = latestVersion;
             }
 
             DirectoryHelper.CreateIfNotExists(CliPaths.TemplateCache);
@@ -55,7 +53,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
             if (Options.CacheTemplates && File.Exists(localCacheFile))
             {
                 Logger.LogInformation("Using cached template: " + name + ", version: " + version);
-                return new TemplateFile(File.ReadAllBytes(localCacheFile), version);
+                return new TemplateFile(File.ReadAllBytes(localCacheFile), version, latestVersion);
             }
 
             Logger.LogInformation("Downloading template: " + name + ", version: " + version);
@@ -73,7 +71,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
                 File.WriteAllBytes(localCacheFile, fileContent);
             }
 
-            return new TemplateFile(fileContent, version);
+            return new TemplateFile(fileContent, version, latestVersion);
         }
 
         private async Task<string> GetLatestTemplateVersionAsync(string name)
@@ -102,7 +100,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
         {
             var postData = JsonSerializer.Serialize(input);
 
-            using (var client = new CliHttpClient())
+            using (var client = new CliHttpClient(TimeSpan.FromMinutes(10)))
             {
                 var responseMessage = await client.PostAsync(
                     $"{CliUrls.WwwAbpIo}api/download/template/",

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/DatabaseProvider.cs

@@ -6,18 +6,4 @@
         EntityFrameworkCore = 1,
         MongoDb = 2
     }
-
-    public static class DatabaseProviderExtensions
-    {
-        public static string ToProviderName(this DatabaseProvider databaseProvider)
-        {
-            switch (databaseProvider)
-            {
-                case DatabaseProvider.EntityFrameworkCore: return "ef";
-                case DatabaseProvider.MongoDb: return "mongodb";
-                case DatabaseProvider.NotSpecified: return "NotSpecified";
-                default: return "NotSpecified";
-            }
-        }
-    }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/DatabaseProviderExtensions.cs

@@ -0,0 +1,16 @@
+namespace Volo.Abp.Cli.ProjectBuilding.Building
+{
+    public static class DatabaseProviderExtensions
+    {
+        public static string ToProviderName(this DatabaseProvider databaseProvider)
+        {
+            switch (databaseProvider)
+            {
+                case DatabaseProvider.EntityFrameworkCore: return "ef";
+                case DatabaseProvider.MongoDb: return "mongodb";
+                case DatabaseProvider.NotSpecified: return "NotSpecified";
+                default: return "NotSpecified";
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipeline.cs

@@ -4,18 +4,21 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
 {
     public class ProjectBuildPipeline
     {
+        public ProjectBuildContext Context { get; }
+
         public List<ProjectBuildPipelineStep> Steps { get; }
 
-        public ProjectBuildPipeline()
+        public ProjectBuildPipeline(ProjectBuildContext context)
         {
+            Context = context;
             Steps = new List<ProjectBuildPipelineStep>();
         }
 
-        public void Execute(ProjectBuildContext context)
+        public void Execute()
         {
             foreach (var step in Steps)
             {
-                step.Execute(context);
+                step.Execute(Context);
             }
         }
     }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs

@@ -6,7 +6,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
     {
         public static ProjectBuildPipeline Build(ProjectBuildContext context)
         {
-            var pipeline = new ProjectBuildPipeline();
+            var pipeline = new ProjectBuildPipeline(context);
 
             pipeline.Steps.Add(new FileEntryListReadStep());
 

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

@@ -0,0 +1,34 @@
+using System;
+using System.Linq;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
+{
+    public class MoveFolderStep : ProjectBuildPipelineStep
+    {
+        private readonly string _sourceFolder;
+        private readonly string _targetFolder;
+
+        public MoveFolderStep(string sourceFolder, string targetFolder)
+        {
+            _sourceFolder = sourceFolder;
+            _targetFolder = targetFolder;
+        }
+
+        public override void Execute(ProjectBuildContext context)
+        {
+            var fileEntries = context.Files.Where(file => file.Name.StartsWith(_sourceFolder)).ToList();
+            foreach (var fileEntry in fileEntries)
+            {
+                var newName = fileEntry.Name.ReplaceFirst(_sourceFolder, _targetFolder);
+
+                if (newName.IsIn("", "/"))
+                {
+                    context.Files.Remove(fileEntry);
+                    continue;
+                }
+
+                fileEntry.SetName(newName);
+            }
+        }
+    }
+}

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

@@ -10,11 +10,17 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
     {
         public override void Execute(ProjectBuildContext context)
         {
+            var nugetPackageVersion = context.TemplateFile.Version;
+            if (nugetPackageVersion.StartsWith(CliConsts.BranchPrefix))
+            {
+                nugetPackageVersion = context.TemplateFile.LatestVersion;
+            }
+
             new NugetReferenceReplacer(
                 context.Files,
                 "MyCompanyName",
                 "MyProjectName",
-                context.TemplateFile.Version
+                nugetPackageVersion
             ).Run();
         }
 
@@ -23,14 +29,18 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
             private readonly List<FileEntry> _entries;
             private readonly string _companyNamePlaceHolder;
             private readonly string _projectNamePlaceHolder;
-            private readonly string _latestNugetPackageVersion;
+            private readonly string _nugetPackageVersion;
 
-            public NugetReferenceReplacer(List<FileEntry> entries, string companyNamePlaceHolder, string projectNamePlaceHolder, string latestNugetPackageVersion)
+            public NugetReferenceReplacer(
+                List<FileEntry> entries, 
+                string companyNamePlaceHolder, 
+                string projectNamePlaceHolder, 
+                string nugetPackageVersion)
             {
                 _entries = entries;
                 _companyNamePlaceHolder = companyNamePlaceHolder;
                 _projectNamePlaceHolder = projectNamePlaceHolder;
-                _latestNugetPackageVersion = latestNugetPackageVersion;
+                _nugetPackageVersion = nugetPackageVersion;
             }
 
             public void Run()
@@ -78,7 +88,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
                     newNode.Attributes.Append(includeAttr);
 
                     var versionAttr = doc.CreateAttribute("Version");
-                    versionAttr.Value = _latestNugetPackageVersion;
+                    versionAttr.Value = _nugetPackageVersion;
                     newNode.Attributes.Append(versionAttr);
 
                     oldNode.ParentNode.ReplaceChild(newNode, oldNode);

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

@@ -0,0 +1,28 @@
+using System.Linq;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
+{
+    public class RemoveFolderStep : ProjectBuildPipelineStep
+    {
+        private readonly string _folderPath;
+
+        public RemoveFolderStep(string folderPath)
+        {
+            _folderPath = folderPath;
+        }
+
+        public override void Execute(ProjectBuildContext context)
+        {
+            //Remove the folder content
+            var folderPathWithSlash = _folderPath + "/";
+            context.Files.RemoveAll(file => file.Name.StartsWith(folderPathWithSlash));
+
+            //Remove the folder
+            var folder = context.Files.FirstOrDefault(file => file.Name == _folderPath);
+            if (folder != null)
+            {
+                context.Files.Remove(folder);
+            }
+        }
+    }
+}

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

@@ -18,15 +18,13 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps
             string projectFolderPath = null)
         {
             _projectName = projectName;
-            _solutionFilePath = solutionFilePath ?? "/MyCompanyName.MyProjectName.sln";
+            _solutionFilePath = solutionFilePath ?? "/aspnet-core/MyCompanyName.MyProjectName.sln";
-            _projectFolderPath = projectFolderPath ?? ("/src/" + projectName);
+            _projectFolderPath = projectFolderPath ?? ("/aspnet-core/src/" + projectName);
         }
 
         public override void Execute(ProjectBuildContext context)
         {
-            var projectFolderWithSlash = _projectFolderPath + "/";
+            new RemoveFolderStep(_projectFolderPath).Execute(context);
-            context.Files.RemoveAll(file => file.Name.StartsWith(projectFolderWithSlash));
-            context.Files.RemoveAll(file => file.Name == _projectFolderPath);
             var solutionFile = context.GetFile(_solutionFilePath);
             solutionFile.NormalizeLineEndings();
             solutionFile.SetLines(RemoveProject(solutionFile.GetLines().ToList()));

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/TemplateInfo.cs

@@ -11,15 +11,19 @@ namespace Volo.Abp.Cli.ProjectBuilding.Building
 
         public DatabaseProvider DefaultDatabaseProvider { get; }
 
+        public UiFramework DefaultUiFramework { get; }
+
         [CanBeNull]
         public string DocumentUrl { get; set; }
 
         protected TemplateInfo(
             [NotNull] string name, 
-            DatabaseProvider defaultDatabaseProvider = DatabaseProvider.NotSpecified)
+            DatabaseProvider defaultDatabaseProvider = DatabaseProvider.NotSpecified,
+            UiFramework defaultUiFramework = UiFramework.NotSpecified)
         {
             Name = Check.NotNullOrWhiteSpace(name, nameof(name));
-            DefaultDatabaseProvider = Check.NotNull(defaultDatabaseProvider, nameof(defaultDatabaseProvider));
+            DefaultDatabaseProvider = defaultDatabaseProvider;
+            DefaultUiFramework = defaultUiFramework;
         }
 
         public virtual IEnumerable<ProjectBuildPipelineStep> GetCustomSteps(ProjectBuildContext context)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFramework.cs

@@ -0,0 +1,9 @@
+namespace Volo.Abp.Cli.ProjectBuilding.Building
+{
+    public enum UiFramework
+    {
+        NotSpecified = 0,
+        Mvc = 1,
+        Angular = 2
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/UiFrameworkExtensions.cs

@@ -0,0 +1,16 @@
+namespace Volo.Abp.Cli.ProjectBuilding.Building
+{
+    public static class UiFrameworkExtensions
+    {
+        public static string ToFrameworkName(this UiFramework uiFramework)
+        {
+            switch (uiFramework)
+            {
+                case UiFramework.Mvc: return "mvc";
+                case UiFramework.Angular: return "angular";
+                case UiFramework.NotSpecified: return "NotSpecified";
+                default: return "NotSpecified";
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Github/GithubRelease.cs

@@ -1,21 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace Volo.Abp.Cli.ProjectBuilding.Github
-{
-    [JsonObject]
-    public class GithubRelease
-    {
-        [JsonProperty("id")]
-        public int Id { get; set; }
-
-        [JsonProperty("name")]
-        public string Name { get; set; }
-
-        [JsonProperty("prerelease")]
-        public bool IsPrerelease { get; set; }
-
-        [JsonProperty("published_at")]
-        public DateTime PublishTime { get; set; }
-    }
-}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ITemplateStore.cs

@@ -1,6 +1,5 @@
 using System.Threading.Tasks;
 using JetBrains.Annotations;
-using Volo.Abp.Cli.ProjectBuilding.Building;
 
 namespace Volo.Abp.Cli.ProjectBuilding
 {
@@ -8,8 +7,6 @@ namespace Volo.Abp.Cli.ProjectBuilding
     {
         Task<TemplateFile> GetAsync(
             string name,
-            DatabaseProvider databaseProvider,
-            string projectName,
             [CanBeNull] string version = null
         );
     }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildArgs.cs

@@ -12,21 +12,29 @@ namespace Volo.Abp.Cli.ProjectBuilding
         [CanBeNull]
         public string TemplateName { get; set; }
 
+        [CanBeNull]
+        public string Version { get; set; }
+
         public DatabaseProvider DatabaseProvider { get; set; }
 
+        public UiFramework UiFramework { get; set; }
+
         [NotNull]
         public Dictionary<string, string> ExtraProperties { get; set; }
 
         public ProjectBuildArgs(
             [NotNull] SolutionName solutionName, 
             [CanBeNull] string templateName = null,
+            [CanBeNull] string version = null,
             DatabaseProvider databaseProvider = DatabaseProvider.NotSpecified,
+            UiFramework uiFramework = UiFramework.NotSpecified,
             Dictionary<string, string> extraProperties = null)
         {
-            DatabaseProvider = databaseProvider;
-            TemplateName = templateName;
             SolutionName = Check.NotNull(solutionName, nameof(solutionName));
-
+            TemplateName = templateName;
+            Version = version;
+            DatabaseProvider = databaseProvider;
+            UiFramework = uiFramework;
             ExtraProperties = extraProperties ?? new Dictionary<string, string>();
         }
     }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuilder.cs

@@ -1,9 +1,10 @@
-using System;
+using Microsoft.Extensions.Logging;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 using Microsoft.Extensions.Options;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Volo.Abp.Cli.ProjectBuilding.Analyticses;
 using Volo.Abp.Cli.ProjectBuilding.Building;
 using Volo.Abp.DependencyInjection;
@@ -40,20 +41,11 @@ namespace Volo.Abp.Cli.ProjectBuilding
         {
             var templateInfo = GetTemplateInfo(args);
 
-            args.TemplateName = templateInfo.Name;
+            NormalizeArgs(args, templateInfo);
-
-            if (args.DatabaseProvider == DatabaseProvider.NotSpecified)
-            {
-                if (templateInfo.DefaultDatabaseProvider != DatabaseProvider.NotSpecified)
-                {
-                    args.DatabaseProvider = templateInfo.DefaultDatabaseProvider;
-                }
-            }
 
             var templateFile = await TemplateStore.GetAsync(
                 args.TemplateName,
-                args.DatabaseProvider,
+                args.Version
-                args.SolutionName.FullName
             );
 
             var context = new ProjectBuildContext(
@@ -62,7 +54,7 @@ namespace Volo.Abp.Cli.ProjectBuilding
                 args
             );
 
-            ProjectBuildPipelineBuilder.Build(context).Execute(context);
+            ProjectBuildPipelineBuilder.Build(context).Execute();
 
             if (!templateInfo.DocumentUrl.IsNullOrEmpty())
             {
@@ -92,6 +84,30 @@ namespace Volo.Abp.Cli.ProjectBuilding
             return new ProjectBuildResult(context.Result.ZipContent, args.SolutionName.ProjectName);
         }
 
+        private static void NormalizeArgs(ProjectBuildArgs args, TemplateInfo templateInfo)
+        {
+            if (args.TemplateName.IsNullOrEmpty())
+            {
+                args.TemplateName = templateInfo.Name;
+            }
+
+            if (args.DatabaseProvider == DatabaseProvider.NotSpecified)
+            {
+                if (templateInfo.DefaultDatabaseProvider != DatabaseProvider.NotSpecified)
+                {
+                    args.DatabaseProvider = templateInfo.DefaultDatabaseProvider;
+                }
+            }
+
+            if (args.UiFramework == UiFramework.NotSpecified)
+            {
+                if (templateInfo.DefaultUiFramework != UiFramework.NotSpecified)
+                {
+                    args.UiFramework = templateInfo.DefaultUiFramework;
+                }
+            }
+        }
+
         private TemplateInfo GetTemplateInfo(ProjectBuildArgs args)
         {
             if (args.TemplateName.IsNullOrWhiteSpace())

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateFile.cs

@@ -4,12 +4,15 @@
     {
         public string Version { get; }
 
+        public string LatestVersion { get; }
+
         public byte[] FileBytes { get; }
 
-        public TemplateFile(byte[] fileBytes, string version)
+        public TemplateFile(byte[] fileBytes, string version, string latestVersion)
         {
             FileBytes = fileBytes;
             Version = version;
+            LatestVersion = latestVersion;
         }
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateInfoProvider.cs

@@ -1,6 +1,6 @@
 using System;
 using Volo.Abp.Cli.ProjectBuilding.Building;
-using Volo.Abp.Cli.ProjectBuilding.Templates.Mvc;
+using Volo.Abp.Cli.ProjectBuilding.Templates.App;
 using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule;
 using Volo.Abp.DependencyInjection;
 
@@ -10,15 +10,15 @@ namespace Volo.Abp.Cli.ProjectBuilding
     {
         public TemplateInfo GetDefault()
         {
-            return Get(MvcTemplate.TemplateName);
+            return Get(AppTemplate.TemplateName);
         }
 
         public TemplateInfo Get(string name)
         {
             switch (name)
             {
-                case MvcTemplate.TemplateName:
+                case AppTemplate.TemplateName:
-                    return new MvcTemplate();
+                    return new AppTemplate();
                 case MvcModuleTemplate.TemplateName:
                     return new MvcModuleTemplate();
                 default:

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplate.cs

@@ -0,0 +1,107 @@
+using System.Collections.Generic;
+using Volo.Abp.Cli.ProjectBuilding.Building;
+using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
+{
+    public class AppTemplate : TemplateInfo
+    {
+        /// <summary>
+        /// "app".
+        /// </summary>
+        public const string TemplateName = "app";
+
+        public AppTemplate()
+            : base(TemplateName, DatabaseProvider.EntityFrameworkCore, UiFramework.Mvc)
+        {
+            DocumentUrl = "https://docs.abp.io/en/abp/latest/Startup-Templates/Application";
+        }
+
+        public override IEnumerable<ProjectBuildPipelineStep> GetCustomSteps(ProjectBuildContext context)
+        {
+            var steps = new List<ProjectBuildPipelineStep>();
+
+            SwitchDatabaseProvider(context, steps);
+            DeleteUnrelatedProjects(context, steps);
+            RandomizeSslPorts(context, steps);
+            CleanupFolderHierarchy(context, steps);
+
+            return steps;
+        }
+
+       private static void SwitchDatabaseProvider(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            if (context.BuildArgs.DatabaseProvider == DatabaseProvider.MongoDb)
+            {
+                steps.Add(new AppTemplateSwitchEntityFrameworkCoreToMongoDbStep());
+            }
+
+            if (context.BuildArgs.DatabaseProvider != DatabaseProvider.EntityFrameworkCore)
+            {
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", projectFolderPath: "/aspnet-core/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests"));
+            }
+
+            if (context.BuildArgs.DatabaseProvider != DatabaseProvider.MongoDb)
+            {
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.MongoDB"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.MongoDB.Tests", projectFolderPath: "/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests"));
+            }
+        }
+
+        private void DeleteUnrelatedProjects(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+        {
+            if (context.BuildArgs.UiFramework == UiFramework.Mvc)
+            {
+                if (context.BuildArgs.ExtraProperties.ContainsKey("tiered"))
+                {
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web"));
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Tests", projectFolderPath: "/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests"));
+                    steps.Add(new AppTemplateProjectRenameStep("MyCompanyName.MyProjectName.Web.Host", "MyCompanyName.MyProjectName.Web"));
+                }
+                else
+                {
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Host"));
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
+                    steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
+                    steps.Add(new AppTemplateChangeConsoleTestClientPortSettingsStep());
+                }
+            }
+
+            if (context.BuildArgs.UiFramework != UiFramework.Mvc)
+            {
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Host"));
+                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Tests", projectFolderPath: "/aspnet-core/test/MyCompanyName.MyProjectName.Web.Tests"));
+            }
+
+            if (context.BuildArgs.UiFramework != UiFramework.Angular)
+            {
+                steps.Add(new RemoveFolderStep("/angular"));
+            }
+        }
+
+        private static 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)
+        {
+            if (context.BuildArgs.UiFramework == UiFramework.Mvc)
+            {
+                steps.Add(new MoveFolderStep("/aspnet-core/", "/"));
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Mvc/MyTemplateChangeConsoleTestClientPortSettingsStep.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateChangeConsoleTestClientPortSettingsStep.cs

@@ -1,14 +1,14 @@
 using Volo.Abp.Cli.ProjectBuilding.Building;
 using Volo.Abp.Cli.ProjectBuilding.Files;
 
-namespace Volo.Abp.Cli.ProjectBuilding.Templates.Mvc
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
 {
-    public class MyTemplateChangeConsoleTestClientPortSettingsStep : ProjectBuildPipelineStep
+    public class AppTemplateChangeConsoleTestClientPortSettingsStep : ProjectBuildPipelineStep
     {
         public override void Execute(ProjectBuildContext context)
         {
             context
-                .GetFile("/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json")
+                .GetFile("/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json")
                 .ReplaceText("44395", "44361")
                 .ReplaceText("44348", "44361");
         }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Mvc/MvcTemplateProjectRenameStep.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateProjectRenameStep.cs

@@ -2,14 +2,14 @@
 using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
 using Volo.Abp.Cli.ProjectBuilding.Files;
 
-namespace Volo.Abp.Cli.ProjectBuilding.Templates.Mvc
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
 {
-    public class MvcTemplateProjectRenameStep : ProjectBuildPipelineStep
+    public class AppTemplateProjectRenameStep : ProjectBuildPipelineStep
     {
         private readonly string _oldProjectName;
         private readonly string _newProjectName;
 
-        public MvcTemplateProjectRenameStep(
+        public AppTemplateProjectRenameStep(
             string oldProjectName,
             string newProjectName)
         {
@@ -20,7 +20,7 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Mvc
         public override void Execute(ProjectBuildContext context)
         {
             context
-                .GetFile("/MyCompanyName.MyProjectName.sln")
+                .GetFile("/aspnet-core/MyCompanyName.MyProjectName.sln")
                 .ReplaceText(_oldProjectName, _newProjectName);
             
             RenameHelper.RenameAll(context.Files, _oldProjectName, _newProjectName);

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Mvc/MvcTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs → framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateSwitchEntityFrameworkCoreToMongoDbStep.cs

@@ -1,9 +1,9 @@
 using System;
 using Volo.Abp.Cli.ProjectBuilding.Building;
 
-namespace Volo.Abp.Cli.ProjectBuilding.Templates.Mvc
+namespace Volo.Abp.Cli.ProjectBuilding.Templates.App
 {
-    public class MvcTemplateSwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPipelineStep
+    public class AppTemplateSwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPipelineStep
     {
         public override void Execute(ProjectBuildContext context)
         {
@@ -11,14 +11,14 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Mvc
 
             ChangeProjectReference(
                 context,
-                "/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj",
+                "/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj",
                 "EntityFrameworkCore.DbMigrations",
                 "MongoDB"
             );
 
             ChangeModuleDependency(
                 context,
-                "/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs",
+                "/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs",
                 "MyCompanyName.MyProjectName.EntityFrameworkCore",
                 "MyCompanyName.MyProjectName.MongoDB",
                 "MyProjectNameEntityFrameworkCoreDbMigrationsModule",
@@ -27,21 +27,21 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Mvc
 
             ChangeConnectionStringToMongoDb(
                 context,
-                "/src/MyCompanyName.MyProjectName.Web/appsettings.json"
+                "/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json"
             );
 
             //MyCompanyName.MyProjectName.IdentityServer
 
             ChangeProjectReference(
                 context,
-                "/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj",
+                "/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyCompanyName.MyProjectName.IdentityServer.csproj",
                 "EntityFrameworkCore.DbMigrations",
                 "MongoDB"
             );
 
             ChangeModuleDependency(
                 context,
-                "/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs",
+                "/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/MyProjectNameIdentityServerModule.cs",
                 "MyCompanyName.MyProjectName.EntityFrameworkCore",
                 "MyCompanyName.MyProjectName.MongoDB",
                 "MyProjectNameEntityFrameworkCoreDbMigrationsModule",
@@ -50,21 +50,21 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Mvc
 
             ChangeConnectionStringToMongoDb(
                 context,
-                "/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json"
+                "/aspnet-core/src/MyCompanyName.MyProjectName.IdentityServer/appsettings.json"
             );
 
             //MyCompanyName.MyProjectName.HttpApi.Host
 
             ChangeProjectReference(
                 context,
-                "/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj",
+                "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj",
                 "EntityFrameworkCore.DbMigrations",
                 "MongoDB"
             );
 
             ChangeModuleDependency(
                 context,
-                "/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs",
+                "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs",
                 "MyCompanyName.MyProjectName.EntityFrameworkCore",
                 "MyCompanyName.MyProjectName.MongoDB",
                 "MyProjectNameEntityFrameworkCoreDbMigrationsModule",
@@ -73,21 +73,21 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Mvc
 
             ChangeConnectionStringToMongoDb(
                 context,
-                "/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json"
+                "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/appsettings.json"
             );
 
             //MyCompanyName.MyProjectName.DbMigrator
 
             ChangeProjectReference(
                 context,
-                "/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj",
+                "/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj",
                 "EntityFrameworkCore.DbMigrations",
                 "MongoDB"
             );
 
             ChangeModuleDependency(
                 context,
-                "/src/MyCompanyName.MyProjectName.DbMigrator/MyProjectNameDbMigratorModule.cs",
+                "/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyProjectNameDbMigratorModule.cs",
                 "MyCompanyName.MyProjectName.EntityFrameworkCore",
                 "MyCompanyName.MyProjectName.MongoDB",
                 "MyProjectNameEntityFrameworkCoreDbMigrationsModule",
@@ -96,21 +96,21 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates.Mvc
 
             ChangeConnectionStringToMongoDb(
                 context,
-                "/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json"
+                "/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json"
             );
 
             //MyCompanyName.MyProjectName.Domain.Tests
 
             ChangeProjectReference(
                 context,
-                "/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj",
+                "/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyCompanyName.MyProjectName.Domain.Tests.csproj",
                 "EntityFrameworkCore.Tests",
                 "MongoDB.Tests"
             );
 
             ChangeModuleDependency(
                 context,
-                "/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestModule.cs",
+                "/aspnet-core/test/MyCompanyName.MyProjectName.Domain.Tests/MyProjectNameDomainTestModule.cs",
                 "MyCompanyName.MyProjectName.EntityFrameworkCore",
                 "MyCompanyName.MyProjectName.MongoDB",
                 "MyProjectNameEntityFrameworkCoreTestModule",

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/Mvc/MvcTemplate.cs

@@ -1,77 +0,0 @@
-using System.Collections.Generic;
-using Volo.Abp.Cli.ProjectBuilding.Building;
-using Volo.Abp.Cli.ProjectBuilding.Building.Steps;
-using Volo.Abp.Cli.ProjectBuilding.Templates.MvcModule;
-
-namespace Volo.Abp.Cli.ProjectBuilding.Templates.Mvc
-{
-    public class MvcTemplate : TemplateInfo
-    {
-        /// <summary>
-        /// "mvc".
-        /// </summary>
-        public const string TemplateName = "mvc";
-
-        public MvcTemplate()
-            : base(TemplateName, DatabaseProvider.EntityFrameworkCore)
-        {
-            DocumentUrl = "https://docs.abp.io/en/abp/latest/Startup-Templates/Mvc";
-        }
-
-        public override IEnumerable<ProjectBuildPipelineStep> GetCustomSteps(ProjectBuildContext context)
-        {
-            var steps = new List<ProjectBuildPipelineStep>();
-
-            SwitchDatabaseProvider(context, steps);
-            DeleteUnrelatedProjects(context, steps);
-
-            steps.Add(new TemplateRandomSslPortStep(new List<string>
-            {
-                "https://localhost:44300",
-                "https://localhost:44301",
-                "https://localhost:44302",
-                "https://localhost:44303"
-            }));
-
-            return steps;
-        }
-
-        private static void SwitchDatabaseProvider(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
-        {
-            if (context.BuildArgs.DatabaseProvider == DatabaseProvider.MongoDb)
-            {
-                steps.Add(new MvcTemplateSwitchEntityFrameworkCoreToMongoDbStep());
-            }
-
-            if (context.BuildArgs.DatabaseProvider != DatabaseProvider.EntityFrameworkCore)
-            {
-                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore"));
-                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations"));
-                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.EntityFrameworkCore.Tests", projectFolderPath: "/test/MyCompanyName.MyProjectName.EntityFrameworkCore.Tests"));
-            }
-
-            if (context.BuildArgs.DatabaseProvider != DatabaseProvider.MongoDb)
-            {
-                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.MongoDB"));
-                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.MongoDB.Tests", projectFolderPath: "/test/MyCompanyName.MyProjectName.MongoDB.Tests"));
-            }
-        }
-
-        private void DeleteUnrelatedProjects(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
-        {
-            if (context.BuildArgs.ExtraProperties.ContainsKey("tiered"))
-            {
-                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web"));
-                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Tests", projectFolderPath: "/test/MyCompanyName.MyProjectName.Web.Tests"));
-                steps.Add(new MvcTemplateProjectRenameStep("MyCompanyName.MyProjectName.Web.Host", "MyCompanyName.MyProjectName.Web"));
-            }
-            else
-            {
-                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.Web.Host"));
-                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.HttpApi.Host"));
-                steps.Add(new RemoveProjectFromSolutionStep("MyCompanyName.MyProjectName.IdentityServer"));
-                steps.Add(new MyTemplateChangeConsoleTestClientPortSettingsStep());
-            }
-        }
-    }
-}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/TemplateRandomSslPortStep.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text.RegularExpressions;
 using Volo.Abp.Cli.ProjectBuilding.Building;
-using Volo.Abp.Cli.ProjectBuilding.Templates.Mvc;
+using Volo.Abp.Cli.ProjectBuilding.Templates.App;
 
 namespace Volo.Abp.Cli.ProjectBuilding.Templates
 {
@@ -34,21 +34,29 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates
                     !x.IsDirectory && x.Name.EndsWith("appSettings.json", StringComparison.InvariantCultureIgnoreCase))
                 .ToList();
 
-            if (context.Template.Name == MvcTemplate.TemplateName)
+            var angularEnvironments = context.Files.Where(x =>
+                    !x.IsDirectory &&
+                    (x.Name.EndsWith("environments/environment.ts", StringComparison.InvariantCultureIgnoreCase) ||
+                    x.Name.EndsWith("environments/environment.hmr.ts", StringComparison.InvariantCultureIgnoreCase) ||
+                    x.Name.EndsWith("environments/environment.prod.ts", StringComparison.InvariantCultureIgnoreCase))
+                )
+                .ToList();
+
+            if (context.Template.Name == AppTemplate.TemplateName)
             {
                 // no tiered
-                if (launchSettings.Count == 1&& launchSettings.First().Name.Equals("/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json", StringComparison.InvariantCultureIgnoreCase))
+                if (launchSettings.Count == 1&& launchSettings.First().Name.Equals("/aspnet-core/src/MyCompanyName.MyProjectName.Web/Properties/launchSettings.json", StringComparison.InvariantCultureIgnoreCase))
                 {
                     var dbMigrator = appSettings.FirstOrDefault(x =>
-                        x.Name.Equals("/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json", StringComparison.InvariantCultureIgnoreCase));
+                        x.Name.Equals("/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/appsettings.json", StringComparison.InvariantCultureIgnoreCase));
                     dbMigrator?.SetContent(dbMigrator.Content.Replace("https://localhost:44302", "https://localhost:44303"));
 
                     var web = appSettings.FirstOrDefault(x =>
-                        x.Name.Equals("/src/MyCompanyName.MyProjectName.Web/appsettings.json", StringComparison.InvariantCultureIgnoreCase));
+                        x.Name.Equals("/aspnet-core/src/MyCompanyName.MyProjectName.Web/appsettings.json", StringComparison.InvariantCultureIgnoreCase));
                     web?.SetContent(web.Content.Replace("https://localhost:44301", "https://localhost:44303"));
 
                     var consoleTestApp = appSettings.FirstOrDefault(x =>
-                        x.Name.Equals("/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json", StringComparison.InvariantCultureIgnoreCase));
+                        x.Name.Equals("/aspnet-core/test/MyCompanyName.MyProjectName.HttpApi.Client.ConsoleTestApp/appsettings.json", StringComparison.InvariantCultureIgnoreCase));
                     consoleTestApp?.SetContent(consoleTestApp.Content.Replace("https://localhost:44300", "https://localhost:44303"));
                     consoleTestApp?.SetContent(consoleTestApp.Content.Replace("https://localhost:44301", "https://localhost:44303"));
                 }
@@ -99,6 +107,22 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates
                         }
                         appSetting.SetLines(appSettingLines);
                     }
+
+                    foreach (var environment in angularEnvironments)
+                    {
+                        environment.NormalizeLineEndings();
+
+                        var environmentLines = environment.GetLines();
+                        for (var i = 0; i < environmentLines.Length; i++)
+                        {
+                            if (environmentLines[i].Contains(buildInUrl))
+                            {
+                                environmentLines[i] = environmentLines[i].Replace(buildInUrl, $"{buildInUrlWithoutPort}:{newPort}");
+                            }
+                        }
+                        environment.SetLines(environmentLines);
+                    }
+
                 }
             }
         }
@@ -112,13 +136,13 @@ namespace Volo.Abp.Cli.ProjectBuilding.Templates
                 : ports.ToList());
         }
 
-        private string GetUrlPort(string url)
+        private static string GetUrlPort(string url)
         {
             var match = Regex.Match(url, @":(\d+)");
             return match.Success ? match.Groups[1].Value : "";
         }
 
-        private string GetUrlWithoutPort(string url)
+        private static string GetUrlWithoutPort(string url)
         {
             var match = Regex.Match(url, @"(^.+):");
             return match.Success ? match.Groups[1].Value : "";

templates/app/angular/.editorconfig

@@ -0,0 +1,13 @@
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

templates/app/angular/.gitignore

@@ -0,0 +1,48 @@
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+# Only exists if Bazel was run
+/bazel-out
+
+# dependencies
+/node_modules
+
+# profiling files
+chrome-profiler-events.json
+speed-measure-plugin.json
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+npm-debug.log
+yarn-error.log
+testem.log
+/typings
+
+# System Files
+.DS_Store
+Thumbs.db
+
+yarn.lock*

templates/app/angular/.npmrc

@@ -0,0 +1 @@
+@volo:registry=http://192.168.1.45:4873/

templates/app/angular/README.md

@@ -0,0 +1,27 @@
+# MyProjectName
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 8.0.3.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

templates/app/angular/angular.json

@@ -0,0 +1,135 @@
+{
+  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
+  "version": 1,
+  "newProjectRoot": "projects",
+  "projects": {
+    "myProjectName": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
+      "root": "",
+      "sourceRoot": "src",
+      "prefix": "app",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/myProjectName",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.app.json",
+            "aot": false,
+            "assets": ["src/favicon.ico", "src/assets"],
+            "styles": [
+              "src/styles.scss",
+              "node_modules/bootstrap/dist/css/bootstrap.min.css",
+              "node_modules/font-awesome/css/font-awesome.min.css",
+              "node_modules/primeng/resources/themes/nova-light/theme.css",
+              "node_modules/primeicons/primeicons.css",
+              "node_modules/primeng/resources/primeng.min.css"
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
+            },
+            "hmr": {
+              "fileReplacements": [
+                {
+                  "replace": "src/environments/environment.ts",
+                  "with": "src/environments/environment.hmr.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "myProjectName:build"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "myProjectName:build:production"
+            },
+            "hmr": {
+              "hmr": true,
+              "browserTarget": "myProjectName:build:hmr"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "myProjectName:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "tsconfig.spec.json",
+            "karmaConfig": "karma.conf.js",
+            "assets": ["src/favicon.ico", "src/assets"],
+            "styles": [
+              "src/styles.scss",
+              "node_modules/bootstrap/dist/css/bootstrap.min.css",
+              "node_modules/font-awesome/css/font-awesome.min.css",
+              "node_modules/primeng/resources/themes/nova-light/theme.css",
+              "node_modules/primeicons/primeicons.css",
+              "node_modules/primeng/resources/primeng.min.css"
+            ],
+            "scripts": []
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": ["tsconfig.app.json", "tsconfig.spec.json", "e2e/tsconfig.json"],
+            "exclude": ["**/node_modules/**"]
+          }
+        },
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "e2e/protractor.conf.js",
+            "devServerTarget": "myProjectName:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "myProjectName:serve:production"
+            }
+          }
+        }
+      }
+    }
+  },
+  "defaultProject": "myProjectName"
+}

templates/app/angular/browserslist

@@ -0,0 +1,12 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+> 0.5%
+last 2 versions
+Firefox ESR
+not dead
+not IE 9-11 # For IE 9-11 support, remove 'not'.

templates/app/angular/e2e/protractor.conf.js

@@ -0,0 +1,32 @@
+// @ts-check
+// Protractor configuration file, see link for more information
+// https://github.com/angular/protractor/blob/master/lib/config.ts
+
+const { SpecReporter } = require('jasmine-spec-reporter');
+
+/**
+ * @type { import("protractor").Config }
+ */
+exports.config = {
+  allScriptsTimeout: 11000,
+  specs: [
+    './src/**/*.e2e-spec.ts'
+  ],
+  capabilities: {
+    'browserName': 'chrome'
+  },
+  directConnect: true,
+  baseUrl: 'http://localhost:4200/',
+  framework: 'jasmine',
+  jasmineNodeOpts: {
+    showColors: true,
+    defaultTimeoutInterval: 30000,
+    print: function() {}
+  },
+  onPrepare() {
+    require('ts-node').register({
+      project: require('path').join(__dirname, './tsconfig.json')
+    });
+    jasmine.getEnv().addReporter(new SpecReporter({ spec: { displayStacktrace: true } }));
+  }
+};

templates/app/angular/e2e/src/app.e2e-spec.ts

@@ -0,0 +1,23 @@
+import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
+
+describe('workspace-project App', () => {
+  let page: AppPage;
+
+  beforeEach(() => {
+    page = new AppPage();
+  });
+
+  it('should display welcome message', () => {
+    page.navigateTo();
+    expect(page.getTitleText()).toEqual('Welcome to myProjectName!');
+  });
+
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    expect(logs).not.toContain(jasmine.objectContaining({
+      level: logging.Level.SEVERE,
+    } as logging.Entry));
+  });
+});

templates/app/angular/e2e/src/app.po.ts

@@ -0,0 +1,11 @@
+import { browser, by, element } from 'protractor';
+
+export class AppPage {
+  navigateTo() {
+    return browser.get(browser.baseUrl) as Promise<any>;
+  }
+
+  getTitleText() {
+    return element(by.css('app-root h1')).getText() as Promise<string>;
+  }
+}

templates/app/angular/e2e/tsconfig.json

@@ -0,0 +1,13 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "../out-tsc/e2e",
+    "module": "commonjs",
+    "target": "es5",
+    "types": [
+      "jasmine",
+      "jasminewd2",
+      "node"
+    ]
+  }
+}

templates/app/angular/karma.conf.js

@@ -0,0 +1,32 @@
+// Karma configuration file, see link for more information
+// https://karma-runner.github.io/1.0/config/configuration-file.html
+
+module.exports = function (config) {
+  config.set({
+    basePath: '',
+    frameworks: ['jasmine', '@angular-devkit/build-angular'],
+    plugins: [
+      require('karma-jasmine'),
+      require('karma-chrome-launcher'),
+      require('karma-jasmine-html-reporter'),
+      require('karma-coverage-istanbul-reporter'),
+      require('@angular-devkit/build-angular/plugins/karma')
+    ],
+    client: {
+      clearContext: false // leave Jasmine Spec Runner output visible in browser
+    },
+    coverageIstanbulReporter: {
+      dir: require('path').join(__dirname, './coverage/myProjectName'),
+      reports: ['html', 'lcovonly', 'text-summary'],
+      fixWebpackSourcePaths: true
+    },
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: true,
+    browsers: ['Chrome'],
+    singleRun: false,
+    restartOnFileChange: true
+  });
+};

templates/app/angular/package.json

@@ -0,0 +1,56 @@
+{
+  "name": "my-project-name",
+  "version": "0.0.0",
+  "scripts": {
+    "ng": "ng",
+    "start": "ng serve",
+    "start:hmr": "ng serve --configuration hmr",
+    "build": "ng build",
+    "build:prod": "ng build --configuration production",
+    "test": "ng test",
+    "lint": "ng lint",
+    "e2e": "ng e2e"
+  },
+  "private": true,
+  "dependencies": {
+    "@abp/ng.account": "^0.7.6",
+    "@abp/ng.identity": "^0.7.6",
+    "@abp/ng.tenant-management": "^0.7.6",
+    "@abp/ng.theme.basic": "^0.7.6",
+    "@angular/animations": "~8.1.2",
+    "@angular/common": "~8.1.2",
+    "@angular/compiler": "~8.1.2",
+    "@angular/core": "~8.1.2",
+    "@angular/forms": "~8.1.2",
+    "@angular/platform-browser": "~8.1.2",
+    "@angular/platform-browser-dynamic": "~8.1.2",
+    "@angular/router": "~8.1.2",
+    "@angularclass/hmr": "^2.1.3",
+    "@ngxs/devtools-plugin": "^3.5.0",
+    "@ngxs/hmr-plugin": "^3.5.0",
+    "rxjs": "^6.4.0",
+    "tslib": "^1.9.0",
+    "zone.js": "~0.9.1"
+  },
+  "devDependencies": {
+    "@angular-devkit/build-angular": "~0.801.2",
+    "@angular/cli": "~8.1.2",
+    "@angular/compiler-cli": "~8.1.2",
+    "@angular/language-service": "~8.1.2",
+    "@types/jasmine": "~3.3.8",
+    "@types/jasminewd2": "~2.0.3",
+    "@types/node": "~8.9.4",
+    "codelyzer": "^5.0.0",
+    "jasmine-core": "~3.4.0",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~4.1.0",
+    "karma-chrome-launcher": "~2.2.0",
+    "karma-coverage-istanbul-reporter": "~2.0.1",
+    "karma-jasmine": "~2.0.1",
+    "karma-jasmine-html-reporter": "^1.4.0",
+    "protractor": "~5.4.0",
+    "ts-node": "~7.0.0",
+    "tslint": "~5.15.0",
+    "typescript": "~3.4.3"
+  }
+}

templates/app/angular/src/app/app-routing.module.ts

@@ -0,0 +1,41 @@
+import { IDENTITY_ROUTES } from '@abp/ng.identity';
+import { ACCOUNT_ROUTES } from '@abp/ng.account';
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { ABP } from '@abp/ng.core';
+import { TENANT_MANAGEMENT_ROUTES } from '@abp/ng.tenant-management';
+
+const routes: Routes = [
+  { path: '', redirectTo: '/home', pathMatch: 'full' },
+  {
+    path: 'home',
+    loadChildren: () => import('./home/home.module').then(m => m.HomeModule),
+    data: {
+      routes: {
+        name: 'Home',
+      } as ABP.Route,
+    },
+  },
+  {
+    path: 'account',
+    loadChildren: () => import('./lazy-libs/account-wrapper.module').then(m => m.AccountWrapperModule),
+    data: { routes: ACCOUNT_ROUTES },
+  },
+  {
+    path: 'identity',
+    loadChildren: () => import('./lazy-libs/identity-wrapper.module').then(m => m.IdentityWrapperModule),
+    data: { routes: IDENTITY_ROUTES },
+  },
+  {
+    path: 'tenant-management',
+    loadChildren: () =>
+      import('./lazy-libs/tenant-management-wrapper.module').then(m => m.TenantManagementWrapperModule),
+    data: { routes: TENANT_MANAGEMENT_ROUTES },
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forRoot(routes)],
+  exports: [RouterModule],
+})
+export class AppRoutingModule {}

templates/app/angular/src/app/app.component.ts

@@ -0,0 +1,11 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'app-root',
+  template: `
+    <router-outlet></router-outlet>
+  `,
+})
+export class AppComponent {
+  title = 'myProjectName';
+}

templates/app/angular/src/app/app.module.ts

@@ -0,0 +1,36 @@
+import { CoreModule } from '@abp/ng.core';
+import { LAYOUTS } from '@abp/ng.theme.basic';
+import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { NgxsReduxDevtoolsPluginModule } from '@ngxs/devtools-plugin';
+import { NgxsModule } from '@ngxs/store';
+import { OAuthModule } from 'angular-oauth2-oidc';
+import { environment } from '../environments/environment';
+import { AppRoutingModule } from './app-routing.module';
+import { AppComponent } from './app.component';
+import { SharedModule } from './shared/shared.module';
+import { ThemeSharedModule } from '@abp/ng.theme.shared';
+
+@NgModule({
+  declarations: [AppComponent],
+  imports: [
+    BrowserModule,
+    BrowserAnimationsModule,
+    AppRoutingModule,
+    SharedModule,
+    ThemeSharedModule.forRoot(),
+    CoreModule.forRoot({
+      environment,
+      requirements: {
+        layouts: LAYOUTS,
+      },
+    }),
+    OAuthModule.forRoot(),
+    NgxsModule.forRoot([]),
+    NgxsReduxDevtoolsPluginModule.forRoot({ disabled: environment.production }),
+  ],
+  providers: [],
+  bootstrap: [AppComponent],
+})
+export class AppModule {}

templates/app/angular/src/app/home/home-routing.module.ts

@@ -0,0 +1,18 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { HomeComponent } from './home.component';
+import { LayoutApplicationComponent } from '@abp/ng.theme.basic';
+
+const routes: Routes = [
+  {
+    path: '',
+    component: LayoutApplicationComponent,
+    children: [{ path: '', component: HomeComponent }],
+  },
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule],
+})
+export class HomeRoutingModule {}

templates/app/angular/src/app/home/home.component.ts

@@ -0,0 +1,31 @@
+import { Component } from '@angular/core';
+import { OAuthService } from 'angular-oauth2-oidc';
+
+@Component({
+  selector: 'abp-home',
+  template: `
+    <div class="card">
+      <div class="card-header">Welcome</div>
+      <div class="card-body">
+        <p>
+          Welcome to the application. This is a startup project based on the ABP framework. For more information, visit
+          abp.io.
+        </p>
+        <p *ngIf="!hasLoggedIn">
+          <a routerLink="/account/login" [state]="{ redirectUrl: '/home' }" class="btn btn-primary" role="button"
+            ><i class="fa fa-sign-in"></i>{{ 'AbpIdentity::Login' | abpLocalization }}</a
+          >
+        </p>
+        <hr />
+        <p class="text-right"><a href="https://abp.io?ref=tmpl" target="_blank">abp.io</a></p>
+      </div>
+    </div>
+  `,
+})
+export class HomeComponent {
+  get hasLoggedIn(): boolean {
+    return this.oAuthService.hasValidAccessToken();
+  }
+
+  constructor(private oAuthService: OAuthService) {}
+}

templates/app/angular/src/app/home/home.module.ts

@@ -0,0 +1,10 @@
+import { NgModule } from '@angular/core';
+import { SharedModule } from '../shared/shared.module';
+import { HomeRoutingModule } from './home-routing.module';
+import { HomeComponent } from './home.component';
+
+@NgModule({
+  declarations: [HomeComponent],
+  imports: [SharedModule, HomeRoutingModule],
+})
+export class HomeModule {}

templates/app/angular/src/app/lazy-libs/account-wrapper.module.ts

@@ -0,0 +1,7 @@
+import { NgModule } from '@angular/core';
+import { AccountModule } from '@abp/ng.account';
+
+@NgModule({
+  imports: [AccountModule],
+})
+export class AccountWrapperModule {}

templates/app/angular/src/app/lazy-libs/identity-wrapper.module.ts

@@ -0,0 +1,7 @@
+import { NgModule } from '@angular/core';
+import { IdentityModule } from '@abp/ng.identity';
+
+@NgModule({
+  imports: [IdentityModule],
+})
+export class IdentityWrapperModule {}

templates/app/angular/src/app/lazy-libs/tenant-management-wrapper.module.ts

@@ -0,0 +1,7 @@
+import { NgModule } from '@angular/core';
+import { TenantManagementModule } from '@abp/ng.tenant-management';
+
+@NgModule({
+  imports: [TenantManagementModule],
+})
+export class TenantManagementWrapperModule {}

templates/app/angular/src/app/shared/shared.module.ts

@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { ThemeSharedModule } from '@abp/ng.theme.shared';
+import { CoreModule } from '@abp/ng.core';
+import { ThemeBasicModule } from '@abp/ng.theme.basic';
+
+@NgModule({
+  declarations: [],
+  imports: [CoreModule, ThemeSharedModule, ThemeBasicModule],
+  exports: [CoreModule, ThemeSharedModule, ThemeBasicModule],
+  providers: [],
+})
+export class SharedModule {}

templates/app/angular/src/environments/environment.hmr.ts

@@ -0,0 +1,21 @@
+export const environment = {
+  production: false,
+  hmr: true,
+  oAuthConfig: {
+    issuer: 'https://localhost:44301',
+    clientId: 'MyProjectName_ConsoleTestApp',
+    dummyClientSecret: '1q2w3e*',
+    scope: 'MyProjectName',
+    showDebugInformation: true,
+    oidc: false,
+    requireHttps: true,
+  },
+  apis: {
+    default: {
+      url: 'https://localhost:44300',
+    },
+  },
+  localization: {
+    defaultResourceName: 'MyProjectName',
+  },
+};

templates/app/angular/src/environments/environment.prod.ts

@@ -0,0 +1,21 @@
+export const environment = {
+  production: true,
+  hmr: false,
+  oAuthConfig: {
+    issuer: 'https://localhost:44301',
+    clientId: 'MyProjectName_ConsoleTestApp',
+    dummyClientSecret: '1q2w3e*',
+    scope: 'MyProjectName',
+    showDebugInformation: true,
+    oidc: false,
+    requireHttps: true,
+  },
+  apis: {
+    default: {
+      url: 'https://localhost:44300',
+    },
+  },
+  localization: {
+    defaultResourceName: 'MyProjectName',
+  },
+};

templates/app/angular/src/environments/environment.ts

@@ -0,0 +1,21 @@
+export const environment = {
+  production: false,
+  hmr: false,
+  oAuthConfig: {
+    issuer: 'https://localhost:44301',
+    clientId: 'MyProjectName_ConsoleTestApp',
+    dummyClientSecret: '1q2w3e*',
+    scope: 'MyProjectName',
+    showDebugInformation: true,
+    oidc: false,
+    requireHttps: true,
+  },
+  apis: {
+    default: {
+      url: 'https://localhost:44300',
+    },
+  },
+  localization: {
+    defaultResourceName: 'MyProjectName',
+  },
+};

templates/app/angular/src/index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <title>MyProjectName</title>
+  <base href="/">
+
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <link rel="icon" type="image/x-icon" href="favicon.ico">
+</head>
+<body>
+  <app-root></app-root>
+</body>
+</html>

templates/app/angular/src/main.ts

@@ -0,0 +1,20 @@
+import { enableProdMode } from '@angular/core';
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { BootstrapModuleFn as Bootstrap, hmr, WebpackModule } from '@ngxs/hmr-plugin';
+
+import { AppModule } from './app/app.module';
+import { environment } from './environments/environment';
+
+declare const module: WebpackModule;
+
+if (environment.production) {
+  enableProdMode();
+}
+
+const bootstrap: Bootstrap = () => platformBrowserDynamic().bootstrapModule(AppModule);
+
+if (environment.hmr) {
+  hmr(module, bootstrap).catch(err => console.error(err));
+} else {
+  bootstrap().catch(err => console.log(err));
+}

templates/app/angular/src/polyfills.ts

@@ -0,0 +1,63 @@
+/**
+ * This file includes polyfills needed by Angular and is loaded before the app.
+ * You can add your own extra polyfills to this file.
+ *
+ * This file is divided into 2 sections:
+ *   1. Browser polyfills. These are applied before loading ZoneJS and are sorted by browsers.
+ *   2. Application imports. Files imported after ZoneJS that should be loaded before your main
+ *      file.
+ *
+ * The current setup is for so-called "evergreen" browsers; the last versions of browsers that
+ * automatically update themselves. This includes Safari >= 10, Chrome >= 55 (including Opera),
+ * Edge >= 13 on the desktop, and iOS 10 and Chrome on mobile.
+ *
+ * Learn more in https://angular.io/guide/browser-support
+ */
+
+/***************************************************************************************************
+ * BROWSER POLYFILLS
+ */
+
+/** IE10 and IE11 requires the following for NgClass support on SVG elements */
+// import 'classlist.js';  // Run `npm install --save classlist.js`.
+
+/**
+ * Web Animations `@angular/platform-browser/animations`
+ * Only required if AnimationBuilder is used within the application and using IE/Edge or Safari.
+ * Standard animation support in Angular DOES NOT require any polyfills (as of Angular 6.0).
+ */
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+/**
+ * By default, zone.js will patch all possible macroTask and DomEvents
+ * user can disable parts of macroTask/DomEvents patch by setting following flags
+ * because those flags need to be set before `zone.js` being loaded, and webpack
+ * will put import in the top of bundle, so user need to create a separate file
+ * in this directory (for example: zone-flags.ts), and put the following flags
+ * into that file, and then add the following code before importing zone.js.
+ * import './zone-flags.ts';
+ *
+ * The flags allowed in zone-flags.ts are listed here.
+ *
+ * The following flags will work for all browsers.
+ *
+ * (window as any).__Zone_disable_requestAnimationFrame = true; // disable patch requestAnimationFrame
+ * (window as any).__Zone_disable_on_property = true; // disable patch onProperty such as onclick
+ * (window as any).__zone_symbol__UNPATCHED_EVENTS = ['scroll', 'mousemove']; // disable patch specified eventNames
+ *
+ *  in IE/Edge developer tools, the addEventListener will also be wrapped by zone.js
+ *  with the following flag, it will bypass `zone.js` patch for IE/Edge
+ *
+ *  (window as any).__Zone_enable_cross_context_check = true;
+ *
+ */
+
+/***************************************************************************************************
+ * Zone JS is required by default for Angular itself.
+ */
+import 'zone.js/dist/zone';  // Included with Angular CLI.
+
+
+/***************************************************************************************************
+ * APPLICATION IMPORTS
+ */

templates/app/angular/src/styles.scss

@@ -0,0 +1 @@
+/* You can add global styles to this file, and also import other style files */

templates/app/angular/src/test.ts

@@ -0,0 +1,20 @@
+// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+
+import 'zone.js/dist/zone-testing';
+import { getTestBed } from '@angular/core/testing';
+import {
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting
+} from '@angular/platform-browser-dynamic/testing';
+
+declare const require: any;
+
+// First, initialize the Angular testing environment.
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting()
+);
+// Then we find all the tests.
+const context = require.context('./', true, /\.spec\.ts$/);
+// And load the modules.
+context.keys().map(context);

templates/app/angular/tsconfig.app.json

@@ -0,0 +1,9 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/app",
+    "types": ["node"]
+  },
+  "include": ["src/**/*.ts"],
+  "exclude": ["src/test.ts", "src/**/*.spec.ts"]
+}

templates/app/angular/tsconfig.json

@@ -0,0 +1,23 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "baseUrl": "./",
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "declaration": false,
+    "downlevelIteration": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "importHelpers": true,
+    "target": "es2015",
+    "typeRoots": [
+      "node_modules/@types"
+    ],
+    "lib": [
+      "es2018",
+      "dom"
+    ]
+  }
+}

templates/app/angular/tsconfig.spec.json

@@ -0,0 +1,18 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./out-tsc/spec",
+    "types": [
+      "jasmine",
+      "node"
+    ]
+  },
+  "files": [
+    "src/test.ts",
+    "src/polyfills.ts"
+  ],
+  "include": [
+    "src/**/*.spec.ts",
+    "src/**/*.d.ts"
+  ]
+}

templates/app/angular/tslint.json

@@ -0,0 +1,92 @@
+{
+  "extends": "tslint:recommended",
+  "rules": {
+    "array-type": false,
+    "arrow-parens": false,
+    "deprecation": {
+      "severity": "warn"
+    },
+    "component-class-suffix": true,
+    "contextual-lifecycle": true,
+    "directive-class-suffix": true,
+    "directive-selector": [
+      true,
+      "attribute",
+      "app",
+      "camelCase"
+    ],
+    "component-selector": [
+      true,
+      "element",
+      "app",
+      "kebab-case"
+    ],
+    "import-blacklist": [
+      true,
+      "rxjs/Rx"
+    ],
+    "interface-name": false,
+    "max-classes-per-file": false,
+    "max-line-length": [
+      true,
+      140
+    ],
+    "member-access": false,
+    "member-ordering": [
+      true,
+      {
+        "order": [
+          "static-field",
+          "instance-field",
+          "static-method",
+          "instance-method"
+        ]
+      }
+    ],
+    "no-consecutive-blank-lines": false,
+    "no-console": [
+      true,
+      "debug",
+      "info",
+      "time",
+      "timeEnd",
+      "trace"
+    ],
+    "no-empty": false,
+    "no-inferrable-types": [
+      true,
+      "ignore-params"
+    ],
+    "no-non-null-assertion": true,
+    "no-redundant-jsdoc": true,
+    "no-switch-case-fall-through": true,
+    "no-use-before-declare": true,
+    "no-var-requires": false,
+    "object-literal-key-quotes": [
+      true,
+      "as-needed"
+    ],
+    "object-literal-sort-keys": false,
+    "ordered-imports": false,
+    "quotemark": [
+      true,
+      "single"
+    ],
+    "trailing-comma": false,
+    "no-conflicting-lifecycle": true,
+    "no-host-metadata-property": true,
+    "no-input-rename": true,
+    "no-inputs-metadata-property": true,
+    "no-output-native": true,
+    "no-output-on-prefix": true,
+    "no-output-rename": true,
+    "no-outputs-metadata-property": true,
+    "template-banana-in-box": true,
+    "template-no-negated-async": true,
+    "use-lifecycle-interface": true,
+    "use-pipe-transform-interface": true
+  },
+  "rulesDirectory": [
+    "codelyzer"
+  ]
+}

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Application.Contracts/MyCompanyName.MyProjectName.Application.Contracts.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Application.Contracts\Volo.Abp.Identity.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.Application.Contracts\Volo.Abp.PermissionManagement.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Application.Contracts\Volo.Abp.TenantManagement.Application.Contracts.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Application.Contracts\Volo.Abp.FeatureManagement.Application.Contracts.csproj" />
+  </ItemGroup>
+
+</Project>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Application/MyCompanyName.MyProjectName.Application.csproj

@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain\MyCompanyName.MyProjectName.Domain.csproj" />
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Application\Volo.Abp.Identity.Application.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.Application\Volo.Abp.PermissionManagement.Application.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Application\Volo.Abp.TenantManagement.Application.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Application\Volo.Abp.FeatureManagement.Application.csproj" />
+  </ItemGroup>
+
+</Project>

templates/mvc/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj → templates/app/aspnet-core/src/MyCompanyName.MyProjectName.DbMigrator/MyCompanyName.MyProjectName.DbMigrator.csproj

@@ -26,7 +26,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
+    <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application.Contracts\MyCompanyName.MyProjectName.Application.Contracts.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations\MyCompanyName.MyProjectName.EntityFrameworkCore.DbMigrations.csproj" />
   </ItemGroup>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain.Shared/MyCompanyName.MyProjectName.Domain.Shared.csproj

@@ -0,0 +1,26 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Domain.Shared\Volo.Abp.Identity.Domain.Shared.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identityserver\src\Volo.Abp.IdentityServer.Domain.Shared\Volo.Abp.IdentityServer.Domain.Shared.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\background-jobs\src\Volo.Abp.BackgroundJobs.Domain.Shared\Volo.Abp.BackgroundJobs.Domain.Shared.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.Domain.Shared\Volo.Abp.AuditLogging.Domain.Shared.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Domain.Shared\Volo.Abp.TenantManagement.Domain.Shared.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Domain.Shared\Volo.Abp.FeatureManagement.Domain.Shared.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\permission-management\src\Volo.Abp.PermissionManagement.Domain.Shared\Volo.Abp.PermissionManagement.Domain.Shared.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Domain.Shared\Volo.Abp.SettingManagement.Domain.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="Localization\MyProjectName\*.json" />
+    <Content Remove="Localization\MyProjectName\*.json" />
+  </ItemGroup>
+
+</Project>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyCompanyName.MyProjectName.Domain.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <RootNamespace>MyCompanyName.MyProjectName</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\MyCompanyName.MyProjectName.Domain.Shared\MyCompanyName.MyProjectName.Domain.Shared.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.DataAnnotations" Version="2.2.0" />
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Domain\Volo.Abp.Identity.Domain.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.PermissionManagement.Domain.Identity\Volo.Abp.PermissionManagement.Domain.Identity.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identityserver\src\Volo.Abp.IdentityServer.Domain\Volo.Abp.IdentityServer.Domain.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\identityserver\src\Volo.Abp.PermissionManagement.Domain.IdentityServer\Volo.Abp.PermissionManagement.Domain.IdentityServer.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\background-jobs\src\Volo.Abp.BackgroundJobs.Domain\Volo.Abp.BackgroundJobs.Domain.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.Domain\Volo.Abp.AuditLogging.Domain.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Domain\Volo.Abp.TenantManagement.Domain.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\feature-management\src\Volo.Abp.FeatureManagement.Domain\Volo.Abp.FeatureManagement.Domain.csproj" />
+    <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Domain\Volo.Abp.SettingManagement.Domain.csproj" />
+  </ItemGroup>
+
+</Project>