diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs index 09fd578d85..a1e69d14ca 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs @@ -7,8 +7,7 @@ using Microsoft.Extensions.Logging.Abstractions; using Volo.Abp.Cli.Args; using Volo.Abp.DependencyInjection; using Volo.Abp.ProjectBuilding; -using Volo.Abp.SolutionTemplating; -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.Cli.Commands { @@ -56,6 +55,8 @@ namespace Volo.Abp.Cli.Commands templateZipFile.ExtractAll(Directory.GetCurrentDirectory(), ExtractExistingFileAction.Throw); } } + + Logger.LogInformation($"Successfully created the project '{commandLineArgs.Target}'"); } protected virtual DatabaseProvider GetDatabaseProviderOrNull(CommandLineArgs commandLineArgs) diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/DatabaseProvider.cs similarity index 71% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/DatabaseProvider.cs index e0e0f14e0b..0352bed89c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/DatabaseProvider.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public enum DatabaseProvider { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/GithubRepositoryInfo.cs similarity index 94% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/GithubRepositoryInfo.cs index f9d8812076..7a7277f8a4 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/GithubRepositoryInfo.cs @@ -1,6 +1,6 @@ using System; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public class GithubRepositoryInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContext.cs similarity index 89% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContext.cs index b620f6dc02..7e16a377c6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContext.cs @@ -1,8 +1,7 @@ using JetBrains.Annotations; -using Volo.Abp.ProjectBuilding; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public class ProjectBuildContext { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContextExtensions.cs similarity index 83% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContextExtensions.cs index 7178a24238..b4623e6744 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildContextExtensions.cs @@ -1,8 +1,8 @@ using System; using System.Linq; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public static class ProjectBuildContextExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipeline.cs similarity index 90% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipeline.cs index 3e2e617517..c4afe2aab6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipeline.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public class ProjectBuildPipeline { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs similarity index 86% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs index 44062f9cee..35ea1bfe39 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineBuilder.cs @@ -1,6 +1,6 @@ -using Volo.Abp.SolutionTemplating.Building.Steps; +using Volo.Abp.ProjectBuilding.Building.Steps; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public static class ProjectBuildPipelineBuilder { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineStep.cs similarity index 72% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineStep.cs index d6ec90325f..3080224ed2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectBuildPipelineStep.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public abstract class ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectResult.cs similarity index 64% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectResult.cs index 3afc3e1a17..19230adfb5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/ProjectResult.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public class ProjectResult { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs similarity index 80% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs index 88f2558e58..a2b468effd 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/CreateProjectResultZipStep.cs @@ -1,8 +1,8 @@ using Ionic.Zip; -using Volo.Abp.SolutionTemplating.Files; -using Volo.Abp.SolutionTemplating.Zipping; +using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.ProjectBuilding.Zipping; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class CreateProjectResultZipStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs similarity index 82% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs index 794f169a26..22f1d8840f 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/FileEntryListReadStep.cs @@ -1,9 +1,9 @@ using System.IO; using Ionic.Zip; -using Volo.Abp.SolutionTemplating.Files; -using Volo.Abp.SolutionTemplating.Zipping; +using Volo.Abp.ProjectBuilding.Files; +using Volo.Abp.ProjectBuilding.Zipping; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class FileEntryListReadStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs index 460e174252..3d41c682dc 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/NugetReferenceReplaceStep.cs @@ -2,9 +2,9 @@ using System.IO; using System.Linq; using HtmlAgilityPack; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class NugetReferenceReplaceStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs index 7130b7ae1e..c956e4b4ab 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/RemoveProjectFromSolutionStep.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class RemoveProjectFromSolutionStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SolutionRenameStep.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SolutionRenameStep.cs index 43d7356a32..20f2810633 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SolutionRenameStep.cs @@ -1,9 +1,9 @@ using System; using System.Collections.Generic; using System.Linq; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class SolutionRenameStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs similarity index 96% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs index 64e1b44c11..6b77808f55 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs @@ -1,7 +1,7 @@ using System; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class SwitchEntityFrameworkCoreToMongoDbStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs similarity index 82% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs index e35e11d441..aa3990905a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs @@ -1,6 +1,6 @@ -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Building.Steps +namespace Volo.Abp.ProjectBuilding.Building.Steps { public class TemplateCodeDeleteStep : ProjectBuildPipelineStep { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/TemplateInfo.cs similarity index 94% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/TemplateInfo.cs index 0ef7d26a4f..c85d1d571c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Building/TemplateInfo.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using JetBrains.Annotations; -namespace Volo.Abp.SolutionTemplating.Building +namespace Volo.Abp.ProjectBuilding.Building { public abstract class TemplateInfo { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/DownloadInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/DownloadInfo.cs similarity index 92% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/DownloadInfo.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/DownloadInfo.cs index 0865e1175c..9d07f6e022 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/DownloadInfo.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/DownloadInfo.cs @@ -1,9 +1,9 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; using Volo.Abp.Domain.Entities.Auditing; -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; -namespace Volo.Abp.SolutionTemplating +namespace Volo.Abp.ProjectBuilding { [Table("Downloads")] public class DownloadInfo : CreationAuditedAggregateRoot diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntry.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntry.cs similarity index 98% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntry.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntry.cs index 7f808ad4cf..5dd67846d2 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntry.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntry.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace Volo.Abp.SolutionTemplating.Files +namespace Volo.Abp.ProjectBuilding.Files { public class FileEntry { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryExtensions.cs similarity index 98% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryExtensions.cs index 999e8a9353..19bf75456c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryExtensions.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.SolutionTemplating.Files +namespace Volo.Abp.ProjectBuilding.Files { public static class FileEntryExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryList.cs similarity index 83% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryList.cs index 17b7b757ba..34543e31fa 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryList.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace Volo.Abp.SolutionTemplating.Files +namespace Volo.Abp.ProjectBuilding.Files { public class FileEntryList : List { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryListExtensions.cs similarity index 92% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryListExtensions.cs index 01acdf297b..1a1a47c1c6 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Files/FileEntryListExtensions.cs @@ -1,7 +1,7 @@ using System; using Ionic.Zip; -namespace Volo.Abp.SolutionTemplating.Files +namespace Volo.Abp.ProjectBuilding.Files { public static class FileEntryListExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Github/GithubRelease.cs similarity index 90% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Github/GithubRelease.cs index 4e5ea612fe..449f9a43d5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Github/GithubRelease.cs @@ -1,7 +1,7 @@ using System; using Newtonsoft.Json; -namespace Volo.Abp.SolutionTemplating.Github +namespace Volo.Abp.ProjectBuilding.Github { [JsonObject] public class GithubRelease diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs index 3011516061..c037442711 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/IProjectBuilder.cs @@ -1,5 +1,4 @@ using System.Threading.Tasks; -using Volo.Abp.SolutionTemplating; namespace Volo.Abp.ProjectBuilding { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs index ad8dbbe874..789e11b341 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ITemplateInfoProvider.cs @@ -1,4 +1,4 @@ -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.ProjectBuilding { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs index 34284ffafb..fffeb87a6c 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildArgs.cs @@ -1,6 +1,5 @@ using JetBrains.Annotations; -using Volo.Abp.SolutionTemplating; -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.ProjectBuilding { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/ProjectBuildResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildResult.cs similarity index 87% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/ProjectBuildResult.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildResult.cs index dd43e8b63e..2acf036ddc 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/ProjectBuildResult.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuildResult.cs @@ -1,4 +1,4 @@ -namespace Volo.Abp.SolutionTemplating +namespace Volo.Abp.ProjectBuilding { public class ProjectBuildResult { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs index 501d309845..3a5c7a6b8a 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/ProjectBuilder.cs @@ -2,8 +2,7 @@ using System.Threading.Tasks; using Volo.Abp.Cli; using Volo.Abp.DependencyInjection; -using Volo.Abp.SolutionTemplating; -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.ProjectBuilding { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionName.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/SolutionName.cs similarity index 97% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionName.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/SolutionName.cs index 63ec52a432..0e274f5ceb 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionName.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/SolutionName.cs @@ -1,6 +1,6 @@ using System; -namespace Volo.Abp.SolutionTemplating +namespace Volo.Abp.ProjectBuilding { public class SolutionName { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs index bfc5aec303..e386bd7ef1 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/TemplateInfoProvider.cs @@ -1,7 +1,7 @@ using System; using Volo.Abp.DependencyInjection; +using Volo.Abp.ProjectBuilding.Building; using Volo.Abp.ProjectBuilding.Templates; -using Volo.Abp.SolutionTemplating.Building; namespace Volo.Abp.ProjectBuilding { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs index 3b8dd55f54..581fe9fcb5 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcApplicationTemplate.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -using Volo.Abp.SolutionTemplating.Building; -using Volo.Abp.SolutionTemplating.Building.Steps; +using Volo.Abp.ProjectBuilding.Building; +using Volo.Abp.ProjectBuilding.Building.Steps; namespace Volo.Abp.ProjectBuilding.Templates { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs index a4f436932b..d2831d32b0 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/MvcModuleTemplate.cs @@ -1,4 +1,4 @@ -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.ProjectBuilding.Templates { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs index ebbd9fa90a..4b547eead0 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Templates/ServiceTemplate.cs @@ -1,4 +1,4 @@ -using Volo.Abp.SolutionTemplating.Building; +using Volo.Abp.ProjectBuilding.Building; namespace Volo.Abp.ProjectBuilding.Templates { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Zipping/ZipFileExtensions.cs similarity index 94% rename from framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Zipping/ZipFileExtensions.cs index e4e5290194..97536bd6ea 100644 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs +++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/ProjectBuilding/Zipping/ZipFileExtensions.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; using Ionic.Zip; -using Volo.Abp.SolutionTemplating.Files; +using Volo.Abp.ProjectBuilding.Files; -namespace Volo.Abp.SolutionTemplating.Zipping +namespace Volo.Abp.ProjectBuilding.Zipping { public static class ZipFileExtensions { diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs deleted file mode 100644 index df7b8b2e39..0000000000 --- a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace Volo.Abp.SolutionTemplating -{ - public static class StandardVersions - { - public const string LatestStable = "LatestStable"; - - public const string LatestUnstable = "LatestUnstable"; - } -}