diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 74fce7f22d..28aa91ae4d 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -76,8 +76,6 @@ 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 @@ -188,10 +186,6 @@ 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 @@ -229,6 +223,5 @@ 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.DependencyInjection.Abstractions/Properties/AssemblyInfo.cs b/src/Volo.Abp.DependencyInjection.Abstractions/Properties/AssemblyInfo.cs deleted file mode 100644 index 95463dabc7..0000000000 --- a/src/Volo.Abp.DependencyInjection.Abstractions/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -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.Abp.DependencyInjection.Abstractions")] -[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("53d69885-fe4a-49e4-b92d-c3f77ad97a8a")] diff --git a/src/Volo.Abp.DependencyInjection.Abstractions/Volo.Abp.DependencyInjection.Abstractions.xproj b/src/Volo.Abp.DependencyInjection.Abstractions/Volo.Abp.DependencyInjection.Abstractions.xproj deleted file mode 100644 index f1d43ae3c6..0000000000 --- a/src/Volo.Abp.DependencyInjection.Abstractions/Volo.Abp.DependencyInjection.Abstractions.xproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 53d69885-fe4a-49e4-b92d-c3f77ad97a8a - - - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.Abp.DependencyInjection.Abstractions/project.json b/src/Volo.Abp.DependencyInjection.Abstractions/project.json deleted file mode 100644 index 3f091a2fb8..0000000000 --- a/src/Volo.Abp.DependencyInjection.Abstractions/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "NETStandard.Library": "1.6.1", - "Microsoft.Extensions.DependencyInjection": "1.1.0" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DependencyAttribute.cs b/src/Volo.Abp/Volo/DependencyInjection/DependencyAttribute.cs similarity index 100% rename from src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DependencyAttribute.cs rename to src/Volo.Abp/Volo/DependencyInjection/DependencyAttribute.cs diff --git a/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs b/src/Volo.Abp/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs similarity index 100% rename from src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs rename to src/Volo.Abp/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs diff --git a/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ExposeServicesAttribute.cs b/src/Volo.Abp/Volo/DependencyInjection/ExposeServicesAttribute.cs similarity index 100% rename from src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ExposeServicesAttribute.cs rename to src/Volo.Abp/Volo/DependencyInjection/ExposeServicesAttribute.cs diff --git a/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IConventionalRegistrar.cs b/src/Volo.Abp/Volo/DependencyInjection/IConventionalRegistrar.cs similarity index 100% rename from src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IConventionalRegistrar.cs rename to src/Volo.Abp/Volo/DependencyInjection/IConventionalRegistrar.cs diff --git a/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IExposedServiceTypesProvider.cs b/src/Volo.Abp/Volo/DependencyInjection/IExposedServiceTypesProvider.cs similarity index 100% rename from src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IExposedServiceTypesProvider.cs rename to src/Volo.Abp/Volo/DependencyInjection/IExposedServiceTypesProvider.cs diff --git a/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IScopedDependency.cs b/src/Volo.Abp/Volo/DependencyInjection/IScopedDependency.cs similarity index 100% rename from src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IScopedDependency.cs rename to src/Volo.Abp/Volo/DependencyInjection/IScopedDependency.cs diff --git a/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ISingletonDependency.cs b/src/Volo.Abp/Volo/DependencyInjection/ISingletonDependency.cs similarity index 100% rename from src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ISingletonDependency.cs rename to src/Volo.Abp/Volo/DependencyInjection/ISingletonDependency.cs diff --git a/src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ITransientDependency.cs b/src/Volo.Abp/Volo/DependencyInjection/ITransientDependency.cs similarity index 100% rename from src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ITransientDependency.cs rename to src/Volo.Abp/Volo/DependencyInjection/ITransientDependency.cs diff --git a/src/Volo.Abp/project.json b/src/Volo.Abp/project.json index 0005f17548..32a6a7341d 100644 --- a/src/Volo.Abp/project.json +++ b/src/Volo.Abp/project.json @@ -3,14 +3,14 @@ "dependencies": { "NETStandard.Library": "1.6.1", + "Microsoft.Extensions.DependencyInjection": "1.1.0", + "Microsoft.Extensions.Options": "1.1.0", "System.Collections.Immutable": "1.3.0", - "Newtonsoft.Json": "9.0.1", - "Nito.AsyncEx.Context": "1.1.0", "System.Runtime.Loader": "4.3.0", "System.Linq.Queryable": "4.3.0", - "Microsoft.Extensions.Options": "1.1.0", "JetBrains.Annotations": "10.2.1", - "Volo.Abp.DependencyInjection.Abstractions": "1.0.0-*" + "Newtonsoft.Json": "9.0.1", + "Nito.AsyncEx.Context": "1.1.0" }, "frameworks": {