Implement Serilog in DNN

Build/Tasks/packaging.json

@@ -32,7 +32,6 @@
     "/bin/BouncyCastle.Crypto.dll",
     "/bin/MailKit.dll",
     "/bin/MimeKit.dll",
-    "/bin/System.Buffers.dll",
     "/bin/System.Net.Http.Formatting.dll",
     "/bin/System.Web.Http.dll",
     "/bin/System.Web.Http.WebHost.dll",
@@ -53,12 +52,7 @@
     "/bin/BouncyCastle.Cryptography.dll",
     "/bin/Microsoft.Bcl.Memory.dll",
     "/bin/Microsoft.Bcl.TimeProvider.dll",
-    "/bin/System.Text.Encodings.Web.dll",
-    "/bin/System.Text.Json.dll",
-    "/bin/System.ValueTuple.dll",
-    "/bin/System.Numerics.Vectors.dll",
     "/bin/System.Formats.Asn1.dll",
-    "/bin/System.Memory.dll",
     "/bin/Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll",
     "/bin/Lucene.Net.Contrib.Core.dll",
     "/bin/Lucene.Net.Contrib.Highlighter.dll",

DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj

@@ -73,6 +73,7 @@
     </Compile>
     <Compile Include="Components\BusinessController.cs" />
     <Compile Include="Components\ConsoleController.cs" />
+    <Compile Include="LoggerMessages.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Settings.ascx.cs">
       <DependentUpon>Settings.ascx</DependentUpon>

DNN Platform/Admin Modules/Dnn.Modules.Console/LoggerMessages.cs

@@ -0,0 +1,21 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+
+namespace Dnn.Modules.Console
+{
+    using System;
+
+    using Microsoft.Extensions.Logging;
+
+    /// <summary>Extension methods for <see cref="ILogger"/> for pre-defined logging messages.</summary>
+    /// <remarks>The Dnn.Modules.Console project has been assigned event IDs from 3,500,000 to 3,599,999.</remarks>
+    internal static partial class LoggerMessages
+    {
+        [LoggerMessage(EventId = 3_500_000, Level = LogLevel.Error)]
+        public static partial void SettingsParseWidthException(this ILogger logger, Exception exception);
+
+        [LoggerMessage(EventId = 3_500_100, Level = LogLevel.Error)]
+        public static partial void ViewConsoleParseConsoleModuleIdException(this ILogger logger, Exception exception);
+    }
+}

DNN Platform/Admin Modules/Dnn.Modules.Console/Settings.ascx.cs

@@ -20,10 +20,12 @@ namespace Dnn.Modules.Console
     using DotNetNuke.Web.Common;
     using DotNetNuke.Web.UI.WebControls.Internal;
 
+    using Microsoft.Extensions.Logging;
+
     /// <summary>Loads and saves the module settings.</summary>
     public partial class Settings : ModuleSettingsBase
     {
-        private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(Settings));
+        private static readonly ILogger Logger = DnnLoggingController.GetLogger<Settings>();
 
         /// <inheritdoc />
         public override void LoadSettings()
@@ -112,7 +114,7 @@ public override void UpdateSettings()
                     }
                     catch (Exception exc)
                     {
-                        Logger.Error(exc);
+                        Logger.SettingsParseWidthException(exc);
 
                         throw new Exception("ConsoleWidth value is invalid. Value must be numeric.");
                     }

DNN Platform/Admin Modules/Dnn.Modules.Console/ViewConsole.ascx.cs

@@ -31,11 +31,12 @@ namespace Dnn.Modules.Console;
 using DotNetNuke.Services.Localization;
 using DotNetNuke.Services.Personalization;
 using Microsoft.Extensions.DependencyInjection;
+    using Microsoft.Extensions.Logging;
 
 /// <summary>Implements the module view logic.</summary>
 public partial class ViewConsole : PortalModuleBase
 {
-    private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(ViewConsole));
+    private static readonly ILogger Logger = DnnLoggingController.GetLogger<ViewConsole>();
     private readonly INavigationManager navigationManager;
     private readonly IJavaScriptLibraryHelper javaScript;
     private readonly IClientResourceController clientResourceController;
@@ -512,7 +513,7 @@ private void SavePersonalizedSettings()
         }
         catch (Exception exc)
         {
-            Logger.Error(exc);
+            Logger.ViewConsoleParseConsoleModuleIdException(exc);
 
             consoleModuleId = -1;
         }

DNN Platform/Dnn.AuthServices.Jwt/Auth/JwtAuthMessageHandler.cs

@@ -12,6 +12,7 @@ namespace Dnn.AuthServices.Jwt.Auth
     using Dnn.AuthServices.Jwt.Components.Common.Controllers;
     using DotNetNuke.Instrumentation;
     using DotNetNuke.Web.Api.Auth;
+    using Microsoft.Extensions.Logging;
 
     /// <summary>
     /// This class implements Json Web Token (JWT) authentication scheme.
@@ -21,7 +22,7 @@ namespace Dnn.AuthServices.Jwt.Auth
     /// </summary>
     public class JwtAuthMessageHandler : AuthMessageHandlerBase
     {
-        private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(JwtAuthMessageHandler));
+        private readonly ILogger<JwtAuthMessageHandler> logger;
 
         private readonly IJwtController jwtController = JwtController.Instance;
 
@@ -35,6 +36,7 @@ public JwtAuthMessageHandler(bool includeByDefault, bool forceSsl)
             // ServicesRoutingManager.RegisterAuthenticationHandlers()
             // this scheme gets marked as enabled.
             IsEnabled = true;
+            this.logger = DnnLoggingController.GetLogger<JwtAuthMessageHandler>();
         }
 
         /// <inheritdoc />
@@ -64,17 +66,14 @@ private void TryToAuthenticate(HttpRequestMessage request)
                 var username = this.jwtController.ValidateToken(request);
                 if (!string.IsNullOrEmpty(username))
                 {
-                    if (Logger.IsTraceEnabled)
-                    {
-                        Logger.Trace($"Authenticated user '{username}'");
-                    }
+                    this.logger.LogTrace("Authenticated user '{userName}'", username);
 
                     SetCurrentPrincipal(new GenericPrincipal(new GenericIdentity(username, this.AuthScheme), null), request);
                 }
             }
             catch (Exception ex)
             {
-                Logger.Error("Unexpected error in authenticating the user. " + ex);
+                this.logger.LogError(ex, "Unexpected error in authenticating the user.");
             }
         }
     }