From a91dfab01227642ffd427d42aab273332ebd0d25 Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Tue, 12 May 2020 09:31:59 +1000 Subject: [PATCH 1/3] Update to show new UseSerilog() overload including service provider --- README.md | 4 ++-- global.json | 2 +- samples/InlineInitializationSample/Program.cs | 7 ++----- samples/InlineInitializationSample/Startup.cs | 2 -- src/Serilog.AspNetCore/Serilog.AspNetCore.csproj | 4 ++-- 5 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index e14efc0..b33f583 100644 --- a/README.md +++ b/README.md @@ -192,13 +192,13 @@ app.UseSerilogRequestLogging(options => You can alternatively configure Serilog inline, in `BuildWebHost()`, using a delegate as shown below: ```csharp - .UseSerilog((hostingContext, loggerConfiguration) => loggerConfiguration + .UseSerilog((hostingContext, services, loggerConfiguration) => loggerConfiguration .ReadFrom.Configuration(hostingContext.Configuration) .Enrich.FromLogContext() .WriteTo.Console()) ``` -This has the advantage of making the `hostingContext`'s `Configuration` object available for [configuration of the logger](https://github.com/serilog/serilog-settings-configuration), but at the expense of losing `Exception`s raised earlier in program startup. +This has the advantage of making a service provider and the `hostingContext`'s `Configuration` object available for [configuration of the logger](https://github.com/serilog/serilog-settings-configuration), but at the expense of losing `Exception`s raised earlier in program startup. If this method is used, `Log.Logger` is assigned implicitly, and closed when the app is shut down. diff --git a/global.json b/global.json index 5442449..747f7cc 100644 --- a/global.json +++ b/global.json @@ -1,7 +1,7 @@ { "sdk": { "allowPrerelease": false, - "version": "3.1.100", + "version": "3.1.201", "rollForward": "latestPatch" } } \ No newline at end of file diff --git a/samples/InlineInitializationSample/Program.cs b/samples/InlineInitializationSample/Program.cs index 9cf2e42..a06dbd1 100644 --- a/samples/InlineInitializationSample/Program.cs +++ b/samples/InlineInitializationSample/Program.cs @@ -13,11 +13,8 @@ public static void Main(string[] args) public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => - { - webBuilder.UseStartup(); - }) - .UseSerilog((hostingContext, loggerConfiguration) => loggerConfiguration + .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) + .UseSerilog((hostingContext, services, loggerConfiguration) => loggerConfiguration .ReadFrom.Configuration(hostingContext.Configuration) .Enrich.FromLogContext() .WriteTo.Debug() diff --git a/samples/InlineInitializationSample/Startup.cs b/samples/InlineInitializationSample/Startup.cs index 82f3bcd..2b71adf 100644 --- a/samples/InlineInitializationSample/Startup.cs +++ b/samples/InlineInitializationSample/Startup.cs @@ -1,10 +1,8 @@ -using System.Net; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Serilog; -using Serilog.Events; namespace InlineInitializationSample { diff --git a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj index 62cd77d..316d955 100644 --- a/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj +++ b/src/Serilog.AspNetCore/Serilog.AspNetCore.csproj @@ -2,7 +2,7 @@ Serilog support for ASP.NET Core logging - 3.3.0 + 3.4.0 Microsoft;Serilog Contributors netstandard2.0;netcoreapp3.1 true @@ -27,7 +27,7 @@ - + From 10a28573d032857418b2b8d6d7028dc171db47e5 Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Tue, 12 May 2020 09:34:06 +1000 Subject: [PATCH 2/3] Formatting --- samples/InlineInitializationSample/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/InlineInitializationSample/Program.cs b/samples/InlineInitializationSample/Program.cs index a06dbd1..b2c964c 100644 --- a/samples/InlineInitializationSample/Program.cs +++ b/samples/InlineInitializationSample/Program.cs @@ -13,7 +13,7 @@ public static void Main(string[] args) public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args) - .ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup(); }) + .ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup()) .UseSerilog((hostingContext, services, loggerConfiguration) => loggerConfiguration .ReadFrom.Configuration(hostingContext.Configuration) .Enrich.FromLogContext() From 815191263a6727cd697b33daa3b3ee31d1861e2e Mon Sep 17 00:00:00 2001 From: Nicholas Blumhardt Date: Wed, 13 May 2020 11:10:37 +1000 Subject: [PATCH 3/3] Allow `latestFeature` in global.json --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 747f7cc..80992af 100644 --- a/global.json +++ b/global.json @@ -2,6 +2,6 @@ "sdk": { "allowPrerelease": false, "version": "3.1.201", - "rollForward": "latestPatch" + "rollForward": "latestFeature" } -} \ No newline at end of file +}