Merge pull request #25 from dennys/dotnet5

Migrate Serilog to Microsoft.Extensions.Logging + NLog (for #20, #24)
dennys · Nov 2, 2021 · 6ae7d38 · 6ae7d38
2 parents aa60d4c + d20d8bc
commit 6ae7d38
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 26 deletions.
diff --git a/hMoney/Apix.cs b/hMoney/Apix.cs
@@ -1,4 +1,4 @@
-using Serilog;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using static hMoney.Globals;
@@ -7,6 +7,8 @@ namespace hMoney
 {
     public class Apix
     {
+        private static readonly NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
+
         public DateTime GetNextTransDate(RepeatType repeatType, DateTime preTransDate, int numOccurrences)
         {
             DateTime nextTransDate = preTransDate;
@@ -79,7 +81,7 @@ public DateTime GetNextTransDate(RepeatType repeatType, DateTime preTransDate, i
                     }
                     break;
                 default:
-                    Log.Error("Invalid repeat type: " + repeatType);
+                    Logger.Error("Invalid repeat type: " + repeatType);
                     //TODO should raise exception here
                     break;
             }

diff --git a/hMoney/DB.cs b/hMoney/DB.cs
@@ -1,5 +1,4 @@
-using Serilog;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.SQLite;
@@ -46,14 +45,10 @@ public class DB
         const String CONDITION_TODAY = "Today";
         const String CONDITION_RECONCILED = "Reconciled";
 
+        private static readonly NLog.Logger Log = NLog.LogManager.GetCurrentClassLogger();
         public DB()
         {
             Configuration config;
-            // Setup log (Serilog)
-            Log.Logger = new LoggerConfiguration()
-                    .MinimumLevel.Debug()
-                    .WriteTo.Console()
-                    .CreateLogger();
 
             // Setup configuration
             config = new Configuration();

diff --git a/hMoney/FormMain.cs b/hMoney/FormMain.cs
@@ -1,4 +1,4 @@
-using Serilog;
+using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -15,22 +15,14 @@ public partial class FormMain : Form
         private readonly DB db;
         private readonly Apix api;
 
+        private static readonly NLog.Logger Log = NLog.LogManager.GetCurrentClassLogger();
+
         public FormMain()
         {
             // Enable configuration
             config = new Configuration();
             config.Init();
 
-            // Setup log (Serilog)
-            Log.Logger = new LoggerConfiguration()
-                .MinimumLevel.Debug()
-                .WriteTo.Console()
-                .CreateLogger();
-
-            Log.Warning("Hello, world!");
-
-            System.Diagnostics.Debug.WriteLine("diag");
-
             // Setup i18n
             System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo(config.GetLanguage());
             System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo(config.GetLanguage());

diff --git a/hMoney/hMoney.csproj b/hMoney/hMoney.csproj
@@ -42,8 +42,9 @@
     <PackageReference Include="Castle.Core" Version="4.4.1" />
     <PackageReference Include="ini-parser-netcore3.1" Version="3.0.0" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
+    <PackageReference Include="NLog.Config" Version="4.7.12" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="8.30.0.37606">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/hMoneyTests/hMoneyTests.csproj b/hMoneyTests/hMoneyTests.csproj
@@ -7,9 +7,10 @@
     <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
+    <PackageReference Include="NLog.Config" Version="4.7.12" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
     <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="8.30.0.37606">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/hMoneyVSTests/hMoneyVSTests.csproj b/hMoneyVSTests/hMoneyVSTests.csproj
@@ -8,12 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.2.7" />
     <PackageReference Include="MSTest.TestFramework" Version="2.2.7" />
     <PackageReference Include="coverlet.collector" Version="3.1.0" />
-    <PackageReference Include="Serilog" Version="2.10.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.0.0" />
+    <PackageReference Include="NLog.Config" Version="4.7.12" />
+    <PackageReference Include="NLog.Extensions.Logging" Version="1.7.4" />
     <PackageReference Include="SonarAnalyzer.CSharp" Version="8.30.0.37606">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>