Bump to .Net 6 and migrates logging to standard library.

Tokenizer.Tests/ConcatenationTests.cs

@@ -17,7 +17,7 @@ private class Foo
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             tokenizer = new Tokenizer(new TokenizerOptions{ EnableLogging = true });
         }

Tokenizer.Tests/HintTests.cs

@@ -17,7 +17,7 @@ private class Student
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             tokenizer = new Tokenizer(new TokenizerOptions{ EnableLogging = true });
         }

Tokenizer.Tests/ListTests.cs

@@ -11,7 +11,7 @@ public class ListTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             tokenizer = new Tokenizer(new TokenizerOptions{ EnableLogging = true });
         }

Tokenizer.Tests/LogConfig.cs

@@ -0,0 +1,21 @@
+
+using Microsoft.Extensions.Logging;
+using Tokens.Logging;
+
+namespace Tokens
+{
+    class LogConfig
+    {
+        public static void Init()
+        {
+            // LoggerFactory should be disposed with the test case.
+            var loggerFactory = LoggerFactory.Create(builder =>
+            {
+                builder.SetMinimumLevel(LogLevel.Trace);
+                builder.AddConsole(options => options.DisableColors = true);
+            });
+            LogProvider.LogLevel = LogLevel.Trace;
+            LogProvider.Factory = loggerFactory;
+        }
+    }
+}

Tokenizer.Tests/MultilineTests.cs

@@ -20,7 +20,7 @@ private class Student
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             tokenizer = new Tokenizer(new TokenizerOptions{ EnableLogging = true });
         }

Tokenizer.Tests/SampleTests.cs

@@ -13,7 +13,7 @@ public class SampleTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             tokenizer = new Tokenizer();
         }

Tokenizer.Tests/SplitTests.cs

@@ -16,7 +16,7 @@ private class Foo
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             tokenizer = new Tokenizer(new TokenizerOptions{ EnableLogging = true });
         }

Tokenizer.Tests/TokenMatcherTests.cs

@@ -19,7 +19,7 @@ private class Person
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             matcher = new TokenMatcher();
             parser = new TokenParser();

Tokenizer.Tests/Tokenizer.Tests.csproj

@@ -1,17 +1,18 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Tokens</RootNamespace>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="NUnit" Version="3.13.3" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Tokenizer\Tokenizer.csproj" />

Tokenizer.Tests/TokenizerTests.cs

@@ -48,7 +48,7 @@ private class Teacher : Student
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             tokenizer = new Tokenizer(new TokenizerOptions{ EnableLogging = true });
         }

Tokenizer.Tests/Transformers/ToDateTimeUtcTransformerTests.cs

@@ -11,7 +11,7 @@ public class ToDateTimeUtcTransformerTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             @operator = new ToDateTimeUtcTransformer();
         }

Tokenizer.Tests/Types/BoolTests.cs

@@ -17,7 +17,7 @@ private class Student
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             tokenizer = new Tokenizer(new TokenizerOptions{ EnableLogging = true });
         }

Tokenizer.Tests/Types/EnumTests.cs

@@ -24,7 +24,7 @@ private enum Grade
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             tokenizer = new Tokenizer(new TokenizerOptions{ EnableLogging = true });
         }

Tokenizer.Tests/Validators/IsNumericValidatorTests.cs

@@ -11,7 +11,7 @@ public class IsNumericValidatorTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             validator = new IsNumericValidator();
         }

Tokenizer/Logging/LogExtensions.cs

@@ -2,19 +2,40 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Text;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Tokens.Logging
 {
     static class VerboseLogExtensions
     {
-        public static void Verbose(this ILog log, string message, params object[] args)
+        public static void Verbose(this ILogger log, string message, params object[] args)
         {
-            log.TraceFormat(string.Concat(LogIndentation.Indentation, message), args);
+            try
+            {
+                log.LogTrace(string.Format(string.Concat(LogIndentation.Indentation, message), args));
+            }
+            catch (System.FormatException e)
+            {
+                log.LogWarning($"String has incorrect format: '{message}'");
+            }
         }
 
-        public static void Verbose(this ILog log, Exception exception, string message, params object[] args)
+        public static void Verbose(this ILogger log, Exception exception, string message, params object[] args)
         {
-            log.TraceException(string.Concat(LogIndentation.Indentation, message), exception, args);
+            try
+            {
+                log.LogError(string.Format(string.Concat(LogIndentation.Indentation, message), exception, args));
+            }
+            catch (System.FormatException e)
+            {
+                log.LogWarning($"String has incorrect format: '{message}'");
+            }
+        }
+
+        public static bool IsDebugEnabled(this ILogger log)
+        {
+            return LogProvider.LogLevel == LogLevel.Debug || LogProvider.LogLevel == LogLevel.Trace;
         }
     }
 }

