diff --git a/src/AbpDesk/AbpDesk.ConsoleClient/Program.cs b/src/AbpDesk/AbpDesk.ConsoleClient/Program.cs
index 802fd647ef..a4c86aa2b3 100644
--- a/src/AbpDesk/AbpDesk.ConsoleClient/Program.cs
+++ b/src/AbpDesk/AbpDesk.ConsoleClient/Program.cs
@@ -2,7 +2,6 @@
using System.Net.Http;
using System.Threading.Tasks;
using IdentityModel.Client;
-using Newtonsoft.Json.Linq;
namespace AbpDesk.ConsoleClient
{
diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180105184326_MultiTenancyModuleAdded.cs b/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180105184326_MultiTenancyModuleAdded.cs
index 3f9eae2ed0..100f3a0cfb 100644
--- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180105184326_MultiTenancyModuleAdded.cs
+++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180105184326_MultiTenancyModuleAdded.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace AbpDesk.EntityFrameworkCore.Migrations
{
diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180215073249_Added_PermissionGrant_Entity.cs b/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180215073249_Added_PermissionGrant_Entity.cs
index ed36be7833..aac6ef438a 100644
--- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180215073249_Added_PermissionGrant_Entity.cs
+++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180215073249_Added_PermissionGrant_Entity.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace AbpDesk.EntityFrameworkCore.Migrations
{
diff --git a/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180218143334_Made_Permission_Entity_MultiTenant.cs b/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180218143334_Made_Permission_Entity_MultiTenant.cs
index c641ec0eda..f93554cc12 100644
--- a/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180218143334_Made_Permission_Entity_MultiTenant.cs
+++ b/src/AbpDesk/AbpDesk.EntityFrameworkCore/Migrations/20180218143334_Made_Permission_Entity_MultiTenant.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace AbpDesk.EntityFrameworkCore.Migrations
{
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj
index 030061a386..47d0ed0c24 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDesk.Web.Mvc.csproj
@@ -23,10 +23,11 @@
+
-
+
@@ -56,7 +57,7 @@
-
+
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
index a5d4997808..1b76be3d79 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
@@ -41,6 +41,7 @@ namespace AbpDesk.Web.Mvc
typeof(AbpAspNetCoreMvcUiBootstrapModule),
typeof(AbpDeskApplicationModule),
typeof(AbpDeskEntityFrameworkCoreModule),
+ typeof(AbpIdentityApplicationModule),
typeof(AbpIdentityEntityFrameworkCoreModule),
typeof(AbpIdentityWebModule),
typeof(AbpAccountWebModule),
@@ -49,7 +50,7 @@ namespace AbpDesk.Web.Mvc
typeof(AbpIdentityServerEntityFrameworkCoreModule),
typeof(AbpAspNetCoreMultiTenancyModule),
typeof(AbpMultiTenancyWebModule),
- typeof(AbpMultiTenancyHttpApiModule),
+ typeof(AbpMultiTenancyApplicationModule),
typeof(AbpPermissionsApplicationModule)
)]
public class AbpDeskWebMvcModule : AbpModule //TODO: Rename to AbpDeskWebModule, change default namespace to AbpDesk.Web
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/IdentityServerTestController.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/IdentityServerTestController.cs
index f51a75597f..04237e095c 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/IdentityServerTestController.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/IdentityServerTestController.cs
@@ -1,5 +1,4 @@
-using System.Linq;
-using System.Threading.Tasks;
+using System.Threading.Tasks;
using IdentityServer4.Models;
using IdentityServer4.Stores;
using Microsoft.AspNetCore.Mvc;
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
index a166afafb9..6639825fa2 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Startup.cs
@@ -46,7 +46,7 @@ namespace AbpDesk.Web.Mvc
.AddDebug()
.AddSerilog(new LoggerConfiguration()
.Enrich.FromLogContext()
- .WriteTo.RollingFile("Logs/logs.txt")
+ .WriteTo.File("Logs/logs.txt")
.CreateLogger()
);
diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/web.config b/src/AbpDesk/AbpDesk.Web.Mvc/web.config
index dc0514fca5..8700b60c05 100644
--- a/src/AbpDesk/AbpDesk.Web.Mvc/web.config
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/web.config
@@ -1,14 +1,12 @@
-
-
-
+
-
+
-
+
\ No newline at end of file
diff --git a/src/MicroserviceDemo/MicroserviceDemo.AuthServer/Migrations/20180228110952_Added_IdentityServer_Module.cs b/src/MicroserviceDemo/MicroserviceDemo.AuthServer/Migrations/20180228110952_Added_IdentityServer_Module.cs
index 3e26498034..c0ec73b746 100644
--- a/src/MicroserviceDemo/MicroserviceDemo.AuthServer/Migrations/20180228110952_Added_IdentityServer_Module.cs
+++ b/src/MicroserviceDemo/MicroserviceDemo.AuthServer/Migrations/20180228110952_Added_IdentityServer_Module.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace MicroserviceDemo.AuthServer.Migrations
{
diff --git a/src/MicroserviceDemo/MicroserviceDemo.AuthServer/Pages/Index.cshtml.cs b/src/MicroserviceDemo/MicroserviceDemo.AuthServer/Pages/Index.cshtml.cs
index 0771c699c0..0783f603b2 100644
--- a/src/MicroserviceDemo/MicroserviceDemo.AuthServer/Pages/Index.cshtml.cs
+++ b/src/MicroserviceDemo/MicroserviceDemo.AuthServer/Pages/Index.cshtml.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Mvc.RazorPages;
+using Microsoft.AspNetCore.Mvc.RazorPages;
namespace MicroserviceDemo.AuthServer.Pages
{
diff --git a/src/MicroserviceDemo/MicroserviceDemo.TenancyService/Migrations/20180227101655_Added_MultiTenancy_Module.cs b/src/MicroserviceDemo/MicroserviceDemo.TenancyService/Migrations/20180227101655_Added_MultiTenancy_Module.cs
index 40088930d9..df09be2697 100644
--- a/src/MicroserviceDemo/MicroserviceDemo.TenancyService/Migrations/20180227101655_Added_MultiTenancy_Module.cs
+++ b/src/MicroserviceDemo/MicroserviceDemo.TenancyService/Migrations/20180227101655_Added_MultiTenancy_Module.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace MicroserviceDemo.TenancyService.Migrations
{
diff --git a/src/MicroserviceDemo/MicroserviceDemo.Web/Migrations/20180226091102_Installed_Identity_Module.cs b/src/MicroserviceDemo/MicroserviceDemo.Web/Migrations/20180226091102_Installed_Identity_Module.cs
index 500fbdbd95..9127ba6f36 100644
--- a/src/MicroserviceDemo/MicroserviceDemo.Web/Migrations/20180226091102_Installed_Identity_Module.cs
+++ b/src/MicroserviceDemo/MicroserviceDemo.Web/Migrations/20180226091102_Installed_Identity_Module.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace MicroserviceDemo.Web.Migrations
{
diff --git a/src/Volo.Abp.AspNetCore.EmbeddedFiles/Microsoft/AspNetCore/Builder/VirtualFileSystemApplicationBuilderExtensions.cs b/src/Volo.Abp.AspNetCore.EmbeddedFiles/Microsoft/AspNetCore/Builder/VirtualFileSystemApplicationBuilderExtensions.cs
index 22a5b18a05..1f5ebc0285 100644
--- a/src/Volo.Abp.AspNetCore.EmbeddedFiles/Microsoft/AspNetCore/Builder/VirtualFileSystemApplicationBuilderExtensions.cs
+++ b/src/Volo.Abp.AspNetCore.EmbeddedFiles/Microsoft/AspNetCore/Builder/VirtualFileSystemApplicationBuilderExtensions.cs
@@ -1,9 +1,5 @@
-using System.Linq;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.FileProviders;
-using Microsoft.Extensions.Options;
+using Microsoft.Extensions.FileProviders;
using Volo.Abp.AspNetCore.VirtualFileSystem;
-using Volo.Abp.VirtualFileSystem;
namespace Microsoft.AspNetCore.Builder
{
diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApiExploring/AbpApiDefinitionController.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApiExploring/AbpApiDefinitionController.cs
index 19db653dc8..ae72975486 100644
--- a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApiExploring/AbpApiDefinitionController.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ApiExploring/AbpApiDefinitionController.cs
@@ -1,5 +1,4 @@
using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.Application.Services;
using Volo.Abp.Http.Modeling;
namespace Volo.Abp.AspNetCore.Mvc.ApiExploring
diff --git a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs
index f3441775a0..0e7e37dcab 100644
--- a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs
+++ b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/CrudAppServiceBase.cs
@@ -4,7 +4,6 @@ using System.Linq.Dynamic.Core;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;
using Volo.Abp.Domain.Repositories;
-using Volo.Abp.ObjectMapping;
namespace Volo.Abp.Application.Services
{
diff --git a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IApplicationService.cs b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IApplicationService.cs
index 8a5b0d5013..b9eefa3411 100644
--- a/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IApplicationService.cs
+++ b/src/Volo.Abp.Ddd.Application/Volo/Abp/Application/Services/IApplicationService.cs
@@ -1,5 +1,4 @@
using Volo.Abp.Authorization;
-using Volo.Abp.Authorization.Permissions;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Uow;
diff --git a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IEntity.cs b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IEntity.cs
index 2f19d591f6..f0d3410eb7 100644
--- a/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IEntity.cs
+++ b/src/Volo.Abp.Ddd.Domain/Volo/Abp/Domain/Entities/IEntity.cs
@@ -1,7 +1,7 @@
namespace Volo.Abp.Domain.Entities
{
///
- /// Defines an entity. It's primary key may not be "Id" or it mah have a composite primary key.
+ /// Defines an entity. It's primary key may not be "Id" or it may have a composite primary key.
/// Use where possible for better integration to repositories and other structures in the framework.
///
public interface IEntity
@@ -18,6 +18,6 @@
///
/// Unique identifier for this entity.
///
- TKey Id { get; set; } //TODO: Consider to remove setter and make it protected in Entity class
+ TKey Id { get; set; }
}
}
diff --git a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
index b7aabf47db..6f068001e3 100644
--- a/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
+++ b/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
@@ -15,7 +15,6 @@ using Volo.Abp.Domain.Entities.Events;
using Volo.Abp.Guids;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Reflection;
-using Volo.Abp.Uow;
namespace Volo.Abp.EntityFrameworkCore
{
diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/RolePermissionManagementProvider.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/RolePermissionManagementProvider.cs
index 6bdf667f61..9e576827a4 100644
--- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/RolePermissionManagementProvider.cs
+++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/RolePermissionManagementProvider.cs
@@ -4,7 +4,6 @@ using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Guids;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Permissions;
-using Volo.Abp.Session;
namespace Volo.Abp.Identity
{
diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/UserPermissionManagementProvider.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/UserPermissionManagementProvider.cs
index ffc831ab23..8bed30d1f8 100644
--- a/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/UserPermissionManagementProvider.cs
+++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Identity/UserPermissionManagementProvider.cs
@@ -2,7 +2,6 @@
using Volo.Abp.Guids;
using Volo.Abp.MultiTenancy;
using Volo.Abp.Permissions;
-using Volo.Abp.Session;
namespace Volo.Abp.Identity
{
diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/RolePermissionManagerExtensions.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/RolePermissionManagerExtensions.cs
index c0d5462d4c..135ab02ebc 100644
--- a/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/RolePermissionManagerExtensions.cs
+++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/RolePermissionManagerExtensions.cs
@@ -2,7 +2,6 @@
using System.Threading.Tasks;
using JetBrains.Annotations;
using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Session;
namespace Volo.Abp.Permissions
{
diff --git a/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/UserPermissionManagerExtensions.cs b/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/UserPermissionManagerExtensions.cs
index c041b13337..cd5c910618 100644
--- a/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/UserPermissionManagerExtensions.cs
+++ b/src/Volo.Abp.Identity.Application/Volo/Abp/Permissions/UserPermissionManagerExtensions.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Threading.Tasks;
using JetBrains.Annotations;
using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Session;
namespace Volo.Abp.Permissions
{
diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Migrations/20180131140437_Identity_Revisions.cs b/src/Volo.Abp.Identity.EntityFrameworkCore/Migrations/20180131140437_Identity_Revisions.cs
index 97272bfecf..99f7145049 100644
--- a/src/Volo.Abp.Identity.EntityFrameworkCore/Migrations/20180131140437_Identity_Revisions.cs
+++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Migrations/20180131140437_Identity_Revisions.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace Volo.Abp.Identity.EntityFrameworkCore.Migrations
{
diff --git a/src/Volo.Abp.Identity.EntityFrameworkCore/Migrations/20180218140410_Made_Identity_Entities_MultiTenant.cs b/src/Volo.Abp.Identity.EntityFrameworkCore/Migrations/20180218140410_Made_Identity_Entities_MultiTenant.cs
index bf3bb866e0..ca0c3b7797 100644
--- a/src/Volo.Abp.Identity.EntityFrameworkCore/Migrations/20180218140410_Made_Identity_Entities_MultiTenant.cs
+++ b/src/Volo.Abp.Identity.EntityFrameworkCore/Migrations/20180218140410_Made_Identity_Entities_MultiTenant.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace Volo.Abp.Identity.EntityFrameworkCore.Migrations
{
diff --git a/src/Volo.Abp.Identity.HttpApi.Host/VersioningTests/V1/CallsController.cs b/src/Volo.Abp.Identity.HttpApi.Host/VersioningTests/V1/CallsController.cs
index a61d3ca4a2..00fec75890 100644
--- a/src/Volo.Abp.Identity.HttpApi.Host/VersioningTests/V1/CallsController.cs
+++ b/src/Volo.Abp.Identity.HttpApi.Host/VersioningTests/V1/CallsController.cs
@@ -1,6 +1,5 @@
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.Application.Services;
using Volo.Abp.AspNetCore.Mvc;
namespace Volo.Abp.Identity.HttpApi.Host.VersioningTests.V1
diff --git a/src/Volo.Abp.Identity.HttpApi.Host/VersioningTests/V2/Calls2Controller.cs b/src/Volo.Abp.Identity.HttpApi.Host/VersioningTests/V2/Calls2Controller.cs
index 808d177c00..73b990ec3c 100644
--- a/src/Volo.Abp.Identity.HttpApi.Host/VersioningTests/V2/Calls2Controller.cs
+++ b/src/Volo.Abp.Identity.HttpApi.Host/VersioningTests/V2/Calls2Controller.cs
@@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.Application.Services;
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.Identity.HttpApi.Host.VersioningTests.V1;
diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerOptions.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerOptions.cs
index 1eb6b14d35..2b66f7a0fb 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerOptions.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/AbpIdentityServerOptions.cs
@@ -1,5 +1,3 @@
-using System.IdentityModel.Tokens.Jwt;
-
namespace Volo.Abp.IdentityServer
{
public class AbpIdentityServerOptions
diff --git a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Temp/IdentityServerConfig.cs b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Temp/IdentityServerConfig.cs
index 6ccfc18ce4..183a9b61ac 100644
--- a/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Temp/IdentityServerConfig.cs
+++ b/src/Volo.Abp.IdentityServer.Domain/Volo/Abp/IdentityServer/Temp/IdentityServerConfig.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using IdentityServer4.Models;
-
-namespace Volo.Abp.IdentityServer.Temp
+namespace Volo.Abp.IdentityServer.Temp
{
//TODO: Remove!
//internal static class IdentityServerConfig
diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180108150119_IdentityServer_Initial.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180108150119_IdentityServer_Initial.cs
index e335b5dc75..6f71f502c8 100644
--- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180108150119_IdentityServer_Initial.cs
+++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180108150119_IdentityServer_Initial.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace Volo.Abp.IdentityServer.EntityFrameworkCore.Migrations
{
diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180111095012_Removed_Id_From_ClientGrantType.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180111095012_Removed_Id_From_ClientGrantType.cs
index bf23617f91..0fa1138280 100644
--- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180111095012_Removed_Id_From_ClientGrantType.cs
+++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180111095012_Removed_Id_From_ClientGrantType.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace Volo.Abp.IdentityServer.EntityFrameworkCore.Migrations
{
diff --git a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180131140336_IdentityServer_Revisions.cs b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180131140336_IdentityServer_Revisions.cs
index d55fc69657..44249ea0f6 100644
--- a/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180131140336_IdentityServer_Revisions.cs
+++ b/src/Volo.Abp.IdentityServer.EntityFrameworkCore/Migrations/20180131140336_IdentityServer_Revisions.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace Volo.Abp.IdentityServer.EntityFrameworkCore.Migrations
{
diff --git a/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationResourceListExtensions.cs b/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationResourceListExtensions.cs
index 5e6b7c3a93..7cad8126ba 100644
--- a/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationResourceListExtensions.cs
+++ b/src/Volo.Abp.Localization/Volo/Abp/Localization/LocalizationResourceListExtensions.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using JetBrains.Annotations;
-using Volo.Abp.Localization.Json;
using Volo.Abp.Localization.VirtualFiles.Json;
namespace Volo.Abp.Localization
diff --git a/src/Volo.Abp.Permissions.EntityFrameworkCore/Migrations/20180218143233_Made_Permission_Entity_MultiTenant.cs b/src/Volo.Abp.Permissions.EntityFrameworkCore/Migrations/20180218143233_Made_Permission_Entity_MultiTenant.cs
index 97e03b270b..fa92148374 100644
--- a/src/Volo.Abp.Permissions.EntityFrameworkCore/Migrations/20180218143233_Made_Permission_Entity_MultiTenant.cs
+++ b/src/Volo.Abp.Permissions.EntityFrameworkCore/Migrations/20180218143233_Made_Permission_Entity_MultiTenant.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace Volo.Abp.Permissions.EntityFrameworkCore.Migrations
{
diff --git a/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs b/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
index 2730ae5e5b..1bbeb65e07 100644
--- a/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
+++ b/test/Abp.IdentityServer.EntityFrameworkCore.Tests/Volo/Abp/IdentityServer/AbpIdentityServerTestDataBuilder.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using IdentityServer4.Models;
+using IdentityServer4.Models;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Guids;
using Volo.Abp.IdentityServer.ApiResources;
diff --git a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestBase.cs b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestBase.cs
index 94b54826a9..535fffe8bc 100644
--- a/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestBase.cs
+++ b/test/AbpDesk/AbpDesk.Application.Tests/AbpDesk/AbpDeskApplicationTestBase.cs
@@ -2,7 +2,6 @@ using AbpDesk.EntityFrameworkCore;
using AbpDesk.Tickets;
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp;
-using Volo.Abp.TestBase;
namespace AbpDesk
{
diff --git a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Authorization/FakePermissionStore.cs b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Authorization/FakePermissionStore.cs
index e8647e13a6..175e281716 100644
--- a/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Authorization/FakePermissionStore.cs
+++ b/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Authorization/FakePermissionStore.cs
@@ -1,7 +1,6 @@
using System.Threading.Tasks;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.DependencyInjection;
-using Volo.Abp.Session;
namespace Volo.Abp.AspNetCore.Mvc.Authorization
{
diff --git a/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/IHelloController.cs b/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/IHelloController.cs
index 5f43027c8e..bd4871aac6 100644
--- a/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/IHelloController.cs
+++ b/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo/Abp/AspNetCore/Mvc/Versioning/App/IHelloController.cs
@@ -1,5 +1,4 @@
using System.Threading.Tasks;
-using Volo.Abp.Application.Services;
namespace Volo.Abp.AspNetCore.Mvc.Versioning.App
{
diff --git a/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AuthorizationTestBase.cs b/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AuthorizationTestBase.cs
index bb443f9bae..e30565bcf2 100644
--- a/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AuthorizationTestBase.cs
+++ b/test/Volo.Abp.Authorization.Tests/Volo/Abp/Authorization/AuthorizationTestBase.cs
@@ -1,6 +1,4 @@
-using Volo.Abp.TestBase;
-
-namespace Volo.Abp.Authorization
+namespace Volo.Abp.Authorization
{
public class AuthorizationTestBase : AbpIntegratedTest
{
diff --git a/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs b/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs
index 45f2b21da3..23169eb240 100644
--- a/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs
+++ b/test/Volo.Abp.Caching.Tests/Volo/Abp/Caching/DistributedCache_Tests.cs
@@ -1,7 +1,6 @@
using System;
using System.Threading.Tasks;
using Shouldly;
-using Volo.Abp.TestBase;
using Xunit;
namespace Volo.Abp.Caching
diff --git a/test/Volo.Abp.Core.Tests/Microsoft/Extensions/DependencyInjection/DependencyInjection_Tests.cs b/test/Volo.Abp.Core.Tests/Microsoft/Extensions/DependencyInjection/DependencyInjection_Tests.cs
index b2cb23c06b..6310043775 100644
--- a/test/Volo.Abp.Core.Tests/Microsoft/Extensions/DependencyInjection/DependencyInjection_Tests.cs
+++ b/test/Volo.Abp.Core.Tests/Microsoft/Extensions/DependencyInjection/DependencyInjection_Tests.cs
@@ -4,7 +4,6 @@ using Shouldly;
using Volo.Abp;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Modularity;
-using Volo.Abp.TestBase;
using Xunit;
namespace Microsoft.Extensions.DependencyInjection
diff --git a/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/AbpInterceptionTestBase.cs b/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/AbpInterceptionTestBase.cs
index c9c23338f9..27b3bf5d81 100644
--- a/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/AbpInterceptionTestBase.cs
+++ b/test/Volo.Abp.Core.Tests/Volo/Abp/DynamicProxy/AbpInterceptionTestBase.cs
@@ -2,7 +2,6 @@ using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using Shouldly;
using Volo.Abp.Modularity;
-using Volo.Abp.TestBase;
using Xunit;
namespace Volo.Abp.DynamicProxy
diff --git a/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs b/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs
index 6255519cd6..9fd70f82e4 100644
--- a/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs
+++ b/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs
@@ -1,7 +1,6 @@
using Microsoft.Extensions.DependencyInjection;
using Shouldly;
using Volo.Abp.Modularity;
-using Volo.Abp.TestBase;
using Xunit;
namespace Volo.Abp.Data
diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Migrations/20170927075606_Initial_Migration.cs b/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Migrations/20170927075606_Initial_Migration.cs
index a6eeaebd9c..817d12ccd8 100644
--- a/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Migrations/20170927075606_Initial_Migration.cs
+++ b/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Migrations/20170927075606_Initial_Migration.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace Volo.Abp.EntityFrameworkCore.Tests.SecondContext.Migrations
{
diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Migrations/20170927100405_Added_PhoneInSecondDbContext.cs b/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Migrations/20170927100405_Added_PhoneInSecondDbContext.cs
index 52512c2e55..e95c8c5ef1 100644
--- a/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Migrations/20170927100405_Added_PhoneInSecondDbContext.cs
+++ b/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Migrations/20170927100405_Added_PhoneInSecondDbContext.cs
@@ -1,6 +1,4 @@
using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
namespace Volo.Abp.EntityFrameworkCore.Tests.SecondContext.Migrations
{
diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20170927080244_Initial_Migration.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20170927080244_Initial_Migration.cs
index 8b2e4f5aa1..6b92668a19 100644
--- a/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20170927080244_Initial_Migration.cs
+++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20170927080244_Initial_Migration.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace Volo.Abp.EntityFrameworkCore.Tests.Migrations
{
diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20171026084129_Added_TenantId_To_Person.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20171026084129_Added_TenantId_To_Person.cs
index 0553e4e716..e5e15e95a7 100644
--- a/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20171026084129_Added_TenantId_To_Person.cs
+++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20171026084129_Added_TenantId_To_Person.cs
@@ -1,6 +1,5 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
-using System.Collections.Generic;
namespace Volo.Abp.EntityFrameworkCore.Tests.Migrations
{
diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20171026101049_Added_IsDeleted_To_Person.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20171026101049_Added_IsDeleted_To_Person.cs
index 6a46d49d28..046a911bbc 100644
--- a/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20171026101049_Added_IsDeleted_To_Person.cs
+++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Migrations/20171026101049_Added_IsDeleted_To_Person.cs
@@ -1,6 +1,4 @@
using Microsoft.EntityFrameworkCore.Migrations;
-using System;
-using System.Collections.Generic;
namespace Volo.Abp.EntityFrameworkCore.Tests.Migrations
{
diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/MultiTenant_Filter_Tests.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/MultiTenant_Filter_Tests.cs
index 976e26ee40..e5a4cb8f2a 100644
--- a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/MultiTenant_Filter_Tests.cs
+++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/DataFiltering/MultiTenant_Filter_Tests.cs
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
-using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
using NSubstitute;
using Shouldly;
diff --git a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/EntityFrameworkCoreTestBase.cs b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/EntityFrameworkCoreTestBase.cs
index d848a03cb8..510c3e261e 100644
--- a/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/EntityFrameworkCoreTestBase.cs
+++ b/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/EntityFrameworkCoreTestBase.cs
@@ -1,7 +1,6 @@
using System;
using System.Threading.Tasks;
using Microsoft.Extensions.DependencyInjection;
-using Volo.Abp.TestBase;
using Volo.Abp.Uow;
namespace Volo.Abp.EntityFrameworkCore
diff --git a/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/EventBusTestBase.cs b/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/EventBusTestBase.cs
index 5f198a17b6..eca0970da4 100644
--- a/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/EventBusTestBase.cs
+++ b/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/EventBusTestBase.cs
@@ -1,5 +1,3 @@
-using Volo.Abp.TestBase;
-
namespace Volo.Abp.EventBus
{
public abstract class EventBusTestBase : AbpIntegratedTest
diff --git a/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/PermissionManager_Tests.cs b/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/PermissionManager_Tests.cs
index 10ef9f84a3..c92bc04879 100644
--- a/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/PermissionManager_Tests.cs
+++ b/test/Volo.Abp.Identity.Application.Tests/Volo/Abp/Identity/PermissionManager_Tests.cs
@@ -5,7 +5,6 @@ using System.Threading.Tasks;
using Shouldly;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Permissions;
-using Volo.Abp.Session;
using Xunit;
namespace Volo.Abp.Identity
diff --git a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityCommonTestBase.cs b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityCommonTestBase.cs
index ef3bf0fb16..2be365ed52 100644
--- a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityCommonTestBase.cs
+++ b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityCommonTestBase.cs
@@ -2,7 +2,6 @@
using System.Linq;
using Volo.Abp.Identity.EntityFrameworkCore;
using Volo.Abp.Modularity;
-using Volo.Abp.TestBase;
namespace Volo.Abp.Identity
{
diff --git a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityDomainTestModule.cs b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityDomainTestModule.cs
index 2d2679f6a7..57e81397b2 100644
--- a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityDomainTestModule.cs
+++ b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/AbpIdentityDomainTestModule.cs
@@ -6,7 +6,6 @@ using Volo.Abp.Autofac;
using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.Identity.EntityFrameworkCore;
using Volo.Abp.Modularity;
-using Volo.Abp.Permissions;
using Volo.Abp.Permissions.EntityFrameworkCore;
using Volo.Abp.Uow;
diff --git a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/IdentityTestPermissionDefinitionProvider.cs b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/IdentityTestPermissionDefinitionProvider.cs
index 518e083891..323758cd9f 100644
--- a/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/IdentityTestPermissionDefinitionProvider.cs
+++ b/test/Volo.Abp.Identity.Tests/Volo/Abp/Identity/IdentityTestPermissionDefinitionProvider.cs
@@ -1,5 +1,4 @@
using Volo.Abp.Authorization.Permissions;
-using Volo.Abp.Permissions;
namespace Volo.Abp.Identity
{
diff --git a/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs b/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs
index 4f8f90652d..f9496a0d91 100644
--- a/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs
+++ b/test/Volo.Abp.Localization.Tests/Volo/Abp/Localization/AbpLocalization_Tests.cs
@@ -6,7 +6,6 @@ using Volo.Abp.Localization.TestResources.Base.CountryNames;
using Volo.Abp.Localization.TestResources.Base.Validation;
using Volo.Abp.Localization.TestResources.Source;
using Volo.Abp.Modularity;
-using Volo.Abp.TestBase;
using Volo.Abp.VirtualFileSystem;
using Xunit;
diff --git a/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/MemoryDbTestBase.cs b/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/MemoryDbTestBase.cs
index 1835a247be..8d818bb32c 100644
--- a/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/MemoryDbTestBase.cs
+++ b/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/MemoryDbTestBase.cs
@@ -1,6 +1,4 @@
-using Volo.Abp.TestBase;
-
-namespace Volo.Abp.MemoryDb
+namespace Volo.Abp.MemoryDb
{
public abstract class MemoryDbTestBase : AbpIntegratedTest
{
diff --git a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestBase.cs b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestBase.cs
index ddb00b47d2..7480ae01c2 100644
--- a/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestBase.cs
+++ b/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/MultiTenancy/MultiTenancyTestBase.cs
@@ -1,6 +1,4 @@
-using Volo.Abp.TestBase;
-
-namespace Volo.Abp.MultiTenancy
+namespace Volo.Abp.MultiTenancy
{
public class MultiTenancyTestBase : AbpIntegratedTest
{
diff --git a/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionTestBase.cs b/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionTestBase.cs
index 6a97483cf9..f997a3e066 100644
--- a/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionTestBase.cs
+++ b/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionTestBase.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using Volo.Abp.Permissions.EntityFrameworkCore;
using Volo.Abp.Session;
-using Volo.Abp.TestBase;
namespace Volo.Abp.Permissions
{
diff --git a/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionTestDataBuilder.cs b/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionTestDataBuilder.cs
index ddb236fa63..958bdee161 100644
--- a/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionTestDataBuilder.cs
+++ b/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionTestDataBuilder.cs
@@ -2,7 +2,6 @@
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Guids;
-using Volo.Abp.Session;
namespace Volo.Abp.Permissions
{
diff --git a/test/Volo.Abp.Serialization.Tests/Volo/Abp/Serialization/ObjectSerializer_Tests.cs b/test/Volo.Abp.Serialization.Tests/Volo/Abp/Serialization/ObjectSerializer_Tests.cs
index 5817c78c4e..e2519a89d3 100644
--- a/test/Volo.Abp.Serialization.Tests/Volo/Abp/Serialization/ObjectSerializer_Tests.cs
+++ b/test/Volo.Abp.Serialization.Tests/Volo/Abp/Serialization/ObjectSerializer_Tests.cs
@@ -1,6 +1,5 @@
using Shouldly;
using Volo.Abp.Serialization.Objects;
-using Volo.Abp.TestBase;
using Xunit;
namespace Volo.Abp.Serialization
diff --git a/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/SettingsTestBase.cs b/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/SettingsTestBase.cs
index e9fdc85d76..79ab98672c 100644
--- a/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/SettingsTestBase.cs
+++ b/test/Volo.Abp.Settings.Tests/Volo/Abp/Settings/SettingsTestBase.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Linq;
using Volo.Abp.Session;
using Volo.Abp.Settings.EntityFrameworkCore;
-using Volo.Abp.TestBase;
namespace Volo.Abp.Settings
{
diff --git a/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/TestAppTestBase.cs b/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/TestAppTestBase.cs
index 8a9daf346c..589b42a21c 100644
--- a/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/TestAppTestBase.cs
+++ b/test/Volo.Abp.TestApp.Tests/Volo/Abp/TestApp/TestAppTestBase.cs
@@ -1,5 +1,3 @@
-using Volo.Abp.TestBase;
-
namespace Volo.Abp.TestApp
{
public class TestAppTestBase : AbpIntegratedTest
diff --git a/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs b/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
index ffc864d3a2..30160b58c0 100644
--- a/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
+++ b/test/Volo.Abp.UI.Navigation.Tests/Volo/Abp/Ui/Navigation/MenuManager_Tests.cs
@@ -2,7 +2,6 @@
using Microsoft.Extensions.DependencyInjection;
using Shouldly;
using Volo.Abp.Modularity;
-using Volo.Abp.TestBase;
using System.Collections.Generic;
using Xunit;
diff --git a/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs b/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs
index 11ce82b563..494c699761 100644
--- a/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs
+++ b/test/Volo.Abp.Validation.Tests/Volo/Abp/Validation/ApplicationService_Validation_Tests.cs
@@ -3,11 +3,9 @@ using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Microsoft.Extensions.DependencyInjection;
using Shouldly;
-using Volo.Abp.Application.Services;
using Volo.Abp.Autofac;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Modularity;
-using Volo.Abp.TestBase;
using Xunit;
namespace Volo.Abp.Validation
diff --git a/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs b/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs
index 7c00508f0b..94679766c5 100644
--- a/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs
+++ b/test/Volo.Abp.VirtualFileSystem.Tests/Volo/Abp/VirtualFileSystem/VirtualFileProvider_Tests.cs
@@ -3,7 +3,6 @@ using System.Text;
using Microsoft.Extensions.DependencyInjection;
using Shouldly;
using Volo.Abp.Modularity;
-using Volo.Abp.TestBase;
using Xunit;
namespace Volo.Abp.VirtualFileSystem