diff --git a/Volo.Abp.sln b/Volo.Abp.sln
index a02adb1d80..30892ce8a6 100644
--- a/Volo.Abp.sln
+++ b/Volo.Abp.sln
@@ -194,6 +194,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Ddd.Tests", "test\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Http.Abstractions", "src\Volo.Abp.Http.Abstractions\Volo.Abp.Http.Abstractions.csproj", "{BA4E3D59-2929-4797-A5F0-7565D76F4076}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Authorization", "src\Volo.Abp.Authorization\Volo.Abp.Authorization.csproj", "{74ECE2F5-A7FB-4363-BDD3-EDAF13F845C8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Json", "src\Volo.Abp.Json\Volo.Abp.Json.csproj", "{89E49906-6606-4126-AB3C-1605E17A1F68}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Timing", "src\Volo.Abp.Timing\Volo.Abp.Timing.csproj", "{46EF4B32-327C-4AFF-B39D-8202580847DB}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -512,6 +518,18 @@ Global
{BA4E3D59-2929-4797-A5F0-7565D76F4076}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BA4E3D59-2929-4797-A5F0-7565D76F4076}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BA4E3D59-2929-4797-A5F0-7565D76F4076}.Release|Any CPU.Build.0 = Release|Any CPU
+ {74ECE2F5-A7FB-4363-BDD3-EDAF13F845C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {74ECE2F5-A7FB-4363-BDD3-EDAF13F845C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {74ECE2F5-A7FB-4363-BDD3-EDAF13F845C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {74ECE2F5-A7FB-4363-BDD3-EDAF13F845C8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {89E49906-6606-4126-AB3C-1605E17A1F68}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {89E49906-6606-4126-AB3C-1605E17A1F68}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {89E49906-6606-4126-AB3C-1605E17A1F68}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {89E49906-6606-4126-AB3C-1605E17A1F68}.Release|Any CPU.Build.0 = Release|Any CPU
+ {46EF4B32-327C-4AFF-B39D-8202580847DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {46EF4B32-327C-4AFF-B39D-8202580847DB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {46EF4B32-327C-4AFF-B39D-8202580847DB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {46EF4B32-327C-4AFF-B39D-8202580847DB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -605,6 +623,9 @@ Global
{B17BAA37-27E8-4421-A18B-DDF6D146EA06} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
{C6CE997A-DE6F-4669-822F-5654BA72C0B0} = {37087D1B-3693-4E96-983D-A69F210BDE53}
{BA4E3D59-2929-4797-A5F0-7565D76F4076} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
+ {74ECE2F5-A7FB-4363-BDD3-EDAF13F845C8} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
+ {89E49906-6606-4126-AB3C-1605E17A1F68} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
+ {46EF4B32-327C-4AFF-B39D-8202580847DB} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}
diff --git a/src/Volo.Abp.Authorization/Volo.Abp.Authorization.csproj b/src/Volo.Abp.Authorization/Volo.Abp.Authorization.csproj
new file mode 100644
index 0000000000..8aadf95fa0
--- /dev/null
+++ b/src/Volo.Abp.Authorization/Volo.Abp.Authorization.csproj
@@ -0,0 +1,20 @@
+
+
+
+
+
+ netstandard2.0
+ Volo.Abp.Authorization
+ Volo.Abp.Authorization
+ $(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
+ false
+ false
+ false
+
+
+
+
+
+
+
+
diff --git a/src/Volo.Abp/Volo/Abp/Authorization/AbpAuthorizationException.cs b/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationException.cs
similarity index 100%
rename from src/Volo.Abp/Volo/Abp/Authorization/AbpAuthorizationException.cs
rename to src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationException.cs
diff --git a/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs b/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs
new file mode 100644
index 0000000000..62ee595e84
--- /dev/null
+++ b/src/Volo.Abp.Authorization/Volo/Abp/Authorization/AbpAuthorizationModule.cs
@@ -0,0 +1,13 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.Authorization
+{
+ public class AbpAuthorizationModule : AbpModule
+ {
+ public override void ConfigureServices(IServiceCollection services)
+ {
+ services.AddAssemblyOf();
+ }
+ }
+}
diff --git a/src/Volo.Abp.Json/Volo.Abp.Json.csproj b/src/Volo.Abp.Json/Volo.Abp.Json.csproj
new file mode 100644
index 0000000000..c5ad0b08c8
--- /dev/null
+++ b/src/Volo.Abp.Json/Volo.Abp.Json.csproj
@@ -0,0 +1,21 @@
+
+
+
+
+
+ netstandard2.0
+ Volo.Abp.Json
+ Volo.Abp.Json
+ $(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
+ false
+ false
+ false
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonModule.cs b/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonModule.cs
new file mode 100644
index 0000000000..d732121b02
--- /dev/null
+++ b/src/Volo.Abp.Json/Volo/Abp/Json/AbpJsonModule.cs
@@ -0,0 +1,15 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Modularity;
+using Volo.Abp.Timing;
+
+namespace Volo.Abp.Json
+{
+ [DependsOn(typeof(AbpTimingModule))]
+ public class AbpJsonModule : AbpModule
+ {
+ public override void ConfigureServices(IServiceCollection services)
+ {
+ services.AddAssemblyOf();
+ }
+ }
+}
diff --git a/src/Volo.Abp/Volo/Abp/Json/IJsonSerializer.cs b/src/Volo.Abp.Json/Volo/Abp/Json/IJsonSerializer.cs
similarity index 100%
rename from src/Volo.Abp/Volo/Abp/Json/IJsonSerializer.cs
rename to src/Volo.Abp.Json/Volo/Abp/Json/IJsonSerializer.cs
diff --git a/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/AbpJsonIsoDateTimeConverter.cs b/src/Volo.Abp.Json/Volo/Abp/Json/Newtonsoft/AbpJsonIsoDateTimeConverter.cs
similarity index 100%
rename from src/Volo.Abp/Volo/Abp/Json/Newtonsoft/AbpJsonIsoDateTimeConverter.cs
rename to src/Volo.Abp.Json/Volo/Abp/Json/Newtonsoft/AbpJsonIsoDateTimeConverter.cs
diff --git a/src/Volo.Abp/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs b/src/Volo.Abp.Json/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs
similarity index 100%
rename from src/Volo.Abp/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs
rename to src/Volo.Abp.Json/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs
diff --git a/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj b/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj
new file mode 100644
index 0000000000..8a6507692c
--- /dev/null
+++ b/src/Volo.Abp.Timing/Volo.Abp.Timing.csproj
@@ -0,0 +1,20 @@
+
+
+
+
+
+ netstandard2.0
+ Volo.Abp.Timing
+ Volo.Abp.Timing
+ $(AssetTargetFallback);portable-net45+win8+wp8+wpa81;
+ false
+ false
+ false
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Volo.Abp.Timing/Volo/Abp/Timing/AbpTimingModule.cs b/src/Volo.Abp.Timing/Volo/Abp/Timing/AbpTimingModule.cs
new file mode 100644
index 0000000000..8c80cb732b
--- /dev/null
+++ b/src/Volo.Abp.Timing/Volo/Abp/Timing/AbpTimingModule.cs
@@ -0,0 +1,13 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.Timing
+{
+ public class AbpTimingModule : AbpModule
+ {
+ public override void ConfigureServices(IServiceCollection services)
+ {
+ services.AddAssemblyOf();
+ }
+ }
+}
diff --git a/src/Volo.Abp/Volo/Abp/Timing/Clock.cs b/src/Volo.Abp.Timing/Volo/Abp/Timing/Clock.cs
similarity index 100%
rename from src/Volo.Abp/Volo/Abp/Timing/Clock.cs
rename to src/Volo.Abp.Timing/Volo/Abp/Timing/Clock.cs
diff --git a/src/Volo.Abp/Volo/Abp/Timing/ClockOptions.cs b/src/Volo.Abp.Timing/Volo/Abp/Timing/ClockOptions.cs
similarity index 100%
rename from src/Volo.Abp/Volo/Abp/Timing/ClockOptions.cs
rename to src/Volo.Abp.Timing/Volo/Abp/Timing/ClockOptions.cs
diff --git a/src/Volo.Abp/Volo/Abp/Timing/IClock.cs b/src/Volo.Abp.Timing/Volo/Abp/Timing/IClock.cs
similarity index 100%
rename from src/Volo.Abp/Volo/Abp/Timing/IClock.cs
rename to src/Volo.Abp.Timing/Volo/Abp/Timing/IClock.cs
diff --git a/src/Volo.Abp/Volo.Abp.csproj b/src/Volo.Abp/Volo.Abp.csproj
index 7284cfd227..f241708cd0 100644
--- a/src/Volo.Abp/Volo.Abp.csproj
+++ b/src/Volo.Abp/Volo.Abp.csproj
@@ -15,8 +15,10 @@
+
+
diff --git a/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs b/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs
index c8225ef725..ca9b4d9c66 100644
--- a/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs
+++ b/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs
@@ -1,6 +1,8 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.ApiVersioning;
+using Volo.Abp.Authorization;
using Volo.Abp.Data;
+using Volo.Abp.Json;
using Volo.Abp.Localization;
using Volo.Abp.Modularity;
using Volo.Abp.MultiTenancy;
@@ -12,15 +14,17 @@ using Volo.Abp.VirtualFileSystem;
namespace Volo.Abp
{
+ [DependsOn(typeof(AbpAuthorizationModule))]
+ [DependsOn(typeof(AbpValidationModule))]
[DependsOn(typeof(AbpLocalizationModule))]
- [DependsOn(typeof(AbpVirtualFileSystemModule))]
- [DependsOn(typeof(AbpApiVersioningAbstractionsModule))]
- [DependsOn(typeof(AbpDataModule))]
- [DependsOn(typeof(AbpMultiTenancyAbstractionsModule))]
[DependsOn(typeof(AbpObjectMappingModule))]
- [DependsOn(typeof(AbpValidationModule))]
[DependsOn(typeof(AbpSecurityModule))]
[DependsOn(typeof(AbpSessionModule))]
+ [DependsOn(typeof(AbpDataModule))]
+ [DependsOn(typeof(AbpJsonModule))]
+ [DependsOn(typeof(AbpVirtualFileSystemModule))]
+ [DependsOn(typeof(AbpApiVersioningAbstractionsModule))]
+ [DependsOn(typeof(AbpMultiTenancyAbstractionsModule))]
public class AbpCommonModule : AbpModule
{
public override void ConfigureServices(IServiceCollection services)