Browse Source

Removed Volo.DependencyInjection and Volo.ExtensionMethods projects.

pull/81/head
Halil İbrahim Kalkan 10 years ago
parent
commit
776c0ca498
  1. 41
      Volo.Abp.sln
  2. 2
      src/Volo.Abp.ApplicationContracts/project.json
  3. 5
      src/Volo.Abp.DependencyInjection.Abstractions/Properties/AssemblyInfo.cs
  4. 2
      src/Volo.Abp.DependencyInjection.Abstractions/Volo.Abp.DependencyInjection.Abstractions.xproj
  5. 2
      src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DependencyAttribute.cs
  6. 0
      src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs
  7. 0
      src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ExposeServicesAttribute.cs
  8. 0
      src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IConventionalRegistrar.cs
  9. 0
      src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IExposedServiceTypesProvider.cs
  10. 0
      src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IScopedDependency.cs
  11. 0
      src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ISingletonDependency.cs
  12. 0
      src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ITransientDependency.cs
  13. 5
      src/Volo.Abp.DependencyInjection.Abstractions/project.json
  14. 0
      src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ConventionalRegistrarList.cs
  15. 0
      src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs
  16. 0
      src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs
  17. 0
      src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs
  18. 0
      src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs
  19. 2
      src/Volo.Abp/Volo/Check.cs
  20. 0
      src/Volo.Abp/Volo/DependencyInjection/AutoRegistrationHelper.cs
  21. 0
      src/Volo.Abp/Volo/DependencyInjection/ConventionalRegistrarBase.cs
  22. 0
      src/Volo.Abp/Volo/DependencyInjection/DefaultConventionalRegistrar.cs
  23. 0
      src/Volo.Abp/Volo/DependencyInjection/IObjectAccessor.cs
  24. 0
      src/Volo.Abp/Volo/DependencyInjection/IServiceProviderAccessor.cs
  25. 0
      src/Volo.Abp/Volo/DependencyInjection/ObjectAccessor.cs
  26. 0
      src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs
  27. 0
      src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs
  28. 0
      src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs
  29. 0
      src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs
  30. 0
      src/Volo.Abp/Volo/ExtensionMethods/ComparableExtensions.cs
  31. 0
      src/Volo.Abp/Volo/ExtensionMethods/DayOfWeekExtensions.cs
  32. 0
      src/Volo.Abp/Volo/ExtensionMethods/EventHandlerExtensions.cs
  33. 0
      src/Volo.Abp/Volo/ExtensionMethods/ExceptionExtensions.cs
  34. 0
      src/Volo.Abp/Volo/ExtensionMethods/ObjectExtensions.cs
  35. 0
      src/Volo.Abp/Volo/ExtensionMethods/StringExtensions.cs
  36. 0
      src/Volo.Abp/Volo/Internal/AssemblyHelper.cs
  37. 6
      src/Volo.Abp/project.json
  38. 18
      src/Volo.DependencyInjection/Properties/AssemblyInfo.cs
  39. 20
      src/Volo.ExtensionMethods/Volo.ExtensionMethods.xproj
  40. 14
      src/Volo.ExtensionMethods/project.json
  41. 0
      test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs
  42. 0
      test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs
  43. 0
      test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs
  44. 0
      test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs
  45. 0
      test/Volo.Abp.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs
  46. 0
      test/Volo.Abp.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs
  47. 0
      test/Volo.Abp.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs
  48. 0
      test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs
  49. 3
      test/Volo.Abp.Tests/project.json
  50. 18
      test/Volo.DependencyInjection.Tests/Properties/AssemblyInfo.cs
  51. 23
      test/Volo.DependencyInjection.Tests/Volo.DependencyInjection.Tests.xproj
  52. 21
      test/Volo.DependencyInjection.Tests/project.json
  53. 18
      test/Volo.ExtensionMethods.Tests/Properties/AssemblyInfo.cs
  54. 23
      test/Volo.ExtensionMethods.Tests/Volo.ExtensionMethods.Tests.xproj
  55. 21
      test/Volo.ExtensionMethods.Tests/project.json

41
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

2
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": {

5
src/Volo.ExtensionMethods/Properties/AssemblyInfo.cs → 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.ExtensionMethods")]
[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("fc889503-0bf4-4959-ac80-f51073787025")]
[assembly: Guid("53d69885-fe4a-49e4-b92d-c3f77ad97a8a")]

2
src/Volo.DependencyInjection/Volo.DependencyInjection.xproj → src/Volo.Abp.DependencyInjection.Abstractions/Volo.Abp.DependencyInjection.Abstractions.xproj

@ -6,7 +6,7 @@
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>f6f172f4-977b-4e20-bb9d-d4b083624011</ProjectGuid>
<ProjectGuid>53d69885-fe4a-49e4-b92d-c3f77ad97a8a</ProjectGuid>
<RootNamespace>
</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>

2
src/Volo.DependencyInjection/Volo/DependencyInjection/DependencyAttribute.cs → 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; }

0
src/Volo.DependencyInjection/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs → src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/DisableConventionalRegistrationAttribute.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/ExposeServicesAttribute.cs → src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ExposeServicesAttribute.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/IConventionalRegistrar.cs → src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IConventionalRegistrar.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/IExposedServiceTypesProvider.cs → src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IExposedServiceTypesProvider.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/IScopedDependency.cs → src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/IScopedDependency.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/ISingletonDependency.cs → src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ISingletonDependency.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/ITransientDependency.cs → src/Volo.Abp.DependencyInjection.Abstractions/Volo/DependencyInjection/ITransientDependency.cs

5
src/Volo.DependencyInjection/project.json → 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": {

