From 50c0074f2df4338ac79b5429cf800b96e7f5abce Mon Sep 17 00:00:00 2001
From: Claudio Schaad <schaad@pog.ch>
Date: Sun, 14 Jun 2020 14:08:06 +0200
Subject: [PATCH] Upgraded to .net core 3.1

---
 .gitignore                                        |  3 +++
 Schaad.Finance.Api/Schaad.Finance.Api.csproj      |  4 ++--
 .../AccountStatementServiceTest.cs                |  4 ++--
 Schaad.Finance.Tests/Schaad.Finance.Tests.csproj  | 15 +++++++++------
 Schaad.Finance/Schaad.Finance.csproj              | 10 +++++-----
 .../Services/CreditCardStatementService.cs        |  2 +-
 6 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index e8f3a70..06a2278 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,6 @@
 /Schaad.Finance/bin/Release/netstandard2.0
 /Schaad.Finance.Tests/bin/Release/netcoreapp2.0
 /Schaad.Finance.Api/bin/Release/netstandard2.0
+/Schaad.Finance/bin/Release/netstandard2.1
+/Schaad.Finance.Api/bin/Release/netstandard2.1
+/Schaad.Finance.Tests/bin/Release/netcoreapp3.1
diff --git a/Schaad.Finance.Api/Schaad.Finance.Api.csproj b/Schaad.Finance.Api/Schaad.Finance.Api.csproj
index b6c502b..d928b56 100644
--- a/Schaad.Finance.Api/Schaad.Finance.Api.csproj
+++ b/Schaad.Finance.Api/Schaad.Finance.Api.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Schaad.Finance.Tests/AccountStatementServiceTest.cs b/Schaad.Finance.Tests/AccountStatementServiceTest.cs
index 207be4a..5cadbf0 100644
--- a/Schaad.Finance.Tests/AccountStatementServiceTest.cs
+++ b/Schaad.Finance.Tests/AccountStatementServiceTest.cs
@@ -25,8 +25,8 @@ namespace Schaad.Finance.Tests
         [Test]
         public void ReadFile_CAMT053()
         {
-            //var statements = service.ReadFile(@"Data\camt053.xml", System.Text.Encoding.UTF8);
-            var statements = service.ReadFile(@"C:\temp\camt053.xml", System.Text.Encoding.UTF8);
+            var statements = service.ReadFile(@"Data\camt053.xml", System.Text.Encoding.UTF8);
+            //var statements = service.ReadFile(@"C:\temp\camt053.xml", System.Text.Encoding.UTF8);
 
             Assert.That(statements.TrueForAll(s => s.IsSuccess));
         }
diff --git a/Schaad.Finance.Tests/Schaad.Finance.Tests.csproj b/Schaad.Finance.Tests/Schaad.Finance.Tests.csproj
index 93fb855..a6773ae 100644
--- a/Schaad.Finance.Tests/Schaad.Finance.Tests.csproj
+++ b/Schaad.Finance.Tests/Schaad.Finance.Tests.csproj
@@ -1,18 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.2.0" />
-    <PackageReference Include="Moq" Version="4.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="1.4.0" />
-    <PackageReference Include="MSTest.TestFramework" Version="1.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
+    <PackageReference Include="Moq" Version="4.14.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="2.1.2" />
+    <PackageReference Include="MSTest.TestFramework" Version="2.1.2" />
     <PackageReference Include="NUnit" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.16.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/Schaad.Finance/Schaad.Finance.csproj b/Schaad.Finance/Schaad.Finance.csproj
index ba289fe..06e7da1 100644
--- a/Schaad.Finance/Schaad.Finance.csproj
+++ b/Schaad.Finance/Schaad.Finance.csproj
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="12.1.2" />
-    <PackageReference Include="FreeSpire.PDF" Version="5.4.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
+    <PackageReference Include="CsvHelper" Version="15.0.5" />
+    <PackageReference Include="FreeSpire.PDF" Version="6.2.0" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
     <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Serialization.Formatters" Version="4.3.0" />
diff --git a/Schaad.Finance/Services/CreditCardStatementService.cs b/Schaad.Finance/Services/CreditCardStatementService.cs
index 35613f2..1eb361b 100644
--- a/Schaad.Finance/Services/CreditCardStatementService.cs
+++ b/Schaad.Finance/Services/CreditCardStatementService.cs
@@ -38,7 +38,7 @@ namespace Schaad.Finance.Services
         {
             using (var reader = new StreamReader(filePath, encoding))
             {
-                using (var csv = new CsvReader(reader))
+                using (var csv = new CsvReader(reader, CultureInfo.CurrentCulture))
                 {
                     csv.Configuration.RegisterClassMap<Formats.CreditCardProvider.CembraMap>();
                     var records = csv.GetRecords<CreditCardTransaction>();