diff --git a/bff/templates/src/BffLocalApi/Program.cs b/bff/templates/src/BffLocalApi/Program.cs index a55972827..8ee9c7548 100644 --- a/bff/templates/src/BffLocalApi/Program.cs +++ b/bff/templates/src/BffLocalApi/Program.cs @@ -11,10 +11,10 @@ try { var builder = WebApplication.CreateBuilder(args); - builder.Host.UseSerilog((ctx, lc) => lc + builder.Services.AddSerilog(lc => lc .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level}] {SourceContext}{NewLine}{Message:lj}{NewLine}{Exception}{NewLine}") .Enrich.FromLogContext() - .ReadFrom.Configuration(ctx.Configuration)); + .ReadFrom.Configuration(builder.Configuration)); var app = builder .ConfigureServices() diff --git a/identity-server/aspire/ServiceDefaults/SerilogExtensions.cs b/identity-server/aspire/ServiceDefaults/SerilogExtensions.cs index a6feef30a..ec0fb116c 100644 --- a/identity-server/aspire/ServiceDefaults/SerilogExtensions.cs +++ b/identity-server/aspire/ServiceDefaults/SerilogExtensions.cs @@ -11,10 +11,10 @@ namespace Microsoft.Extensions.Hosting; public static class SerilogExtensions { public static void ConfigureSerilogDefaults(this WebApplicationBuilder builder) => - builder.Host.UseSerilog((context, services, configuration) => + builder.Services.AddSerilog((services, configuration) => { configuration - .ReadFrom.Configuration(context.Configuration) + .ReadFrom.Configuration(builder.Configuration) .ReadFrom.Services(services) .Enrich.FromLogContext() .MinimumLevel.Debug() diff --git a/identity-server/templates/src/IdentityServer/Extensions/HostingExtensions.cs b/identity-server/templates/src/IdentityServer/Extensions/HostingExtensions.cs index e5dc48086..efadfef14 100644 --- a/identity-server/templates/src/IdentityServer/Extensions/HostingExtensions.cs +++ b/identity-server/templates/src/IdentityServer/Extensions/HostingExtensions.cs @@ -19,7 +19,7 @@ internal static class HostingExtensions { // Write most logs to the console but diagnostic data to a file. // See https://docs.duendesoftware.com/identityserver/diagnostics/data - builder.Host.UseSerilog((ctx, lc) => + builder.Services.AddSerilog(lc => { lc.WriteTo.Logger(consoleLogger => { @@ -43,7 +43,7 @@ internal static class HostingExtensions formatProvider: CultureInfo.InvariantCulture) .Filter .ByIncludingOnly(Matching.FromSource("Duende.IdentityServer.Diagnostics.Summary")); - }).Enrich.FromLogContext().ReadFrom.Configuration(ctx.Configuration); + }).Enrich.FromLogContext().ReadFrom.Configuration(builder.Configuration); } }); return builder; diff --git a/identity-server/templates/src/IdentityServerAspNetIdentity/HostingExtensions.cs b/identity-server/templates/src/IdentityServerAspNetIdentity/HostingExtensions.cs index e370452ca..d6d289e5e 100644 --- a/identity-server/templates/src/IdentityServerAspNetIdentity/HostingExtensions.cs +++ b/identity-server/templates/src/IdentityServerAspNetIdentity/HostingExtensions.cs @@ -16,7 +16,7 @@ internal static class HostingExtensions { // Write most logs to the console but diagnostic data to a file. // See https://docs.duendesoftware.com/identityserver/diagnostics/data - builder.Host.UseSerilog((ctx, lc) => + builder.Services.AddSerilog(lc => { lc.WriteTo.Logger(consoleLogger => { @@ -40,7 +40,7 @@ internal static class HostingExtensions formatProvider: CultureInfo.InvariantCulture) .Filter .ByIncludingOnly(Matching.FromSource("Duende.IdentityServer.Diagnostics.Summary")); - }).Enrich.FromLogContext().ReadFrom.Configuration(ctx.Configuration); + }).Enrich.FromLogContext().ReadFrom.Configuration(builder.Configuration); } }); return builder; diff --git a/identity-server/templates/src/IdentityServerEmpty/HostingExtensions.cs b/identity-server/templates/src/IdentityServerEmpty/HostingExtensions.cs index 314272c9a..6a72339ec 100644 --- a/identity-server/templates/src/IdentityServerEmpty/HostingExtensions.cs +++ b/identity-server/templates/src/IdentityServerEmpty/HostingExtensions.cs @@ -10,7 +10,7 @@ internal static class HostingExtensions { // Set up logging to write regular entries to console, and diagnostics data to a file. // See https://docs.duendesoftware.com/identityserver/diagnostics/data - builder.Host.UseSerilog((ctx, lc) => + builder.Services.AddSerilog(lc => { lc.WriteTo.Logger(consoleLogger => { @@ -34,7 +34,7 @@ internal static class HostingExtensions formatProvider: CultureInfo.InvariantCulture) .Filter .ByIncludingOnly(Matching.FromSource("Duende.IdentityServer.Diagnostics.Summary")); - }).Enrich.FromLogContext().ReadFrom.Configuration(ctx.Configuration); + }).Enrich.FromLogContext().ReadFrom.Configuration(builder.Configuration); } }); return builder; diff --git a/identity-server/templates/src/IdentityServerEntityFramework/HostingExtensions.cs b/identity-server/templates/src/IdentityServerEntityFramework/HostingExtensions.cs index 01a6b72ae..e59fba358 100644 --- a/identity-server/templates/src/IdentityServerEntityFramework/HostingExtensions.cs +++ b/identity-server/templates/src/IdentityServerEntityFramework/HostingExtensions.cs @@ -18,7 +18,7 @@ internal static class HostingExtensions { // Write most logs to the console but diagnostic data to a file. // See https://docs.duendesoftware.com/identityserver/diagnostics/data - builder.Host.UseSerilog((ctx, lc) => + builder.Services.AddSerilog(lc => { lc.WriteTo.Logger(consoleLogger => { @@ -42,7 +42,7 @@ internal static class HostingExtensions formatProvider: CultureInfo.InvariantCulture) .Filter .ByIncludingOnly(Matching.FromSource("Duende.IdentityServer.Diagnostics.Summary")); - }).Enrich.FromLogContext().ReadFrom.Configuration(ctx.Configuration); + }).Enrich.FromLogContext().ReadFrom.Configuration(builder.Configuration); } }); return builder; diff --git a/identity-server/templates/src/IdentityServerInMem/HostingExtensions.cs b/identity-server/templates/src/IdentityServerInMem/HostingExtensions.cs index 60d085aa2..fa5b29cf2 100644 --- a/identity-server/templates/src/IdentityServerInMem/HostingExtensions.cs +++ b/identity-server/templates/src/IdentityServerInMem/HostingExtensions.cs @@ -13,7 +13,7 @@ internal static class HostingExtensions { // Write most logs to the console but diagnostic data to a file. // See https://docs.duendesoftware.com/identityserver/diagnostics/data - builder.Host.UseSerilog((ctx, lc) => + builder.Services.AddSerilog(lc => { lc.WriteTo.Logger(consoleLogger => { @@ -37,7 +37,7 @@ internal static class HostingExtensions formatProvider: CultureInfo.InvariantCulture) .Filter .ByIncludingOnly(Matching.FromSource("Duende.IdentityServer.Diagnostics.Summary")); - }).Enrich.FromLogContext().ReadFrom.Configuration(ctx.Configuration); + }).Enrich.FromLogContext().ReadFrom.Configuration(builder.Configuration); } }); return builder;