0
src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ConventionalRegistrarList.cs → src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ConventionalRegistrarList.cs

0
src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs → src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs

0
src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs → src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs

0
src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs → src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs

0
src/Volo.DependencyInjection/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs → src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationExtensions.cs

2
src/Volo.ExtensionMethods/Volo/Check.cs → 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
{

0
src/Volo.DependencyInjection/Volo/DependencyInjection/AutoRegistrationHelper.cs → src/Volo.Abp/Volo/DependencyInjection/AutoRegistrationHelper.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/ConventionalRegistrarBase.cs → src/Volo.Abp/Volo/DependencyInjection/ConventionalRegistrarBase.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/DefaultConventionalRegistrar.cs → src/Volo.Abp/Volo/DependencyInjection/DefaultConventionalRegistrar.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/IObjectAccessor.cs → src/Volo.Abp/Volo/DependencyInjection/IObjectAccessor.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/IServiceProviderAccessor.cs → src/Volo.Abp/Volo/DependencyInjection/IServiceProviderAccessor.cs

0
src/Volo.DependencyInjection/Volo/DependencyInjection/ObjectAccessor.cs → src/Volo.Abp/Volo/DependencyInjection/ObjectAccessor.cs

0
src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs → src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/CollectionExtensions.cs

0
src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs → src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/DictionaryExtensions.cs

0
src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs → src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/EnumerableExtensions.cs

0
src/Volo.ExtensionMethods/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs → src/Volo.Abp/Volo/ExtensionMethods/Collections/Generic/ListExtensions.cs

0
src/Volo.ExtensionMethods/Volo/ExtensionMethods/ComparableExtensions.cs → src/Volo.Abp/Volo/ExtensionMethods/ComparableExtensions.cs

0
src/Volo.ExtensionMethods/Volo/ExtensionMethods/DayOfWeekExtensions.cs → src/Volo.Abp/Volo/ExtensionMethods/DayOfWeekExtensions.cs

0
src/Volo.ExtensionMethods/Volo/ExtensionMethods/EventHandlerExtensions.cs → src/Volo.Abp/Volo/ExtensionMethods/EventHandlerExtensions.cs

0
src/Volo.ExtensionMethods/Volo/ExtensionMethods/ExceptionExtensions.cs → src/Volo.Abp/Volo/ExtensionMethods/ExceptionExtensions.cs

0
src/Volo.ExtensionMethods/Volo/ExtensionMethods/ObjectExtensions.cs → src/Volo.Abp/Volo/ExtensionMethods/ObjectExtensions.cs

0
src/Volo.ExtensionMethods/Volo/ExtensionMethods/StringExtensions.cs → src/Volo.Abp/Volo/ExtensionMethods/StringExtensions.cs

0
src/Volo.DependencyInjection/Volo/Internal/AssemblyHelper.cs → src/Volo.Abp/Volo/Internal/AssemblyHelper.cs

6
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": {

18
src/Volo.DependencyInjection/Properties/AssemblyInfo.cs

@ -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")]
[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("f6f172f4-977b-4e20-bb9d-d4b083624011")]

20
src/Volo.ExtensionMethods/Volo.ExtensionMethods.xproj

@ -1,20 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>fc889503-0bf4-4959-ac80-f51073787025</ProjectGuid>
<RootNamespace>
</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

14
src/Volo.ExtensionMethods/project.json

@ -1,14 +0,0 @@
{
"version": "1.0.0-*",
"dependencies": {
"JetBrains.Annotations": "10.2.1",
"NETStandard.Library": "1.6.1"
},
"frameworks": {
"netstandard1.6": {
"imports": "dnxcore50"
}
}
}

0
test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs → test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/AbpConventionalDependencyInjectionExtensions_Tests.cs

0
test/Volo.DependencyInjection.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs → test/Volo.Abp.Tests/Microsoft/Extensions/DependencyInjection/ServiceCollectionShouldlyExtensions.cs

0
test/Volo.DependencyInjection.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs → test/Volo.Abp.Tests/Volo/DependencyInjection/AutoRegistrationHelper_Tests.cs

0
test/Volo.DependencyInjection.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs → test/Volo.Abp.Tests/Volo/DependencyInjection/ConventionalRegistrar_Test.cs

0
test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs → test/Volo.Abp.Tests/Volo/ExtensionMethods/ComparableExtensions_Tests.cs

0
test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs → test/Volo.Abp.Tests/Volo/ExtensionMethods/DayOfWeekExtensions_Tests.cs

0
test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs → test/Volo.Abp.Tests/Volo/ExtensionMethods/ObjectExtension_Test.cs

0
test/Volo.ExtensionMethods.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs → test/Volo.Abp.Tests/Volo/ExtensionMethods/StringExtensions_Tests.cs

3
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": {

18
test/Volo.DependencyInjection.Tests/Properties/AssemblyInfo.cs

@ -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")]

23
test/Volo.DependencyInjection.Tests/Volo.DependencyInjection.Tests.xproj

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>d68b762e-2a55-4a9f-9f2f-d4361b0925b0</ProjectGuid>
<RootNamespace>
</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

21
test/Volo.DependencyInjection.Tests/project.json

@ -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"
}
}
}
}
}

18
test/Volo.ExtensionMethods.Tests/Properties/AssemblyInfo.cs

@ -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")]

23
test/Volo.ExtensionMethods.Tests/Volo.ExtensionMethods.Tests.xproj

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>b520b696-86c7-46d2-a359-c2e9013a7bed</ProjectGuid>
<RootNamespace>
</RootNamespace>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
<OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
</ItemGroup>
<Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

21
test/Volo.ExtensionMethods.Tests/project.json

@ -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"
}
}
}
}
}
Loading…
Cancel
Save