Bump to .NET 6 and removes deprecated dependency

Whois.Console/Program.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using CommandLine;
+using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
-using Serilog;
 
 namespace Whois
 {
@@ -18,14 +18,12 @@ class Program
         /// <param name="args">The args.</param>
         private static async Task Main(string[] args)
         {
-            var log = new LoggerConfiguration()
-                .WriteTo
-                .Console(outputTemplate: "{Timestamp:HH:mm} [{Level}] {Message}{NewLine}{Exception}")
-                .MinimumLevel
-                .Error()
-                .CreateLogger();
-
-            Log.Logger = log;
+            var loggerFactory = LoggerFactory.Create(builder =>
+            {
+                builder.SetMinimumLevel(LogLevel.Trace);
+                builder.AddConsole(options => options.DisableColors = true);
+            });
+            LogProvider.Factory = loggerFactory;
 
             var result = Parser
                 .Default

Whois.Console/Whois.Console.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>Whois.Console</AssemblyName>
     <RootNamespace>Whois</RootNamespace>
     <PackAsTool>true</PackAsTool>
@@ -13,14 +13,14 @@
     <Authors>Chris Wood</Authors>
     <Company>flipbit.co.uk</Company>
     <Product>.NET WHOIS Lookup</Product>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
-    <PackageReference Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
   </ItemGroup>
 
   <ItemGroup>

Whois.Tests.Integration/SampleReader.cs

@@ -11,7 +11,7 @@ internal class SampleReader
     {
         public List<SampleDomain> ReadSampleDomains()
         {
-            var json = File.ReadAllText(Path.Join("..\\..\\..\\Samples", "Domains.txt"));
+            var json = File.ReadAllText(Path.Join("..", "..", "..", "Samples", "Domains.txt"));
 
             return JsonConvert.DeserializeObject<List<SampleDomain>>(json);
         }

Whois.Tests.Integration/Whois.Tests.Integration.csproj

@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Whois</RootNamespace>
     <ApplicationIcon />
     <OutputType>Library</OutputType>
     <StartupObject />
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />

Whois.Tests/LogConfig.cs

@@ -0,0 +1,18 @@
+using Microsoft.Extensions.Logging;
+
+namespace Whois
+{
+    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.Factory = loggerFactory;
+        }
+    }
+}

Whois.Tests/Parsers/WhoisParserTests.cs

@@ -11,7 +11,7 @@ public class WhoisParserTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
             sampleReader = new SampleReader();

Whois.Tests/Parsing/capetown-whois.registry.net.za/capetown/CapetownParsingTests.cs

@@ -12,7 +12,7 @@ public class CapetownParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/ccwhois.ksregistry.net/vg/VgParsingTests.cs

@@ -12,7 +12,7 @@ public class VgParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/ccwhois.verisign-grs.com/cc/CcParsingTests.cs

@@ -12,7 +12,7 @@ public class CcParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/coza-whois.registry.net.za/co.za/CoZaParsingTests.cs

@@ -12,7 +12,7 @@ public class CoZaParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/durban-whois.registry.net.za/durban/DurbanParsingTests.cs

@@ -12,7 +12,7 @@ public class DurbanParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/joburg-whois.registry.net.za/joburg/JoburgParsingTests.cs

@@ -12,7 +12,7 @@ public class JoburgParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/kero.yachay.pe/pe/PeParsingTests.cs

@@ -11,7 +11,7 @@ public class PeParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/org-whois.registry.net.za/org.za/OrgZaParsingTests.cs

@@ -12,7 +12,7 @@ public class OrgZaParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/tvwhois.verisign-grs.com/tv/TvParsingTests.cs

@@ -12,7 +12,7 @@ public class TvParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.aeda.net.ae/ae/AeParsingTests.cs

@@ -11,7 +11,7 @@ public class AeParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.afilias-grs.info/bz/BzParsingTests.cs

@@ -12,7 +12,7 @@ public class BzParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.afilias-grs.info/gi/GiParsingTests.cs

@@ -12,7 +12,7 @@ public class GiParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.afilias-grs.info/lc/LcParsingTests.cs

@@ -12,7 +12,7 @@ public class LcParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.afilias-grs.info/mn/MnParsingTests.cs

@@ -12,7 +12,7 @@ public class MnParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.afilias-grs.info/sc/ScParsingTests.cs

@@ -12,7 +12,7 @@ public class ScParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.afilias-grs.info/vc/VcParsingTests.cs

@@ -12,7 +12,7 @@ public class VcParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.afilias.net/info/InfoParsingTests.cs

@@ -12,7 +12,7 @@ public class InfoParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.afilias.net/pro/ProParsingTests.cs

@@ -12,7 +12,7 @@ public class ProParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.amnic.net/am/AmParsingTests.cs

@@ -12,7 +12,7 @@ public class AmParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.ati.tn/tn/TnParsingTests.cs

@@ -12,7 +12,7 @@ public class TnParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.audns.net.au/au/AuParsingTests.cs

@@ -12,7 +12,7 @@ public class AuParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.ax/ax/AxParsingTests.cs

@@ -12,7 +12,7 @@ public class AxParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }
@@ -50,7 +50,7 @@ public void Test_found()
 
 
             Assert.AreEqual(new DateTime(2006, 8, 3, 0, 0, 0), response.Registered);
-            Assert.AreEqual("�lands landskapsregering", response.Registrant.Name);
+            Assert.AreEqual("Ålands landskapsregering", response.Registrant.Name);
             Assert.AreEqual("0145076-7", response.Registrant.Organization);
 
             Assert.AreEqual(1, response.Registrant.Address.Count);

Whois.Tests/Parsing/whois.biz/biz/BizParsingTests.cs

@@ -12,7 +12,7 @@ public class BizParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.bnnic.bn/bn/BnParsingTests.cs

@@ -12,7 +12,7 @@ public class BnParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.cat/cat/CatParsingTests.cs

@@ -12,7 +12,7 @@ public class CatParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.cctld.by/by/ByParsingTests.cs

@@ -12,7 +12,7 @@ public class ByParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.cctld.uz/uz/UzParsingTests.cs

@@ -12,7 +12,7 @@ public class UzParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.cdmon.com/com/ComParsingTests.cs

@@ -12,7 +12,7 @@ public class ComParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.centralnic.com/ae.org/AeOrgParsingTests.cs

@@ -12,7 +12,7 @@ public class AeOrgParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.centralnic.com/ar.com/ArComParsingTests.cs

@@ -12,7 +12,7 @@ public class ArComParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }

Whois.Tests/Parsing/whois.centralnic.com/br.com/BrComParsingTests.cs

@@ -12,7 +12,7 @@ public class BrComParsingTests : ParsingTests
         [SetUp]
         public void SetUp()
         {
-            SerilogConfig.Init();
+            LogConfig.Init();
 
             parser = new WhoisParser();
         }