Updated output assemblies and fixed preprocessor directives.

JoshClose · Jan 23, 2024 · 50b8cb5 · 50b8cb5
1 parent 7076885
commit 50b8cb5
Show file tree

Hide file tree

Showing 21 changed files with 79 additions and 49 deletions.
diff --git a/src/CsvHelper/CsvHelper.csproj b/src/CsvHelper/CsvHelper.csproj
@@ -8,7 +8,7 @@
 
 		<!-- Build -->
 		<AssemblyName>CsvHelper</AssemblyName>
-		<TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net7.0;net6.0;netstandard2.1;netstandard2.0;net48;net47;net462</TargetFrameworks>
 		<!--<TargetFrameworks>net60</TargetFrameworks>-->
 		<LangVersion>latest</LangVersion>
 		<RootNamespace>CsvHelper</RootNamespace>
@@ -66,6 +66,15 @@
 		<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
 	</ItemGroup>
 
+	<!-- .NET 4.8 -->
+	<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />
+		<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.0.0" />
+		<PackageReference Include="Microsoft.CSharp" Version="4.3.0" />
+		<PackageReference Include="System.Memory" Version="4.5.0" />
+		<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
+	</ItemGroup>
+
 	<!-- .NET Standard 2.0 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />

diff --git a/src/CsvHelper/CsvHelper.net462.v3.ncrunchproject b/src/CsvHelper/CsvHelper.net462.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreventSigningOfAssembly>True</PreventSigningOfAssembly>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/CsvHelper/CsvHelper.net48.v3.ncrunchproject b/src/CsvHelper/CsvHelper.net48.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreventSigningOfAssembly>True</PreventSigningOfAssembly>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/CsvHelper/CsvHelper.net7.0.v3.ncrunchproject b/src/CsvHelper/CsvHelper.net7.0.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreventSigningOfAssembly>True</PreventSigningOfAssembly>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/CsvHelper/CsvHelper.net8.0.v3.ncrunchproject b/src/CsvHelper/CsvHelper.net8.0.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreventSigningOfAssembly>True</PreventSigningOfAssembly>
+  </Settings>
+</ProjectConfiguration>
diff --git a/src/CsvHelper/CsvReader.cs b/src/CsvHelper/CsvReader.cs
@@ -1019,7 +1019,7 @@ public virtual IEnumerable<T> EnumerateRecords<T>(T record)
 			}
 		}
 
-#if !NET462
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		/// <inheritdoc/>
 		public virtual async IAsyncEnumerable<T> GetRecordsAsync<T>([EnumeratorCancellation] CancellationToken cancellationToken = default(CancellationToken))
 		{

diff --git a/src/CsvHelper/CsvWriter.cs b/src/CsvHelper/CsvWriter.cs
@@ -465,7 +465,7 @@ public virtual async Task WriteRecordsAsync<T>(IEnumerable<T> records, Cancellat
 			}
 		}
 
-#if !NET462
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		/// <inheritdoc/>
 		public virtual async Task WriteRecordsAsync<T>(IAsyncEnumerable<T> records, CancellationToken cancellationToken = default)
 		{
@@ -726,7 +726,7 @@ protected virtual void Dispose(bool disposing)
 			disposed = true;
 		}
 
-#if !NET462 && !NET47 && !NETSTANDARD2_0
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		/// <inheritdoc/>
 		public async ValueTask DisposeAsync()
 		{
@@ -763,7 +763,7 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 		}
 #endif
 
