From 7d2da072b1f39139aa1fb94829e695bd570f85ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= <hi_kalkan@yahoo.com>
Date: Sat, 10 Mar 2018 23:05:28 +0300
Subject: [PATCH] Created Volo.Abp.Uow package.

---
 Volo.Abp.sln                                  | 14 +++++++++++
 src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj          |  1 +
 src/Volo.Abp.Ddd/Volo/Abp/AbpDddModule.cs     |  3 ++-
 src/Volo.Abp.Ddd/Volo/Abp/AbpServiceBase.cs   |  2 +-
 .../AuthorizationInterceptorRegistrar.cs      |  1 +
 .../ValidationInterceptorRegistrar.cs         |  1 +
 src/Volo.Abp.Uow/Volo.Abp.Uow.csproj          | 20 ++++++++++++++++
 .../Volo/Abp/Uow/AbpUnitOfWorkModule.cs       | 18 ++++++++++++++
 .../Volo/Abp/Uow/AmbientUnitOfWork.cs         |  0
 .../Volo/Abp/Uow/ChildUnitOfWork.cs           |  0
 .../Volo/Abp/Uow/IAmbientUnitOfWork.cs        |  0
 .../Volo/Abp/Uow/IDatabaseApi.cs              |  0
 .../Volo/Abp/Uow/IDatabaseApiContainer.cs     |  0
 .../Volo/Abp/Uow/ISupportsRollback.cs         |  0
 .../Volo/Abp/Uow/ISupportsSavingChanges.cs    |  0
 .../Volo/Abp/Uow/ITransactionApi.cs           |  0
 .../Volo/Abp/Uow/ITransactionApiContainer.cs  |  0
 .../Volo/Abp/Uow/IUnitOfWork.cs               |  0
 .../Volo/Abp/Uow/IUnitOfWorkAccessor.cs       |  0
 .../Volo/Abp/Uow/IUnitOfWorkEnabled.cs        |  0
 .../Volo/Abp/Uow/IUnitOfWorkManager.cs        |  0
 .../Volo/Abp/Uow/IUnitOfWorkOptions.cs        |  0
 .../Volo/Abp/Uow/UnitOfWork.cs                |  0
 .../Volo/Abp/Uow/UnitOfWorkAttribute.cs       |  0
 .../Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs  |  0
 .../Volo/Abp/Uow/UnitOfWorkEventArgs.cs       |  0
 .../Volo/Abp/Uow/UnitOfWorkExtensions.cs      |  0
 .../Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs |  0
 .../Volo/Abp/Uow/UnitOfWorkHelper.cs          |  0
 .../Volo/Abp/Uow/UnitOfWorkInterceptor.cs     |  0
 .../Abp/Uow/UnitOfWorkInterceptorRegistrar.cs |  0
 .../Volo/Abp/Uow/UnitOfWorkManager.cs         |  0
 .../Abp/Uow/UnitOfWorkManagerExtensions.cs    |  0
 .../Volo/Abp/Uow/UnitOfWorkOptions.cs         |  0
 .../Abp/Uow/UnitOfWorkTransactionBehavior.cs  |  0
 .../Volo.Abp.Uow.Tests.csproj                 | 24 +++++++++++++++++++
 .../Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs |  2 +-
 .../Volo/Abp/Uow/UnitOfWork_Events_Tests.cs   |  2 +-
 .../Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs   |  2 +-
 39 files changed, 85 insertions(+), 5 deletions(-)
 create mode 100644 src/Volo.Abp.Uow/Volo.Abp.Uow.csproj
 create mode 100644 src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkModule.cs
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/AmbientUnitOfWork.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/ChildUnitOfWork.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/IAmbientUnitOfWork.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/IDatabaseApi.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/IDatabaseApiContainer.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/ISupportsRollback.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/ISupportsSavingChanges.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/ITransactionApi.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/ITransactionApiContainer.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/IUnitOfWork.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/IUnitOfWorkAccessor.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/IUnitOfWorkEnabled.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/IUnitOfWorkManager.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/IUnitOfWorkOptions.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWork.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkAttribute.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkEventArgs.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkExtensions.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkHelper.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkInterceptor.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkManager.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkOptions.cs (100%)
 rename src/{Volo.Abp.Data => Volo.Abp.Uow}/Volo/Abp/Uow/UnitOfWorkTransactionBehavior.cs (100%)
 create mode 100644 test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj
 rename test/{Volo.Abp.Ddd.Tests => Volo.Abp.Uow.Tests}/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs (98%)
 rename test/{Volo.Abp.Ddd.Tests => Volo.Abp.Uow.Tests}/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs (99%)
 rename test/{Volo.Abp.Ddd.Tests => Volo.Abp.Uow.Tests}/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs (98%)

