diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 583cb2a2bf..4577ba271e 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -34,8 +34,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{6D893E48 build\build.ps1 = build\build.ps1 EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp", "src\Volo.Abp\Volo.Abp.csproj", "{FC5F7372-EA60-4052-B943-0EE070221CC1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AbpTestBase", "test\AbpTestBase\AbpTestBase.csproj", "{1020F5FD-6A97-40C2-AFCA-EBDF641DF111}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.AspNetCore", "src\Volo.Abp.AspNetCore\Volo.Abp.AspNetCore.csproj", "{02BE03BA-3411-448C-AB61-CB36407CC49A}" @@ -306,7 +304,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Uow.Tests", "test\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Ddd.Domain", "src\Volo.Abp.Ddd.Domain\Volo.Abp.Ddd.Domain.csproj", "{D1318094-7907-4826-B5F3-CFFC741F235F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Ddd.Application", "src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj", "{5AB7E368-1CC8-401D-9952-6CA6779305E7}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.Ddd.Application", "src\Volo.Abp.Ddd.Application\Volo.Abp.Ddd.Application.csproj", "{5AB7E368-1CC8-401D-9952-6CA6779305E7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -314,10 +312,6 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {FC5F7372-EA60-4052-B943-0EE070221CC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC5F7372-EA60-4052-B943-0EE070221CC1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC5F7372-EA60-4052-B943-0EE070221CC1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC5F7372-EA60-4052-B943-0EE070221CC1}.Release|Any CPU.Build.0 = Release|Any CPU {1020F5FD-6A97-40C2-AFCA-EBDF641DF111}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1020F5FD-6A97-40C2-AFCA-EBDF641DF111}.Debug|Any CPU.Build.0 = Debug|Any CPU {1020F5FD-6A97-40C2-AFCA-EBDF641DF111}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -827,7 +821,6 @@ Global {146F561E-C7B8-4166-9383-47E1BC1A2E62} = {447C8A77-E5F0-4538-8687-7383196D04EA} {0BEA55D6-E0B8-40DD-A256-B34C4DD990A5} = {CBCC288A-53C3-402F-99F7-E468738560F5} {6D893E48-0739-401A-9AD1-286BCB6E5517} = {CBCC288A-53C3-402F-99F7-E468738560F5} - {FC5F7372-EA60-4052-B943-0EE070221CC1} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {1020F5FD-6A97-40C2-AFCA-EBDF641DF111} = {447C8A77-E5F0-4538-8687-7383196D04EA} {02BE03BA-3411-448C-AB61-CB36407CC49A} = {C4C6961D-01CC-49A5-8B96-2A36E71CF01F} {B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510} = {37087D1B-3693-4E96-983D-A69F210BDE53} diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj index b498f5377e..e8776b6775 100644 --- a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj +++ b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk.Application.Contracts.csproj @@ -13,7 +13,6 @@ - diff --git a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/AbpDeskApplicationContractsModule.cs b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/AbpDeskApplicationContractsModule.cs index 416371ac8b..895d6627ec 100644 --- a/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/AbpDeskApplicationContractsModule.cs +++ b/src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/AbpDeskApplicationContractsModule.cs @@ -1,10 +1,8 @@ -using Volo.Abp; -using Volo.Abp.Application; +using Volo.Abp.Application; using Volo.Abp.Modularity; namespace AbpDesk { - [DependsOn(typeof(AbpCommonModule))] [DependsOn(typeof(AbpDddApplicationModule))] public class AbpDeskApplicationContractsModule : AbpModule { diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj index cae66a59a4..a9a72fb2ea 100644 --- a/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk.Domain.csproj @@ -13,7 +13,6 @@ - diff --git a/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs b/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs index 96e01ec6a9..fa6ac907b4 100644 --- a/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs +++ b/src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs @@ -1,11 +1,9 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; using Volo.Abp.Domain; using Volo.Abp.Modularity; namespace AbpDesk { - [DependsOn(typeof(AbpCommonModule))] [DependsOn(typeof(AbpDddDomainModule))] public class AbpDeskDomainModule : AbpModule { diff --git a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj index ef27b1183d..b00d332f34 100644 --- a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj +++ b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDesk.SamplePlugInModule.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDeskSamplePlugInModule.cs b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDeskSamplePlugInModule.cs index 99b3a94a14..d87e62144a 100644 --- a/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDeskSamplePlugInModule.cs +++ b/src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDeskSamplePlugInModule.cs @@ -1,13 +1,8 @@ using Microsoft.Extensions.DependencyInjection; -using Volo.Abp; using Volo.Abp.Modularity; namespace AbpDesk.SamplePlugInModule { - /* This is just a sample plugin module to test loading plugin modules. - */ - - [DependsOn(typeof(AbpCommonModule))] public class AbpDeskSamplePlugInModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/src/Volo.Abp/Volo.Abp.csproj b/src/Volo.Abp/Volo.Abp.csproj deleted file mode 100644 index ec47794004..0000000000 --- a/src/Volo.Abp/Volo.Abp.csproj +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - netstandard2.0 - Volo.Abp - Volo.Abp - $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - false - false - false - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Volo.Abp/Volo.Abp.csproj.DotSettings b/src/Volo.Abp/Volo.Abp.csproj.DotSettings deleted file mode 100644 index 58ad6c8854..0000000000 --- a/src/Volo.Abp/Volo.Abp.csproj.DotSettings +++ /dev/null @@ -1,2 +0,0 @@ - - CSharp71 \ No newline at end of file diff --git a/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs b/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs deleted file mode 100644 index 9f4bb07e62..0000000000 --- a/src/Volo.Abp/Volo/Abp/AbpCommonModule.cs +++ /dev/null @@ -1,41 +0,0 @@ -using Microsoft.Extensions.DependencyInjection; -using Volo.Abp.ApiVersioning; -using Volo.Abp.Authorization; -using Volo.Abp.Caching; -using Volo.Abp.Data; -using Volo.Abp.Json; -using Volo.Abp.Localization; -using Volo.Abp.Modularity; -using Volo.Abp.MultiTenancy; -using Volo.Abp.ObjectMapping; -using Volo.Abp.Security; -using Volo.Abp.Serialization; -using Volo.Abp.Session; -using Volo.Abp.Settings; -using Volo.Abp.Validation; -using Volo.Abp.VirtualFileSystem; - -namespace Volo.Abp -{ - [DependsOn(typeof(AbpAuthorizationModule))] - [DependsOn(typeof(AbpValidationModule))] - [DependsOn(typeof(AbpLocalizationModule))] - [DependsOn(typeof(AbpObjectMappingModule))] - [DependsOn(typeof(AbpSecurityModule))] - [DependsOn(typeof(AbpSessionModule))] - [DependsOn(typeof(AbpSettingsModule))] - [DependsOn(typeof(AbpDataModule))] - [DependsOn(typeof(AbpJsonModule))] - [DependsOn(typeof(AbpVirtualFileSystemModule))] - [DependsOn(typeof(AbpApiVersioningAbstractionsModule))] - [DependsOn(typeof(AbpMultiTenancyAbstractionsModule))] - [DependsOn(typeof(AbpCachingModule))] - [DependsOn(typeof(AbpSerializationModule))] - public class AbpCommonModule : AbpModule - { - public override void ConfigureServices(IServiceCollection services) - { - services.AddAssemblyOf(); - } - } -} diff --git a/test/SimpleConsoleDemo/Program.cs b/test/SimpleConsoleDemo/Program.cs index 182f763c09..8193538354 100644 --- a/test/SimpleConsoleDemo/Program.cs +++ b/test/SimpleConsoleDemo/Program.cs @@ -30,7 +30,6 @@ namespace SimpleConsoleDemo } } - [DependsOn(typeof(AbpCommonModule))] public class MyConsoleModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj b/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj index d2cd131578..56bc28707f 100644 --- a/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj +++ b/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj b/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj index acdcf18df4..5a15c1f594 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj +++ b/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj @@ -13,7 +13,6 @@ - diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs index 6e67d4a546..a75f5ff949 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutoMapper_ConfigurationValidation_Tests.cs @@ -23,7 +23,6 @@ namespace Volo.Abp.AutoMapper _objectMapper.Map(new MySourceClass {Value = "42"}).ValueNotMatched.ShouldBe(null); } - [DependsOn(typeof(AbpCommonModule))] [DependsOn(typeof(AbpAutoMapperModule))] public class TestModule : AbpModule { diff --git a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs index 4a06c6d771..4dda1020e9 100644 --- a/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs +++ b/test/Volo.Abp.AutoMapper.Tests/Volo/Abp/AutoMapper/AutofacTestModule.cs @@ -4,7 +4,6 @@ using Volo.Abp.Modularity; namespace Volo.Abp.AutoMapper { [DependsOn(typeof(AbpAutoMapperModule))] - [DependsOn(typeof(AbpCommonModule))] public class AutoMapperTestModule : AbpModule { public override void ConfigureServices(IServiceCollection services) diff --git a/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj b/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj index a073e551ec..49ab464f51 100644 --- a/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj +++ b/test/Volo.Abp.TestApp/Volo.Abp.TestApp.csproj @@ -14,7 +14,6 @@ - diff --git a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs index 662abc23c8..2ae07e2519 100644 --- a/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs +++ b/test/Volo.Abp.TestApp/Volo/Abp/TestApp/TestAppModule.cs @@ -8,7 +8,6 @@ using Volo.Abp.TestApp.Application.Dto; namespace Volo.Abp.TestApp { [DependsOn(typeof(AbpAutoMapperModule))] - [DependsOn(typeof(AbpCommonModule))] [DependsOn(typeof(AbpDddApplicationModule))] public class TestAppModule : AbpModule {