Fixed compatibility issues.

JoshClose · Jan 26, 2024 · 0c59831 · 0c59831
1 parent 53a709b
commit 0c59831
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 49 deletions.
diff --git a/src/CsvHelper/Compatibility/AsyncExtensions.cs b/src/CsvHelper/Compatibility/AsyncExtensions.cs
@@ -0,0 +1,20 @@
+using System.IO;
+using System.Threading.Tasks;
+
+namespace CsvHelper
+{
+	internal static class AsyncExtensions
+	{
+#if !(NETSTANDARD2_1_OR_GREATER || NET)
+		public static ValueTask DisposeAsync(this TextWriter textWriter)
+		{
+			if (textWriter != null)
+			{
+				textWriter.Dispose();
+			}
+
+			return default;
+		}
+#endif
+	}
+}
diff --git a/src/CsvHelper/CsvHelper.csproj b/src/CsvHelper/CsvHelper.csproj
@@ -48,6 +48,11 @@
 		<None Include="Icon.png" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
+	<!-- All .NET Versions-->
+	<ItemGroup>
+		<PackageReference Include="System.Linq.Async" Version="4.0.0" />
+	</ItemGroup>
+
 	<!-- .NET 4.6.2 -->
 	<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
 		<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" />

diff --git a/src/CsvHelper/CsvReader.cs b/src/CsvHelper/CsvReader.cs
@@ -1019,7 +1019,6 @@ public virtual IEnumerable<T> EnumerateRecords<T>(T record)
 			}
 		}
 
-#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		/// <inheritdoc/>
 		public virtual async IAsyncEnumerable<T> GetRecordsAsync<T>([EnumeratorCancellation] CancellationToken cancellationToken = default(CancellationToken))
 		{
@@ -1211,7 +1210,6 @@ public virtual async IAsyncEnumerable<T> EnumerateRecordsAsync<T>(T record, [Enu
 				yield return record;
 			}
 		}
-#endif
 
 		/// <summary>
 		/// Gets the index of the field with the given name.

diff --git a/src/CsvHelper/CsvWriter.cs b/src/CsvHelper/CsvWriter.cs
@@ -464,7 +464,6 @@ public virtual async Task WriteRecordsAsync<T>(IEnumerable<T> records, Cancellat
 			}
 		}
 
-#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		/// <inheritdoc/>
 		public virtual async Task WriteRecordsAsync<T>(IAsyncEnumerable<T> records, CancellationToken cancellationToken = default)
 		{
@@ -493,7 +492,6 @@ public virtual async Task WriteRecordsAsync<T>(IAsyncEnumerable<T> records, Canc
 				throw new WriterException(context, "An unexpected error occurred. See inner exception for details.", ex);
 			}
 		}
-#endif
 
 		/// <inheritdoc/>
 		public virtual void NextRecord()
@@ -725,7 +723,6 @@ protected virtual void Dispose(bool disposing)
 			disposed = true;
 		}
 
-#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		/// <inheritdoc/>
 		public async ValueTask DisposeAsync()
 		{
@@ -760,9 +757,7 @@ protected virtual async ValueTask DisposeAsync(bool disposing)
 
 			disposed = true;
 		}
-#endif
 
-#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		private async Task<bool> WriteHeaderAsync<T>(IAsyncEnumerable<T> records)
 		{
 			if (!hasHeaderRecord || hasHeaderBeenWritten)
@@ -780,7 +775,6 @@ private async Task<bool> WriteHeaderAsync<T>(IAsyncEnumerable<T> records)
 
 			return WriteHeader(await records.FirstOrDefaultAsync());
 		}
-#endif
 
 		private bool WriteHeader<T>(IEnumerable<T> records)
 		{

diff --git a/src/CsvHelper/EnumerableExtensions.cs b/src/CsvHelper/EnumerableExtensions.cs
diff --git a/src/CsvHelper/IReader.cs b/src/CsvHelper/IReader.cs
@@ -77,7 +77,6 @@ public interface IReader : IReaderRow, IDisposable
 		/// <returns>An <see cref="IEnumerable{T}"/> of records.</returns>
 		IEnumerable<T> EnumerateRecords<T>(T record);
 
-#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
@@ -121,6 +120,5 @@ public interface IReader : IReaderRow, IDisposable
 		/// /// <param name="cancellationToken">The cancellation token to stop the writing.</param>
 		/// <returns>An <see cref="IAsyncEnumerable{T}"/> of records.</returns>
 		IAsyncEnumerable<T> EnumerateRecordsAsync<T>(T record, CancellationToken cancellationToken = default(CancellationToken));
-#endif
 	}
 }
diff --git a/src/CsvHelper/IWriter.cs b/src/CsvHelper/IWriter.cs
@@ -14,10 +14,7 @@ namespace CsvHelper
 	/// <summary>
 	/// Defines methods used to write to a CSV file.
 	/// </summary>
-	public interface IWriter : IWriterRow, IDisposable
-#if NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
-		, IAsyncDisposable
-#endif
+	public interface IWriter : IWriterRow, IDisposable, IAsyncDisposable
 	{
 		/// <summary>
 		/// Flushes the internal buffer to the <see cref="TextWriter"/> then
@@ -73,14 +70,12 @@ 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 NETSTANDARD2_1_OR_GREATER || NET6_0_OR_GREATER
 		/// <summary>
 		/// Writes the list of records to the CSV file.
 		/// </summary>
 		/// <typeparam name="T">Record type.</typeparam>
 		/// <param name="records">The records to write.</param>
 		/// <param name="cancellationToken">The cancellation token to stop the writing.</param>
 		Task WriteRecordsAsync<T>(IAsyncEnumerable<T> records, CancellationToken cancellationToken = default);
-#endif
 	}
 }
diff --git a/tests/CsvHelper.Tests/CsvHelper.Tests.csproj b/tests/CsvHelper.Tests/CsvHelper.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net7.0;net6.0;net48;net47;net462</TargetFrameworks>
-		<!--<TargetFrameworks>net8.0</TargetFrameworks>-->
+		<!--<TargetFrameworks>net8.0;net7.0;net6.0;net48;net47;net462</TargetFrameworks>-->
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<LangVersion>preview</LangVersion>
 		<SignAssembly>True</SignAssembly>
 		<AssemblyOriginatorKeyFile>CsvHelper.snk</AssemblyOriginatorKeyFile>