Cleanup to unhook Open.Disposable.

Author: Oren (electricessence)

CsvReader.cs

@@ -1,13 +1,12 @@
-using Open.Disposable;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.IO;
 using System.Threading.Tasks;
 
 namespace Open.Text.CSV
 {
-	public class CsvReader : DisposableBase
+	public class CsvReader : IDisposable
 	{
 		public CsvReader(StreamReader source)
 		{
@@ -17,7 +16,7 @@ public CsvReader(StreamReader source)
 		StreamReader _source;
 
 
-		protected override void OnDispose(bool calledExplicitly)
+		public void Dispose()
 		{
 			_source = null; // The intention here is if this object is disposed, then prevent further reading.
 		}
@@ -96,7 +95,7 @@ public static IEnumerable<IEnumerable<string>> GetRowsFromFile(string filepath)
 
 			if (File.Exists(filepath))
 			{
-				using (var s = new StreamReader((new FileInfo(filepath)).OpenRead()))
+				using (var s = new StreamReader(new FileInfo(filepath).OpenRead()))
 					foreach (var line in GetRows(s))
 						yield return line;
 			}

CsvWriter.cs

@@ -1,42 +1,45 @@
-using Open.Disposable;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics.Contracts;
 using System.IO;
 
 namespace Open.Text.CSV
 {
-	public class CsvWriter : DisposableBase
+	public class CsvWriter : IDisposable
 	{
 		internal TextWriter Target;
 
 		public CsvWriter(TextWriter target)
 		{
-			Target = target;
+			Target = target ?? throw new ArgumentNullException(nameof(target));
 		}
 
-		protected override void OnDispose(bool calledExplicitly)
+		public void Dispose()
 		{
 			Target = null; // The intention here is if this object is disposed, then prevent further writing.
 		}
 
 		public void WriteRow<T>(IEnumerable<T> row, bool forceQuotes = false)
 		{
-			WriteRow(Target, row, forceQuotes);
+			WriteRow(Target ?? throw new ObjectDisposedException(GetType().ToString()), row, forceQuotes);
 		}
 
 		public void WriteRows<T>(IEnumerable<IEnumerable<T>> rows, bool forceQuotes = false)
 		{
-			WriteRows(Target, rows, forceQuotes);
+			WriteRows(Target ?? throw new ObjectDisposedException(GetType().ToString()), rows, forceQuotes);
 		}
 
 		public static void WriteValue(TextWriter writer, object value = null, bool forceQuotes = false)
 		{
+			if (writer == null) throw new ArgumentNullException(nameof(writer));
+			Contract.EndContractBlock();
+
 			writer.Write(CsvUtility.ExportValue(value, forceQuotes));
 		}
 
 		public static void WriteRow<T>(TextWriter writer, IEnumerable<T> row, bool forceQuotes = false)
 		{
+			if (writer == null) throw new ArgumentNullException(nameof(writer));
 			if (row == null) throw new ArgumentNullException(nameof(row));
 			Contract.EndContractBlock();
 
@@ -48,6 +51,7 @@ public static void WriteRow<T>(TextWriter writer, IEnumerable<T> row, bool force
 
 		public static void WriteRows<T>(TextWriter writer, IEnumerable<IEnumerable<T>> rows, bool forceQuotes = false)
 		{
+			if (writer == null) throw new ArgumentNullException(nameof(writer));
 			if (rows == null) throw new ArgumentNullException(nameof(rows));
 			Contract.EndContractBlock();
 

Open.Text.CSV.csproj

@@ -16,9 +16,9 @@ Part of the "Open" set of libraries.</Description>
     <RepositoryUrl>https://github.com/electricessence/Open.Text.CSV/</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>csv, csharp, dotnetcore, textwriter, streamreader</PackageTags>
-    <Version>2.0.1</Version>
-    <AssemblyVersion>2.0.1.0</AssemblyVersion>
-    <FileVersion>2.0.1.0</FileVersion>
+    <Version>2.1.0</Version>
+    <AssemblyVersion>2.1.0.0</AssemblyVersion>
+    <FileVersion>2.1.0.0</FileVersion>
     <PackageReleaseNotes></PackageReleaseNotes>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
@@ -42,14 +42,13 @@ Part of the "Open" set of libraries.</Description>
     <None Remove="LICENSE" />
     <None Remove="README.md" />
   </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Open.Disposable" Version="2.0.1" />
-    <PackageReference Include="Open.Text" Version="2.0.5" />
-  </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Open.Text" Version="2.0.5" />
+  </ItemGroup>
 
 </Project>