diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 6423a9cd4e..82e8d2f7fb 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -16,16 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{447C8A77-E EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.Tests", "test\Volo.Abp.Tests\Volo.Abp.Tests.xproj", "{E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Volo", "Volo", "{9A4A646B-CC96-44FB-A717-E50C5C148B54}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp", "Abp", "{4C753F64-0C93-4D65-96C2-A40893AFC1E8}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.DependencyInjection", "src\Volo.DependencyInjection\Volo.DependencyInjection.xproj", "{F6F172F4-977B-4E20-BB9D-D4B083624011}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Volo", "Volo", "{82B41A0A-6068-410F-9C6B-2508CA763E21}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.DependencyInjection.Tests", "test\Volo.DependencyInjection.Tests\Volo.DependencyInjection.Tests.xproj", "{D68B762E-2A55-4A9F-9F2F-D4361B0925B0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Abp", "Abp", "{37087D1B-3693-4E96-983D-A69F210BDE53}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpTestBase", "test\AbpTestBase\AbpTestBase.xproj", "{1020F5FD-6A97-40C2-AFCA-EBDF641DF111}" @@ -34,10 +26,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore", "src\ EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.AspNetCore.Tests", "test\Volo.Abp.AspNetCore.Tests\Volo.Abp.AspNetCore.Tests.xproj", "{B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.ExtensionMethods", "src\Volo.ExtensionMethods\Volo.ExtensionMethods.xproj", "{FC889503-0BF4-4959-AC80-F51073787025}" -EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.ExtensionMethods.Tests", "test\Volo.ExtensionMethods.Tests\Volo.ExtensionMethods.Tests.xproj", "{B520B696-86C7-46D2-A359-C2E9013A7BED}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.MultiTenancy", "src\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.xproj", "{58FA9F8F-216D-4C93-8929-D40D22B11CA7}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.MultiTenancy.Tests", "test\Volo.Abp.MultiTenancy.Tests\Volo.Abp.MultiTenancy.Tests.xproj", "{05271341-7A15-484C-9FD6-802A4193F4DE}" @@ -90,6 +78,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.MongoBlog", "src\Ab EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AbpDesk.SamplePlugInModule", "src\AbpDesk\AbpDesk.SamplePlugInModule\AbpDesk.SamplePlugInModule.xproj", "{ADFAF85B-B785-41EA-B57D-422775989FA6}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.Abp.DependencyInjection.Abstractions", "src\Volo.Abp.DependencyInjection.Abstractions\Volo.Abp.DependencyInjection.Abstractions.xproj", "{53D69885-FE4A-49E4-B92D-C3F77AD97A8A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -104,14 +94,6 @@ Global {E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}.Debug|Any CPU.Build.0 = Debug|Any CPU {E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}.Release|Any CPU.ActiveCfg = Release|Any CPU {E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1}.Release|Any CPU.Build.0 = Release|Any CPU - {F6F172F4-977B-4E20-BB9D-D4B083624011}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F6F172F4-977B-4E20-BB9D-D4B083624011}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F6F172F4-977B-4E20-BB9D-D4B083624011}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F6F172F4-977B-4E20-BB9D-D4B083624011}.Release|Any CPU.Build.0 = Release|Any CPU - {D68B762E-2A55-4A9F-9F2F-D4361B0925B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D68B762E-2A55-4A9F-9F2F-D4361B0925B0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D68B762E-2A55-4A9F-9F2F-D4361B0925B0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D68B762E-2A55-4A9F-9F2F-D4361B0925B0}.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 @@ -124,14 +106,6 @@ Global {B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510}.Debug|Any CPU.Build.0 = Debug|Any CPU {B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510}.Release|Any CPU.ActiveCfg = Release|Any CPU {B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510}.Release|Any CPU.Build.0 = Release|Any CPU - {FC889503-0BF4-4959-AC80-F51073787025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FC889503-0BF4-4959-AC80-F51073787025}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FC889503-0BF4-4959-AC80-F51073787025}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FC889503-0BF4-4959-AC80-F51073787025}.Release|Any CPU.Build.0 = Release|Any CPU - {B520B696-86C7-46D2-A359-C2E9013A7BED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B520B696-86C7-46D2-A359-C2E9013A7BED}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B520B696-86C7-46D2-A359-C2E9013A7BED}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B520B696-86C7-46D2-A359-C2E9013A7BED}.Release|Any CPU.Build.0 = Release|Any CPU {58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU {58FA9F8F-216D-4C93-8929-D40D22B11CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -220,6 +194,10 @@ Global {ADFAF85B-B785-41EA-B57D-422775989FA6}.Debug|Any CPU.Build.0 = Debug|Any CPU {ADFAF85B-B785-41EA-B57D-422775989FA6}.Release|Any CPU.ActiveCfg = Release|Any CPU {ADFAF85B-B785-41EA-B57D-422775989FA6}.Release|Any CPU.Build.0 = Release|Any CPU + {53D69885-FE4A-49E4-B92D-C3F77AD97A8A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53D69885-FE4A-49E4-B92D-C3F77AD97A8A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53D69885-FE4A-49E4-B92D-C3F77AD97A8A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53D69885-FE4A-49E4-B92D-C3F77AD97A8A}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -227,17 +205,11 @@ Global GlobalSection(NestedProjects) = preSolution {FC5F7372-EA60-4052-B943-0EE070221CC1} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {E9A85F1B-A5CB-4E19-B2BB-A7F97BB25EE1} = {37087D1B-3693-4E96-983D-A69F210BDE53} - {9A4A646B-CC96-44FB-A717-E50C5C148B54} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} {4C753F64-0C93-4D65-96C2-A40893AFC1E8} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6} - {F6F172F4-977B-4E20-BB9D-D4B083624011} = {9A4A646B-CC96-44FB-A717-E50C5C148B54} - {82B41A0A-6068-410F-9C6B-2508CA763E21} = {447C8A77-E5F0-4538-8687-7383196D04EA} - {D68B762E-2A55-4A9F-9F2F-D4361B0925B0} = {82B41A0A-6068-410F-9C6B-2508CA763E21} {37087D1B-3693-4E96-983D-A69F210BDE53} = {447C8A77-E5F0-4538-8687-7383196D04EA} {1020F5FD-6A97-40C2-AFCA-EBDF641DF111} = {447C8A77-E5F0-4538-8687-7383196D04EA} {02BE03BA-3411-448C-AB61-CB36407CC49A} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {B1D860BB-6EC6-4BAE-ADAA-C2AEC2FFB510} = {37087D1B-3693-4E96-983D-A69F210BDE53} - {FC889503-0BF4-4959-AC80-F51073787025} = {9A4A646B-CC96-44FB-A717-E50C5C148B54} - {B520B696-86C7-46D2-A359-C2E9013A7BED} = {82B41A0A-6068-410F-9C6B-2508CA763E21} {58FA9F8F-216D-4C93-8929-D40D22B11CA7} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {05271341-7A15-484C-9FD6-802A4193F4DE} = {37087D1B-3693-4E96-983D-A69F210BDE53} {7CC7946B-E026-4F66-8D4F-4F78F4801D43} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} @@ -264,5 +236,6 @@ Global {B31FFAE3-5DAC-4E51-BD17-F7446B741A36} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} {63244DC7-34BE-44E1-BF6F-F2672E59AF36} = {1187F469-0063-4065-9419-A1D956C80145} {ADFAF85B-B785-41EA-B57D-422775989FA6} = {1187F469-0063-4065-9419-A1D956C80145} + {53D69885-FE4A-49E4-B92D-C3F77AD97A8A} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8} EndGlobalSection EndGlobal diff --git a/src/Volo.Abp.ApplicationContracts/project.json b/src/Volo.Abp.ApplicationContracts/project.json index ab4c096616..c30f7f5abd 100644 --- a/src/Volo.Abp.ApplicationContracts/project.json +++ b/src/Volo.Abp.ApplicationContracts/project.json @@ -3,7 +3,7 @@ "dependencies": { "NETStandard.Library": "1.6.1", - "Volo.DependencyInjection": "1.0.0-*" + "Volo.Abp.DependencyInjection.Abstractions": "1.0.0-*" }, "frameworks": { diff --git a/src/Volo.DependencyInjection/Properties/AssemblyInfo.cs b/src/Volo.Abp.DependencyInjection.Abstractions/Properties/AssemblyInfo.cs similarity index 80% rename from src/Volo.DependencyInjection/Properties/AssemblyInfo.cs rename to src/Volo.Abp.DependencyInjection.Abstractions/Properties/AssemblyInfo.cs index 0b503fb893..95463dabc7 100644 --- a/src/Volo.DependencyInjection/Properties/AssemblyInfo.cs +++ b/src/Volo.Abp.DependencyInjection.Abstractions/Properties/AssemblyInfo.cs @@ -1,4 +1,5 @@ using System.Reflection; +using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following @@ -6,7 +7,7 @@ using System.Runtime.InteropServices; // associated with an assembly. [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Volo.DependencyInjection")] +[assembly: AssemblyProduct("Volo.Abp.DependencyInjection.Abstractions")] [assembly: AssemblyTrademark("")] // Setting ComVisible to false makes the types in this assembly not visible @@ -15,4 +16,4 @@ using System.Runtime.InteropServices; [assembly: ComVisible(false)] // The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f6f172f4-977b-4e20-bb9d-d4b083624011")] +[assembly: Guid("53d69885-fe4a-49e4-b92d-c3f77ad97a8a")] diff --git a/src/Volo.ExtensionMethods/Volo.ExtensionMethods.xproj b/src/Volo.Abp.DependencyInjection.Abstractions/Volo.Abp.DependencyInjection.Abstractions.xproj similarity index 93% rename from src/Volo.ExtensionMethods/Volo.ExtensionMethods.xproj rename to src/Volo.Abp.DependencyInjection.Abstractions/Volo.Abp.DependencyInjection.Abstractions.xproj index 256e71750c..f1d43ae3c6 100644 --- a/src/Volo.ExtensionMethods/Volo.ExtensionMethods.xproj +++ b/src/Volo.Abp.DependencyInjection.Abstractions/Volo.Abp.DependencyInjection.Abstractions.xproj @@ -6,7 +6,7 @@ - fc889503-0bf4-4959-ac80-f51073787025 + 53d69885-fe4a-49e4-b92d-c3f77ad97a8a .\obj diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/DependencyAttribute.cs b/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DependencyAttribute.cs similarity index 91% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/DependencyAttribute.cs rename to src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DependencyAttribute.cs index 4a3290cdf4..8e917cc71d 100644 --- a/src/Volo.DependencyInjection/Volo/DependencyInjection/DependencyAttribute.cs +++ b/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DependencyAttribute.cs @@ -1,12 +1,10 @@ using System; -using JetBrains.Annotations; using Microsoft.Extensions.DependencyInjection; namespace Volo.DependencyInjection { public class DependencyAttribute : Attribute { - [CanBeNull] public virtual ServiceLifetime? Lifetime { get; set; } public virtual bool TryRegister { get; set; } diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs b/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs rename to src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/ExposeServicesAttribute.cs b/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ExposeServicesAttribute.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/ExposeServicesAttribute.cs rename to src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ExposeServicesAttribute.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/IConventionalRegistrar.cs b/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IConventionalRegistrar.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/IConventionalRegistrar.cs rename to src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IConventionalRegistrar.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/IExposedServiceTypesProvider.cs b/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IExposedServiceTypesProvider.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/IExposedServiceTypesProvider.cs rename to src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IExposedServiceTypesProvider.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/IScopedDependency.cs b/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IScopedDependency.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/IScopedDependency.cs rename to src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IScopedDependency.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/ISingletonDependency.cs b/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ISingletonDependency.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/ISingletonDependency.cs rename to src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ISingletonDependency.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/ITransientDependency.cs b/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ITransientDependency.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/ITransientDependency.cs rename to src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ITransientDependency.cs diff --git a/src/Volo.DependencyInjection/project.json b/src/Volo.Abp.DependencyInjection.Abstractions/project.json similarity index 63% rename from src/Volo.DependencyInjection/project.json rename to src/Volo.Abp.DependencyInjection.Abstractions/project.json index dedb8eba0c..3f091a2fb8 100644 --- a/src/Volo.DependencyInjection/project.json +++ b/src/Volo.Abp.DependencyInjection.Abstractions/project.json @@ -1,10 +1,9 @@ -{ +{ "version": "1.0.0-*", "dependencies": { "NETStandard.Library": "1.6.1", - "Microsoft.Extensions.DependencyInjection": "1.1.0", - "Volo.ExtensionMethods": "1.0.0-*" + "Microsoft.Extensions.DependencyInjection": "1.1.0" }, "frameworks": { diff --git a/src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ConventionalRegistrarList.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ConventionalRegistrarList.cs similarity index 100% rename from src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ConventionalRegistrarList.cs rename to src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ConventionalRegistrarList.cs diff --git a/src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs similarity index 100% rename from src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs rename to src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs diff --git a/src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs similarity index 100% rename from src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs rename to src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs diff --git a/src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs similarity index 100% rename from src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs rename to src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs diff --git a/src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs b/src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs similarity index 100% rename from src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs rename to src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs diff --git a/src/Volo.ExtensionMethods/Volo/Check.cs b/src/Volo.Abp/Volo/Check.cs similarity index 90% rename from src/Volo.ExtensionMethods/Volo/Check.cs rename to src/Volo.Abp/Volo/Check.cs index e6ed115be0..f3af3aa6b5 100644 --- a/src/Volo.ExtensionMethods/Volo/Check.cs +++ b/src/Volo.Abp/Volo/Check.cs @@ -6,8 +6,6 @@ using Volo.ExtensionMethods.Collections.Generic; namespace Volo { - //TODO: This code should not be here and this library should not depend on JetBrains.Annotations. - [DebuggerStepThrough] public static class Check { diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/AutoRegistrationHelper.cs b/src/Volo.Abp/Volo/DependencyInjection/AutoRegistrationHelper.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/AutoRegistrationHelper.cs rename to src/Volo.Abp/Volo/DependencyInjection/AutoRegistrationHelper.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/ConventionalRegistrarBase.cs b/src/Volo.Abp/Volo/DependencyInjection/ConventionalRegistrarBase.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/ConventionalRegistrarBase.cs rename to src/Volo.Abp/Volo/DependencyInjection/ConventionalRegistrarBase.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/DefaultConventionalRegistrar.cs b/src/Volo.Abp/Volo/DependencyInjection/DefaultConventionalRegistrar.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/DefaultConventionalRegistrar.cs rename to src/Volo.Abp/Volo/DependencyInjection/DefaultConventionalRegistrar.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/IObjectAccessor.cs b/src/Volo.Abp/Volo/DependencyInjection/IObjectAccessor.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/IObjectAccessor.cs rename to src/Volo.Abp/Volo/DependencyInjection/IObjectAccessor.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/IServiceProviderAccessor.cs b/src/Volo.Abp/Volo/DependencyInjection/IServiceProviderAccessor.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/IServiceProviderAccessor.cs rename to src/Volo.Abp/Volo/DependencyInjection/IServiceProviderAccessor.cs diff --git a/src/Volo.DependencyInjection/Volo/DependencyInjection/ObjectAccessor.cs b/src/Volo.Abp/Volo/DependencyInjection/ObjectAccessor.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/DependencyInjection/ObjectAccessor.cs rename to src/Volo.Abp/Volo/DependencyInjection/ObjectAccessor.cs diff --git a/src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs b/src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs rename to src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs diff --git a/src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs b/src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs rename to src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs diff --git a/src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs b/src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs rename to src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs diff --git a/src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs b/src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs rename to src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs diff --git a/src/Volo.ExtensionMethods/Volo/ExtensionMethods/ComparableExtensions.cs b/src/Volo.Abp/Volo/ExtensionMethods/ComparableExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/Volo/ExtensionMethods/ComparableExtensions.cs rename to src/Volo.Abp/Volo/ExtensionMethods/ComparableExtensions.cs diff --git a/src/Volo.ExtensionMethods/Volo/ExtensionMethods/DayOfWeekExtensions.cs b/src/Volo.Abp/Volo/ExtensionMethods/DayOfWeekExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/Volo/ExtensionMethods/DayOfWeekExtensions.cs rename to src/Volo.Abp/Volo/ExtensionMethods/DayOfWeekExtensions.cs diff --git a/src/Volo.ExtensionMethods/Volo/ExtensionMethods/EventHandlerExtensions.cs b/src/Volo.Abp/Volo/ExtensionMethods/EventHandlerExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/Volo/ExtensionMethods/EventHandlerExtensions.cs rename to src/Volo.Abp/Volo/ExtensionMethods/EventHandlerExtensions.cs diff --git a/src/Volo.ExtensionMethods/Volo/ExtensionMethods/ExceptionExtensions.cs b/src/Volo.Abp/Volo/ExtensionMethods/ExceptionExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/Volo/ExtensionMethods/ExceptionExtensions.cs rename to src/Volo.Abp/Volo/ExtensionMethods/ExceptionExtensions.cs diff --git a/src/Volo.ExtensionMethods/Volo/ExtensionMethods/ObjectExtensions.cs b/src/Volo.Abp/Volo/ExtensionMethods/ObjectExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/Volo/ExtensionMethods/ObjectExtensions.cs rename to src/Volo.Abp/Volo/ExtensionMethods/ObjectExtensions.cs diff --git a/src/Volo.ExtensionMethods/Volo/ExtensionMethods/StringExtensions.cs b/src/Volo.Abp/Volo/ExtensionMethods/StringExtensions.cs similarity index 100% rename from src/Volo.ExtensionMethods/Volo/ExtensionMethods/StringExtensions.cs rename to src/Volo.Abp/Volo/ExtensionMethods/StringExtensions.cs diff --git a/src/Volo.DependencyInjection/Volo/Internal/AssemblyHelper.cs b/src/Volo.Abp/Volo/Internal/AssemblyHelper.cs similarity index 100% rename from src/Volo.DependencyInjection/Volo/Internal/AssemblyHelper.cs rename to src/Volo.Abp/Volo/Internal/AssemblyHelper.cs diff --git a/src/Volo.Abp/project.json b/src/Volo.Abp/project.json index fa16444863..c943df9775 100644 --- a/src/Volo.Abp/project.json +++ b/src/Volo.Abp/project.json @@ -3,15 +3,15 @@ "dependencies": { "NETStandard.Library": "1.6.1", - "Volo.DependencyInjection": "1.0.0-*", "System.Collections.Immutable": "1.3.0", - "Volo.ExtensionMethods": "1.0.0-*", "Newtonsoft.Json": "9.0.1", "Nito.AsyncEx.Context": "1.1.0", "System.Runtime.Loader": "4.3.0", "System.Linq.Queryable": "4.3.0", "Volo.Abp.ApplicationContracts": "1.0.0-*", - "Microsoft.Extensions.Options": "1.1.0" + "Microsoft.Extensions.Options": "1.1.0", + "JetBrains.Annotations": "10.2.1", + "Volo.Abp.DependencyInjection.Abstractions": "1.0.0-*" }, "frameworks": { diff --git a/src/Volo.DependencyInjection/Volo.DependencyInjection.xproj b/src/Volo.DependencyInjection/Volo.DependencyInjection.xproj deleted file mode 100644 index c8b527e090..0000000000 --- a/src/Volo.DependencyInjection/Volo.DependencyInjection.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - f6f172f4-977b-4e20-bb9d-d4b083624011 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.ExtensionMethods/Properties/AssemblyInfo.cs b/src/Volo.ExtensionMethods/Properties/AssemblyInfo.cs deleted file mode 100644 index bc1acba485..0000000000 --- a/src/Volo.ExtensionMethods/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Volo.ExtensionMethods")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("fc889503-0bf4-4959-ac80-f51073787025")] diff --git a/src/Volo.ExtensionMethods/project.json b/src/Volo.ExtensionMethods/project.json deleted file mode 100644 index 65a8e28a9d..0000000000 --- a/src/Volo.ExtensionMethods/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "JetBrains.Annotations": "10.2.1", - "NETStandard.Library": "1.6.1" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs b/test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs similarity index 100% rename from test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs rename to test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs diff --git a/test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs b/test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs similarity index 100% rename from test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs rename to test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs diff --git a/test/Volo.DependencyInjection.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs b/test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs similarity index 100% rename from test/Volo.DependencyInjection.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs rename to test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs diff --git a/test/Volo.DependencyInjection.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs b/test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs similarity index 100% rename from test/Volo.DependencyInjection.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs rename to test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs diff --git a/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs b/test/Volo.Abp.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs similarity index 100% rename from test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs rename to test/Volo.Abp.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs diff --git a/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs b/test/Volo.Abp.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs similarity index 100% rename from test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs rename to test/Volo.Abp.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs diff --git a/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs b/test/Volo.Abp.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs similarity index 100% rename from test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs rename to test/Volo.Abp.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs diff --git a/test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs b/test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs similarity index 100% rename from test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs rename to test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs diff --git a/test/Volo.Abp.Tests/project.json b/test/Volo.Abp.Tests/project.json index ef5e9cffd2..71a3b1d32e 100644 --- a/test/Volo.Abp.Tests/project.json +++ b/test/Volo.Abp.Tests/project.json @@ -5,8 +5,7 @@ "dependencies": { "AbpTestBase": "1.0.0-*", - "Volo.Abp": "1.0.0-*", - "Volo.DependencyInjection.Tests": "1.0.0-*" + "Volo.Abp": "1.0.0-*" }, "frameworks": { diff --git a/test/Volo.DependencyInjection.Tests/Properties/AssemblyInfo.cs b/test/Volo.DependencyInjection.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index b33e4df489..0000000000 --- a/test/Volo.DependencyInjection.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Volo.DependencyInjection.Tests")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("d68b762e-2a55-4a9f-9f2f-d4361b0925b0")] diff --git a/test/Volo.DependencyInjection.Tests/Volo.DependencyInjection.Tests.xproj b/test/Volo.DependencyInjection.Tests/Volo.DependencyInjection.Tests.xproj deleted file mode 100644 index 469823b16a..0000000000 --- a/test/Volo.DependencyInjection.Tests/Volo.DependencyInjection.Tests.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - d68b762e-2a55-4a9f-9f2f-d4361b0925b0 - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Volo.DependencyInjection.Tests/project.json b/test/Volo.DependencyInjection.Tests/project.json deleted file mode 100644 index 3a56ca3129..0000000000 --- a/test/Volo.DependencyInjection.Tests/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - - "testRunner": "xunit", - - "dependencies": { - "AbpTestBase": "1.0.0-*", - "Volo.DependencyInjection": "1.0.0-*" - }, - - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - } - } -} diff --git a/test/Volo.ExtensionMethods.Tests/Properties/AssemblyInfo.cs b/test/Volo.ExtensionMethods.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 5c757b0217..0000000000 --- a/test/Volo.ExtensionMethods.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Volo.ExtensionMethods.Tests")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("b520b696-86c7-46d2-a359-c2e9013a7bed")] diff --git a/test/Volo.ExtensionMethods.Tests/Volo.ExtensionMethods.Tests.xproj b/test/Volo.ExtensionMethods.Tests/Volo.ExtensionMethods.Tests.xproj deleted file mode 100644 index adb273a6f2..0000000000 --- a/test/Volo.ExtensionMethods.Tests/Volo.ExtensionMethods.Tests.xproj +++ /dev/null @@ -1,23 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - b520b696-86c7-46d2-a359-c2e9013a7bed - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - - - - \ No newline at end of file diff --git a/test/Volo.ExtensionMethods.Tests/project.json b/test/Volo.ExtensionMethods.Tests/project.json deleted file mode 100644 index e3ac6ea56c..0000000000 --- a/test/Volo.ExtensionMethods.Tests/project.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "1.0.0-*", - - "testRunner": "xunit", - - "dependencies": { - "AbpTestBase": "1.0.0-*", - "Volo.ExtensionMethods": "1.0.0-*" - }, - - "frameworks": { - "netcoreapp1.1": { - "dependencies": { - "Microsoft.NETCore.App": { - "type": "platform", - "version": "1.1.0" - } - } - } - } -}