diff --git a/Volo.Abp.sln b/Volo.Abp.sln
index 8c586f8d5b..b83fd2be5d 100644
--- a/Volo.Abp.sln
+++ b/Volo.Abp.sln
@@ -302,6 +302,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Authent
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore.Authentication.OAuth.Tests", "test\Volo.Abp.AspNetCore.Authentication.OAuth.Tests\Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj", "{627B88DB-BDCF-4D92-8454-EFE95F4AFB7A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Uow", "src\Volo.Abp.Uow\Volo.Abp.Uow.csproj", "{23C5849D-4C09-4588-AE32-E31F03B7ED63}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Uow.Tests", "test\Volo.Abp.Uow.Tests\Volo.Abp.Uow.Tests.csproj", "{9FC49D82-04E5-4170-8618-682BD3350910}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -796,6 +800,14 @@ Global
 		{627B88DB-BDCF-4D92-8454-EFE95F4AFB7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{627B88DB-BDCF-4D92-8454-EFE95F4AFB7A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{627B88DB-BDCF-4D92-8454-EFE95F4AFB7A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{23C5849D-4C09-4588-AE32-E31F03B7ED63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{23C5849D-4C09-4588-AE32-E31F03B7ED63}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{23C5849D-4C09-4588-AE32-E31F03B7ED63}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{23C5849D-4C09-4588-AE32-E31F03B7ED63}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9FC49D82-04E5-4170-8618-682BD3350910}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9FC49D82-04E5-4170-8618-682BD3350910}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9FC49D82-04E5-4170-8618-682BD3350910}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9FC49D82-04E5-4170-8618-682BD3350910}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -943,6 +955,8 @@ Global
 		{CD4E755D-D47C-45B1-AFB3-3444FF2E2E39} = {3510E248-DC9F-4A07-8134-02E7F5CC5783}
 		{A1C792B7-0DBF-460D-9158-A1A68A2D9C1A} = {C4C6961D-01CC-49A5-8B96-2A36E71CF01F}
 		{627B88DB-BDCF-4D92-8454-EFE95F4AFB7A} = {37087D1B-3693-4E96-983D-A69F210BDE53}
+		{23C5849D-4C09-4588-AE32-E31F03B7ED63} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
+		{9FC49D82-04E5-4170-8618-682BD3350910} = {37087D1B-3693-4E96-983D-A69F210BDE53}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}
diff --git a/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj b/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj
index f79f78898f..f65e44e8fd 100644
--- a/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj
+++ b/src/Volo.Abp.Ddd/Volo.Abp.Ddd.csproj
@@ -23,6 +23,7 @@
     <ProjectReference Include="..\Volo.Abp.MultiTenancy.Abstractions\Volo.Abp.MultiTenancy.Abstractions.csproj" />
     <ProjectReference Include="..\Volo.Abp.ObjectMapping\Volo.Abp.ObjectMapping.csproj" />
     <ProjectReference Include="..\Volo.Abp.Threading\Volo.Abp.Threading.csproj" />
+    <ProjectReference Include="..\Volo.Abp.Uow\Volo.Abp.Uow.csproj" />
     <ProjectReference Include="..\Volo.Abp.Validation\Volo.Abp.Validation.csproj" />
   </ItemGroup>
 
diff --git a/src/Volo.Abp.Ddd/Volo/Abp/AbpDddModule.cs b/src/Volo.Abp.Ddd/Volo/Abp/AbpDddModule.cs
index 61771a68a9..32b70770a8 100644
--- a/src/Volo.Abp.Ddd/Volo/Abp/AbpDddModule.cs
+++ b/src/Volo.Abp.Ddd/Volo/Abp/AbpDddModule.cs
@@ -26,12 +26,13 @@ namespace Volo.Abp
     [DependsOn(typeof(AbpEventBusModule))]
     [DependsOn(typeof(AbpValidationModule))]
     [DependsOn(typeof(AbpAuthorizationModule))]
