Release 2.6.2

TinyCsvParser · May 31, 2022 · 0d8c574 · 0d8c574
1 parent ce2172e
commit 0d8c574
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 46 deletions.
diff --git a/TinyCsvParser/NuGet/nupkg/TinyCsvParser.2.6.2.nupkg b/TinyCsvParser/NuGet/nupkg/TinyCsvParser.2.6.2.nupkg
diff --git a/TinyCsvParser/NuGet/nupkg/TinyCsvParser.2.6.2.symbols.nupkg b/TinyCsvParser/NuGet/nupkg/TinyCsvParser.2.6.2.symbols.nupkg
diff --git a/TinyCsvParser/TinyCsvParser.Benchmark/TinyCsvParser.Benchmark.csproj b/TinyCsvParser/TinyCsvParser.Benchmark/TinyCsvParser.Benchmark.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/TinyCsvParser/TinyCsvParser.Test/Examples/CustomConverterTest.cs b/TinyCsvParser/TinyCsvParser.Test/Examples/CustomConverterTest.cs
@@ -72,9 +72,9 @@ public void ParseWithNULLStringTest()
                 .ToList();
 
             Assert.AreEqual(null, result[0].Result.Property);
-            Assert.AreEqual(1.0, result[1].Result.Property, 1e-5);
+            Assert.That(result[1].Result.Property, Is.EqualTo(1.0).Within(1e-5));
             Assert.AreEqual(null, result[2].Result.Property);
-            Assert.AreEqual(2.0, result[3].Result.Property, 1e-5);
+            Assert.That(result[3].Result.Property, Is.EqualTo(2.0).Within(1e-5));
         }
     }
 }
diff --git a/TinyCsvParser/TinyCsvParser.Test/TinyCsvParser.Test.csproj b/TinyCsvParser/TinyCsvParser.Test/TinyCsvParser.Test.csproj
@@ -1,12 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452;netcoreapp2.0;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
+	  <ImplicitUsings>disable</ImplicitUsings>
+	  <Nullable>disable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.11.0" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.12.0" />
+    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.2.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TinyCsvParser/TinyCsvParser.Test/TypeConverter/NullableDoubleConverterTest.cs b/TinyCsvParser/TinyCsvParser.Test/TypeConverter/NullableDoubleConverterTest.cs
@@ -41,7 +41,7 @@ public override void AssertAreEqual(Double? expected, Double? actual)
             }
             else
             {
-                Assert.AreEqual(expected.Value, actual, Double.Epsilon);
+                Assert.AreEqual(actual, Is.EqualTo(expected.Value).Within(double.Epsilon));
             }
         }
 

diff --git a/TinyCsvParser/TinyCsvParser.Test/TypeConverter/NullableSingleConverterTest.cs b/TinyCsvParser/TinyCsvParser.Test/TypeConverter/NullableSingleConverterTest.cs
@@ -41,7 +41,7 @@ public override void AssertAreEqual(float? expected, float? actual)
             }
             else
             {
-                Assert.AreEqual(expected.Value, actual, float.Epsilon);
+                Assert.AreEqual(actual, Is.EqualTo(expected.Value).Within(float.Epsilon));
             }
         }
 

diff --git a/TinyCsvParser/TinyCsvParser.sln b/TinyCsvParser/TinyCsvParser.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28917.182
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32210.238
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TinyCsvParser", "TinyCsvParser\TinyCsvParser.csproj", "{055420D5-85B9-499A-A5C9-022B37529214}"
 EndProject

diff --git a/TinyCsvParser/TinyCsvParser/TinyCsvParser.csproj b/TinyCsvParser/TinyCsvParser/TinyCsvParser.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard1.3;netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
     <Authors>Philipp Wagner</Authors>
     <Company />
     <Product />
@@ -10,44 +10,16 @@
     <RepositoryUrl>git://github.com/bytefish/TinyCsvParser</RepositoryUrl>
     <PackageProjectUrl>https://github.com/bytefish/TinyCsvParser</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <Copyright>Copyright © 2019 Philipp Wagner</Copyright>
+    <Copyright>Copyright © 2021 Philipp Wagner</Copyright>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <AssemblyVersion>2.6.1.0</AssemblyVersion>
-    <FileVersion>2.6.1.0</FileVersion>
+    <AssemblyVersion>2.6.2.0</AssemblyVersion>
+    <FileVersion>2.6.2.0</FileVersion>
     <RepositoryType>git</RepositoryType>
-    <Version>2.6.1</Version>
+    <Version>2.6.2</Version>
     <IncludeSource>True</IncludeSource>
     <IncludeSymbols>True</IncludeSymbols>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>TinyCsvParser.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net45|x64'" />
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
-    <PackageReference Include="System.Runtime" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Extensions" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.InteropServices" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
-    <PackageReference Include="System.Globalization" Version="4.3.0" />
-    <PackageReference Include="System.Linq" Version="4.3.0" />
-    <PackageReference Include="System.Linq.Expressions" Version="4.3.0" />
-    <PackageReference Include="System.Linq.Parallel" Version="4.3.0" />
-    <PackageReference Include="System.Text.RegularExpressions" Version="4.3.0" />
-    <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
-    <PackageReference Include="System.Reflection" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.Extensions" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="Async\**" />
-    <EmbeddedResource Remove="Async\**" />
-    <None Remove="Async\**" />
-  </ItemGroup>
-
-
 </Project>