From 2201fc0d80462f5c628b240e274217cba8a5b6f5 Mon Sep 17 00:00:00 2001
From: Jon Sagara <jonsagara@gmail.com>
Date: Fri, 1 Sep 2023 08:19:18 -0700
Subject: [PATCH] Added a Serilog extension to work with the new
 HostApplicationBuilder pattern.

---
 Directory.Build.props                         |  2 +-
 .../Sagara.Core.Logging.Serilog.csproj        |  2 +
 .../SerilogExtensions.cs                      | 42 +++++++++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 src/Sagara.Core.Logging.Serilog/SerilogExtensions.cs

diff --git a/Directory.Build.props b/Directory.Build.props
index 84988fa..b18fdb8 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		
 		<!-- NuGet -->
-		<Version>1.0.0-alpha4</Version>
+		<Version>1.0.0-alpha5</Version>
 		<AssemblyVersion>1.0.0</AssemblyVersion>
 		<FileVersion>1.0.0</FileVersion>
 		<Authors>Jon Sagara</Authors>
diff --git a/src/Sagara.Core.Logging.Serilog/Sagara.Core.Logging.Serilog.csproj b/src/Sagara.Core.Logging.Serilog/Sagara.Core.Logging.Serilog.csproj
index c7df9ca..7c0b792 100644
--- a/src/Sagara.Core.Logging.Serilog/Sagara.Core.Logging.Serilog.csproj
+++ b/src/Sagara.Core.Logging.Serilog/Sagara.Core.Logging.Serilog.csproj
@@ -25,7 +25,9 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
 		<PackageReference Include="Serilog" Version="3.0.1" />
+		<PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Sagara.Core.Logging.Serilog/SerilogExtensions.cs b/src/Sagara.Core.Logging.Serilog/SerilogExtensions.cs
new file mode 100644
index 0000000..8b408c5
--- /dev/null
+++ b/src/Sagara.Core.Logging.Serilog/SerilogExtensions.cs
@@ -0,0 +1,42 @@
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging;
+using Serilog;
+
+namespace Sagara.Core.Logging.Serilog;
+
+public static class SerilogExtensions
+{
+    /// <summary>
+    /// Sets Serilog as the logging provider.
+    /// </summary>
+    /// <remarks>
+    /// <para>This is (hopefully) a temporary replacement for <c>Serilog.Extensions.Hosting.UseSerilog</c>. It's necessary
+    /// to support working with the new <c>Host.CreateApplicationBuilder()</c> pattern being rolled out in .NET 7, which 
+    /// does not currently support the <c>IHostBuilder</c> interface.</para>
+    /// <para>See: https://github.com/dotnet/runtime/discussions/81090#discussioncomment-4784551</para>
+    /// </remarks>
+    /// <param name="builder">The logging builder to configure.</param>
+    /// <param name="config">The IConfiguration from which Serilog will attempt to read its configuration.</param>
+    /// <param name="configureLogger">The delegate for configuring the Serilog.LoggerConfiguration that will be used 
+    /// to construct a Serilog.Core.Logger.</param>
+    /// <param name="preserveStaticLogger">Indicates whether to preserve the value of Serilog.Log.Logger.</param>
+    /// <param name="writeToProviders">By default, Serilog does not write events to Microsoft.Extensions.Logging.ILoggerProviders 
+    /// registered through the Microsoft.Extensions.Logging API. Normally, equivalent Serilog sinks are used in place of providers. 
+    /// Specify true to write events to all providers.</param>
+    /// <returns>The logging builder.</returns>
+    public static ILoggingBuilder UseSerilog(this ILoggingBuilder builder, IConfiguration config, Action<IConfiguration, IServiceProvider, LoggerConfiguration> configureLogger, bool preserveStaticLogger = false, bool writeToProviders = false)
+    {
+        ArgumentNullException.ThrowIfNull(builder);
+        ArgumentNullException.ThrowIfNull(configureLogger);
+
+        IConfiguration config2 = config;
+
+        builder.Services.AddSerilog(
+            (serviceProvider, loggerConfiguration) => configureLogger(config2, serviceProvider, loggerConfiguration),
+            preserveStaticLogger: preserveStaticLogger,
+            writeToProviders: writeToProviders
+            );
+
+        return builder;
+    }
+}