Cleanup

* Remove all backwards compatible code and preprocessor statements
* Renamed StrangeCrc.cs to BZip2Crc.cs

Author: McNeight

ICSharpCode.SharpZipLib/AssemblyInfo.cs

@@ -36,36 +36,12 @@
 using System;
 using System.Reflection;
 
-// Version name | Version number | Release date
-// 1.0 RTM | 1.0.2268.0 | 2002 late
-// 1.0 SP1 | 1.0.3111.0 | 2003
-// 1.0 SP2 | 1.0.3316.0 | unknown
-// 1.0 SP3 | 1.0.4292.0 | 2005 January
-// 2.0 RTM | 2.0.5238.0 | 2005 October
-// 2.0 SP1 | 2.0.6129.0 | 2006 June
-// 2.0 SP2 | 2.0.7045.0 | 2007 March
-
-#if (NET_1_0)
-[assembly: AssemblyTitle("SharpZipLib for .NET Framework 1.0")]
-#elif (NET_1_1)
-[assembly: AssemblyTitle("SharpZipLib for .NET Framework 1.1")]
-#elif (NETCF_1_0)
-[assembly: AssemblyTitle("SharpZipLib for .NET Compact Framework 1.0")]
-#elif (NETCF_2_0)
-[assembly: AssemblyTitle("SharpZipLib for .NET Compact Framework 2.0")]
-#else
 [assembly: AssemblyTitle("SharpZipLib")]
-#endif
-
 [assembly: AssemblyDescription("A free C# compression library")]
 [assembly: AssemblyDefaultAlias("ICSharpCode.SharpZipLib")]
 [assembly: AssemblyCulture("")]
 
 [assembly: CLSCompliant(true)]
 
-#if (!NETCF)
-//
-// If #Zip is strongly named it still allows partially trusted callers
-//
+// If SharpZipLib is strongly named it still allows partially trusted callers
 [assembly: System.Security.AllowPartiallyTrustedCallers]
-#endif

ICSharpCode.SharpZipLib/BZip2/BZip2.cs

@@ -33,9 +33,6 @@
 // obligated to do so.  If you do not wish to do so, delete this
 // exception statement from your version.
 
-// Suppress this in CF and 1.1, not needed. Static classes introduced in C# version 2.0
-#if !NETCF_2_0 && !NET_1_1
-
 using System;
 using System.IO;
 
@@ -102,4 +99,3 @@ public static void Compress(Stream inStream, Stream outStream, bool isStreamOwne
 
 	}
 }
-#endif

ICSharpCode.SharpZipLib/BZip2/BZip2Exception.cs

@@ -1,4 +1,4 @@
-// BZip2.cs
+// BZip2Exception.cs
 //
 // Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
 //
@@ -34,23 +34,17 @@
 // exception statement from your version.
 
 using System;
-
-#if !NETCF_1_0 && !NETCF_2_0
 using System.Runtime.Serialization;
