diff --git a/framework/Volo.Abp.sln b/framework/Volo.Abp.sln
index e1af7720f9..41eb7f1aeb 100644
--- a/framework/Volo.Abp.sln
+++ b/framework/Volo.Abp.sln
@@ -224,10 +224,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FluentValidation",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.FluentValidation.Tests", "test\Volo.Abp.FluentValidation.Tests\Volo.Abp.FluentValidation.Tests.csproj", "{E9E1714F-7ED2-4BD1-BA4A-BA06E398288A}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Cli.Tests", "test\Volo.Abp.Cli.Tests\Volo.Abp.Cli.Tests.csproj", "{92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Cli.Tests", "test\Volo.Abp.Cli.Tests\Volo.Abp.Cli.Tests.csproj", "{92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.EntityFrameworkCore.Sqlite", "src\Volo.Abp.EntityFrameworkCore.Sqlite\Volo.Abp.EntityFrameworkCore.Sqlite.csproj", "{58CF8957-5045-4F81-884D-72DF48F721CC}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Cli.Core", "src\Volo.Abp.Cli.Core\Volo.Abp.Cli.Core.csproj", "{3DA9923E-048E-4FE7-9748-3A0194F5D196}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -678,6 +680,10 @@ Global
{58CF8957-5045-4F81-884D-72DF48F721CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58CF8957-5045-4F81-884D-72DF48F721CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58CF8957-5045-4F81-884D-72DF48F721CC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {3DA9923E-048E-4FE7-9748-3A0194F5D196}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -794,6 +800,7 @@ Global
{E9E1714F-7ED2-4BD1-BA4A-BA06E398288A} = {447C8A77-E5F0-4538-8687-7383196D04EA}
{92B70EFF-C1B1-4D1D-8BCE-D116908FC6FF} = {447C8A77-E5F0-4538-8687-7383196D04EA}
{58CF8957-5045-4F81-884D-72DF48F721CC} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
+ {3DA9923E-048E-4FE7-9748-3A0194F5D196} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj
new file mode 100644
index 0000000000..459d95089a
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo.Abp.Cli.Core.csproj
@@ -0,0 +1,25 @@
+
+
+
+
+
+ netstandard2.0
+ $(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
new file mode 100644
index 0000000000..e56c95ff27
--- /dev/null
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/AbpCliCoreModule.cs
@@ -0,0 +1,15 @@
+using Volo.Abp.Domain;
+using Volo.Abp.Json;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.Cli
+{
+ [DependsOn(
+ typeof(AbpDddDomainModule),
+ typeof(AbpJsonModule)
+ )]
+ public class AbpCliCoreModule : AbpModule
+ {
+
+ }
+}
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgs.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgs.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineArgumentParser.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineOptions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/CommandLineOptions.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/CommandLineOptions.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Args/ICommandLineArgumentParser.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs
similarity index 98%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs
index d76216b300..50108567e6 100644
--- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/CliService.cs
+++ b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs
@@ -1,5 +1,4 @@
using Microsoft.Extensions.DependencyInjection;
-using System;
using System.Threading.Tasks;
using Volo.Abp.Cli.Args;
using Volo.Abp.Cli.Commands;
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/CommandSelector.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/CommandSelector.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ICommandSelector.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/ICommandSelector.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ICommandSelector.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/IConsoleCommand.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/IConsoleCommand.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/IConsoleCommand.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/MainHelpCommand.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/MainHelpCommand.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Commands/NewProjectCommand.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewProjectCommand.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/DatabaseProvider.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/GithubRepositoryInfo.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContext.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildContextExtensions.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipeline.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineBuilder.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildPipelineStep.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectBuildRequest.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/ProjectResult.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/CreateProjectResultZipStep.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/FileEntryListReadStep.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/GithubDownloadStep.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/NugetReferenceReplaceStep.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/RemoveProjectFromSolutionStep.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SolutionRenameStep.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/SwitchEntityFrameworkCoreToMongoDbStep.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/Steps/TemplateCodeDeleteStep.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Building/TemplateInfo.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/DownloadInfo.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/DownloadInfo.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/DownloadInfo.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/DownloadInfo.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntry.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntry.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntry.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntry.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryExtensions.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryList.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Files/FileEntryListExtensions.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubManager.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubManager.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubManager.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubManager.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Github/GithubRelease.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuildResult.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuilder.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuilder.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionBuilder.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionBuilder.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionName.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionName.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/SolutionName.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/SolutionName.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/StandardVersions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/StandardVersions.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/StandardVersions.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs b/framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs
similarity index 100%
rename from framework/src/Volo.Abp.Cli/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs
rename to framework/src/Volo.Abp.Cli.Core/Volo/Abp/SolutionTemplating/Zipping/ZipFileExtensions.cs
diff --git a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj
index fb8b3b9e19..f2f9424512 100644
--- a/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj
+++ b/framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj
@@ -11,14 +11,7 @@
-
-
-
-
-
-
-
-
+
diff --git a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs
index 0b891e1299..523dd6c813 100644
--- a/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs
+++ b/framework/src/Volo.Abp.Cli/Volo/Abp/Cli/AbpCliModule.cs
@@ -1,10 +1,9 @@
-using Volo.Abp.Domain;
-using Volo.Abp.Modularity;
+using Volo.Abp.Modularity;
namespace Volo.Abp.Cli
{
[DependsOn(
- typeof(AbpDddDomainModule)
+ typeof(AbpCliCoreModule)
)]
public class AbpCliModule : AbpModule
{
diff --git a/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj b/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj
index 915cb58607..3f094594d0 100644
--- a/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj
+++ b/framework/test/Volo.Abp.Cli.Tests/Volo.Abp.Cli.Tests.csproj
@@ -9,7 +9,7 @@
-
+
diff --git a/nupkg/common.ps1 b/nupkg/common.ps1
index 6ebae9a0b5..100bfe3b89 100644
--- a/nupkg/common.ps1
+++ b/nupkg/common.ps1
@@ -53,6 +53,7 @@ $projects = (
"framework/src/Volo.Abp.BackgroundWorkers",
"framework/src/Volo.Abp.Caching",
"framework/src/Volo.Abp.Castle.Core",
+ "framework/src/Volo.Abp.Cli.Core",
"framework/src/Volo.Abp.Cli",
"framework/src/Volo.Abp.Core",
"framework/src/Volo.Abp.Data",