Tokenizer/Logging/LogProvider.cs

@@ -0,0 +1,14 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+
+namespace Tokens.Logging;
+
+public class LogProvider
+{
+    public static LogLevel LogLevel = LogLevel.Information;
+    public static ILoggerFactory Factory = new NullLoggerFactory();
+    public static ILogger<T> For<T>()
+    {
+        return Factory.CreateLogger<T>();
+    }
+}

Tokenizer/Parsers/TokenParser.cs

@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using Microsoft.Extensions.Logging;
 using Tokens.Exceptions;
 using Tokens.Extensions;
 using Tokens.Logging;
@@ -20,7 +21,7 @@ internal class TokenParser
         private readonly List<Type> transformers;
         private readonly List<Type> validators;
 
-        private readonly ILog log;
+        private readonly ILogger<TokenParser> log;
 
         public TokenizerOptions Options { get; set; }
 

Tokenizer/Token.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Microsoft.Extensions.Logging;
 using Tokens.Enumerators;
 using Tokens.Exceptions;
 using Tokens.Extensions;
@@ -13,15 +14,15 @@ namespace Tokens
     /// </summary>
     public class Token
     {
-        private static readonly ILog Log;
+        private static readonly ILogger<Token> Log;
         private string content;
 
         /// <summary>
         /// Sets the token logger
         /// </summary>
         static Token()
         {
-            Log = LogProvider.GetLogger(nameof(Token));
+            Log = LogProvider.For<Token>();
         }
 
         /// <summary>

Tokenizer/TokenMatcher.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using Microsoft.Extensions.Logging;
 using Tokens.Exceptions;
 using Tokens.Logging;
 using Tokens.Parsers;
@@ -16,14 +17,14 @@ public class TokenMatcher
     {
         private readonly Tokenizer tokenizer;
         private readonly TokenParser parser;
-        private readonly ILog log;
+        private readonly ILogger<TokenMatcher> log;
 
         public TokenMatcher()
         {
             parser = new TokenParser();
             Templates = new TemplateCollection();
             tokenizer = new Tokenizer();
-            log = LogProvider.GetLogger(typeof(TokenMatcher));
+            log = LogProvider.For<TokenMatcher>();
         }
 
         public TokenMatcher(TokenizerOptions options) : this()
@@ -81,7 +82,7 @@ public TokenMatcherResult Match(string input, string[] tags)
                             Template = template
                         };
 
-                        log.ErrorException($"Error processing template: {template.Name}", e);
+                        log.LogError($"Error processing template: {template.Name}", e);
 
                         throw exception;
                     }
@@ -145,7 +146,7 @@ public TokenMatcherResult Match(string input, string[] tags)
                             Template = template
                         };
 
-                        log.ErrorException($"Error processing template: {template.Name}", e);
+                        log.LogError($"Error processing template: {template.Name}", e);
 
                         throw exception;
                     }

Tokenizer/Tokenizer.cs

@@ -3,6 +3,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using Microsoft.Extensions.Logging;
 using Tokens.Enumerators;
 using Tokens.Logging;
 using Tokens.Parsers;
@@ -18,7 +19,7 @@ namespace Tokens
     public class Tokenizer
     {
         private readonly TokenParser parser;
-        private readonly ILog log;
+        private readonly ILogger<Tokenizer> log;
 
         /// <summary>
         /// Gets or sets the options.

Tokenizer/Tokenizer.csproj

@@ -1,6 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-   <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
    <Version>2.2.2.0</Version>
    <PackageVersion>2.2.2</PackageVersion>
@@ -11,18 +10,17 @@
    <Description>Tokenizer extracts structured information from blocks of text and reflects them onto .NET objects</Description>
    <Copyright>Chris Wood 2021</Copyright>
    <RootNamespace>Tokens</RootNamespace>
+   <TargetFramework>net6.0</TargetFramework>
+   <LangVersion>default</LangVersion>
    </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="LibLog" Version="5.0.6">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
 
   <PropertyGroup>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
   </PropertyGroup>
   <ItemGroup>
     <None Include="LICENSE.txt" Pack="true" PackagePath="$(PackageLicenseFile)" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.2" />
+  </ItemGroup>
 </Project>