-#endif
 
 namespace ICSharpCode.SharpZipLib.BZip2
 {
 	/// <summary>
 	/// BZip2Exception represents exceptions specific to Bzip2 algorithm
 	/// </summary>
-#if !NETCF_1_0 && !NETCF_2_0
 	[Serializable]
-#endif	
 	public class BZip2Exception : SharpZipBaseException
 	{
 
-#if !NETCF_1_0 && !NETCF_2_0
 		/// <summary>
 		/// Deserialization constructor 
 		/// </summary>
@@ -61,7 +55,6 @@ protected BZip2Exception(SerializationInfo info, StreamingContext context)
 
 		{
 		}
-#endif
 		/// <summary>
 		/// Initialise a new instance of BZip2Exception.
 		/// </summary>

ICSharpCode.SharpZipLib/BZip2/BZip2InputStream.cs

@@ -913,7 +913,7 @@ The current block size is 100000 * this number.
 
 		int bsBuff;
 		int bsLive;
-		IChecksum mCrc = new StrangeCRC();
+		IChecksum mCrc = new BZip2Crc();
 
 		bool[] inUse = new bool[256];
 		int    nInUse;

ICSharpCode.SharpZipLib/BZip2/BZip2OutputStream.cs

@@ -377,16 +377,10 @@ public int BytesWritten
 		/// Releases the unmanaged resources used by the <see cref="BZip2OutputStream"/> and optionally releases the managed resources.
 		/// </summary>
 		/// <param name="disposing">true to release both managed and unmanaged resources; false to release only unmanaged resources.</param>
-#if NET_1_0 || NET_1_1 || NETCF_1_0
-		protected virtual void Dispose(bool disposing)
-#else		
 		override protected void Dispose(bool disposing)
-#endif			
 		{
 			try {
-#if !NET_1_0 && !NET_1_1 && !NETCF_1_0
 				base.Dispose(disposing);
-#endif			
 				if( !disposed_ ) {
 					disposed_=true;
 
@@ -1829,7 +1823,7 @@ The current block size is 100000 * this number.
 		int bytesOut;
 		int bsBuff;
 		int bsLive;
-		IChecksum mCrc = new StrangeCRC();
+		IChecksum mCrc = new BZip2Crc();
 
 		bool[] inUse = new bool[256];
 		int nInUse;

ICSharpCode.SharpZipLib/Checksums/Adler32.cs

@@ -172,38 +172,22 @@ public void Update(byte[] buffer, int offset, int count)
 			}
 
 			if (offset < 0) {
-#if NETCF_1_0
-				throw new ArgumentOutOfRangeException("offset");
-#else
 				throw new ArgumentOutOfRangeException(nameof(offset), "cannot be negative");
-#endif				
 			}
 
 			if ( count < 0 ) 
 			{
-#if NETCF_1_0
-				throw new ArgumentOutOfRangeException("count");
-#else
 				throw new ArgumentOutOfRangeException(nameof(count), "cannot be negative");
-#endif				
 			}
 
 			if (offset >= buffer.Length) 
 			{
-#if NETCF_1_0
-				throw new ArgumentOutOfRangeException("offset");
-#else
 				throw new ArgumentOutOfRangeException(nameof(offset), "not a valid index into buffer");
-#endif				
 			}
 
 			if (offset + count > buffer.Length) 
 			{
-#if NETCF_1_0
-				throw new ArgumentOutOfRangeException("count");
-#else
 				throw new ArgumentOutOfRangeException(nameof(count), "exceeds buffer size");
-#endif				
 			}
 
 			//(By Per Bothner)

…Code.SharpZipLib/Checksums/StrangeCrc.cs …rpCode.SharpZipLib/Checksums/BZip2Crc.csICSharpCode.SharpZipLib/Checksums/StrangeCrc.cs renamed to ICSharpCode.SharpZipLib/Checksums/BZip2Crc.cs ICSharpCode.SharpZipLib/Checksums/StrangeCrc.cs renamed to ICSharpCode.SharpZipLib/Checksums/BZip2Crc.cs

@@ -1,4 +1,4 @@
-// StrangeCRC.cs - computes a crc used in the bziplib
+// BZip2Crc.cs - computes a crc used in the bzip2lib
 //
 // Copyright © 2000-2016 AlphaSierraPapa for the SharpZipLib Team
 //
@@ -43,7 +43,7 @@ namespace ICSharpCode.SharpZipLib.Checksums
 	/// <summary>
 	/// Bzip2 checksum algorithm
 	/// </summary>
-	public class StrangeCRC : IChecksum
+	public class BZip2Crc : IChecksum
 	{
 		readonly static uint[] crc32Table = {
 			0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
@@ -115,9 +115,9 @@ public class StrangeCRC : IChecksum
 		int globalCrc;
 
 		/// <summary>
-		/// Initialise a default instance of <see cref="StrangeCRC"></see>
+		/// Initialise a default instance of <see cref="BZip2Crc"></see>
 		/// </summary>	
-		public StrangeCRC() 
+		public BZip2Crc() 
 		{
 			Reset();
 		}
@@ -179,20 +179,12 @@ public void Update(byte[] buffer, int offset, int count)
 
 			if ( offset < 0 )
 			{
-#if NETCF_1_0
-				throw new ArgumentOutOfRangeException("offset");
-#else
 				throw new ArgumentOutOfRangeException(nameof(offset), "cannot be less than zero");
-#endif				
 			}
 
 			if ( count < 0 )
 			{
-#if NETCF_1_0
-				throw new ArgumentOutOfRangeException("count");
-#else
 				throw new ArgumentOutOfRangeException(nameof(count), "cannot be less than zero");
-#endif
 			}
 
 			if ( offset + count > buffer.Length )

ICSharpCode.SharpZipLib/Checksums/Crc32.cs

@@ -200,11 +200,7 @@ public void Update(byte[] buffer, int offset, int count)
 			}
 
 			if ( count < 0 ) {
-#if NETCF_1_0
-				throw new ArgumentOutOfRangeException("count");
-#else
 				throw new ArgumentOutOfRangeException(nameof(count), "Count cannot be less than zero");
-#endif				
 			}
 
 			if (offset < 0 || offset + count > buffer.Length) {

ICSharpCode.SharpZipLib/Core/NameFilter.cs

@@ -152,11 +152,7 @@ public static string[] SplitQuoted(string original)
 					else if (original[endIndex] == escape) {
 						endIndex += 1;
 						if (endIndex >= original.Length) {
-#if NETCF_1_0
-							throw new ArgumentException("Missing terminating escape character");
-#else
 							throw new ArgumentException("Missing terminating escape character", nameof(original));
-#endif
 						}
 						// include escape if this is not an escaped separator
 						if (Array.IndexOf(separators, original[endIndex]) < 0)

ICSharpCode.SharpZipLib/Core/PathFilter.cs

@@ -212,11 +212,7 @@ public DateTime MinDate
 			set
 			{
 				if ( value > maxDate_ ) {
-#if NETCF_1_0
-					throw new ArgumentOutOfRangeException("value");
-#else
 					throw new ArgumentOutOfRangeException(nameof(value), "Exceeds MaxDate");
-#endif
 				}
 
 				minDate_ = value;
@@ -237,11 +233,7 @@ public DateTime MaxDate
 			set
 			{
 				if ( minDate_ > value ) {
-#if NETCF_1_0
-					throw new ArgumentOutOfRangeException("value");
-#else
 					throw new ArgumentOutOfRangeException(nameof(value), "Exceeds MinDate");
-#endif
 				}
 
 				maxDate_ = value;