-#if !NET462
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		private async Task<bool> WriteHeaderAsync<T>(IAsyncEnumerable<T> records)
 		{
 			if (!hasHeaderRecord || hasHeaderBeenWritten)

diff --git a/src/CsvHelper/EnumerableExtensions.cs b/src/CsvHelper/EnumerableExtensions.cs
@@ -9,7 +9,7 @@ namespace CsvHelper
 {
 	internal static class EnumerableExtensions
 	{
-#if !NET462
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		public static async Task<T?> FirstOrDefaultAsync<T>(this IAsyncEnumerable<T> collection)
 		{
 			await foreach (var o in collection.ConfigureAwait(false))

diff --git a/src/CsvHelper/IReader.cs b/src/CsvHelper/IReader.cs
@@ -77,7 +77,7 @@ public interface IReader : IReaderRow, IDisposable
 		/// <returns>An <see cref="IEnumerable{T}"/> of records.</returns>
 		IEnumerable<T> EnumerateRecords<T>(T record);
 
-#if !NET462
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		/// <summary>
 		/// Gets all the records in the CSV file and
 		/// converts each to <see cref="Type"/> T. The Read method

diff --git a/src/CsvHelper/IWriter.cs b/src/CsvHelper/IWriter.cs
@@ -15,7 +15,7 @@ namespace CsvHelper
 	/// Defines methods used to write to a CSV file.
 	/// </summary>
 	public interface IWriter : IWriterRow, IDisposable
-#if !NET462 && !NET47 && !NETSTANDARD2_0
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		, IAsyncDisposable
 #endif
 	{
@@ -73,7 +73,7 @@ public interface IWriter : IWriterRow, IDisposable
 		/// <param name="cancellationToken">The cancellation token to stop the writing.</param>
 		Task WriteRecordsAsync<T>(IEnumerable<T> records, CancellationToken cancellationToken = default);
 
-#if !NET462
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		/// <summary>
 		/// Writes the list of records to the CSV file.
 		/// </summary>

diff --git a/src/CsvHelper/ObjectCreator.cs b/src/CsvHelper/ObjectCreator.cs
@@ -70,7 +70,7 @@ private static Type[] GetArgTypes(object[] args)
 		[MethodImpl(MethodImplOptions.AggressiveInlining)]
 		private static int GetConstructorCacheKey(Type type, Type[] args)
 		{
-#if !NET462
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 			var hashCode = new HashCode();
 			hashCode.Add(type.GetHashCode());
 			for (var i = 0; i < args.Length; i++)

diff --git a/src/CsvHelper/Properties/AssemblyInfo.cs b/src/CsvHelper/Properties/AssemblyInfo.cs
@@ -7,7 +7,7 @@
 
 [assembly: CLSCompliant(true)]
 #if NCRUNCH
-[assembly: InternalsVisibleTo("CsvHelper.Tests")]
+[assembly: InternalsVisibleTo("CsvHelper.Tests, PublicKeyToken=null")]
 #else
 [assembly: InternalsVisibleTo("CsvHelper.Tests, PublicKey=00240000048000009400000006020000002400005253413100040000010001000db97564beef98ad18a76ba31f769fab92b14341c9c37ed12f8004bb2a1a7fe42ad829b0e285915a816f05a32325c5e0ba83bd69d8f4d26a0785ccf446749842ad038f7325601a99c59a323dfa7ecf210139159da0aad1822b5d9c9be6d914ecbaa8b8c908c4af798a89b8777010971d81975079a49662ced398c742ff186a94")]
 #endif
diff --git a/src/CsvHelper/TypeConversion/EnumConverter.cs b/src/CsvHelper/TypeConversion/EnumConverter.cs
@@ -86,21 +86,21 @@ public EnumConverter(Type type)
 				}
 			}
 
-#if NET462 || NET47 || NETSTANDARD2_0
-			try
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
+			if (Enum.TryParse(type, text, ignoreCase, out var value))
 			{
-				return Enum.Parse(type, text, ignoreCase);
+				return value;
 			}
-			catch
+			else
 			{
 				return base.ConvertFromString(text, row, memberMapData);
 			}
 #else
-			if (Enum.TryParse(type, text, ignoreCase, out var value))
+			try
 			{
-				return value;
+				return Enum.Parse(type, text, ignoreCase);
 			}
-			else
+			catch
 			{
 				return base.ConvertFromString(text, row, memberMapData);
 			}

diff --git a/tests/CsvHelper.Tests/CsvHelper.Tests.csproj b/tests/CsvHelper.Tests/CsvHelper.Tests.csproj
@@ -2,14 +2,14 @@
 
 	<PropertyGroup>
 		<TargetFrameworks>net8.0;net7.0;net6.0;net48;net47;net462</TargetFrameworks>
-		<!--<TargetFrameworks>net6.0</TargetFrameworks>-->
+		<!--<TargetFrameworks>net8.0</TargetFrameworks>-->
 		<LangVersion>preview</LangVersion>
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>CsvHelper.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 
 	<ItemGroup>
-	  <None Remove="*.ncrunchproject" />
+		<None Remove="*.ncrunchproject" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -28,35 +28,11 @@
 		</PackageReference>
 	</ItemGroup>
 
-	<!-- .NET 4.6.2 -->
-	<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
-		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-		<PackageReference Include="System.Buffers" Version="4.5.1" />
-		<PackageReference Include="System.Memory" Version="4.5.4" />
-		<PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    </ItemGroup>
-
-	<!-- .NET 4.7 -->
-	<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
-		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-		<PackageReference Include="System.Buffers" Version="4.5.1" />
-		<PackageReference Include="System.Memory" Version="4.5.4" />
-		<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-	</ItemGroup>
-
-    <!-- .NET Standard 2.0 -->
-    <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-        <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
-		<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    </ItemGroup>
-
-    <ItemGroup>
-		<ProjectReference Include="..\..\src\CsvHelper\CsvHelper.csproj" />
+	<ItemGroup>
+		<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
 	</ItemGroup>
 
 	<ItemGroup>
-		<Content Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
+	  <ProjectReference Include="..\..\src\CsvHelper\CsvHelper.csproj" />
 	</ItemGroup>
 </Project>
diff --git a/tests/CsvHelper.Tests/CsvHelper.Tests.net462.v3.ncrunchproject b/tests/CsvHelper.Tests/CsvHelper.Tests.net462.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreventSigningOfAssembly>True</PreventSigningOfAssembly>
+  </Settings>
+</ProjectConfiguration>
diff --git a/tests/CsvHelper.Tests/CsvHelper.Tests.net48.v3.ncrunchproject b/tests/CsvHelper.Tests/CsvHelper.Tests.net48.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreventSigningOfAssembly>True</PreventSigningOfAssembly>
+  </Settings>
+</ProjectConfiguration>
diff --git a/tests/CsvHelper.Tests/CsvHelper.Tests.net6.0.v3.ncrunchproject b/tests/CsvHelper.Tests/CsvHelper.Tests.net6.0.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreventSigningOfAssembly>True</PreventSigningOfAssembly>
+  </Settings>
+</ProjectConfiguration>
diff --git a/tests/CsvHelper.Tests/CsvHelper.Tests.net7.0.v3.ncrunchproject b/tests/CsvHelper.Tests/CsvHelper.Tests.net7.0.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreventSigningOfAssembly>True</PreventSigningOfAssembly>
+  </Settings>
+</ProjectConfiguration>
diff --git a/tests/CsvHelper.Tests/CsvHelper.Tests.net8.0.v3.ncrunchproject b/tests/CsvHelper.Tests/CsvHelper.Tests.net8.0.v3.ncrunchproject
@@ -0,0 +1,5 @@
+<ProjectConfiguration>
+  <Settings>
+    <PreventSigningOfAssembly>True</PreventSigningOfAssembly>
+  </Settings>
+</ProjectConfiguration>
diff --git a/tests/CsvHelper.Tests/Reading/YieldTests.cs b/tests/CsvHelper.Tests/Reading/YieldTests.cs
@@ -72,7 +72,7 @@ public void EnumerateRecords_Disposed_ThrowsObjectDisposedExceptionTest()
 			Assert.Throws<ObjectDisposedException>(() => records.ToList());
 		}
 
-#if !NET462
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		[Fact]
 		public async Task GetRecordsAsyncGeneric_Disposed_ThrowsObjectDisposedExceptionTest()
 		{

diff --git a/tests/CsvHelper.Tests/Writing/IAsyncEnumerableTests.cs b/tests/CsvHelper.Tests/Writing/IAsyncEnumerableTests.cs
@@ -2,7 +2,7 @@
 // This file is a part of CsvHelper and is dual licensed under MS-PL and Apache 2.0.
 // See LICENSE.txt for details or visit http://www.opensource.org/licenses/ms-pl.html for MS-PL and http://opensource.org/licenses/Apache-2.0 for Apache 2.0.
 // https://github.com/JoshClose/CsvHelper
-#if !NET462
+#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 using System;
 using System.Collections.Generic;
 using System.Globalization;