Merge pull request #5 from hsaito/develop

Version 1.6.0
hsaito · Oct 22, 2019 · 3e05a4c · 3e05a4c
2 parents 677f60a + f4eeeda
commit 3e05a4c
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 94 deletions.
diff --git a/.idea/.idea.VE_Count_Consolidator/.idea/projectSettingsUpdater.xml b/.idea/.idea.VE_Count_Consolidator/.idea/projectSettingsUpdater.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: csharp
 solution: VE_Count_Consolidator.sln
 mono: none
-dotnet: 2.1.300
+dotnet: 3.0.100
 script:
  - dotnet restore
  - dotnet build

diff --git a/README.md b/README.md
@@ -12,6 +12,8 @@ This repository contains two components:
 - VECountConsolidatorCli -- CLI frontend that uses the library above.
 
 ### VECountConsolidator
+This library is available from [NuGet](https://www.nuget.org/packages/VECountConsolidator/).
+
 Library handling the process. Caller should call Process() function with appropriate `enum` currently only supports `VEC.ARRL`.
 
 Return the list of the following format.

diff --git a/VECountConsolidator/VECountConsolidator.csproj b/VECountConsolidator/VECountConsolidator.csproj
@@ -1,20 +1,27 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>netstandard2.0</TargetFramework>
+        <TargetFramework>netcoreapp3.0</TargetFramework>
         <Authors>Hideki Saito</Authors>
         <Company>Hideki Saito</Company>
         <Title>Volunteer Examiner Session Count Consolidator Library</Title>
         <Product>VECountConsolidator</Product>
         <PackageId>VECountConsolidator</PackageId>
         <Description>Consolidates Volunteer Examiner participation counts.</Description>
-        <Copyright>Copyright (c) 2018 Hideki Saito</Copyright>
+        <Copyright>Copyright (c) 2019 Hideki Saito</Copyright>
         <PackageLicenseUrl>https://github.com/hsaito/VE_Count_Consolidator/blob/master/LICENSE</PackageLicenseUrl>
         <PackageProjectUrl>https://github.com/hsaito/VE_Count_Consolidator</PackageProjectUrl>
-        <Version>1.5.0.0</Version>
-        <AssemblyVersion>1.5.0.0</AssemblyVersion>
-        <FileVersion>1.5.0.0</FileVersion>
+        <Version>1.6.0.0</Version>
+        <AssemblyVersion>1.6.0.0</AssemblyVersion>
+        <FileVersion>1.6.0.0</FileVersion>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <Deterministic>true</Deterministic>
+        <DeterministicSourceRoot>/_/</DeterministicSourceRoot>
+        <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\'))</RepoRoot>
+        <PathMap>$(RepoRoot)=$(DeterministicSourceRoot)</PathMap>
+    </PropertyGroup>
+
 </Project>
diff --git a/VECountConsolidatorCli/Program.cs b/VECountConsolidatorCli/Program.cs
@@ -3,39 +3,31 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Xml;
 using CommandLine;
 using CsvHelper;
-using log4net;
-using log4net.Config;
-using log4net.Repository.Hierarchy;
 using VECountConsolidator;
 
 namespace VECountConsolidatorCli
 {
     internal class Program
     {
-        private static readonly ILog Log = LogManager.GetLogger(typeof(Program));
-
-
         public static int Main(string[] args)
         {
-            if (!InitializeLogging()) return -1;
             try
             {
                 Parser.Default.ParseArguments<Options>(args).WithParsed(
                     Generate);
             }
             catch (Exception ex)
             {
-                Log.Fatal(ex.Message);
+                Console.Error.WriteLine(ex.Message);
                 return -1;
             }
 
             return 0;
         }
 
+
         private static void Generate(Options options)
         {
             if (options.Mode != "create") return;
@@ -79,34 +71,7 @@ private static void Output(IEnumerable<Consolidator.Person> persons)
             }
             catch (Exception e)
             {
-                Log.Error(e.Message);
-            }
-        }
-
-        /// <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;
+                Console.Error.WriteLine(e.Message);
             }
         }
 

diff --git a/VECountConsolidatorCli/VECountConsolidatorCli.csproj b/VECountConsolidatorCli/VECountConsolidatorCli.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <TargetFramework>netcoreapp3.0</TargetFramework>
         <Title>VE Count Consolidator</Title>
         <Authors>Hideki Saito</Authors>
         <Company>Hideki Saito</Company>
@@ -11,23 +11,24 @@
         <Copyright>Copyright (c) 2018 Hideki Saito</Copyright>
         <PackageLicenseUrl>https://github.com/hsaito/VE_Count_Consolidator/blob/master/LICENSE</PackageLicenseUrl>
         <PackageProjectUrl>https://github.com/hsaito/VE_Count_Consolidator</PackageProjectUrl>
-        <Version>1.5.0.0</Version>
-        <AssemblyVersion>1.5.0.0</AssemblyVersion>
-        <FileVersion>1.5.0.0</FileVersion>
-        <RuntimeIdentifiers>linux-x64,linux-arm,win-x64,win-x86,osx-x64</RuntimeIdentifiers>
+        <Version>1.6.0.0</Version>
+        <AssemblyVersion>1.6.0.0</AssemblyVersion>
+        <FileVersion>1.6.0.0</FileVersion>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.5.0" />
         <PackageReference Include="CsvHelper" Version="12.1.2" />
         <PackageReference Include="log4net" Version="2.0.8" />
     </ItemGroup>
-    <ItemGroup>
-        <None Update="log4net.config">
-            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-        </None>
-    </ItemGroup>
     <ItemGroup>
       <ProjectReference Include="..\VECountConsolidator\VECountConsolidator.csproj" />
     </ItemGroup>
+
+    <PropertyGroup>
+        <Deterministic>true</Deterministic>
+        <DeterministicSourceRoot>/_/</DeterministicSourceRoot>
+        <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\'))</RepoRoot>
+        <PathMap>$(RepoRoot)=$(DeterministicSourceRoot)</PathMap>
+    </PropertyGroup>
 </Project>
diff --git a/VECountConsolidatorCli/log4net.config b/VECountConsolidatorCli/log4net.config