Browse Source

Created Volo.Abp.Core package.

pull/179/head
Halil İbrahim Kalkan 9 years ago
parent
commit
5de19c03f7
  1. 11
      src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/AbpDeskApplicationContractsModule.cs
  2. 6
      src/AbpDesk/AbpDesk.Application/AbpDesk/AbpDeskApplicationModule.cs
  3. 2
      src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs
  4. 2
      src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDeskSamplePlugInModule.cs
  5. BIN
      src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll
  6. 1
      src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs
  7. 1
      src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs
  8. 1
      src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj
  9. 1
      src/Volo.Abp.Castle.Core/Volo/Abp/Castle/AbpCastleCoreModule.cs
  10. 0
      src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionApplicationExtensions.cs
  11. 8
      src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs
  12. 0
      src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionConventionalRegistrationExtensions.cs
  13. 0
      src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionObjectAccessorExtensions.cs
  14. 0
      src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionPreConfigureExtensions.cs
  15. 0
      src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs
  16. 47
      src/Volo.Abp.Core/Microsoft/Extensions/Logging/LoggerExtensions.cs
  17. 0
      src/Volo.Abp.Core/System/AbpComparableExtensions.cs
  18. 0
      src/Volo.Abp.Core/System/AbpDayOfWeekExtensions.cs
  19. 0
      src/Volo.Abp.Core/System/AbpEventHandlerExtensions.cs
  20. 0
      src/Volo.Abp.Core/System/AbpExceptionExtensions.cs
  21. 0
      src/Volo.Abp.Core/System/AbpObjectExtensions.cs
  22. 0
      src/Volo.Abp.Core/System/AbpStringExtensions.cs
  23. 0
      src/Volo.Abp.Core/System/AbpTypeExtensions.cs
  24. 0
      src/Volo.Abp.Core/System/Collections/Generic/AbpCollectionExtensions.cs
  25. 0
      src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs
  26. 0
      src/Volo.Abp.Core/System/Collections/Generic/AbpEnumerableExtensions.cs
  27. 0
      src/Volo.Abp.Core/System/Collections/Generic/AbpListExtensions.cs
  28. 0
      src/Volo.Abp.Core/System/IO/AbpStreamExtensions.cs
  29. 13
      src/Volo.Abp.Core/System/Linq/AbpQueryableExtensions.cs
  30. 0
      src/Volo.Abp.Core/System/Reflection/AbpMemberInfoExtensions.cs
  31. 2
      src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs
  32. 0
      src/Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs
  33. 0
      src/Volo.Abp.Core/Volo/Abp/AbpApplicationFactory.cs
  34. 0
      src/Volo.Abp.Core/Volo/Abp/AbpApplicationWithExternalServiceProvider.cs
  35. 0
      src/Volo.Abp.Core/Volo/Abp/AbpApplicationWithInternalServiceProvider.cs
  36. 0
      src/Volo.Abp.Core/Volo/Abp/AbpException.cs
  37. 0
      src/Volo.Abp.Core/Volo/Abp/ApplicationInitializationContext.cs
  38. 0
      src/Volo.Abp.Core/Volo/Abp/ApplicationShutdownContext.cs
  39. 0
      src/Volo.Abp.Core/Volo/Abp/Check.cs
  40. 0
      src/Volo.Abp.Core/Volo/Abp/Collections/ITypeList.cs
  41. 0
      src/Volo.Abp.Core/Volo/Abp/Collections/TypeList.cs
  42. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/AutoRegistrationHelper.cs
  43. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ConventionalRegistrarBase.cs
  44. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs
  45. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/DefaultConventionalRegistrar.cs
  46. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/DependencyAttribute.cs
  47. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/DisableConventionalRegistrationAttribute.cs
  48. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ExposeServicesAttribute.cs
  49. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IConventionalRegistrar.cs
  50. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IExposedServiceTypesProvider.cs
  51. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IObjectAccessor.cs
  52. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs
  53. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IScopedDependency.cs
  54. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs
  55. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IServiceProviderAccessor.cs
  56. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ISingletonDependency.cs
  57. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ITransientDependency.cs
  58. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ObjectAccessor.cs
  59. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs
  60. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs
  61. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs
  62. 0
      src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs
  63. 0
      src/Volo.Abp.Core/Volo/Abp/DisposeAction.cs
  64. 0
      src/Volo.Abp.Core/Volo/Abp/DynamicProxy/AbpInterceptor.cs
  65. 0
      src/Volo.Abp.Core/Volo/Abp/DynamicProxy/IAbpInterceptor.cs
  66. 0
      src/Volo.Abp.Core/Volo/Abp/DynamicProxy/IAbpMethodInvocation.cs
  67. 0
      src/Volo.Abp.Core/Volo/Abp/DynamicProxy/ProxyHelper.cs
  68. 0
      src/Volo.Abp.Core/Volo/Abp/IAbpApplication.cs
  69. 0
      src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs
  70. 0
      src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithInternalServiceProvider.cs
  71. 0
      src/Volo.Abp.Core/Volo/Abp/IOnApplicationInitialization.cs
  72. 0
      src/Volo.Abp.Core/Volo/Abp/IOnApplicationShutdown.cs
  73. 17
      src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs
  74. 2
      src/Volo.Abp.Core/Volo/Abp/Internal/Utf8Helper.cs
  75. 9
      src/Volo.Abp.Core/Volo/Abp/Logging/IExceptionCanLogDetails.cs
  76. 0
      src/Volo.Abp.Core/Volo/Abp/Logging/IHasLogLevel.cs
  77. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModule.cs
  78. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleDescriptor.cs
  79. 1
      src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleHelper.cs
  80. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/DefaultModuleLifecycleContributer.cs
  81. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/DependsOnAttribute.cs
  82. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs
  83. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModuleDescriptor.cs
  84. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IDependedModuleTypesProvider.cs
  85. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleContainer.cs
  86. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLifecycleContributer.cs
  87. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLoader.cs
  88. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleManager.cs
  89. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IOnPostApplicationInitialization.cs
  90. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IOnPreApplicationInitialization.cs
  91. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IPostConfigureServices.cs
  92. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/IPreConfigureServices.cs
  93. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleContributerBase.cs
  94. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleOptions.cs
  95. 1
      src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLoader.cs
  96. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs
  97. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/PlugIns/FilePlugInSource.cs
  98. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/PlugIns/FolderPlugInSource.cs
  99. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/PlugIns/IPlugInSource.cs
  100. 0
      src/Volo.Abp.Core/Volo/Abp/Modularity/PlugIns/PlugInSourceExtensions.cs

