Merge pull request #179 from aspnetzero/abp-core-package

Abp core package

Volo.Abp.sln

@@ -158,6 +158,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.VirtualFileSystem"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Volo.Abp.VirtualFileSystem.Tests", "test\Volo.Abp.VirtualFileSystem.Tests\Volo.Abp.VirtualFileSystem.Tests.csproj", "{F79B6D80-C79B-4C13-9221-CA2345983743}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Core", "src\Volo.Abp.Core\Volo.Abp.Core.csproj", "{A7A97BFD-48FA-45D1-8423-031BA30BEAA1}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -404,6 +406,10 @@ Global
 		{F79B6D80-C79B-4C13-9221-CA2345983743}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F79B6D80-C79B-4C13-9221-CA2345983743}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F79B6D80-C79B-4C13-9221-CA2345983743}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A7A97BFD-48FA-45D1-8423-031BA30BEAA1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A7A97BFD-48FA-45D1-8423-031BA30BEAA1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A7A97BFD-48FA-45D1-8423-031BA30BEAA1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A7A97BFD-48FA-45D1-8423-031BA30BEAA1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -479,6 +485,7 @@ Global
 		{3E62ED84-8792-4DA6-9B0A-AADEA183C2B3} = {DB012309-74FD-4D5A-B843-DD77BF053BF4}
 		{6E6A7554-3488-45AB-BC0E-9BDE1F19789D} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
 		{F79B6D80-C79B-4C13-9221-CA2345983743} = {37087D1B-3693-4E96-983D-A69F210BDE53}
+		{A7A97BFD-48FA-45D1-8423-031BA30BEAA1} = {4C753F64-0C93-4D65-96C2-A40893AFC1E8}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}

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
+    {
+
+    }
+}

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)

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)

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)

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)

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;

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>

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)

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);
         }

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);
             }
         }
     }

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>

src/Volo.Abp.Core/Volo.Abp.Core.csproj

@@ -0,0 +1,33 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="..\..\common.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <AssemblyName>Volo.Abp.Core</AssemblyName>
+    <PackageId>Volo.Abp.Core</PackageId>
+    <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+    <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+    <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+    <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+    <RootNamespace />
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
+    <PackageReference Include="System.Collections.Immutable" Version="1.4.0" />
+    <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
+    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.0.7.6" />
+    <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="11.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+    <PackageReference Include="Nito.AsyncEx.Coordination" Version="1.0.2" />
+    <PackageReference Include="Nito.AsyncEx.Context" Version="1.1.0" />
+  </ItemGroup>
+
+</Project>

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);

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>();
+            });
         }
     }
 }

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)
         {

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);
+    }
+}

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;
         }
 

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;
         }