Create Volo.Abp.AspNetCore.Serilog package.

framework/Volo.Abp.sln

@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.28922.388
 MinimumVisualStudioVersion = 10.0.40219.1
@@ -256,6 +256,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Minify", "src\Volo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.Minify.Tests", "test\Volo.Abp.Minify.Tests\Volo.Abp.Minify.Tests.csproj", "{E69182B3-350A-43F5-A935-5EBBEBECEF97}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Volo.Abp.AspNetCore.Serilog", "src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj", "{3B801003-BE74-49ED-9749-DA5E99F45EBF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -762,6 +764,10 @@ Global
 		{E69182B3-350A-43F5-A935-5EBBEBECEF97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E69182B3-350A-43F5-A935-5EBBEBECEF97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E69182B3-350A-43F5-A935-5EBBEBECEF97}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3B801003-BE74-49ED-9749-DA5E99F45EBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3B801003-BE74-49ED-9749-DA5E99F45EBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3B801003-BE74-49ED-9749-DA5E99F45EBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3B801003-BE74-49ED-9749-DA5E99F45EBF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -892,6 +898,7 @@ Global
 		{73559227-EBF0-475F-835B-1FF0CD9132AA} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{928DC30D-C078-4BB4-A9F8-FE7252C67DC6} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 		{E69182B3-350A-43F5-A935-5EBBEBECEF97} = {447C8A77-E5F0-4538-8687-7383196D04EA}
+		{3B801003-BE74-49ED-9749-DA5E99F45EBF} = {5DF0E140-0513-4D0D-BE2E-3D4D85CD70E6}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BB97ECF4-9A84-433F-A80B-2A3285BDD1D5}

framework/src/Volo.Abp.AspNetCore.Serilog/Microsoft/AspNetCore/Builder/AbpAspNetCoreSerilogApplicationBuilderExtensions.cs

@@ -0,0 +1,13 @@
+using Volo.Abp.AspNetCore.Serilog;
+
+namespace Microsoft.AspNetCore.Builder
+{
+    public static class AbpAspNetCoreSerilogApplicationBuilderExtensions
+    {
+        public static IApplicationBuilder UseSerilogEnrichers(this IApplicationBuilder app)
+        {
+            return app
+                .UseMiddleware<SerilogMiddleware>();
+        }
+    }
+}

framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.csproj

@@ -0,0 +1,27 @@
+<Project Sdk="Microsoft.NET.Sdk.Web">
+
+    <Import Project="..\..\..\common.props" />
+
+    <PropertyGroup>
+        <TargetFramework>netcoreapp3.1</TargetFramework>
+        <AssemblyName>Volo.Abp.AspNetCore.Serilog</AssemblyName>
+        <PackageId>Volo.Abp.AspNetCore.Serilog</PackageId>
+        <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
+        <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
+        <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
+        <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
+        <IsPackable>true</IsPackable>
+        <OutputType>Library</OutputType>
+        <RootNamespace />
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Volo.Abp.AspNetCore\Volo.Abp.AspNetCore.csproj" />
+        <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Serilog" Version="2.8.0" />
+    </ItemGroup>
+
+</Project>

framework/src/Volo.Abp.AspNetCore.Serilog/Volo/Abp/AspNetCore/Serilog/AbpSerilogModule.cs

@@ -0,0 +1,14 @@
+using Volo.Abp.AspNetCore;
+using Volo.Abp.Modularity;
+using Volo.Abp.MultiTenancy;
+
+namespace Volo.Abp.AspNetCore.Serilog
+{
+    [DependsOn(
+        typeof(AbpMultiTenancyModule),
+        typeof(AbpAspNetCoreModule)
+    )]
+    public class AbpSerilogModule : AbpModule
+    {
+    }
+}

framework/src/Volo.Abp.AspNetCore.Serilog/Volo/Abp/AspNetCore/Serilog/SerilogMiddleware.cs

@@ -0,0 +1,70 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Http;
+using Serilog.Context;
+using Serilog.Core;
+using Serilog.Core.Enrichers;
+using Volo.Abp.Clients;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.MultiTenancy;
+using Volo.Abp.Tracing;
+using Volo.Abp.Users;
+
+namespace Volo.Abp.AspNetCore.Serilog
+{
+    public class SerilogMiddleware : IMiddleware, ITransientDependency
+    {
+        private const string TenantEnricherPropertyName = "TenantId";
+        private const string UserEnricherPropertyName = "UserId";
+        private const string ClientEnricherPropertyName = "ClientId";
+        private const string CorrelationIdPropertyName = "CorrelationId";
+
+        private readonly ICurrentClient _currentClient;
+        private readonly ICurrentTenant _currentTenant;
+        private readonly ICurrentUser _currentUser;
+        private readonly ICorrelationIdProvider _correlationIdProvider;
+
+        public SerilogMiddleware(
+            ICurrentTenant currentTenant,
+            ICurrentUser currentUser,
+            ICurrentClient currentClient,
+            ICorrelationIdProvider correlationIdProvider)
+        {
+            _currentTenant = currentTenant;
+            _currentUser = currentUser;
+            _currentClient = currentClient;
+            _correlationIdProvider = correlationIdProvider;
+        }
+
+        public async Task InvokeAsync(HttpContext context, RequestDelegate next)
+        {
+            var enrichers = new List<ILogEventEnricher>();
+
+            if (_currentTenant?.Id != null)
+            {
+                enrichers.Add(new PropertyEnricher(TenantEnricherPropertyName, _currentTenant.Id));
+            }
+
+            if (_currentUser?.Id != null)
+            {
+                enrichers.Add(new PropertyEnricher(UserEnricherPropertyName, _currentUser.Id));
+            }
+
+            if (_currentClient?.Id != null)
+            {
+                enrichers.Add(new PropertyEnricher(ClientEnricherPropertyName, _currentClient.Id));
+            }
+
+            var correlationId = _correlationIdProvider.Get();
+            if (!string.IsNullOrEmpty(correlationId))
+            {
+                enrichers.Add(new PropertyEnricher(CorrelationIdPropertyName, correlationId));
+            }
+
+            using (LogContext.Push(enrichers.ToArray()))
+            {
+                await next(context).ConfigureAwait(false);
+            }
+        }
+    }
+}