11
src/AbpDesk/AbpDesk.Application.Contracts/AbpDesk/AbpDeskApplicationContractsModule.cs

@ -0,0 +1,11 @@
using Volo.Abp;
using Volo.Abp.Modularity;
namespace AbpDesk
{
[DependsOn(typeof(AbpCommonModule))]
public class AbpDeskApplicationContractsModule : AbpModule
{
}
}

6
src/AbpDesk/AbpDesk.Application/AbpDesk/AbpDeskApplicationModule.cs

@ -4,7 +4,11 @@ using Volo.Abp.Modularity;
namespace AbpDesk
{
[DependsOn(typeof(AbpDeskDomainModule), typeof(AbpAutoMapperModule))]
[DependsOn(
typeof(AbpDeskDomainModule),
typeof(AbpDeskApplicationContractsModule),
typeof(AbpAutoMapperModule)
)]
public class AbpDeskApplicationModule : AbpModule
{
public override void ConfigureServices(IServiceCollection services)

2
src/AbpDesk/AbpDesk.Domain/AbpDesk/AbpDeskDomainModule.cs

@ -1,8 +1,10 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp;
using Volo.Abp.Modularity;
namespace AbpDesk
{
[DependsOn(typeof(AbpCommonModule))]
public class AbpDeskDomainModule : AbpModule
{
public override void ConfigureServices(IServiceCollection services)

2
src/AbpDesk/AbpDesk.SamplePlugInModule/AbpDeskSamplePlugInModule.cs

@ -1,4 +1,5 @@
using Microsoft.Extensions.DependencyInjection;
using Volo.Abp;
using Volo.Abp.Modularity;
namespace AbpDesk.SamplePlugInModule
@ -6,6 +7,7 @@ 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)

BIN
src/AbpDesk/Web_PlugIns/AbpDesk.MongoBlog.dll

Binary file not shown.

1
src/Volo.Abp.Account.Application.Contracts/Volo/Abp/Account/AbpAccountApplicationContractsModule.cs

@ -3,6 +3,7 @@ using Volo.Abp.Modularity;
namespace Volo.Abp.Account
{
[DependsOn(typeof(AbpCommonModule))]
public class AbpAccountApplicationContractsModule : AbpModule
{
public override void ConfigureServices(IServiceCollection services)

1
src/Volo.Abp.AutoMapper/Volo/Abp/AutoMapper/AbpAutoMapperModule.cs

@ -10,6 +10,7 @@ using Volo.Abp.Reflection;
namespace Volo.Abp.AutoMapper
{
[DependsOn(typeof(AbpCommonModule))]
public class AbpAutoMapperModule : AbpModule
{
private static volatile bool _createdMappingsBefore;

1
src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj

@ -19,7 +19,6 @@
<ItemGroup>
<ProjectReference Include="..\Volo.Abp.Castle.Core\Volo.Abp.Castle.Core.csproj" />
<ProjectReference Include="..\Volo.Abp\Volo.Abp.csproj" />
</ItemGroup>
</Project>

1
src/Volo.Abp.Castle.Core/Volo/Abp/Castle/AbpCastleCoreModule.cs

@ -4,6 +4,7 @@ using Volo.Abp.Modularity;
namespace Volo.Abp.Castle
{
[DependsOn(typeof(AbpCommonModule))]
public class AbpCastleCoreModule : AbpModule
{
public override void ConfigureServices(IServiceCollection services)

0
src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionApplicationExtensions.cs → src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionApplicationExtensions.cs

8
src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs → src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionCommonExtensions.cs

@ -124,7 +124,7 @@ namespace Microsoft.Extensions.DependencyInjection
/// Returns a <see cref="Lazy{T}"/> to resolve a service from given <see cref="IServiceCollection"/>
/// once dependency injection registration phase completed.
/// </summary>
internal static Lazy<T> GetServiceLazy<T>(this IServiceCollection services)
public static Lazy<T> GetServiceLazy<T>(this IServiceCollection services)
{
return new Lazy<T>(services.GetService<T>, true);
}
@ -133,7 +133,7 @@ namespace Microsoft.Extensions.DependencyInjection
/// Returns a <see cref="Lazy{T}"/> to resolve a service from given <see cref="IServiceCollection"/>
/// once dependency injection registration phase completed.
/// </summary>
internal static Lazy<object> GetServiceLazy(this IServiceCollection services, Type type)
public static Lazy<object> GetServiceLazy(this IServiceCollection services, Type type)
{
return new Lazy<object>(() => services.GetService(type), true);
}
@ -142,7 +142,7 @@ namespace Microsoft.Extensions.DependencyInjection
/// Returns a <see cref="Lazy{T}"/> to resolve a service from given <see cref="IServiceCollection"/>
/// once dependency injection registration phase completed.
/// </summary>
internal static Lazy<T> GetRequiredServiceLazy<T>(this IServiceCollection services)
public static Lazy<T> GetRequiredServiceLazy<T>(this IServiceCollection services)
{
return new Lazy<T>(services.GetRequiredService<T>, true);
}
@ -151,7 +151,7 @@ namespace Microsoft.Extensions.DependencyInjection
/// Returns a <see cref="Lazy{T}"/> to resolve a service from given <see cref="IServiceCollection"/>
/// once dependency injection registration phase completed.
/// </summary>
internal static Lazy<object> GetRequiredServiceLazy(this IServiceCollection services, Type type)
public static Lazy<object> GetRequiredServiceLazy(this IServiceCollection services, Type type)
{
return new Lazy<object>(() => services.GetRequiredService(type), true);
}

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

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

0
src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionPreConfigureExtensions.cs → src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionPreConfigureExtensions.cs

0
src/Volo.Abp/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs → src/Volo.Abp.Core/Microsoft/Extensions/DependencyInjection/ServiceCollectionRegistrationActionExtensions.cs

47
src/Volo.Abp/Microsoft/Extensions/Logging/LoggerExtensions.cs → src/Volo.Abp.Core/Microsoft/Extensions/Logging/LoggerExtensions.cs

@ -1,8 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Volo.Abp.Logging;
using Volo.Abp.Validation;
namespace Microsoft.Extensions.Logging
{
@ -63,42 +61,37 @@ namespace Microsoft.Extensions.Logging
var logLevel = (ex as IHasLogLevel)?.LogLevel ?? LogLevel.Error;
logger.LogWithLevel(logLevel, ex.Message, ex);
LogValidationErrors(logger, ex);
LogDetails(logger, ex);
}
private static void LogValidationErrors(ILogger logger, Exception exception)
private static void LogDetails(ILogger logger, Exception exception)
{
//Try to find inner validation exception
if (exception is AggregateException && exception.InnerException != null)
{
var aggException = exception as AggregateException;
if (aggException.InnerException is AbpValidationException)
{
exception = aggException.InnerException;
}
}
var loggingExceptions = new List<IExceptionCanLogDetails>();
if (!(exception is AbpValidationException))
if (exception is IExceptionCanLogDetails)
{
return;
loggingExceptions.Add(exception as IExceptionCanLogDetails);
}
var validationException = exception as AbpValidationException;
if (validationException.ValidationErrors.IsNullOrEmpty())
else if (exception is AggregateException && exception.InnerException != null)
{
return;
}
var aggException = exception as AggregateException;
if (aggException.InnerException is IExceptionCanLogDetails)
{
loggingExceptions.Add(aggException.InnerException as IExceptionCanLogDetails);
}
logger.LogWithLevel(validationException.LogLevel, "There are " + validationException.ValidationErrors.Count + " validation errors:");
foreach (var validationResult in validationException.ValidationErrors)
{
var memberNames = "";
if (validationResult.MemberNames != null && validationResult.MemberNames.Any())
foreach (var innerException in aggException.InnerExceptions)
{
memberNames = " (" + string.Join(", ", validationResult.MemberNames) + ")";
if (innerException is IExceptionCanLogDetails)
{
loggingExceptions.AddIfNotContains(innerException as IExceptionCanLogDetails);
}
}
}
logger.LogWithLevel(validationException.LogLevel, validationResult.ErrorMessage + memberNames);
foreach (var ex in loggingExceptions)
{
ex.LogDetails(logger);
}
}
}

0
src/Volo.Abp/System/AbpComparableExtensions.cs → src/Volo.Abp.Core/System/AbpComparableExtensions.cs

0
src/Volo.Abp/System/AbpDayOfWeekExtensions.cs → src/Volo.Abp.Core/System/AbpDayOfWeekExtensions.cs

0
src/Volo.Abp/System/AbpEventHandlerExtensions.cs → src/Volo.Abp.Core/System/AbpEventHandlerExtensions.cs

0
src/Volo.Abp/System/AbpExceptionExtensions.cs → src/Volo.Abp.Core/System/AbpExceptionExtensions.cs

0
src/Volo.Abp/System/AbpObjectExtensions.cs → src/Volo.Abp.Core/System/AbpObjectExtensions.cs

0
src/Volo.Abp/System/AbpStringExtensions.cs → src/Volo.Abp.Core/System/AbpStringExtensions.cs

0
src/Volo.Abp/System/AbpTypeExtensions.cs → src/Volo.Abp.Core/System/AbpTypeExtensions.cs

0
src/Volo.Abp/System/Collections/Generic/AbpCollectionExtensions.cs → src/Volo.Abp.Core/System/Collections/Generic/AbpCollectionExtensions.cs

0
src/Volo.Abp/System/Collections/Generic/AbpDictionaryExtensions.cs → src/Volo.Abp.Core/System/Collections/Generic/AbpDictionaryExtensions.cs

0
src/Volo.Abp/System/Collections/Generic/AbpEnumerableExtensions.cs → src/Volo.Abp.Core/System/Collections/Generic/AbpEnumerableExtensions.cs

0
src/Volo.Abp/System/Collections/Generic/AbpListExtensions.cs → src/Volo.Abp.Core/System/Collections/Generic/AbpListExtensions.cs

0
src/Volo.Abp/System/IO/AbpStreamExtensions.cs → src/Volo.Abp.Core/System/IO/AbpStreamExtensions.cs

13
src/Volo.Abp/System/Linq/AbpQueryableExtensions.cs → src/Volo.Abp.Core/System/Linq/AbpQueryableExtensions.cs

@ -1,7 +1,6 @@
using System.Linq.Expressions;
using JetBrains.Annotations;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
namespace System.Linq
{
@ -20,18 +19,6 @@ namespace System.Linq
return query.Skip(skipCount).Take(maxResultCount);
}
/// <summary>
/// Used for paging with an <see cref="IPagedResultRequest"/> object.
/// </summary>
/// <param name="query">Queryable to apply paging</param>
/// <param name="pagedResultRequest">An object implements <see cref="IPagedResultRequest"/> interface</param>
public static IQueryable<T> PageBy<T>([NotNull] this IQueryable<T> query, IPagedResultRequest pagedResultRequest)
{
Check.NotNull(query, nameof(query));
return query.PageBy(pagedResultRequest.SkipCount, pagedResultRequest.MaxResultCount);
}
/// <summary>
/// Filters a <see cref="IQueryable{T}"/> by given predicate if given condition is true.
/// </summary>

0
src/Volo.Abp/System/Reflection/AbpMemberInfoExtensions.cs → src/Volo.Abp.Core/System/Reflection/AbpMemberInfoExtensions.cs

2
src/Volo.Abp/Volo/Abp/AbpApplicationBase.cs → src/Volo.Abp.Core/Volo/Abp/AbpApplicationBase.cs

@ -37,6 +37,8 @@ namespace Volo.Abp
services.AddSingleton<IAbpApplication>(this);
services.AddSingleton<IModuleContainer>(this);
services.AddCoreServices();
services.AddCoreAbpServices(this);
Modules = LoadModules(services, options);

0
src/Volo.Abp/Volo/Abp/AbpApplicationCreationOptions.cs → src/Volo.Abp.Core/Volo/Abp/AbpApplicationCreationOptions.cs

0
src/Volo.Abp/Volo/Abp/AbpApplicationFactory.cs → src/Volo.Abp.Core/Volo/Abp/AbpApplicationFactory.cs

0
src/Volo.Abp/Volo/Abp/AbpApplicationWithExternalServiceProvider.cs → src/Volo.Abp.Core/Volo/Abp/AbpApplicationWithExternalServiceProvider.cs

0
src/Volo.Abp/Volo/Abp/AbpApplicationWithInternalServiceProvider.cs → src/Volo.Abp.Core/Volo/Abp/AbpApplicationWithInternalServiceProvider.cs

0
src/Volo.Abp/Volo/Abp/AbpException.cs → src/Volo.Abp.Core/Volo/Abp/AbpException.cs

0
src/Volo.Abp/Volo/Abp/ApplicationInitializationContext.cs → src/Volo.Abp.Core/Volo/Abp/ApplicationInitializationContext.cs

0
src/Volo.Abp/Volo/Abp/ApplicationShutdownContext.cs → src/Volo.Abp.Core/Volo/Abp/ApplicationShutdownContext.cs

0
src/Volo.Abp/Volo/Abp/Check.cs → src/Volo.Abp.Core/Volo/Abp/Check.cs

0
src/Volo.Abp/Volo/Abp/Collections/ITypeList.cs → src/Volo.Abp.Core/Volo/Abp/Collections/ITypeList.cs

0
src/Volo.Abp/Volo/Abp/Collections/TypeList.cs → src/Volo.Abp.Core/Volo/Abp/Collections/TypeList.cs

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

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

0
src/Volo.Abp/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs → src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ConventionalRegistrarList.cs

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

0
src/Volo.Abp/Volo/Abp/DependencyInjection/DependencyAttribute.cs → src/Volo.Abp.Core/Volo/Abp/DependencyInjection/DependencyAttribute.cs

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

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

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

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

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

0
src/Volo.Abp/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs → src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IOnServiceRegistredContext.cs

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

0
src/Volo.Abp/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs → src/Volo.Abp.Core/Volo/Abp/DependencyInjection/IServiceExposingArgs.cs

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

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

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

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

0
src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs → src/Volo.Abp.Core/Volo/Abp/DependencyInjection/OnServiceExposingArgs.cs

0
src/Volo.Abp/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs → src/Volo.Abp.Core/Volo/Abp/DependencyInjection/OnServiceRegistredContext.cs

0
src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs → src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceExposingActionList.cs

0
src/Volo.Abp/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs → src/Volo.Abp.Core/Volo/Abp/DependencyInjection/ServiceRegistrationActionList.cs

0
src/Volo.Abp/Volo/Abp/DisposeAction.cs → src/Volo.Abp.Core/Volo/Abp/DisposeAction.cs

0
src/Volo.Abp/Volo/Abp/DynamicProxy/AbpInterceptor.cs → src/Volo.Abp.Core/Volo/Abp/DynamicProxy/AbpInterceptor.cs

0
src/Volo.Abp/Volo/Abp/DynamicProxy/IAbpInterceptor.cs → src/Volo.Abp.Core/Volo/Abp/DynamicProxy/IAbpInterceptor.cs

0
src/Volo.Abp/Volo/Abp/DynamicProxy/IAbpMethodInvocation.cs → src/Volo.Abp.Core/Volo/Abp/DynamicProxy/IAbpMethodInvocation.cs

0
src/Volo.Abp/Volo/Abp/DynamicProxy/ProxyHelper.cs → src/Volo.Abp.Core/Volo/Abp/DynamicProxy/ProxyHelper.cs

0
src/Volo.Abp/Volo/Abp/IAbpApplication.cs → src/Volo.Abp.Core/Volo/Abp/IAbpApplication.cs

0
src/Volo.Abp/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs → src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithExternalServiceProvider.cs

0
src/Volo.Abp/Volo/Abp/IAbpApplicationWithInternalServiceProvider.cs → src/Volo.Abp.Core/Volo/Abp/IAbpApplicationWithInternalServiceProvider.cs

0
src/Volo.Abp/Volo/Abp/IOnApplicationInitialization.cs → src/Volo.Abp.Core/Volo/Abp/IOnApplicationInitialization.cs

0
src/Volo.Abp/Volo/Abp/IOnApplicationShutdown.cs → src/Volo.Abp.Core/Volo/Abp/IOnApplicationShutdown.cs

17
src/Volo.Abp/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs → src/Volo.Abp.Core/Volo/Abp/Internal/InternalServiceCollectionExtensions.cs

@ -7,6 +7,13 @@ namespace Volo.Abp.Internal
{
internal static class InternalServiceCollectionExtensions
{
internal static void AddCoreServices(this IServiceCollection services)
{
services.AddOptions();
services.AddLogging();
services.AddLocalization();
}
internal static void AddCoreAbpServices(this IServiceCollection services, IAbpApplication abpApplication)
{
var moduleLoader = new ModuleLoader();
@ -16,6 +23,16 @@ namespace Volo.Abp.Internal
services.TryAddSingleton<IModuleLoader>(moduleLoader);
services.TryAddSingleton<IAssemblyFinder>(assemblyFinder);
services.TryAddSingleton<ITypeFinder>(typeFinder);
services.AddAssemblyOf<IAbpApplication>();
services.Configure<ModuleLifecycleOptions>(options =>
{
options.Contributers.Add<OnPreApplicationInitializationModuleLifecycleContributer>();
options.Contributers.Add<OnApplicationInitializationModuleLifecycleContributer>();
options.Contributers.Add<OnPostApplicationInitializationModuleLifecycleContributer>();
options.Contributers.Add<OnApplicationShutdownModuleLifecycleContributer>();
});
}
}
}

2
src/Volo.Abp/Volo/Abp/Internal/Utf8Helper.cs → src/Volo.Abp.Core/Volo/Abp/Internal/Utf8Helper.cs

@ -3,7 +3,7 @@ using System.Text;
namespace Volo.Abp.Internal
{
internal static class Utf8Helper
public static class Utf8Helper
{
public static string ReadStringFromStream(Stream stream)
{

9
src/Volo.Abp.Core/Volo/Abp/Logging/IExceptionCanLogDetails.cs

@ -0,0 +1,9 @@
using Microsoft.Extensions.Logging;
namespace Volo.Abp.Logging
{
public interface IExceptionCanLogDetails
{
void LogDetails(ILogger logger);
}
}

0
src/Volo.Abp/Volo/Abp/Logging/IHasLogLevel.cs → src/Volo.Abp.Core/Volo/Abp/Logging/IHasLogLevel.cs

0
src/Volo.Abp/Volo/Abp/Modularity/AbpModule.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModule.cs

0
src/Volo.Abp/Volo/Abp/Modularity/AbpModuleDescriptor.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleDescriptor.cs

1
src/Volo.Abp/Volo/Abp/Modularity/AbpModuleHelper.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/AbpModuleHelper.cs

@ -11,7 +11,6 @@ namespace Volo.Abp.Modularity
{
var moduleTypes = new List<Type>();
AddModuleAndDependenciesResursively(moduleTypes, startupModuleType);
moduleTypes.AddIfNotContains(typeof(AbpKernelModule));
return moduleTypes;
}

0
src/Volo.Abp/Volo/Abp/Modularity/DefaultModuleLifecycleContributer.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/DefaultModuleLifecycleContributer.cs

0
src/Volo.Abp/Volo/Abp/Modularity/DependsOnAttribute.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/DependsOnAttribute.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IAbpModule.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModule.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IAbpModuleDescriptor.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IAbpModuleDescriptor.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IDependedModuleTypesProvider.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IDependedModuleTypesProvider.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IModuleContainer.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleContainer.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IModuleLifecycleContributer.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLifecycleContributer.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IModuleLoader.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleLoader.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IModuleManager.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IModuleManager.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IOnPostApplicationInitialization.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IOnPostApplicationInitialization.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IOnPreApplicationInitialization.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IOnPreApplicationInitialization.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IPostConfigureServices.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IPostConfigureServices.cs

0
src/Volo.Abp/Volo/Abp/Modularity/IPreConfigureServices.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/IPreConfigureServices.cs

0
src/Volo.Abp/Volo/Abp/Modularity/ModuleLifecycleContributerBase.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleContributerBase.cs

0
src/Volo.Abp/Volo/Abp/Modularity/ModuleLifecycleOptions.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLifecycleOptions.cs

1
src/Volo.Abp/Volo/Abp/Modularity/ModuleLoader.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleLoader.cs

@ -73,7 +73,6 @@ namespace Volo.Abp.Modularity
protected virtual List<IAbpModuleDescriptor> SortByDependency(List<IAbpModuleDescriptor> modules, Type startupModuleType)
{
var sortedModules = modules.SortByDependencies(m => m.Dependencies);
sortedModules.MoveItem(m => m.Type == typeof(AbpKernelModule), 0);
sortedModules.MoveItem(m => m.Type == startupModuleType, modules.Count - 1);
return sortedModules;
}

0
src/Volo.Abp/Volo/Abp/Modularity/ModuleManager.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/ModuleManager.cs

0
src/Volo.Abp/Volo/Abp/Modularity/PlugIns/FilePlugInSource.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/PlugIns/FilePlugInSource.cs

0
src/Volo.Abp/Volo/Abp/Modularity/PlugIns/FolderPlugInSource.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/PlugIns/FolderPlugInSource.cs

0
src/Volo.Abp/Volo/Abp/Modularity/PlugIns/IPlugInSource.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/PlugIns/IPlugInSource.cs

0
src/Volo.Abp/Volo/Abp/Modularity/PlugIns/PlugInSourceExtensions.cs → src/Volo.Abp.Core/Volo/Abp/Modularity/PlugIns/PlugInSourceExtensions.cs

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save