From d33b207d503a87fe9c3f0e2053091b8d8d782035 Mon Sep 17 00:00:00 2001
From: Aaron Stannard <aaron@petabridge.com>
Date: Tue, 28 May 2024 15:16:21 -0500
Subject: [PATCH] added Akka.Hosting extensions to Akka.Logger.Serilog

---
 .../Akka.Logger.Serilog.csproj                |  2 +-
 .../SerilogAkkaHostingExtensions.cs           | 31 +++++++++++++++++++
 src/Directory.Build.props                     |  6 ++--
 src/Directory.Packages.props                  |  4 +--
 4 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 src/Akka.Logger.Serilog/SerilogAkkaHostingExtensions.cs

diff --git a/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj b/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj
index 3efb833..11e8b00 100644
--- a/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj
+++ b/src/Akka.Logger.Serilog/Akka.Logger.Serilog.csproj
@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Serilog" />
-    <PackageReference Include="Akka" />
+    <PackageReference Include="Akka.Hosting" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Akka.Logger.Serilog/SerilogAkkaHostingExtensions.cs b/src/Akka.Logger.Serilog/SerilogAkkaHostingExtensions.cs
new file mode 100644
index 0000000..e38759a
--- /dev/null
+++ b/src/Akka.Logger.Serilog/SerilogAkkaHostingExtensions.cs
@@ -0,0 +1,31 @@
+// -----------------------------------------------------------------------
+//  <copyright file="SerilogAkkaHostingExtensions.cs" company="Akka.NET Project">
+//      Copyright (C) 2013-2024 .NET Foundation <https://github.com/akkadotnet/akka.net>
+// </copyright>
+// -----------------------------------------------------------------------
+
+using Akka.Hosting;
+
+namespace Akka.Logger.Serilog;
+
+/// <summary>
+/// Extension methods for configuring Serilog as the default logger for Akka.NET.
+/// </summary>
+public static class SerilogAkkaHostingExtensions
+{
+    /// <summary>
+    /// Adds Serilog one of the default loggers for the Akka.NET actor system and enables
+    /// Serilog-style semantic logging formatting for all log messages.
+    /// </summary>
+    /// <param name="configBuilder">The Akka.Hosting <see cref="LoggerConfigBuilder"/> - call <see cref="AkkaConfigurationBuilder.WithLogging"/></param>
+    /// <param name="enableSerilogFormatter">Defaults to <c>true</c> - enables the <see cref="SerilogLogMessageFormatter"/> to be used by default.</param>
+    /// <returns></returns>
+    public static LoggerConfigBuilder AddSerilogLogging(this LoggerConfigBuilder configBuilder, bool enableSerilogFormatter = true)
+    {
+        configBuilder.AddLogger<SerilogLogger>();
+        
+        if(enableSerilogFormatter)
+            configBuilder.WithDefaultLogMessageFormatter<SerilogLogMessageFormatter>();
+        return configBuilder;
+    }
+}
\ No newline at end of file
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 7ddb592..90a48ee 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -12,9 +12,9 @@
     <LangVersion>10</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
-    <AkkaVersion>1.5.14</AkkaVersion>
-    <AkkaHostingVersion>1.5.13</AkkaHostingVersion>
-    <NetCoreTestVersion>netcoreapp3.1</NetCoreTestVersion>
+    <AkkaVersion>1.5.20</AkkaVersion>
+    <AkkaHostingVersion>1.5.20</AkkaHostingVersion>
+    <NetCoreTestVersion>net8.0</NetCoreTestVersion>
     <NetFrameworkTestVersion>net471</NetFrameworkTestVersion>
     <NetStandardLibVersion>netstandard2.0</NetStandardLibVersion>
   </PropertyGroup>
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 0cee255..6381b80 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -6,8 +6,8 @@
   <ItemGroup>
     <PackageVersion Include="Akka" Version="$(AkkaVersion)" />
     <PackageVersion Include="Akka.Cluster" Version="$(AkkaVersion)" />
+    <PackageVersion Include="Akka.Hosting" Version="$(AkkaHostingVersion)" />
     <PackageVersion Include="Akka.Cluster.Hosting" Version="$(AkkaHostingVersion)" />
-    
     <PackageVersion Include="Serilog" Version="2.12.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="4.1.0" />
     <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
@@ -18,7 +18,7 @@
     <PackageVersion Include="xunit" Version="2.6.1" />
     <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.3" />
     <PackageVersion Include="FluentAssertions" Version="6.12.0" />
-    <PackageVersion Include="Akka.TestKit.Xunit2" Version="$(AkkaVersion)" />
+    <PackageVersion Include="Akka.TestKit.Xunit2" Version="1.5.20" />
     <PackageVersion Include="NBench" Version="2.0.1" />
   </ItemGroup>
   <!-- SourceLink support for all Akka.NET projects -->