Merge pull request #87 from hsaito/maint

Misc maintenance

Author: hsaito

.travis.yml

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Authors>Hideki Saito</Authors>
     <Company>Hideki Saito</Company>
     <Title>MyNumberNET My Number Validation Library</Title>

MyNumberNET/MyNumberNET.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Authors>Hideki Saito</Authors>
     <Company>Hideki Saito</Company>
     <Title>MyNumber My Number Validation Command Line Tool</Title>
@@ -14,24 +14,17 @@
     <Version>1.0.4.0</Version>
     <AssemblyVersion>1.0.4.0</AssemblyVersion>
     <FileVersion>1.0.4.0</FileVersion>
-    <RuntimeIdentifiers>linux-x64,linux-arm,win-x64,win-x86,osx-x64</RuntimeIdentifiers>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <None Update="log4net.config">
+    <None Update="nlog.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="log4net" Version="2.0.10" />
-    <PackageReference Include="System.Console" Version="4.3.1" />
-    <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
+    <PackageReference Include="NLog" Version="6.0.3" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MyNumberNET\MyNumberNET.csproj" />
   </ItemGroup>
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
-  </PropertyGroup>
 </Project>

MyNumberNET_CLI/MyNumberNET_CLI.csproj

@@ -4,29 +4,25 @@
 using System.Reflection;
 using System.Text.RegularExpressions;
 using System.Xml;
-using log4net;
-using log4net.Config;
-using log4net.Repository.Hierarchy;
+using NLog;
 using MyNumberNET;
 using static System.Char;
 
 namespace MyNumberNET_CLI
 {
     public class Program
     {
-        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
+        private static readonly Logger Log = LogManager.GetCurrentClassLogger();
 
         public static int Main(string[] args)
         {
             try
             {
-                var result = InitializeLogging();
-                if (!result)
-                    throw new Exception("Logging could not be enabled.");
+                // NLog automatically loads nlog.config, no manual initialization needed
             }
             catch (Exception ex)
             {
-                Log.Fatal(ex.Message);
+                Log.Fatal(ex, ex.Message);
                 return -1;
             }
 
@@ -183,8 +179,7 @@ public static int Main(string[] args)
             }
             catch (Exception ex)
             {
-                Log.Fatal(ex.Message);
-                Log.Debug(ex.StackTrace);
+                Log.Fatal(ex, ex.Message);
                 return -1;
             }
         }
@@ -379,32 +374,6 @@ private static int[] Increment(int[] input)
             return input;
         }
 
-        /// <summary>
-        ///     Initialize logging
-        /// </summary>
-        private static bool InitializeLogging()
-        {
-            try
-            {
-                // Configuration for logging
-                var log4NetConfig = new XmlDocument();
-
-                using (var reader = new StreamReader(new FileStream("log4net.config", FileMode.Open, FileAccess.Read)))
-                {
-                    log4NetConfig.Load(reader);
-                }
-
-                var rep = LogManager.CreateRepository(Assembly.GetEntryAssembly(), typeof(Hierarchy));
-                XmlConfigurator.Configure(rep, log4NetConfig["log4net"]);
-                return true;
-            }
-            catch (Exception ex)
-            {
-                Console.WriteLine("Error initializing the logging.");
-                Console.WriteLine(ex.Message);
-                return false;
-            }
-        }
 
         private enum RangeMode
         {

MyNumberNET_CLI/Program.cs

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<nlog xmlns="http://www.nlog-project.org/schemas/NLog.xsd"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <targets>
+    <target xsi:type="File" name="logfile" fileName="${basedir}/log.txt" layout="${longdate}|${level:uppercase=true}|${logger}|${message}" />
+    <target xsi:type="Console" name="logconsole" layout="${longdate}|${level:uppercase=true}|${logger}|${message}" />
+  </targets>
+  <rules>
+    <logger name="*" minlevel="Info" writeTo="logconsole,logfile" />
+  </rules>
+</nlog>
+

MyNumberNET_CLI/log4net.config

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <Authors>Hideki Saito</Authors>
     <Company>Hideki Saito</Company>
@@ -17,9 +17,9 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.2.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.10.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.10.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MyNumberNET\MyNumberNET.csproj" />