+    [DependsOn(typeof(AbpGuidsModule))]
+    [DependsOn(typeof(AbpUnitOfWorkModule))]
     [DependsOn(typeof(AbpHttpAbstractionsModule))]
     public class AbpDddModule : AbpModule
     {
         public override void PreConfigureServices(IServiceCollection services)
         {
-            services.OnRegistred(UnitOfWorkInterceptorRegistrar.RegisterIfNeeded);
             services.OnRegistred(ValidationInterceptorRegistrar.RegisterIfNeeded);
             services.OnRegistred(AuthorizationInterceptorRegistrar.RegisterIfNeeded);
         }
diff --git a/src/Volo.Abp.Ddd/Volo/Abp/AbpServiceBase.cs b/src/Volo.Abp.Ddd/Volo/Abp/AbpServiceBase.cs
index 01b7aecaf1..42bce4e12a 100644
--- a/src/Volo.Abp.Ddd/Volo/Abp/AbpServiceBase.cs
+++ b/src/Volo.Abp.Ddd/Volo/Abp/AbpServiceBase.cs
@@ -8,7 +8,7 @@ using Volo.Abp.Uow;
 
 namespace Volo.Abp
 {
-    public abstract class AbpServiceBase
+    public abstract class AbpServiceBase //TODO: This is not so related to DDD, can we move to another package or completely remove it..?
     {
         public IUnitOfWorkManager UnitOfWorkManager { get; set; }
 
diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/AuthorizationInterceptorRegistrar.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/AuthorizationInterceptorRegistrar.cs
index 3e9f244e94..dbf7f6db42 100644
--- a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/AuthorizationInterceptorRegistrar.cs
+++ b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/AuthorizationInterceptorRegistrar.cs
@@ -7,6 +7,7 @@ namespace Volo.Abp.Application.Services
     {
         public static void RegisterIfNeeded(IOnServiceRegistredContext context)
         {
+            //TODO Create IAuthorizationEnabled interface and inherit IApplicationService from it!
             if (typeof(IApplicationService).IsAssignableFrom(context.ImplementationType))
             {
                 context.Interceptors.TryAdd<AuthorizationInterceptor>();
diff --git a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ValidationInterceptorRegistrar.cs b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ValidationInterceptorRegistrar.cs
index d7e86de27a..ffef57bdf7 100644
--- a/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ValidationInterceptorRegistrar.cs
+++ b/src/Volo.Abp.Ddd/Volo/Abp/Application/Services/ValidationInterceptorRegistrar.cs
@@ -7,6 +7,7 @@ namespace Volo.Abp.Application.Services
     {
         public static void RegisterIfNeeded(IOnServiceRegistredContext context)
         {
+            //TODO Create IValidationEnabled interface and inherit IApplicationService from it!
             if (typeof(IApplicationService).IsAssignableFrom(context.ImplementationType))
             {
                 context.Interceptors.TryAdd<ValidationInterceptor>();
diff --git a/src/Volo.Abp.Uow/Volo.Abp.Uow.csproj b/src/Volo.Abp.Uow/Volo.Abp.Uow.csproj
new file mode 100644
index 0000000000..433eb96bbe
--- /dev/null
+++ b/src/Volo.Abp.Uow/Volo.Abp.Uow.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>Volo.Abp.Uow</AssemblyName>
+    <PackageId>Volo.Abp.Uow</PackageId>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkModule.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkModule.cs
new file mode 100644
index 0000000000..37ff997fdd
--- /dev/null
+++ b/src/Volo.Abp.Uow/Volo/Abp/Uow/AbpUnitOfWorkModule.cs
@@ -0,0 +1,18 @@
+using Microsoft.Extensions.DependencyInjection;
+using Volo.Abp.Modularity;
+
+namespace Volo.Abp.Uow
+{
+    public class AbpUnitOfWorkModule : AbpModule
+    {
+        public override void PreConfigureServices(IServiceCollection services)
+        {
+            services.OnRegistred(UnitOfWorkInterceptorRegistrar.RegisterIfNeeded);
+        }
+
+        public override void ConfigureServices(IServiceCollection services)
+        {
+            services.AddAssemblyOf<AbpUnitOfWorkModule>();
+        }
+    }
+}
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/AmbientUnitOfWork.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/AmbientUnitOfWork.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/AmbientUnitOfWork.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/AmbientUnitOfWork.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/ChildUnitOfWork.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/ChildUnitOfWork.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/ChildUnitOfWork.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/IAmbientUnitOfWork.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/IAmbientUnitOfWork.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/IAmbientUnitOfWork.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/IAmbientUnitOfWork.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/IDatabaseApi.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/IDatabaseApi.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/IDatabaseApi.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/IDatabaseApi.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/IDatabaseApiContainer.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/IDatabaseApiContainer.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/IDatabaseApiContainer.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/IDatabaseApiContainer.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/ISupportsRollback.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/ISupportsRollback.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/ISupportsRollback.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/ISupportsRollback.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/ISupportsSavingChanges.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/ISupportsSavingChanges.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/ISupportsSavingChanges.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/ISupportsSavingChanges.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/ITransactionApi.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/ITransactionApi.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/ITransactionApi.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/ITransactionApi.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/ITransactionApiContainer.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/ITransactionApiContainer.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/ITransactionApiContainer.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/ITransactionApiContainer.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/IUnitOfWork.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/IUnitOfWork.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWork.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/IUnitOfWorkAccessor.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkAccessor.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/IUnitOfWorkAccessor.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkAccessor.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/IUnitOfWorkEnabled.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkEnabled.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/IUnitOfWorkEnabled.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkEnabled.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/IUnitOfWorkManager.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkManager.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/IUnitOfWorkManager.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkManager.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/IUnitOfWorkOptions.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkOptions.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/IUnitOfWorkOptions.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/IUnitOfWorkOptions.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWork.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWork.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWork.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkAttribute.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkAttribute.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkAttribute.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkAttribute.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkDefaultOptions.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkEventArgs.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkEventArgs.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkEventArgs.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkEventArgs.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkExtensions.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkExtensions.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkExtensions.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkExtensions.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkFailedEventArgs.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkHelper.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkHelper.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkHelper.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkHelper.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkInterceptor.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptor.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkInterceptorRegistrar.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkManager.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkManager.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManager.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkManagerExtensions.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkOptions.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkOptions.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkOptions.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkOptions.cs
diff --git a/src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkTransactionBehavior.cs b/src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkTransactionBehavior.cs
similarity index 100%
rename from src/Volo.Abp.Data/Volo/Abp/Uow/UnitOfWorkTransactionBehavior.cs
rename to src/Volo.Abp.Uow/Volo/Abp/Uow/UnitOfWorkTransactionBehavior.cs
diff --git a/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj b/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj
new file mode 100644
index 0000000000..fe26e9227f
--- /dev/null
+++ b/test/Volo.Abp.Uow.Tests/Volo.Abp.Uow.Tests.csproj
@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <LangVersion>latest</LangVersion>
+    <AssemblyName>Volo.Abp.Uow.Tests</AssemblyName>
+    <PackageId>Volo.Abp.Uow.Tests</PackageId>
+    <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
+    <ProjectReference Include="..\..\src\Volo.Abp.Uow\Volo.Abp.Uow.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+  </ItemGroup>
+
+</Project>
diff --git a/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs b/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs
similarity index 98%
rename from test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs
rename to test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs
index 19f8fa1bde..c4b43bebe1 100644
--- a/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs
+++ b/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Ambient_Scope_Tests.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Volo.Abp.Uow
 {
-    public class UnitOfWork_Ambient_Scope_Tests : AbpIntegratedTest<AbpDddModule>
+    public class UnitOfWork_Ambient_Scope_Tests : AbpIntegratedTest<AbpUnitOfWorkModule>
     {
         private readonly IUnitOfWorkManager _unitOfWorkManager;
 
diff --git a/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs b/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs
similarity index 99%
rename from test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs
rename to test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs
index 2f99745c03..fdc2ca62a8 100644
--- a/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs
+++ b/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Events_Tests.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Volo.Abp.Uow
 {
-    public class UnitOfWork_Events_Tests : AbpIntegratedTest<AbpDddModule>
+    public class UnitOfWork_Events_Tests : AbpIntegratedTest<AbpUnitOfWorkModule>
     {
         private readonly IUnitOfWorkManager _unitOfWorkManager;
 
diff --git a/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs b/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs
similarity index 98%
rename from test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs
rename to test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs
index 06fd20b569..e322a25682 100644
--- a/test/Volo.Abp.Ddd.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs
+++ b/test/Volo.Abp.Uow.Tests/Volo/Abp/Uow/UnitOfWork_Nested_Tests.cs
@@ -5,7 +5,7 @@ using Xunit;
 
 namespace Volo.Abp.Uow
 {
-    public class UnitOfWork_Nested_Tests : AbpIntegratedTest<AbpDddModule>
+    public class UnitOfWork_Nested_Tests : AbpIntegratedTest<AbpUnitOfWorkModule>
     {
         private readonly IUnitOfWorkManager _unitOfWorkManager;