Merge branch 'release/0.0.4' into main

stuebersystems · Sep 24, 2021 · e0768d0 · e0768d0
2 parents 95beec5 + c1357e3
commit e0768d0
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 40 deletions.
diff --git a/src/CommandDefinitions.cs b/src/CommandDefinitions.cs
@@ -31,9 +31,8 @@ public static Command Export()
         {
             var command = new Command("export", "Exports data from CSV or XLSX to ECF files")
             {
-                new Option(new[] { "--config", "-c" }, "Path to existing JSON configuration file")
+                new Option<FileInfo>(new[] { "--config", "-c" }, "Path to existing JSON configuration file")
                 {
-                    Argument = new Argument<FileInfo>(),
                     IsRequired = true
                 },
             };

diff --git a/src/Converters/CsvConverterResolver.cs b/src/Converters/CsvConverterResolver.cs
@@ -32,37 +32,25 @@ public class CsvConverterResolver : CsvDefaultConverterResolver
     {
         protected override void RegisterDefaultConverters()
         {
-            AddConverter<bool?>(new CsvBooleanConverter());
-            AddConverter<bool>(new CsvBooleanConverter());
-            AddConverter<byte?>(new CsvByteConverter());
-            AddConverter<byte>(new CsvByteConverter());
-            AddConverter<char?>(new CsvCharConverter());
-            AddConverter<char>(new CsvCharConverter());
-            AddConverter<Date?>(new CsvDateConverter());
-            AddConverter<Date>(new CsvDateConverter());
-            AddConverter<decimal?>(new CsvDecimalConverter());
-            AddConverter<decimal>(new CsvDecimalConverter());
-            AddConverter<double?>(new CsvDoubleConverter());
-            AddConverter<double>(new CsvDoubleConverter());
-            AddConverter<EcfGender?>(new CsvGenderConverter());
-            AddConverter<EcfGender>(new CsvGenderConverter());
-            AddConverter<Guid?>(new CsvGuidConverter());
-            AddConverter<Guid>(new CsvGuidConverter());
-            AddConverter<int?>(new CsvInt32Converter());
-            AddConverter<int>(new CsvInt32Converter());
-            AddConverter<long?>(new CsvInt64Converter());
-            AddConverter<long>(new CsvInt64Converter());
-            AddConverter<sbyte?>(new CsvSByteConverter());
-            AddConverter<sbyte>(new CsvSByteConverter());
-            AddConverter<short?>(new CsvInt16Converter());
-            AddConverter<short>(new CsvInt16Converter());
-            AddConverter<string>(new CsvStringConverter());
-            AddConverter<uint?>(new CsvUInt32Converter());
-            AddConverter<uint>(new CsvUInt32Converter());
-            AddConverter<ulong?>(new CsvUInt64Converter());
-            AddConverter<ulong>(new CsvUInt64Converter());
-            AddConverter<ushort?>(new CsvUInt16Converter());
-            AddConverter<ushort>(new CsvUInt16Converter());
+            AddConverter(typeof(bool), new CsvBooleanConverter());
+            AddConverter(typeof(byte), new CsvByteConverter());
+            AddConverter(typeof(char), new CsvCharConverter());
+            AddConverter(typeof(Date), new CsvDateConverter());
+            AddConverter(typeof(decimal), new CsvDecimalConverter());
+            AddConverter(typeof(double), new CsvDoubleConverter());
+            AddConverter(typeof(Guid), new CsvGuidConverter());
+            AddConverter(typeof(int), new CsvInt32Converter());
+            AddConverter(typeof(long), new CsvInt64Converter());
+            AddConverter(typeof(sbyte), new CsvSByteConverter());
+            AddConverter(typeof(short), new CsvInt16Converter());
+            AddConverter(typeof(string), new CsvStringConverter());
+            AddConverter(typeof(uint), new CsvUInt32Converter());
+            AddConverter(typeof(uint), new CsvUInt32Converter());
+            AddConverter(typeof(ulong), new CsvUInt64Converter());
+            AddConverter(typeof(ulong), new CsvUInt64Converter());
+            AddConverter(typeof(Uri), new CsvUriConverter());
+            AddConverter(typeof(ushort), new CsvUInt16Converter());
+            AddConverter(typeof(EcfGender), new CsvGenderConverter());
         }
     }
 }
diff --git a/src/Ecf.Excel.csproj b/src/Ecf.Excel.csproj
@@ -14,10 +14,10 @@
 
   <ItemGroup>
     <PackageReference Include="ClosedXML" Version="0.95.4" />
-    <PackageReference Include="Enbrea.Csv" Version="0.1.2" />
-    <PackageReference Include="Enbrea.Ecf" Version="0.1.8" />
-    <PackageReference Include="Enbrea.GuidFactory" Version="0.1.1" />
-    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20574.7" />
+    <PackageReference Include="Enbrea.Csv" Version="0.2.1" />
+    <PackageReference Include="Enbrea.Ecf" Version="0.1.10" />
+    <PackageReference Include="Enbrea.GuidFactory" Version="0.2.0" />
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.21308.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Export/ExportStudent.cs b/src/Export/ExportStudent.cs
@@ -113,7 +113,7 @@ private string GenerateId()
 
            var keyValues = csvLineBuilder.Write(FirstName, MiddleName, LastName, BirthDate?.ToString("yyyy-MM-dd"));
 
-           return GuidFactory.Create(GuidFactory.DnsNamespace, keyValues).ToString();
+           return GuidGenerator.Create(GuidGenerator.DnsNamespace, keyValues).ToString();
         }
     }
 }
diff --git a/test/xunit/Ecf.Excel.XUnit.csproj b/test/xunit/Ecf.Excel.XUnit.csproj
@@ -7,13 +7,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.0.3">
+    <PackageReference Include="coverlet.collector" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>